Skip to content

P
Postgres FD Implementation
Commit 62abb039 authored by Bruce Momjian's avatar Bruce Momjian
Browse files
Options

Change 5e0 to 5.0, for consistency.

parent 220e6bfc
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 33 deletions
src/backend/utils/adt/date.c
View file @ 62abb039
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/date.c,v 1.111 2005/07/10 21:13:59 tgl Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/date.c,v 1.112 2005/07/12 15:17:44 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -946,9 +946,9 @@ time2tm(TimeADT time, struct pg_tm * tm, fsec_t *fsec) ...@@ -946,9 +946,9 @@ time2tm(TimeADT time, struct pg_tm * tm, fsec_t *fsec)
double trem; double trem;
trem = time; trem = time;
TMODULO(trem, tm->tm_hour, 3600e0); TMODULO(trem, tm->tm_hour, 3600.0);
TMODULO(trem, tm->tm_min, 60e0); TMODULO(trem, tm->tm_min, 60.0);
TMODULO(trem, tm->tm_sec, 1e0); TMODULO(trem, tm->tm_sec, 1.0);
*fsec = trem; *fsec = trem;
#endif #endif
...@@ -1683,7 +1683,7 @@ time_part(PG_FUNCTION_ARGS) ...@@ -1683,7 +1683,7 @@ time_part(PG_FUNCTION_ARGS)
else if (type == RESERV && val == DTK_EPOCH) else if (type == RESERV && val == DTK_EPOCH)
{ {
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
result = (time / 1000000e0); result = (time / 1000000.0);
#else #else
result = time; result = time;
#endif #endif
...@@ -1841,9 +1841,9 @@ timetz2tm(TimeTzADT *time, struct pg_tm * tm, fsec_t *fsec, int *tzp) ...@@ -1841,9 +1841,9 @@ timetz2tm(TimeTzADT *time, struct pg_tm * tm, fsec_t *fsec, int *tzp)
#else #else
double trem = time->time; double trem = time->time;
TMODULO(trem, tm->tm_hour, 3600e0); TMODULO(trem, tm->tm_hour, 3600.0);
TMODULO(trem, tm->tm_min, 60e0); TMODULO(trem, tm->tm_min, 60.0);
TMODULO(trem, tm->tm_sec, 1e0); TMODULO(trem, tm->tm_sec, 1.0);
*fsec = trem; *fsec = trem;
#endif #endif
...@@ -2398,12 +2398,12 @@ timetz_part(PG_FUNCTION_ARGS) ...@@ -2398,12 +2398,12 @@ timetz_part(PG_FUNCTION_ARGS)
case DTK_TZ_MINUTE: case DTK_TZ_MINUTE:
result = -tz; result = -tz;
result /= 60; result /= 60;
FMODULO(result, dummy, 60e0); FMODULO(result, dummy, 60.0);
break; break;
case DTK_TZ_HOUR: case DTK_TZ_HOUR:
dummy = -tz; dummy = -tz;
FMODULO(dummy, result, 3600e0); FMODULO(dummy, result, 3600.0);
break; break;
case DTK_MICROSEC: case DTK_MICROSEC:
...@@ -2458,7 +2458,7 @@ timetz_part(PG_FUNCTION_ARGS) ...@@ -2458,7 +2458,7 @@ timetz_part(PG_FUNCTION_ARGS)
else if (type == RESERV && val == DTK_EPOCH) else if (type == RESERV && val == DTK_EPOCH)
{ {
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
result = time->time / 1000000e0 + time->zone; result = time->time / 1000000.0 + time->zone;
#else #else
result = time->time + time->zone; result = time->time + time->zone;
#endif #endif
......
src/backend/utils/adt/datetime.c
View file @ 62abb039
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.151 2005/06/29 22:51:56 tgl Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.152 2005/07/12 15:17:44 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -3278,7 +3278,7 @@ DecodeInterval(char **field, int *ftype, int nf, int *dtype, struct pg_tm * tm, ...@@ -3278,7 +3278,7 @@ DecodeInterval(char **field, int *ftype, int nf, int *dtype, struct pg_tm * tm,
sec = (*fsec / USECS_PER_SEC); sec = (*fsec / USECS_PER_SEC);
*fsec -= (sec * USECS_PER_SEC); *fsec -= (sec * USECS_PER_SEC);
#else #else
TMODULO(*fsec, sec, 1e0); TMODULO(*fsec, sec, 1.0);
#endif #endif
tm->tm_sec += sec; tm->tm_sec += sec;
} }
......
src/backend/utils/adt/timestamp.c
View file @ 62abb039
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/timestamp.c,v 1.130 2005/07/10 21:13:59 tgl Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/timestamp.c,v 1.131 2005/07/12 15:17:44 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -1241,9 +1241,9 @@ interval2tm(Interval span, struct pg_tm * tm, fsec_t *fsec) ...@@ -1241,9 +1241,9 @@ interval2tm(Interval span, struct pg_tm * tm, fsec_t *fsec)
*fsec = (time - (tm->tm_sec * USECS_PER_SEC)); *fsec = (time - (tm->tm_sec * USECS_PER_SEC));
#else #else
TMODULO(time, tm->tm_mday, (double)SECS_PER_DAY); TMODULO(time, tm->tm_mday, (double)SECS_PER_DAY);
TMODULO(time, tm->tm_hour, 3600e0); TMODULO(time, tm->tm_hour, 3600.0);
TMODULO(time, tm->tm_min, 60e0); TMODULO(time, tm->tm_min, 60.0);
TMODULO(time, tm->tm_sec, 1e0); TMODULO(time, tm->tm_sec, 1.0);
*fsec = time; *fsec = time;
#endif #endif
...@@ -3330,7 +3330,7 @@ timestamp_part(PG_FUNCTION_ARGS) ...@@ -3330,7 +3330,7 @@ timestamp_part(PG_FUNCTION_ARGS)
{ {
case DTK_MICROSEC: case DTK_MICROSEC:
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
result = tm->tm_sec * 1000000e0 + fsec; result = tm->tm_sec * 1000000.0 + fsec;
#else #else
result = (tm->tm_sec + fsec) * 1000000; result = (tm->tm_sec + fsec) * 1000000;
#endif #endif
...@@ -3338,7 +3338,7 @@ timestamp_part(PG_FUNCTION_ARGS) ...@@ -3338,7 +3338,7 @@ timestamp_part(PG_FUNCTION_ARGS)
case DTK_MILLISEC: case DTK_MILLISEC:
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
result = tm->tm_sec * 1000e0 + fsec / 1000e0; result = tm->tm_sec * 1000.0 + fsec / 1000.0;
#else #else
result = (tm->tm_sec + fsec) * 1000; result = (tm->tm_sec + fsec) * 1000;
#endif #endif
...@@ -3346,7 +3346,7 @@ timestamp_part(PG_FUNCTION_ARGS) ...@@ -3346,7 +3346,7 @@ timestamp_part(PG_FUNCTION_ARGS)
case DTK_SECOND: case DTK_SECOND:
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
result = tm->tm_sec + fsec / 1000000e0; result = tm->tm_sec + fsec / 1000000.0;
#else #else
result = tm->tm_sec + fsec; result = tm->tm_sec + fsec;
#endif #endif
...@@ -3424,7 +3424,7 @@ timestamp_part(PG_FUNCTION_ARGS) ...@@ -3424,7 +3424,7 @@ timestamp_part(PG_FUNCTION_ARGS)
result = date2j(tm->tm_year, tm->tm_mon, tm->tm_mday); result = date2j(tm->tm_year, tm->tm_mon, tm->tm_mday);
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
result += ((((tm->tm_hour * 60) + tm->tm_min) * 60) + result += ((((tm->tm_hour * 60) + tm->tm_min) * 60) +
tm->tm_sec + (fsec / 1000000e0)) / (double)SECS_PER_DAY; tm->tm_sec + (fsec / 1000000.0)) / (double)SECS_PER_DAY;
#else #else
result += ((((tm->tm_hour * 60) + tm->tm_min) * 60) + result += ((((tm->tm_hour * 60) + tm->tm_min) * 60) +
tm->tm_sec + fsec) / (double)SECS_PER_DAY; tm->tm_sec + fsec) / (double)SECS_PER_DAY;
...@@ -3468,7 +3468,7 @@ timestamp_part(PG_FUNCTION_ARGS) ...@@ -3468,7 +3468,7 @@ timestamp_part(PG_FUNCTION_ARGS)
errmsg("timestamp out of range"))); errmsg("timestamp out of range")));
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
result = (timestamptz - SetEpochTimestamp()) / 1000000e0; result = (timestamptz - SetEpochTimestamp()) / 1000000.0;
#else #else
result = timestamptz - SetEpochTimestamp(); result = timestamptz - SetEpochTimestamp();
#endif #endif
...@@ -3560,17 +3560,17 @@ timestamptz_part(PG_FUNCTION_ARGS) ...@@ -3560,17 +3560,17 @@ timestamptz_part(PG_FUNCTION_ARGS)
case DTK_TZ_MINUTE: case DTK_TZ_MINUTE:
result = -tz; result = -tz;
result /= 60; result /= 60;
FMODULO(result, dummy, 60e0); FMODULO(result, dummy, 60.0);
break; break;
case DTK_TZ_HOUR: case DTK_TZ_HOUR:
dummy = -tz; dummy = -tz;
FMODULO(dummy, result, 3600e0); FMODULO(dummy, result, 3600.0);
break; break;
case DTK_MICROSEC: case DTK_MICROSEC:
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
result = tm->tm_sec * 1000000e0 + fsec; result = tm->tm_sec * 1000000.0 + fsec;
#else #else
result = (tm->tm_sec + fsec) * 1000000; result = (tm->tm_sec + fsec) * 1000000;
#endif #endif
...@@ -3578,7 +3578,7 @@ timestamptz_part(PG_FUNCTION_ARGS) ...@@ -3578,7 +3578,7 @@ timestamptz_part(PG_FUNCTION_ARGS)
case DTK_MILLISEC: case DTK_MILLISEC:
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
result = tm->tm_sec * 1000e0 + fsec / 1000e0; result = tm->tm_sec * 1000.0 + fsec / 1000.0;
#else #else
result = (tm->tm_sec + fsec) * 1000; result = (tm->tm_sec + fsec) * 1000;
#endif #endif
...@@ -3586,7 +3586,7 @@ timestamptz_part(PG_FUNCTION_ARGS) ...@@ -3586,7 +3586,7 @@ timestamptz_part(PG_FUNCTION_ARGS)
case DTK_SECOND: case DTK_SECOND:
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
result = tm->tm_sec + fsec / 1000000e0; result = tm->tm_sec + fsec / 1000000.0;
#else #else
result = tm->tm_sec + fsec; result = tm->tm_sec + fsec;
#endif #endif
...@@ -3652,7 +3652,7 @@ timestamptz_part(PG_FUNCTION_ARGS) ...@@ -3652,7 +3652,7 @@ timestamptz_part(PG_FUNCTION_ARGS)
result = date2j(tm->tm_year, tm->tm_mon, tm->tm_mday); result = date2j(tm->tm_year, tm->tm_mon, tm->tm_mday);
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
result += ((((tm->tm_hour * 60) + tm->tm_min) * 60) + result += ((((tm->tm_hour * 60) + tm->tm_min) * 60) +
tm->tm_sec + (fsec / 1000000e0)) / (double)SECS_PER_DAY; tm->tm_sec + (fsec / 1000000.0)) / (double)SECS_PER_DAY;
#else #else
result += ((((tm->tm_hour * 60) + tm->tm_min) * 60) + result += ((((tm->tm_hour * 60) + tm->tm_min) * 60) +
tm->tm_sec + fsec) / (double)SECS_PER_DAY; tm->tm_sec + fsec) / (double)SECS_PER_DAY;
...@@ -3674,7 +3674,7 @@ timestamptz_part(PG_FUNCTION_ARGS) ...@@ -3674,7 +3674,7 @@ timestamptz_part(PG_FUNCTION_ARGS)
{ {
case DTK_EPOCH: case DTK_EPOCH:
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
result = (timestamp - SetEpochTimestamp()) /1000000e0; result = (timestamp - SetEpochTimestamp()) /1000000.0;
#else #else
result = timestamp - SetEpochTimestamp(); result = timestamp - SetEpochTimestamp();
#endif #endif
...@@ -3751,7 +3751,7 @@ interval_part(PG_FUNCTION_ARGS) ...@@ -3751,7 +3751,7 @@ interval_part(PG_FUNCTION_ARGS)
{ {
case DTK_MICROSEC: case DTK_MICROSEC:
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
result = tm->tm_sec * 1000000e0 + fsec; result = tm->tm_sec * 1000000.0 + fsec;
#else #else
result = (tm->tm_sec + fsec) * 1000000; result = (tm->tm_sec + fsec) * 1000000;
#endif #endif
...@@ -3759,7 +3759,7 @@ interval_part(PG_FUNCTION_ARGS) ...@@ -3759,7 +3759,7 @@ interval_part(PG_FUNCTION_ARGS)
case DTK_MILLISEC: case DTK_MILLISEC:
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
result = tm->tm_sec * 1000e0 + fsec / 1000e0; result = tm->tm_sec * 1000.0 + fsec / 1000.0;
#else #else
result = (tm->tm_sec + fsec) * 1000; result = (tm->tm_sec + fsec) * 1000;
#endif #endif
...@@ -3767,7 +3767,7 @@ interval_part(PG_FUNCTION_ARGS) ...@@ -3767,7 +3767,7 @@ interval_part(PG_FUNCTION_ARGS)
case DTK_SECOND: case DTK_SECOND:
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
result = tm->tm_sec + fsec / 1000000e0; result = tm->tm_sec + fsec / 1000000.0;
#else #else
result = tm->tm_sec + fsec; result = tm->tm_sec + fsec;
#endif #endif
...@@ -3831,7 +3831,7 @@ interval_part(PG_FUNCTION_ARGS) ...@@ -3831,7 +3831,7 @@ interval_part(PG_FUNCTION_ARGS)
else if (type == RESERV && val == DTK_EPOCH) else if (type == RESERV && val == DTK_EPOCH)
{ {
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
result = interval->time / 1000000e0; result = interval->time / 1000000.0;
#else #else
result = interval->time; result = interval->time;
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment