Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit e6b72d6

Browse files
bmomjianbmomjian
committed
Update DAYS_PER_MONTH comment.
Add SECS_PER_YEAR and MINS_PER_HOUR macros.
1 parent a0407f5 commit e6b72d6

File tree

11 files changed

+82
-71
lines changed

11 files changed

+82
-71
lines changed

‎src/backend/postmaster/syslogger.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*
1919
*
2020
* IDENTIFICATION
21-
* $PostgreSQL: pgsql/src/backend/postmaster/syslogger.c,v 1.17 2005/07/21 03:56:11 momjian Exp $
21+
* $PostgreSQL: pgsql/src/backend/postmaster/syslogger.c,v 1.18 2005/07/21 18:06:12 momjian Exp $
2222
*
2323
*-------------------------------------------------------------------------
2424
*/
@@ -60,7 +60,7 @@
6060
* start, but the rest can change at SIGHUP.
6161
*/
6262
bool Redirect_stderr = false;
63-
int Log_RotationAge = HOURS_PER_DAY * SECS_PER_MINUTE;
63+
int Log_RotationAge = HOURS_PER_DAY * MINS_PER_HOUR;
6464
int Log_RotationSize = 10 * 1024;
6565
char *Log_directory = NULL;
6666
char *Log_filename = NULL;

‎src/backend/utils/adt/date.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/utils/adt/date.c,v 1.115 2005/07/21 04:41:43 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/utils/adt/date.c,v 1.116 2005/07/21 18:06:12 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -917,10 +917,10 @@ static int
917917
tm2time(struct pg_tm * tm, fsec_t fsec, TimeADT *result)
918918
{
919919
#ifdef HAVE_INT64_TIMESTAMP
920-
*result = ((((tm->tm_hour * SECS_PER_MINUTE + tm->tm_min) * SECS_PER_MINUTE) + tm->tm_sec)
920+
*result = ((((tm->tm_hour * MINS_PER_HOUR + tm->tm_min) * SECS_PER_MINUTE) + tm->tm_sec)
921921
* USECS_PER_SEC) + fsec;
922922
#else
923-
*result = ((tm->tm_hour * SECS_PER_MINUTE + tm->tm_min) * SECS_PER_MINUTE) + tm->tm_sec + fsec;
923+
*result = ((tm->tm_hour * MINS_PER_HOUR + tm->tm_min) * SECS_PER_MINUTE) + tm->tm_sec + fsec;
924924
#endif
925925
return 0;
926926
}
@@ -1347,10 +1347,10 @@ timestamp_time(PG_FUNCTION_ARGS)
13471347
* Could also do this with time = (timestamp / USECS_PER_DAY *
13481348
* USECS_PER_DAY) - timestamp;
13491349
*/
1350-
result = ((((tm->tm_hour * SECS_PER_MINUTE + tm->tm_min) * SECS_PER_MINUTE) + tm->tm_sec) *
1350+
result = ((((tm->tm_hour * MINS_PER_HOUR + tm->tm_min) * SECS_PER_MINUTE) + tm->tm_sec) *
13511351
USECS_PER_SEC) + fsec;
13521352
#else
1353-
result = ((tm->tm_hour * SECS_PER_MINUTE + tm->tm_min) * SECS_PER_MINUTE) + tm->tm_sec + fsec;
1353+
result = ((tm->tm_hour * MINS_PER_HOUR + tm->tm_min) * SECS_PER_MINUTE) + tm->tm_sec + fsec;
13541354
#endif
13551355

13561356
PG_RETURN_TIMEADT(result);
@@ -1384,10 +1384,10 @@ timestamptz_time(PG_FUNCTION_ARGS)
13841384
* Could also do this with time = (timestamp / USECS_PER_DAY *
13851385
* USECS_PER_DAY) - timestamp;
13861386
*/
1387-
result = ((((tm->tm_hour * SECS_PER_MINUTE + tm->tm_min) * SECS_PER_MINUTE) + tm->tm_sec) *
1387+
result = ((((tm->tm_hour * MINS_PER_HOUR + tm->tm_min) * SECS_PER_MINUTE) + tm->tm_sec) *
13881388
USECS_PER_SEC) + fsec;
13891389
#else
1390-
result = ((tm->tm_hour * SECS_PER_MINUTE + tm->tm_min) * SECS_PER_MINUTE) + tm->tm_sec + fsec;
1390+
result = ((tm->tm_hour * MINS_PER_HOUR + tm->tm_min) * SECS_PER_MINUTE) + tm->tm_sec + fsec;
13911391
#endif
13921392

13931393
PG_RETURN_TIMEADT(result);
@@ -1714,10 +1714,10 @@ static int
17141714
tm2timetz(struct pg_tm * tm, fsec_t fsec, int tz, TimeTzADT *result)
17151715
{
17161716
#ifdef HAVE_INT64_TIMESTAMP
1717-
result->time = ((((tm->tm_hour * SECS_PER_MINUTE + tm->tm_min) * SECS_PER_MINUTE) + tm->tm_sec) *
1717+
result->time = ((((tm->tm_hour * MINS_PER_HOUR + tm->tm_min) * SECS_PER_MINUTE) + tm->tm_sec) *
17181718
USECS_PER_SEC) + fsec;
17191719
#else
1720-
result->time = ((tm->tm_hour * SECS_PER_MINUTE + tm->tm_min) * SECS_PER_MINUTE) + tm->tm_sec + fsec;
1720+
result->time = ((tm->tm_hour * MINS_PER_HOUR + tm->tm_min) * SECS_PER_MINUTE) + tm->tm_sec + fsec;
17211721
#endif
17221722
result->zone = tz;
17231723

‎src/backend/utils/adt/datetime.c

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.154 2005/07/21 04:41:43 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.155 2005/07/21 18:06:12 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -1447,7 +1447,7 @@ DecodeDateTime(char **field, int *ftype, int nf,
14471447
tm->tm_isdst = 1;
14481448
if (tzp == NULL)
14491449
return DTERR_BAD_FORMAT;
1450-
*tzp += val * SECS_PER_MINUTE;
1450+
*tzp += val * MINS_PER_HOUR;
14511451
break;
14521452

14531453
case DTZ:
@@ -1460,15 +1460,15 @@ DecodeDateTime(char **field, int *ftype, int nf,
14601460
tm->tm_isdst = 1;
14611461
if (tzp == NULL)
14621462
return DTERR_BAD_FORMAT;
1463-
*tzp = val * SECS_PER_MINUTE;
1463+
*tzp = val * MINS_PER_HOUR;
14641464
ftype[i] = DTK_TZ;
14651465
break;
14661466

14671467
case TZ:
14681468
tm->tm_isdst = 0;
14691469
if (tzp == NULL)
14701470
return DTERR_BAD_FORMAT;
1471-
*tzp = val * SECS_PER_MINUTE;
1471+
*tzp = val * MINS_PER_HOUR;
14721472
ftype[i] = DTK_TZ;
14731473
break;
14741474

@@ -1667,7 +1667,7 @@ DetermineLocalTimeZone(struct pg_tm * tm)
16671667
day = ((pg_time_t) date) *SECS_PER_DAY;
16681668
if (day / SECS_PER_DAY != date)
16691669
goto overflow;
1670-
sec = tm->tm_sec + (tm->tm_min + tm->tm_hour * SECS_PER_MINUTE) * SECS_PER_MINUTE;
1670+
sec = tm->tm_sec + (tm->tm_min + tm->tm_hour * MINS_PER_HOUR) * SECS_PER_MINUTE;
16711671
mytime = day + sec;
16721672
/* since sec >= 0, overflow could only be from +day to -mytime */
16731673
if (mytime < 0 && day > 0)
@@ -1679,7 +1679,7 @@ DetermineLocalTimeZone(struct pg_tm * tm)
16791679
* that DST boundaries can't be closer together than 48 hours, so
16801680
* backing up 24 hours and finding the "next" boundary will work.
16811681
*/
1682-
prevtime = mytime - (HOURS_PER_DAY * SECS_PER_MINUTE * SECS_PER_MINUTE);
1682+
prevtime = mytime - SECS_PER_DAY;
16831683
if (mytime < 0 && prevtime > 0)
16841684
goto overflow;
16851685

@@ -2167,7 +2167,7 @@ DecodeTimeOnly(char **field, int *ftype, int nf,
21672167
tm->tm_isdst = 1;
21682168
if (tzp == NULL)
21692169
return DTERR_BAD_FORMAT;
2170-
*tzp += val * SECS_PER_MINUTE;
2170+
*tzp += val * MINS_PER_HOUR;
21712171
break;
21722172

21732173
case DTZ:
@@ -2180,15 +2180,15 @@ DecodeTimeOnly(char **field, int *ftype, int nf,
21802180
tm->tm_isdst = 1;
21812181
if (tzp == NULL)
21822182
return DTERR_BAD_FORMAT;
2183-
*tzp = val * SECS_PER_MINUTE;
2183+
*tzp = val * MINS_PER_HOUR;
21842184
ftype[i] = DTK_TZ;
21852185
break;
21862186

21872187
case TZ:
21882188
tm->tm_isdst = 0;
21892189
if (tzp == NULL)
21902190
return DTERR_BAD_FORMAT;
2191-
*tzp = val * SECS_PER_MINUTE;
2191+
*tzp = val * MINS_PER_HOUR;
21922192
ftype[i] = DTK_TZ;
21932193
break;
21942194

@@ -2833,7 +2833,7 @@ DecodeTimezone(char *str, int *tzp)
28332833
if (min < 0 || min >= 60)
28342834
return DTERR_TZDISP_OVERFLOW;
28352835

2836-
tz = (hr * SECS_PER_MINUTE + min) * SECS_PER_MINUTE;
2836+
tz = (hr * MINS_PER_HOUR + min) * SECS_PER_MINUTE;
28372837
if (*str == '-')
28382838
tz = -tz;
28392839

@@ -2890,7 +2890,7 @@ DecodePosixTimezone(char *str, int *tzp)
28902890
{
28912891
case DTZ:
28922892
case TZ:
2893-
*tzp = (val * SECS_PER_MINUTE) - tz;
2893+
*tzp = (val * MINS_PER_HOUR) - tz;
28942894
break;
28952895

28962896
default:
@@ -3510,7 +3510,7 @@ EncodeTimeOnly(struct pg_tm * tm, fsec_t fsec, int *tzp, int style, char *str)
35103510
min;
35113511

35123512
hour = -(*tzp / SECS_PER_HOUR);
3513-
min = (abs(*tzp) / SECS_PER_MINUTE) % SECS_PER_MINUTE;
3513+
min = (abs(*tzp) / MINS_PER_HOUR) % MINS_PER_HOUR;
35143514
sprintf(str + strlen(str), (min != 0) ? "%+03d:%02d" : "%+03d", hour, min);
35153515
}
35163516

@@ -3583,7 +3583,7 @@ EncodeDateTime(struct pg_tm * tm, fsec_t fsec, int *tzp, char **tzn, int style,
35833583
if (tzp != NULL && tm->tm_isdst >= 0)
35843584
{
35853585
hour = -(*tzp / SECS_PER_HOUR);
3586-
min = (abs(*tzp) / SECS_PER_MINUTE) % SECS_PER_MINUTE;
3586+
min = (abs(*tzp) / MINS_PER_HOUR) % MINS_PER_HOUR;
35873587
sprintf(str + strlen(str), (min != 0) ? "%+03d:%02d" : "%+03d", hour, min);
35883588
}
35893589

@@ -3633,7 +3633,7 @@ EncodeDateTime(struct pg_tm * tm, fsec_t fsec, int *tzp, char **tzn, int style,
36333633
else
36343634
{
36353635
hour = -(*tzp / SECS_PER_HOUR);
3636-
min = (abs(*tzp) / SECS_PER_MINUTE) % SECS_PER_MINUTE;
3636+
min = (abs(*tzp) / MINS_PER_HOUR) % MINS_PER_HOUR;
36373637
sprintf(str + strlen(str), (min != 0) ? "%+03d:%02d" : "%+03d", hour, min);
36383638
}
36393639
}
@@ -3681,7 +3681,7 @@ EncodeDateTime(struct pg_tm * tm, fsec_t fsec, int *tzp, char **tzn, int style,
36813681
else
36823682
{
36833683
hour = -(*tzp / SECS_PER_HOUR);
3684-
min = (abs(*tzp) / SECS_PER_MINUTE) % SECS_PER_MINUTE;
3684+
min = (abs(*tzp) / MINS_PER_HOUR) % MINS_PER_HOUR;
36853685
sprintf(str + strlen(str), (min != 0) ? "%+03d:%02d" : "%+03d", hour, min);
36863686
}
36873687
}
@@ -3747,7 +3747,7 @@ EncodeDateTime(struct pg_tm * tm, fsec_t fsec, int *tzp, char **tzn, int style,
37473747
* 2001-10-19
37483748
*/
37493749
hour = -(*tzp / SECS_PER_HOUR);
3750-
min = (abs(*tzp) / SECS_PER_MINUTE) % SECS_PER_MINUTE;
3750+
min = (abs(*tzp) / MINS_PER_HOUR) % MINS_PER_HOUR;
37513751
sprintf(str + strlen(str), (min != 0) ? " %+03d:%02d" : " %+03d", hour, min);
37523752
}
37533753
}

‎src/backend/utils/adt/nabstime.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
*
1212
* IDENTIFICATION
13-
* $PostgreSQL: pgsql/src/backend/utils/adt/nabstime.c,v 1.138 2005/07/21 04:41:43 momjian Exp $
13+
* $PostgreSQL: pgsql/src/backend/utils/adt/nabstime.c,v 1.139 2005/07/21 18:06:12 momjian Exp $
1414
*
1515
*-------------------------------------------------------------------------
1616
*/
@@ -199,7 +199,7 @@ tm2abstime(struct pg_tm * tm, int tz)
199199
return INVALID_ABSTIME;
200200

201201
/* convert to seconds */
202-
sec = tm->tm_sec + tz + (tm->tm_min + (day * HOURS_PER_DAY + tm->tm_hour) * SECS_PER_MINUTE) * SECS_PER_MINUTE;
202+
sec = tm->tm_sec + tz + (tm->tm_min + (day * HOURS_PER_DAY + tm->tm_hour) * MINS_PER_HOUR) * SECS_PER_MINUTE;
203203

204204
/* check for overflow */
205205
if ((day == MAX_DAYNUM && sec < 0) ||
@@ -638,8 +638,8 @@ reltimein(PG_FUNCTION_ARGS)
638638
switch (dtype)
639639
{
640640
case DTK_DELTA:
641-
result = ((tm->tm_hour * SECS_PER_MINUTE + tm->tm_min) * SECS_PER_MINUTE) + tm->tm_sec;
642-
result += tm->tm_year * 36525 * 864 + ((tm->tm_mon * DAYS_PER_MONTH) + tm->tm_mday) * SECS_PER_DAY;
641+
result = ((tm->tm_hour * MINS_PER_HOUR + tm->tm_min) * SECS_PER_MINUTE) + tm->tm_sec;
642+
result += tm->tm_year * SECS_PER_YEAR + ((tm->tm_mon * DAYS_PER_MONTH) + tm->tm_mday) * SECS_PER_DAY;
643643
break;
644644

645645
default:
@@ -884,16 +884,16 @@ reltime_interval(PG_FUNCTION_ARGS)
884884

885885
default:
886886
#ifdef HAVE_INT64_TIMESTAMP
887-
year = reltime / (36525 * 864);
888-
reltime -= year * (36525 * 864);
887+
year = reltime / SECS_PER_YEAR;
888+
reltime -= year * SECS_PER_YEAR;
889889
month = reltime / (DAYS_PER_MONTH * SECS_PER_DAY);
890890
reltime -= month * (DAYS_PER_MONTH * SECS_PER_DAY);
891891
day = reltime / SECS_PER_DAY;
892892
reltime -= day * SECS_PER_DAY;
893893

894894
result->time = (reltime * USECS_PER_SEC);
895895
#else
896-
TMODULO(reltime, year, 36525 * 864);
896+
TMODULO(reltime, year, SECS_PER_YEAR);
897897
TMODULO(reltime, month, DAYS_PER_MONTH * SECS_PER_DAY);
898898
TMODULO(reltime, day, SECS_PER_DAY);
899899

‎src/backend/utils/adt/timestamp.c

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/utils/adt/timestamp.c,v 1.137 2005/07/21 05:18:26 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/utils/adt/timestamp.c,v 1.138 2005/07/21 18:06:12 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -748,7 +748,6 @@ AdjustIntervalForTypmod(Interval *interval, int32 typmod)
748748
interval->time -= hour * USECS_PER_HOUR;
749749
interval->time = (interval->time / USECS_PER_MINUTE) *
750750
USECS_PER_MINUTE;
751-
752751
#else
753752
TMODULO(interval->time, hour, (double)SECS_PER_HOUR);
754753
interval->time = ((int)(interval->time / SECS_PER_MINUTE)) * (double)SECS_PER_MINUTE;
@@ -1212,7 +1211,7 @@ tm2interval(struct pg_tm *tm, fsec_t fsec, Interval *span)
12121211
tm->tm_min) * INT64CONST(60)) +
12131212
tm->tm_sec) * USECS_PER_SEC) + fsec;
12141213
#else
1215-
span->time = (((tm->tm_hour * (double)SECS_PER_MINUTE) +
1214+
span->time = (((tm->tm_hour * (double)MINS_PER_HOUR) +
12161215
tm->tm_min) * (double)SECS_PER_MINUTE) +
12171216
tm->tm_sec;
12181217
span->time = JROUND(span->time + fsec);
@@ -1225,14 +1224,14 @@ tm2interval(struct pg_tm *tm, fsec_t fsec, Interval *span)
12251224
static int64
12261225
time2t(const int hour, const int min, const int sec, const fsec_t fsec)
12271226
{
1228-
return (((((hour * SECS_PER_MINUTE) + min) * SECS_PER_MINUTE) + sec) * USECS_PER_SEC) + fsec;
1227+
return (((((hour * MINS_PER_HOUR) + min) * SECS_PER_MINUTE) + sec) * USECS_PER_SEC) + fsec;
12291228
} /* time2t() */
12301229

12311230
#else
12321231
static double
12331232
time2t(const int hour, const int min, const int sec, const fsec_t fsec)
12341233
{
1235-
return (((hour * SECS_PER_MINUTE) + min) * SECS_PER_MINUTE) + sec + fsec;
1234+
return (((hour * MINS_PER_HOUR) + min) * SECS_PER_MINUTE) + sec + fsec;
12361235
} /* time2t() */
12371236
#endif
12381237

@@ -2475,7 +2474,7 @@ timestamp_age(PG_FUNCTION_ARGS)
24752474

24762475
while (tm->tm_min < 0)
24772476
{
2478-
tm->tm_min += SECS_PER_MINUTE;
2477+
tm->tm_min += MINS_PER_HOUR;
24792478
tm->tm_hour--;
24802479
}
24812480

@@ -2589,7 +2588,7 @@ timestamptz_age(PG_FUNCTION_ARGS)
25892588

25902589
while (tm->tm_min < 0)
25912590
{
2592-
tm->tm_min += SECS_PER_MINUTE;
2591+
tm->tm_min += MINS_PER_HOUR;
25932592
tm->tm_hour--;
25942593
}
25952594

@@ -3492,10 +3491,10 @@ timestamp_part(PG_FUNCTION_ARGS)
34923491
case DTK_JULIAN:
34933492
result = date2j(tm->tm_year, tm->tm_mon, tm->tm_mday);
34943493
#ifdef HAVE_INT64_TIMESTAMP
3495-
result += ((((tm->tm_hour * SECS_PER_MINUTE) + tm->tm_min) * SECS_PER_MINUTE) +
3494+
result += ((((tm->tm_hour * MINS_PER_HOUR) + tm->tm_min) * SECS_PER_MINUTE) +
34963495
tm->tm_sec + (fsec / 1000000.0)) / (double)SECS_PER_DAY;
34973496
#else
3498-
result += ((((tm->tm_hour * SECS_PER_MINUTE) + tm->tm_min) * SECS_PER_MINUTE) +
3497+
result += ((((tm->tm_hour * MINS_PER_HOUR) + tm->tm_min) * SECS_PER_MINUTE) +
34993498
tm->tm_sec + fsec) / (double)SECS_PER_DAY;
35003499
#endif
35013500
break;
@@ -3628,8 +3627,8 @@ timestamptz_part(PG_FUNCTION_ARGS)
36283627

36293628
case DTK_TZ_MINUTE:
36303629
result = -tz;
3631-
result /= SECS_PER_MINUTE;
3632-
FMODULO(result, dummy, (double)SECS_PER_MINUTE);
3630+
result /= MINS_PER_HOUR;
3631+
FMODULO(result, dummy, (double)MINS_PER_HOUR);
36333632
break;
36343633

36353634
case DTK_TZ_HOUR:
@@ -3720,10 +3719,10 @@ timestamptz_part(PG_FUNCTION_ARGS)
37203719
case DTK_JULIAN:
37213720
result = date2j(tm->tm_year, tm->tm_mon, tm->tm_mday);
37223721
#ifdef HAVE_INT64_TIMESTAMP
3723-
result += ((((tm->tm_hour * SECS_PER_MINUTE) + tm->tm_min) * SECS_PER_MINUTE) +
3722+
result += ((((tm->tm_hour * MINS_PER_HOUR) + tm->tm_min) * SECS_PER_MINUTE) +
37243723
tm->tm_sec + (fsec / 1000000.0)) / (double)SECS_PER_DAY;
37253724
#else
3726-
result += ((((tm->tm_hour * SECS_PER_MINUTE) + tm->tm_min) * SECS_PER_MINUTE) +
3725+
result += ((((tm->tm_hour * MINS_PER_HOUR) + tm->tm_min) * SECS_PER_MINUTE) +
37273726
tm->tm_sec + fsec) / (double)SECS_PER_DAY;
37283727
#endif
37293728
break;

‎src/backend/utils/misc/guc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Written by Peter Eisentraut <peter_e@gmx.net>.
1111
*
1212
* IDENTIFICATION
13-
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.275 2005/07/21 03:56:21 momjian Exp $
13+
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.276 2005/07/21 18:06:12 momjian Exp $
1414
*
1515
*--------------------------------------------------------------------
1616
*/
@@ -1349,7 +1349,7 @@ static struct config_int ConfigureNamesInt[] =
13491349
NULL
13501350
},
13511351
&Log_RotationAge,
1352-
HOURS_PER_DAY * SECS_PER_MINUTE, 0, INT_MAX / SECS_PER_MINUTE, NULL, NULL
1352+
HOURS_PER_DAY * MINS_PER_HOUR, 0, INT_MAX / MINS_PER_HOUR, NULL, NULL
13531353
},
13541354

13551355
{

0 commit comments

Comments
 (0)