aboutsummaryrefslogtreecommitdiff
path: root/src/backend
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend')
-rw-r--r--src/backend/utils/adt/date.c109
-rw-r--r--src/backend/utils/adt/datetime.c58
-rw-r--r--src/backend/utils/adt/nabstime.c64
-rw-r--r--src/backend/utils/adt/timestamp.c81
4 files changed, 154 insertions, 158 deletions
diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c
index 11bca4f000c..1e54f3877e8 100644
--- a/src/backend/utils/adt/date.c
+++ b/src/backend/utils/adt/date.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/utils/adt/date.c,v 1.107 2005/05/23 21:54:01 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/date.c,v 1.108 2005/05/24 02:09:45 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -921,10 +921,10 @@ static int
tm2time(struct pg_tm * tm, fsec_t fsec, TimeADT *result)
{
#ifdef HAVE_INT64_TIMESTAMP
- *result = ((((((tm->tm_hour * 60) + tm->tm_min) * 60) + tm->tm_sec)
- * USECS_PER_SEC) + fsec);
+ *result = ((((tm->tm_hour * 60 + tm->tm_min) * 60) + tm->tm_sec)
+ * USECS_PER_SEC) + fsec;
#else
- *result = ((((tm->tm_hour * 60) + tm->tm_min) * 60) + tm->tm_sec + fsec);
+ *result = ((tm->tm_hour * 60 + tm->tm_min) * 60) + tm->tm_sec + fsec;
#endif
return 0;
}
@@ -938,12 +938,12 @@ static int
time2tm(TimeADT time, struct pg_tm * tm, fsec_t *fsec)
{
#ifdef HAVE_INT64_TIMESTAMP
- tm->tm_hour = (time / USECS_PER_HOUR);
- time -= (tm->tm_hour * USECS_PER_HOUR);
- tm->tm_min = (time / USECS_PER_MINUTE);
- time -= (tm->tm_min * USECS_PER_MINUTE);
- tm->tm_sec = (time / USECS_PER_SEC);
- time -= (tm->tm_sec * USECS_PER_SEC);
+ tm->tm_hour = time / USECS_PER_HOUR;
+ time -= tm->tm_hour * USECS_PER_HOUR;
+ tm->tm_min = time / USECS_PER_MINUTE;
+ time -= tm->tm_min * USECS_PER_MINUTE;
+ tm->tm_sec = time / USECS_PER_SEC;
+ time -= tm->tm_sec * USECS_PER_SEC;
*fsec = time;
#else
double trem;
@@ -1077,7 +1077,7 @@ AdjustTimeForTypmod(TimeADT *time, int32 typmod)
};
#endif
- if ((typmod >= 0) && (typmod <= MAX_TIME_PRECISION))
+ if (typmod >= 0 && typmod <= MAX_TIME_PRECISION)
{
/*
* Note: this round-to-nearest code is not completely consistent
@@ -1089,17 +1089,17 @@ AdjustTimeForTypmod(TimeADT *time, int32 typmod)
#ifdef HAVE_INT64_TIMESTAMP
if (*time >= INT64CONST(0))
{
- *time = (((*time + TimeOffsets[typmod]) / TimeScales[typmod])
- * TimeScales[typmod]);
+ *time = ((*time + TimeOffsets[typmod]) / TimeScales[typmod]) *
+ TimeScales[typmod];
}
else
{
- *time = -((((-*time) + TimeOffsets[typmod]) / TimeScales[typmod])
- * TimeScales[typmod]);
+ *time = -((((-*time) + TimeOffsets[typmod]) / TimeScales[typmod]) *
+ TimeScales[typmod]);
}
#else
- *time = (rint(((double) *time) * TimeScales[typmod])
- / TimeScales[typmod]);
+ *time = rint((double)*time * TimeScales[typmod])
+ / TimeScales[typmod];
#endif
}
}
@@ -1342,10 +1342,10 @@ timestamp_time(PG_FUNCTION_ARGS)
* Could also do this with time = (timestamp / USECS_PER_DAY *
* USECS_PER_DAY) - timestamp;
*/
- result = ((((((tm->tm_hour * 60) + tm->tm_min) * 60) + tm->tm_sec)
- * USECS_PER_SEC) + fsec);
+ result = ((((tm->tm_hour * 60 + tm->tm_min) * 60) + tm->tm_sec) *
+ USECS_PER_SEC) + fsec;
#else
- result = ((((tm->tm_hour * 60) + tm->tm_min) * 60) + tm->tm_sec + fsec);
+ result = ((tm->tm_hour * 60 + tm->tm_min) * 60) + tm->tm_sec + fsec;
#endif
PG_RETURN_TIMEADT(result);
@@ -1379,10 +1379,10 @@ timestamptz_time(PG_FUNCTION_ARGS)
* Could also do this with time = (timestamp / USECS_PER_DAY *
* USECS_PER_DAY) - timestamp;
*/
- result = ((((((tm->tm_hour * 60) + tm->tm_min) * 60) + tm->tm_sec)
- * USECS_PER_SEC) + fsec);
+ result = ((((tm->tm_hour * 60 + tm->tm_min) * 60) + tm->tm_sec) *
+ USECS_PER_SEC) + fsec;
#else
- result = ((((tm->tm_hour * 60) + tm->tm_min) * 60) + tm->tm_sec + fsec);
+ result = ((tm->tm_hour * 60 + tm->tm_min) * 60) + tm->tm_sec + fsec;
#endif
PG_RETURN_TIMEADT(result);
@@ -1624,26 +1624,25 @@ time_part(PG_FUNCTION_ARGS)
{
case DTK_MICROSEC:
#ifdef HAVE_INT64_TIMESTAMP
- result = ((tm->tm_sec * USECS_PER_SEC) + fsec);
+ result = tm->tm_sec * USECS_PER_SEC + fsec;
#else
- result = ((tm->tm_sec + fsec) * 1000000);
+ result = (tm->tm_sec + fsec) * 1000000;
#endif
break;
case DTK_MILLISEC:
#ifdef HAVE_INT64_TIMESTAMP
- result = ((tm->tm_sec * INT64CONST(1000))
- + (fsec / INT64CONST(1000)));
+ result = tm->tm_sec * INT64CONST(1000) + fsec / INT64CONST(1000);
#else
- result = ((tm->tm_sec + fsec) * 1000);
+ result = (tm->tm_sec + fsec) * 1000;
#endif
break;
case DTK_SECOND:
#ifdef HAVE_INT64_TIMESTAMP
- result = (tm->tm_sec + (fsec / USECS_PER_SEC));
+ result = tm->tm_sec + fsec / USECS_PER_SEC;
#else
- result = (tm->tm_sec + fsec);
+ result = tm->tm_sec + fsec;
#endif
break;
@@ -1675,7 +1674,7 @@ time_part(PG_FUNCTION_ARGS)
result = 0;
}
}
- else if ((type == RESERV) && (val == DTK_EPOCH))
+ else if (type == RESERV && val == DTK_EPOCH)
{
#ifdef HAVE_INT64_TIMESTAMP
result = (time / 1000000e0);
@@ -1708,10 +1707,10 @@ static int
tm2timetz(struct pg_tm * tm, fsec_t fsec, int tz, TimeTzADT *result)
{
#ifdef HAVE_INT64_TIMESTAMP
- result->time = ((((((tm->tm_hour * 60) + tm->tm_min) * 60) + tm->tm_sec)
- * USECS_PER_SEC) + fsec);
+ result->time = ((((tm->tm_hour * 60 + tm->tm_min) * 60) + tm->tm_sec) *
+ USECS_PER_SEC) + fsec;
#else
- result->time = ((((tm->tm_hour * 60) + tm->tm_min) * 60) + tm->tm_sec + fsec);
+ result->time = ((tm->tm_hour * 60 + tm->tm_min) * 60) + tm->tm_sec + fsec;
#endif
result->zone = tz;
@@ -1823,12 +1822,12 @@ timetz2tm(TimeTzADT *time, struct pg_tm * tm, fsec_t *fsec, int *tzp)
#ifdef HAVE_INT64_TIMESTAMP
int64 trem = time->time;
- tm->tm_hour = (trem / USECS_PER_HOUR);
- trem -= (tm->tm_hour * USECS_PER_HOUR);
- tm->tm_min = (trem / USECS_PER_MINUTE);
- trem -= (tm->tm_min * USECS_PER_MINUTE);
- tm->tm_sec = (trem / USECS_PER_SEC);
- *fsec = (trem - (tm->tm_sec * USECS_PER_SEC));
+ tm->tm_hour = trem / USECS_PER_HOUR;
+ trem -= tm->tm_hour * USECS_PER_HOUR;
+ tm->tm_min = trem / USECS_PER_MINUTE;
+ trem -= tm->tm_min * USECS_PER_MINUTE;
+ tm->tm_sec = trem / USECS_PER_SEC;
+ *fsec = trem - tm->tm_sec * USECS_PER_SEC;
#else
double trem = time->time;
@@ -2281,10 +2280,9 @@ datetimetz_timestamptz(PG_FUNCTION_ARGS)
TimestampTz result;
#ifdef HAVE_INT64_TIMESTAMP
- result = (((date *USECS_PER_DAY) +time->time)
- + (time->zone * USECS_PER_SEC));
+ result = (date * USECS_PER_DAY + time->time) + time->zone * USECS_PER_SEC;
#else
- result = (((date *(double)SECS_PER_DAY) +time->time) + time->zone);
+ result = date * (double)SECS_PER_DAY + time->time + time->zone;
#endif
PG_RETURN_TIMESTAMP(result);
@@ -2400,26 +2398,25 @@ timetz_part(PG_FUNCTION_ARGS)
case DTK_MICROSEC:
#ifdef HAVE_INT64_TIMESTAMP
- result = ((tm->tm_sec * USECS_PER_SEC) + fsec);
+ result = tm->tm_sec * USECS_PER_SEC + fsec;
#else
- result = ((tm->tm_sec + fsec) * 1000000);
+ result = (tm->tm_sec + fsec) * 1000000;
#endif
break;
case DTK_MILLISEC:
#ifdef HAVE_INT64_TIMESTAMP
- result = ((tm->tm_sec * INT64CONST(1000))
- + (fsec / INT64CONST(1000)));
+ result = tm->tm_sec * INT64CONST(1000) + fsec / INT64CONST(1000);
#else
- result = ((tm->tm_sec + fsec) * 1000);
+ result = (tm->tm_sec + fsec) * 1000;
#endif
break;
case DTK_SECOND:
#ifdef HAVE_INT64_TIMESTAMP
- result = (tm->tm_sec + (fsec / USECS_PER_SEC));
+ result = tm->tm_sec + fsec / USECS_PER_SEC;
#else
- result = (tm->tm_sec + fsec);
+ result = tm->tm_sec + fsec;
#endif
break;
@@ -2448,12 +2445,12 @@ timetz_part(PG_FUNCTION_ARGS)
result = 0;
}
}
- else if ((type == RESERV) && (val == DTK_EPOCH))
+ else if (type == RESERV && val == DTK_EPOCH)
{
#ifdef HAVE_INT64_TIMESTAMP
- result = ((time->time / 1000000e0) + time->zone);
+ result = time->time / 1000000e0 + time->zone;
#else
- result = (time->time + time->zone);
+ result = time->time + time->zone;
#endif
}
else
@@ -2492,11 +2489,11 @@ timetz_zone(PG_FUNCTION_ARGS)
result = (TimeTzADT *) palloc(sizeof(TimeTzADT));
- if ((type == TZ) || (type == DTZ))
+ if (type == TZ || type == DTZ)
{
tz = val * 60;
#ifdef HAVE_INT64_TIMESTAMP
- result->time = time->time + ((time->zone - tz) * USECS_PER_SEC);
+ result->time = time->time + (time->zone - tz) * USECS_PER_SEC;
while (result->time < INT64CONST(0))
result->time += USECS_PER_DAY;
while (result->time >= USECS_PER_DAY)
@@ -2550,7 +2547,7 @@ timetz_izone(PG_FUNCTION_ARGS)
result = (TimeTzADT *) palloc(sizeof(TimeTzADT));
#ifdef HAVE_INT64_TIMESTAMP
- result->time = time->time + ((time->zone - tz) * USECS_PER_SEC);
+ result->time = time->time + (time->zone - tz) * USECS_PER_SEC;
while (result->time < INT64CONST(0))
result->time += USECS_PER_DAY;
while (result->time >= USECS_PER_DAY)
diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c
index d911fb891cf..bb70f8d3aaa 100644
--- a/src/backend/utils/adt/datetime.c
+++ b/src/backend/utils/adt/datetime.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.143 2005/05/23 21:54:01 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.144 2005/05/24 02:09:45 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -3020,7 +3020,7 @@ DecodeInterval(char **field, int *ftype, int nf, int *dtype, struct pg_tm * tm,
return DTERR_BAD_FORMAT;
if (*field[i] == '-')
- fval = -(fval);
+ fval = -fval;
}
else if (*cp == '\0')
fval = 0;
@@ -3033,24 +3033,24 @@ DecodeInterval(char **field, int *ftype, int nf, int *dtype, struct pg_tm * tm,
{
case DTK_MICROSEC:
#ifdef HAVE_INT64_TIMESTAMP
- *fsec += (val + fval);
+ *fsec += val + fval;
#else
- *fsec += ((val + fval) * 1e-6);
+ *fsec += (val + fval) * 1e-6;
#endif
break;
case DTK_MILLISEC:
#ifdef HAVE_INT64_TIMESTAMP
- *fsec += ((val + fval) * 1000);
+ *fsec += (val + fval) * 1000;
#else
- *fsec += ((val + fval) * 1e-3);
+ *fsec += (val + fval) * 1e-3;
#endif
break;
case DTK_SECOND:
tm->tm_sec += val;
#ifdef HAVE_INT64_TIMESTAMP
- *fsec += (fval * 1000000);
+ *fsec += fval * 1000000;
#else
*fsec += fval;
#endif
@@ -3067,9 +3067,9 @@ DecodeInterval(char **field, int *ftype, int nf, int *dtype, struct pg_tm * tm,
sec = fval;
tm->tm_sec += sec;
#ifdef HAVE_INT64_TIMESTAMP
- *fsec += ((fval - sec) * 1000000);
+ *fsec += (fval - sec) * 1000000;
#else
- *fsec += (fval - sec);
+ *fsec += fval - sec;
#endif
}
tmask = DTK_M(MINUTE);
@@ -3085,9 +3085,9 @@ DecodeInterval(char **field, int *ftype, int nf, int *dtype, struct pg_tm * tm,
sec = fval;
tm->tm_sec += sec;
#ifdef HAVE_INT64_TIMESTAMP
- *fsec += ((fval - sec) * 1000000);
+ *fsec += (fval - sec) * 1000000;
#else
- *fsec += (fval - sec);
+ *fsec += fval - sec;
#endif
}
tmask = DTK_M(HOUR);
@@ -3103,9 +3103,9 @@ DecodeInterval(char **field, int *ftype, int nf, int *dtype, struct pg_tm * tm,
sec = fval;
tm->tm_sec += sec;
#ifdef HAVE_INT64_TIMESTAMP
- *fsec += ((fval - sec) * 1000000);
+ *fsec += (fval - sec) * 1000000;
#else
- *fsec += (fval - sec);
+ *fsec += fval - sec;
#endif
}
tmask = (fmask & DTK_M(DAY)) ? 0 : DTK_M(DAY);
@@ -3117,13 +3117,13 @@ DecodeInterval(char **field, int *ftype, int nf, int *dtype, struct pg_tm * tm,
{
int sec;
- fval *= (7 * SECS_PER_DAY);
+ fval *= 7 * SECS_PER_DAY;
sec = fval;
tm->tm_sec += sec;
#ifdef HAVE_INT64_TIMESTAMP
- *fsec += ((fval - sec) * 1000000);
+ *fsec += (fval - sec) * 1000000;
#else
- *fsec += (fval - sec);
+ *fsec += fval - sec;
#endif
}
tmask = (fmask & DTK_M(DAY)) ? 0 : DTK_M(DAY);
@@ -3135,13 +3135,13 @@ DecodeInterval(char **field, int *ftype, int nf, int *dtype, struct pg_tm * tm,
{
int sec;
- fval *= (30 * SECS_PER_DAY);
+ fval *= 30 * SECS_PER_DAY;
sec = fval;
tm->tm_sec += sec;
#ifdef HAVE_INT64_TIMESTAMP
- *fsec += ((fval - sec) * 1000000);
+ *fsec += (fval - sec) * 1000000;
#else
- *fsec += (fval - sec);
+ *fsec += fval - sec;
#endif
}
tmask = DTK_M(MONTH);
@@ -3150,28 +3150,28 @@ DecodeInterval(char **field, int *ftype, int nf, int *dtype, struct pg_tm * tm,
case DTK_YEAR:
tm->tm_year += val;
if (fval != 0)
- tm->tm_mon += (fval * 12);
+ tm->tm_mon += fval * 12;
tmask = (fmask & DTK_M(YEAR)) ? 0 : DTK_M(YEAR);
break;
case DTK_DECADE:
tm->tm_year += val * 10;
if (fval != 0)
- tm->tm_mon += (fval * 120);
+ tm->tm_mon += fval * 120;
tmask = (fmask & DTK_M(YEAR)) ? 0 : DTK_M(YEAR);
break;
case DTK_CENTURY:
tm->tm_year += val * 100;
if (fval != 0)
- tm->tm_mon += (fval * 1200);
+ tm->tm_mon += fval * 1200;
tmask = (fmask & DTK_M(YEAR)) ? 0 : DTK_M(YEAR);
break;
case DTK_MILLENNIUM:
tm->tm_year += val * 1000;
if (fval != 0)
- tm->tm_mon += (fval * 12000);
+ tm->tm_mon += fval * 12000;
tmask = (fmask & DTK_M(YEAR)) ? 0 : DTK_M(YEAR);
break;
@@ -3233,12 +3233,12 @@ DecodeInterval(char **field, int *ftype, int nf, int *dtype, struct pg_tm * tm,
if (is_before)
{
*fsec = -(*fsec);
- tm->tm_sec = -(tm->tm_sec);
- tm->tm_min = -(tm->tm_min);
- tm->tm_hour = -(tm->tm_hour);
- tm->tm_mday = -(tm->tm_mday);
- tm->tm_mon = -(tm->tm_mon);
- tm->tm_year = -(tm->tm_year);
+ tm->tm_sec = -tm->tm_sec;
+ tm->tm_min = -tm->tm_min;
+ tm->tm_hour = -tm->tm_hour;
+ tm->tm_mday = -tm->tm_mday;
+ tm->tm_mon = -tm->tm_mon;
+ tm->tm_year = -tm->tm_year;
}
/* ensure that at least one time field has been found */
diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c
index 1ed6321fd0f..46483aa5981 100644
--- a/src/backend/utils/adt/nabstime.c
+++ b/src/backend/utils/adt/nabstime.c
@@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/utils/adt/nabstime.c,v 1.130 2005/05/23 21:54:02 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/nabstime.c,v 1.131 2005/05/24 02:09:45 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -27,7 +27,7 @@
#include "miscadmin.h"
#include "pgtime.h"
#include "utils/builtins.h"
-
+#include "utils/timestamp.h"
#define MIN_DAYNUM -24856 /* December 13, 1901 */
#define MAX_DAYNUM 24854 /* January 18, 2038 */
@@ -191,7 +191,7 @@ abstime2tm(AbsoluteTime _time, int *tzp, struct pg_tm * tm, char **tzn)
if (HasCTZSet && (tzp != NULL))
time -= CTimeZone;
- if ((!HasCTZSet) && (tzp != NULL))
+ if (!HasCTZSet && tzp != NULL)
tx = pg_localtime(&time,global_timezone);
else
tx = pg_gmtime(&time);
@@ -273,7 +273,7 @@ tm2abstime(struct pg_tm * tm, int tz)
day = date2j(tm->tm_year, tm->tm_mon, tm->tm_mday) - UNIX_EPOCH_JDATE;
/* check for time out of range */
- if ((day < MIN_DAYNUM) || (day > MAX_DAYNUM))
+ if (day < MIN_DAYNUM || day > MAX_DAYNUM)
return INVALID_ABSTIME;
/* convert to seconds */
@@ -432,9 +432,9 @@ abstime_finite(PG_FUNCTION_ARGS)
{
AbsoluteTime abstime = PG_GETARG_ABSOLUTETIME(0);
- PG_RETURN_BOOL((abstime != INVALID_ABSTIME) &&
- (abstime != NOSTART_ABSTIME) &&
- (abstime != NOEND_ABSTIME));
+ PG_RETURN_BOOL(abstime != INVALID_ABSTIME &&
+ abstime != NOSTART_ABSTIME &&
+ abstime != NOEND_ABSTIME);
}
@@ -729,8 +729,8 @@ reltimein(PG_FUNCTION_ARGS)
switch (dtype)
{
case DTK_DELTA:
- result = ((((tm->tm_hour * 60) + tm->tm_min) * 60) + tm->tm_sec);
- result += ((tm->tm_year * 36525 * 864) + (((tm->tm_mon * 30) + tm->tm_mday) * SECS_PER_DAY));
+ result = ((tm->tm_hour * 60 + tm->tm_min) * 60) + tm->tm_sec;
+ result += tm->tm_year * 36525 * 864 + ((tm->tm_mon * 30) + tm->tm_mday) * SECS_PER_DAY;
break;
default:
@@ -946,14 +946,14 @@ interval_reltime(PG_FUNCTION_ARGS)
}
#ifdef HAVE_INT64_TIMESTAMP
- span = ((((INT64CONST(365250000) * year) + (INT64CONST(30000000) * month))
- * INT64CONST(SECS_PER_DAY)) + interval->time);
+ span = ((INT64CONST(365250000) * year + INT64CONST(30000000) * month) *
+ INT64CONST(86400)) + interval->time;
span /= USECS_PER_SEC;
#else
- span = (((((double) 365.25 * year) + ((double) 30 * month)) * SECS_PER_DAY) + interval->time);
+ span = (365.25 * year + 30.0 * month) * SECS_PER_DAY + interval->time;
#endif
- if ((span < INT_MIN) || (span > INT_MAX))
+ if (span < INT_MIN || span > INT_MAX)
time = INVALID_RELTIME;
else
time = span;
@@ -991,12 +991,12 @@ reltime_interval(PG_FUNCTION_ARGS)
result->time = (reltime * USECS_PER_SEC);
#else
- TMODULO(reltime, year, (36525 * 864));
- TMODULO(reltime, month, (30 * SECS_PER_DAY));
+ TMODULO(reltime, year, 36525 * 864);
+ TMODULO(reltime, month, 30 * SECS_PER_DAY);
result->time = reltime;
#endif
- result->month = ((12 * year) + month);
+ result->month = 12 * year + month;
break;
}
@@ -1049,8 +1049,8 @@ timepl(PG_FUNCTION_ARGS)
if (AbsoluteTimeIsReal(t1) &&
RelativeTimeIsValid(t2) &&
- ((t2 > 0) ? (t1 < NOEND_ABSTIME - t2)
- : (t1 > NOSTART_ABSTIME - t2))) /* prevent overflow */
+ ((t2 > 0 && t1 < NOEND_ABSTIME - t2) ||
+ (t2 <= 0 && t1 > NOSTART_ABSTIME - t2))) /* prevent overflow */
PG_RETURN_ABSOLUTETIME(t1 + t2);
PG_RETURN_ABSOLUTETIME(INVALID_ABSTIME);
@@ -1068,8 +1068,8 @@ timemi(PG_FUNCTION_ARGS)
if (AbsoluteTimeIsReal(t1) &&
RelativeTimeIsValid(t2) &&
- ((t2 > 0) ? (t1 > NOSTART_ABSTIME + t2)
- : (t1 < NOEND_ABSTIME + t2))) /* prevent overflow */
+ ((t2 > 0 && t1 > NOSTART_ABSTIME + t2) ||
+ (t2 <= 0 && t1 < NOEND_ABSTIME + t2))) /* prevent overflow */
PG_RETURN_ABSOLUTETIME(t1 - t2);
PG_RETURN_ABSOLUTETIME(INVALID_ABSTIME);
@@ -1272,12 +1272,12 @@ tinterval_cmp_internal(TimeInterval a, TimeInterval b)
* non-INVALID. This is somewhat arbitrary; the important thing is to
* have a consistent sort order.
*/
- a_invalid = ((a->status == T_INTERVAL_INVAL) ||
- (a->data[0] == INVALID_ABSTIME) ||
- (a->data[1] == INVALID_ABSTIME));
- b_invalid = ((b->status == T_INTERVAL_INVAL) ||
- (b->data[0] == INVALID_ABSTIME) ||
- (b->data[1] == INVALID_ABSTIME));
+ a_invalid = a->status == T_INTERVAL_INVAL ||
+ a->data[0] == INVALID_ABSTIME ||
+ a->data[1] == INVALID_ABSTIME;
+ b_invalid = b->status == T_INTERVAL_INVAL ||
+ b->data[0] == INVALID_ABSTIME ||
+ b->data[1] == INVALID_ABSTIME;
if (a_invalid)
{
@@ -1390,7 +1390,7 @@ tintervalleneq(PG_FUNCTION_ARGS)
PG_RETURN_BOOL(false);
rt = DatumGetRelativeTime(DirectFunctionCall1(tintervalrel,
TimeIntervalGetDatum(i)));
- PG_RETURN_BOOL((rt != INVALID_RELTIME) && (rt == t));
+ PG_RETURN_BOOL(rt != INVALID_RELTIME && rt == t);
}
Datum
@@ -1404,7 +1404,7 @@ tintervallenne(PG_FUNCTION_ARGS)
PG_RETURN_BOOL(false);
rt = DatumGetRelativeTime(DirectFunctionCall1(tintervalrel,
TimeIntervalGetDatum(i)));
- PG_RETURN_BOOL((rt != INVALID_RELTIME) && (rt != t));
+ PG_RETURN_BOOL(rt != INVALID_RELTIME && rt != t);
}
Datum
@@ -1418,7 +1418,7 @@ tintervallenlt(PG_FUNCTION_ARGS)
PG_RETURN_BOOL(false);
rt = DatumGetRelativeTime(DirectFunctionCall1(tintervalrel,
TimeIntervalGetDatum(i)));
- PG_RETURN_BOOL((rt != INVALID_RELTIME) && (rt < t));
+ PG_RETURN_BOOL(rt != INVALID_RELTIME && rt < t);
}
Datum
@@ -1432,7 +1432,7 @@ tintervallengt(PG_FUNCTION_ARGS)
PG_RETURN_BOOL(false);
rt = DatumGetRelativeTime(DirectFunctionCall1(tintervalrel,
TimeIntervalGetDatum(i)));
- PG_RETURN_BOOL((rt != INVALID_RELTIME) && (rt > t));
+ PG_RETURN_BOOL(rt != INVALID_RELTIME && rt > t);
}
Datum
@@ -1446,7 +1446,7 @@ tintervallenle(PG_FUNCTION_ARGS)
PG_RETURN_BOOL(false);
rt = DatumGetRelativeTime(DirectFunctionCall1(tintervalrel,
TimeIntervalGetDatum(i)));
- PG_RETURN_BOOL((rt != INVALID_RELTIME) && (rt <= t));
+ PG_RETURN_BOOL(rt != INVALID_RELTIME && rt <= t);
}
Datum
@@ -1460,7 +1460,7 @@ tintervallenge(PG_FUNCTION_ARGS)
PG_RETURN_BOOL(false);
rt = DatumGetRelativeTime(DirectFunctionCall1(tintervalrel,
TimeIntervalGetDatum(i)));
- PG_RETURN_BOOL((rt != INVALID_RELTIME) && (rt >= t));
+ PG_RETURN_BOOL(rt != INVALID_RELTIME && rt >= t);
}
/*
diff --git a/src/backend/utils/adt/timestamp.c b/src/backend/utils/adt/timestamp.c
index 573ef6e0582..9aa28ffcc6a 100644
--- a/src/backend/utils/adt/timestamp.c
+++ b/src/backend/utils/adt/timestamp.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/utils/adt/timestamp.c,v 1.122 2005/05/23 21:54:02 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/timestamp.c,v 1.123 2005/05/24 02:09:45 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -280,8 +280,8 @@ AdjustTimestampForTypmod(Timestamp *time, int32 typmod)
#ifdef HAVE_INT64_TIMESTAMP
if (*time >= INT64CONST(0))
{
- *time = (((*time + TimestampOffsets[typmod]) / TimestampScales[typmod])
- * TimestampScales[typmod]);
+ *time = ((*time + TimestampOffsets[typmod]) / TimestampScales[typmod]) *
+ TimestampScales[typmod];
}
else
{
@@ -289,8 +289,7 @@ AdjustTimestampForTypmod(Timestamp *time, int32 typmod)
* TimestampScales[typmod]);
}
#else
- *time = (rint(((double) *time) * TimestampScales[typmod])
- / TimestampScales[typmod]);
+ *time = rint((double)*time * TimestampScales[typmod]) / TimestampScales[typmod];
#endif
}
}
@@ -891,7 +890,7 @@ AdjustIntervalForTypmod(Interval *interval, int32 typmod)
#ifdef HAVE_INT64_TIMESTAMP
if (interval->time >= INT64CONST(0))
{
- interval->time = (((interval->time +
+ interval->time = ((interval->time +
IntervalOffsets[precision]) /
IntervalScales[precision]) *
IntervalScales[precision];
@@ -1212,15 +1211,15 @@ tm2interval(struct pg_tm * tm, fsec_t fsec, Interval *span)
{
span->month = tm->tm_year * 12 + tm->tm_mon;
#ifdef HAVE_INT64_TIMESTAMP
- span->time = ((((((((tm->tm_mday * INT64CONST(24))
- + tm->tm_hour) * INT64CONST(60))
- + tm->tm_min) * INT64CONST(60))
- + tm->tm_sec) * USECS_PER_SEC) + fsec);
+ span->time = (((((((tm->tm_mday * INT64CONST(24)) +
+ tm->tm_hour) * INT64CONST(60)) +
+ tm->tm_min) * INT64CONST(60)) +
+ tm->tm_sec) * USECS_PER_SEC) + fsec;
#else
- span->time = ((((((tm->tm_mday * 24.0)
- + tm->tm_hour) * 60.0)
- + tm->tm_min) * 60.0)
- + tm->tm_sec);
+ span->time = (((((tm->tm_mday * 24.0) +
+ tm->tm_hour) * 60.0) +
+ tm->tm_min) * 60.0) +
+ tm->tm_sec;
span->time = JROUND(span->time + fsec);
#endif
@@ -1231,14 +1230,14 @@ tm2interval(struct pg_tm * tm, fsec_t fsec, Interval *span)
static int64
time2t(const int hour, const int min, const int sec, const fsec_t fsec)
{
- return ((((((hour * 60) + min) * 60) + sec) * USECS_PER_SEC) + fsec);
+ return (((((hour * 60) + min) * 60) + sec) * USECS_PER_SEC) + fsec;
} /* time2t() */
#else
static double
time2t(const int hour, const int min, const int sec, const fsec_t fsec)
{
- return ((((hour * 60) + min) * 60) + sec + fsec);
+ return (((hour * 60) + min) * 60) + sec + fsec;
} /* time2t() */
#endif
@@ -1324,7 +1323,7 @@ int
timestamp_cmp_internal(Timestamp dt1, Timestamp dt2)
{
#ifdef HAVE_INT64_TIMESTAMP
- return ((dt1 < dt2) ? -1 : ((dt1 > dt2) ? 1 : 0));
+ return (dt1 < dt2) ? -1 : ((dt1 > dt2) ? 1 : 0);
#else
/*
@@ -1935,13 +1934,13 @@ timestamp_pl_interval(PG_FUNCTION_ARGS)
tm->tm_mon += span->month;
if (tm->tm_mon > 12)
{
- tm->tm_year += ((tm->tm_mon - 1) / 12);
- tm->tm_mon = (((tm->tm_mon - 1) % 12) + 1);
+ tm->tm_year += (tm->tm_mon - 1) / 12;
+ tm->tm_mon = ((tm->tm_mon - 1) % 12) + 1;
}
else if (tm->tm_mon < 1)
{
- tm->tm_year += ((tm->tm_mon / 12) - 1);
- tm->tm_mon = ((tm->tm_mon % 12) + 12);
+ tm->tm_year += tm->tm_mon / 12 - 1;
+ tm->tm_mon = tm->tm_mon % 12 + 12;
}
/* adjust for end of month boundary problems... */
@@ -2014,13 +2013,13 @@ timestamptz_pl_interval(PG_FUNCTION_ARGS)
tm->tm_mon += span->month;
if (tm->tm_mon > 12)
{
- tm->tm_year += ((tm->tm_mon - 1) / 12);
- tm->tm_mon = (((tm->tm_mon - 1) % 12) + 1);
+ tm->tm_year += (tm->tm_mon - 1) / 12;
+ tm->tm_mon = ((tm->tm_mon - 1) % 12) + 1;
}
else if (tm->tm_mon < 1)
{
- tm->tm_year += ((tm->tm_mon / 12) - 1);
- tm->tm_mon = ((tm->tm_mon % 12) + 12);
+ tm->tm_year += tm->tm_mon / 12 - 1;
+ tm->tm_mon = tm->tm_mon % 12 + 12;
}
/* adjust for end of month boundary problems... */
@@ -2337,12 +2336,12 @@ timestamp_age(PG_FUNCTION_ARGS)
timestamp2tm(dt2, NULL, tm2, &fsec2, NULL) == 0)
{
fsec = (fsec1 - fsec2);
- tm->tm_sec = (tm1->tm_sec - tm2->tm_sec);
- tm->tm_min = (tm1->tm_min - tm2->tm_min);
- tm->tm_hour = (tm1->tm_hour - tm2->tm_hour);
- tm->tm_mday = (tm1->tm_mday - tm2->tm_mday);
- tm->tm_mon = (tm1->tm_mon - tm2->tm_mon);
- tm->tm_year = (tm1->tm_year - tm2->tm_year);
+ tm->tm_sec = tm1->tm_sec - tm2->tm_sec;
+ tm->tm_min = tm1->tm_min - tm2->tm_min;
+ tm->tm_hour = tm1->tm_hour - tm2->tm_hour;
+ tm->tm_mday = tm1->tm_mday - tm2->tm_mday;
+ tm->tm_mon = tm1->tm_mon - tm2->tm_mon;
+ tm->tm_year = tm1->tm_year - tm2->tm_year;
/* flip sign if necessary... */
if (dt1 < dt2)
@@ -2450,13 +2449,13 @@ timestamptz_age(PG_FUNCTION_ARGS)
if (timestamp2tm(dt1, &tz1, tm1, &fsec1, &tzn) == 0 &&
timestamp2tm(dt2, &tz2, tm2, &fsec2, &tzn) == 0)
{
- fsec = (fsec1 - fsec2);
- tm->tm_sec = (tm1->tm_sec - tm2->tm_sec);
- tm->tm_min = (tm1->tm_min - tm2->tm_min);
- tm->tm_hour = (tm1->tm_hour - tm2->tm_hour);
- tm->tm_mday = (tm1->tm_mday - tm2->tm_mday);
- tm->tm_mon = (tm1->tm_mon - tm2->tm_mon);
- tm->tm_year = (tm1->tm_year - tm2->tm_year);
+ fsec = fsec1 - fsec2;
+ tm->tm_sec = tm1->tm_sec - tm2->tm_sec;
+ tm->tm_min = tm1->tm_min - tm2->tm_min;
+ tm->tm_hour = tm1->tm_hour - tm2->tm_hour;
+ tm->tm_mday = tm1->tm_mday - tm2->tm_mday;
+ tm->tm_mon = tm1->tm_mon - tm2->tm_mon;
+ tm->tm_year = tm1->tm_year - tm2->tm_year;
/* flip sign if necessary... */
if (dt1 < dt2)
@@ -3048,7 +3047,7 @@ interval_trunc(PG_FUNCTION_ARGS)
case DTK_YEAR:
tm->tm_mon = 0;
case DTK_QUARTER:
- tm->tm_mon = (3 * (tm->tm_mon / 3));
+ tm->tm_mon = 3 * (tm->tm_mon / 3);
case DTK_MONTH:
tm->tm_mday = 0;
case DTK_DAY:
@@ -3357,7 +3356,7 @@ timestamp_part(PG_FUNCTION_ARGS)
* ----
*/
if (tm->tm_year > 0)
- result = ((tm->tm_year + 99) / 100);
+ result = (tm->tm_year + 99) / 100;
else
/* caution: C division may have negative remainder */
result = -((99 - (tm->tm_year - 1)) / 100);
@@ -3419,7 +3418,7 @@ timestamp_part(PG_FUNCTION_ARGS)
errmsg("timestamp out of range")));
#ifdef HAVE_INT64_TIMESTAMP
- result = ((timestamptz - SetEpochTimestamp()) / 1000000e0);
+ result = (timestamptz - SetEpochTimestamp()) / 1000000e0;
#else
result = timestamptz - SetEpochTimestamp();
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 01:30:55 +0000