database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-10-22 14:32:25 +03:00
Code Activity

Replace float8 with int in date2isoweek() and date2isoyear().

Browse Source 
The values of the "result" variables in these functions are
always integers; using a float8 variable accomplishes nothing
except to incur useless conversions to and from float.  While
that wastes a few nanoseconds, these functions aren't all that
time-critical.  But it seems worth fixing to remove possible
reader confusion.

Also, in the case of date2isoyear(), "result" is a very poorly
chosen variable name because it is *not* the function's result.
Rename it to "week", and do the same in date2isoweek() for
consistency.

Since this is mostly cosmetic, there seems little need
for back-patch.

Author: Sergey Fukanchik <s.fukanchik@postgrespro.ru>
Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us>
Discussion: https://postgr.es/m/6323a-68726500-1-7def9d00@137821581
This commit is contained in:
Tom Lane
2025-07-12 11:50:35 -04:00
parent f2c87ac04e
commit 84ce258707
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/backend/utils/adt/timestamp.c
View File

@@ -5312,10 +5312,10 @@ isoweekdate2date(int isoweek, int wday, int *year, int *mon, int *mday)
int int
date2isoweek(int year, int mon, int mday) date2isoweek(int year, int mon, int mday)
{ {
float8 result;
int day0, int day0,
day4, day4,
dayn; dayn,
week;
/* current day */ /* current day */
dayn = date2j(year, mon, mday); dayn = date2j(year, mon, mday);
@@ -5338,13 +5338,13 @@ date2isoweek(int year, int mon, int mday)
day0 = j2day(day4 - 1); day0 = j2day(day4 - 1);
} }
result = (dayn - (day4 - day0)) / 7 + 1; week = (dayn - (day4 - day0)) / 7 + 1;
/* /*
* Sometimes the last few days in a year will fall into the first week of * Sometimes the last few days in a year will fall into the first week of
* the next year, so check for this. * the next year, so check for this.
*/ */
if (result >= 52) if (week >= 52)
{ {
day4 = date2j(year + 1, 1, 4); day4 = date2j(year + 1, 1, 4);
@@ -5352,10 +5352,10 @@ date2isoweek(int year, int mon, int mday)
day0 = j2day(day4 - 1); day0 = j2day(day4 - 1);
if (dayn >= day4 - day0) if (dayn >= day4 - day0)
result = (dayn - (day4 - day0)) / 7 + 1; week = (dayn - (day4 - day0)) / 7 + 1;
} }
return (int) result; return week;
} }
@@ -5367,10 +5367,10 @@ date2isoweek(int year, int mon, int mday)
int int
date2isoyear(int year, int mon, int mday) date2isoyear(int year, int mon, int mday)
{ {
float8 result;
int day0, int day0,
day4, day4,
dayn; dayn,
week;
/* current day */ /* current day */
dayn = date2j(year, mon, mday); dayn = date2j(year, mon, mday);
@@ -5395,13 +5395,13 @@ date2isoyear(int year, int mon, int mday)
year--; year--;
} }
result = (dayn - (day4 - day0)) / 7 + 1; week = (dayn - (day4 - day0)) / 7 + 1;
/* /*
* Sometimes the last few days in a year will fall into the first week of * Sometimes the last few days in a year will fall into the first week of
* the next year, so check for this. * the next year, so check for this.
*/ */
if (result >= 52) if (week >= 52)
{ {
day4 = date2j(year + 1, 1, 4); day4 = date2j(year + 1, 1, 4);