database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-27 22:56:53 +03:00
Code

Get rid of a bunch of #ifdef HAVE_INT64_TIMESTAMP conditionals by inventing

Browse Source 
a new typedef TimeOffset to represent an intermediate time value.  It's
either int64 or double as appropriate, and in most usages will be measured
in microseconds or seconds the same as Timestamp.  We don't call it
Timestamp, though, since the value doesn't necessarily represent an absolute
time instant.

Warren Turkal
This commit is contained in:
Tom Lane 2008-03-21 01:31:43 +00:00
parent 6b0706ac33
commit 2d0583a166
5 changed files with 58 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/backend/utils/adt/date.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/date.c,v 1.139 2008/02/17 02:09:28 tgl Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/date.c,v 1.140 2008/03/21 01:31:42 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1838,9 +1838,9 @@ timetztypmodout(PG_FUNCTION_ARGS)
static int static int
timetz2tm(TimeTzADT *time, struct pg_tm * tm, fsec_t *fsec, int *tzp) timetz2tm(TimeTzADT *time, struct pg_tm * tm, fsec_t *fsec, int *tzp)
{ {
#ifdef HAVE_INT64_TIMESTAMP TimeOffset trem = time->time;
int64 trem = time->time;
#ifdef HAVE_INT64_TIMESTAMP
tm->tm_hour = trem / USECS_PER_HOUR; tm->tm_hour = trem / USECS_PER_HOUR;
trem -= tm->tm_hour * USECS_PER_HOUR; trem -= tm->tm_hour * USECS_PER_HOUR;
tm->tm_min = trem / USECS_PER_MINUTE; tm->tm_min = trem / USECS_PER_MINUTE;
@ -1848,8 +1848,6 @@ timetz2tm(TimeTzADT *time, struct pg_tm * tm, fsec_t *fsec, int *tzp)
tm->tm_sec = trem / USECS_PER_SEC; tm->tm_sec = trem / USECS_PER_SEC;
*fsec = trem - tm->tm_sec * USECS_PER_SEC; *fsec = trem - tm->tm_sec * USECS_PER_SEC;
#else #else
double trem = time->time;
recalc: recalc:
TMODULO(trem, tm->tm_hour, (double) SECS_PER_HOUR); TMODULO(trem, tm->tm_hour, (double) SECS_PER_HOUR);
TMODULO(trem, tm->tm_min, (double) SECS_PER_MINUTE); TMODULO(trem, tm->tm_min, (double) SECS_PER_MINUTE);
@ -1895,17 +1893,14 @@ timetz_scale(PG_FUNCTION_ARGS)
static int static int
timetz_cmp_internal(TimeTzADT *time1, TimeTzADT *time2) timetz_cmp_internal(TimeTzADT *time1, TimeTzADT *time2)
{ {
/* Primary sort is by true (GMT-equivalent) time */ TimeOffset t1,
#ifdef HAVE_INT64_TIMESTAMP
int64 t1,
t2; t2;
/* Primary sort is by true (GMT-equivalent) time */
#ifdef HAVE_INT64_TIMESTAMP
t1 = time1->time + (time1->zone * USECS_PER_SEC); t1 = time1->time + (time1->zone * USECS_PER_SEC);
t2 = time2->time + (time2->zone * USECS_PER_SEC); t2 = time2->time + (time2->zone * USECS_PER_SEC);
#else #else
double t1,
t2;
t1 = time1->time + time1->zone; t1 = time1->time + time1->zone;
t2 = time2->time + time2->zone; t2 = time2->time + time2->zone;
#endif #endif

9
src/backend/utils/adt/nabstime.c
View File

@ -10,7 +10,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/nabstime.c,v 1.153 2008/02/17 02:09:28 tgl Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/nabstime.c,v 1.154 2008/03/21 01:31:42 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -831,12 +831,7 @@ interval_reltime(PG_FUNCTION_ARGS)
int year, int year,
month, month,
day; day;
TimeOffset span;
#ifdef HAVE_INT64_TIMESTAMP
int64 span;
#else
double span;
#endif
year = interval->month / MONTHS_PER_YEAR; year = interval->month / MONTHS_PER_YEAR;
month = interval->month % MONTHS_PER_YEAR; month = interval->month % MONTHS_PER_YEAR;

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

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/timestamp.c,v 1.185 2008/02/17 02:09:28 tgl Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/timestamp.c,v 1.186 2008/03/21 01:31:42 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -44,11 +44,7 @@
TimestampTz PgStartTime; TimestampTz PgStartTime;
#ifdef HAVE_INT64_TIMESTAMP static TimeOffset time2t(const int hour, const int min, const int sec, const fsec_t fsec);
static int64 time2t(const int hour, const int min, const int sec, const fsec_t fsec);
#else
static double time2t(const int hour, const int min, const int sec, const fsec_t fsec);
#endif
static int EncodeSpecialTimestamp(Timestamp dt, char *str); static int EncodeSpecialTimestamp(Timestamp dt, char *str);
static Timestamp dt2local(Timestamp dt, int timezone); static Timestamp dt2local(Timestamp dt, int timezone);
static void AdjustTimestampForTypmod(Timestamp *time, int32 typmod); static void AdjustTimestampForTypmod(Timestamp *time, int32 typmod);
@ -977,11 +973,7 @@ AdjustIntervalForTypmod(Interval *interval, int32 typmod)
} }
else if (range == INTERVAL_MASK(MINUTE)) else if (range == INTERVAL_MASK(MINUTE))
{ {
#ifdef HAVE_INT64_TIMESTAMP TimeOffset hour;
int64 hour;
#else
double hour;
#endif
interval->month = 0; interval->month = 0;
interval->day = 0; interval->day = 0;
@ -998,11 +990,7 @@ AdjustIntervalForTypmod(Interval *interval, int32 typmod)
} }
else if (range == INTERVAL_MASK(SECOND)) else if (range == INTERVAL_MASK(SECOND))
{ {
#ifdef HAVE_INT64_TIMESTAMP TimeOffset minute;
int64 minute;
#else
double minute;
#endif
interval->month = 0; interval->month = 0;
interval->day = 0; interval->day = 0;
@ -1076,11 +1064,7 @@ AdjustIntervalForTypmod(Interval *interval, int32 typmod)
else if (range == (INTERVAL_MASK(MINUTE) | else if (range == (INTERVAL_MASK(MINUTE) |
INTERVAL_MASK(SECOND))) INTERVAL_MASK(SECOND)))
{ {
#ifdef HAVE_INT64_TIMESTAMP TimeOffset hour;
int64 hour;
#else
double hour;
#endif
interval->month = 0; interval->month = 0;
interval->day = 0; interval->day = 0;
@ -1342,11 +1326,7 @@ timestamptz_to_str(TimestampTz t)
void void
dt2time(Timestamp jd, int *hour, int *min, int *sec, fsec_t *fsec) dt2time(Timestamp jd, int *hour, int *min, int *sec, fsec_t *fsec)
{ {
#ifdef HAVE_INT64_TIMESTAMP TimeOffset time;
int64 time;
#else
double time;
#endif
time = jd; time = jd;
@ -1547,13 +1527,8 @@ recalc_t:
int int
tm2timestamp(struct pg_tm * tm, fsec_t fsec, int *tzp, Timestamp *result) tm2timestamp(struct pg_tm * tm, fsec_t fsec, int *tzp, Timestamp *result)
{ {
#ifdef HAVE_INT64_TIMESTAMP TimeOffset date;
int date; TimeOffset time;
int64 time;
#else
double date,
time;
#endif
/* Julian day routines are not correct for negative Julian days */ /* Julian day routines are not correct for negative Julian days */
if (!IS_VALID_JULIAN(tm->tm_year, tm->tm_mon, tm->tm_mday)) if (!IS_VALID_JULIAN(tm->tm_year, tm->tm_mon, tm->tm_mday))
@ -1596,13 +1571,8 @@ tm2timestamp(struct pg_tm * tm, fsec_t fsec, int *tzp, Timestamp *result)
int int
interval2tm(Interval span, struct pg_tm * tm, fsec_t *fsec) interval2tm(Interval span, struct pg_tm * tm, fsec_t *fsec)
{ {
#ifdef HAVE_INT64_TIMESTAMP TimeOffset time;
int64 time; TimeOffset tfrac;
int64 tfrac;
#else
double time;
double tfrac;
#endif
tm->tm_year = span.month / MONTHS_PER_YEAR; tm->tm_year = span.month / MONTHS_PER_YEAR;
tm->tm_mon = span.month % MONTHS_PER_YEAR; tm->tm_mon = span.month % MONTHS_PER_YEAR;
@ -1658,19 +1628,15 @@ tm2interval(struct pg_tm * tm, fsec_t fsec, Interval *span)
return 0; return 0;
} }
static TimeOffset
time2t(const int hour, const int min, const int sec, const fsec_t fsec)
{
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
static int64
time2t(const int hour, const int min, const int sec, const fsec_t fsec)
{
return (((((hour * MINS_PER_HOUR) + min) * SECS_PER_MINUTE) + sec) * USECS_PER_SEC) + fsec; return (((((hour * MINS_PER_HOUR) + min) * SECS_PER_MINUTE) + sec) * USECS_PER_SEC) + fsec;
} /* time2t() */
#else #else
static double
time2t(const int hour, const int min, const int sec, const fsec_t fsec)
{
return (((hour * MINS_PER_HOUR) + min) * SECS_PER_MINUTE) + sec + fsec; return (((hour * MINS_PER_HOUR) + min) * SECS_PER_MINUTE) + sec + fsec;
} /* time2t() */
#endif #endif
}
static Timestamp static Timestamp
dt2local(Timestamp dt, int tz) dt2local(Timestamp dt, int tz)
@ -1681,7 +1647,7 @@ dt2local(Timestamp dt, int tz)
dt -= tz; dt -= tz;
#endif #endif
return dt; return dt;
} /* dt2local() */ }
/***************************************************************************** /*****************************************************************************
@ -2042,13 +2008,8 @@ timestamptz_cmp_timestamp(PG_FUNCTION_ARGS)
static int static int
interval_cmp_internal(Interval *interval1, Interval *interval2) interval_cmp_internal(Interval *interval1, Interval *interval2)
{ {
#ifdef HAVE_INT64_TIMESTAMP TimeOffset span1,
int64 span1,
span2; span2;
#else
double span1,
span2;
#endif
span1 = interval1->time; span1 = interval1->time;
span2 = interval2->time; span2 = interval2->time;
@ -2387,12 +2348,7 @@ interval_justify_interval(PG_FUNCTION_ARGS)
{ {
Interval *span = PG_GETARG_INTERVAL_P(0); Interval *span = PG_GETARG_INTERVAL_P(0);
Interval *result; Interval *result;
TimeOffset wholeday;
#ifdef HAVE_INT64_TIMESTAMP
int64 wholeday;
#else
double wholeday;
#endif
int32 wholemonth; int32 wholemonth;
result = (Interval *) palloc(sizeof(Interval)); result = (Interval *) palloc(sizeof(Interval));
@ -2459,12 +2415,7 @@ interval_justify_hours(PG_FUNCTION_ARGS)
{ {
Interval *span = PG_GETARG_INTERVAL_P(0); Interval *span = PG_GETARG_INTERVAL_P(0);
Interval *result; Interval *result;
TimeOffset wholeday;
#ifdef HAVE_INT64_TIMESTAMP
int64 wholeday;
#else
double wholeday;
#endif
result = (Interval *) palloc(sizeof(Interval)); result = (Interval *) palloc(sizeof(Interval));
result->month = span->month; result->month = span->month;

12
src/include/utils/date.h
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $PostgreSQL: pgsql/src/include/utils/date.h,v 1.39 2008/01/01 19:45:59 momjian Exp $ * $PostgreSQL: pgsql/src/include/utils/date.h,v 1.40 2008/03/21 01:31:43 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -29,11 +29,7 @@ typedef float8 TimeADT;
typedef struct typedef struct
{ {
#ifdef HAVE_INT64_TIMESTAMP TimeADT time; /* all time units other than months and years */
int64 time; /* all time units other than months and years */
#else
double time; /* all time units other than months and years */
#endif
int32 zone; /* numeric time zone, in seconds */ int32 zone; /* numeric time zone, in seconds */
} TimeTzADT; } TimeTzADT;
@ -54,7 +50,8 @@ typedef struct
#define DateADTGetDatum(X) Int32GetDatum(X) #define DateADTGetDatum(X) Int32GetDatum(X)
#define TimeADTGetDatum(X) Int64GetDatum(X) #define TimeADTGetDatum(X) Int64GetDatum(X)
#define TimeTzADTPGetDatum(X) PointerGetDatum(X) #define TimeTzADTPGetDatum(X) PointerGetDatum(X)
#else
#else /* !HAVE_INT64_TIMESTAMP */
#define MAX_TIME_PRECISION 10 #define MAX_TIME_PRECISION 10
@ -69,6 +66,7 @@ typedef struct
#define DateADTGetDatum(X) Int32GetDatum(X) #define DateADTGetDatum(X) Int32GetDatum(X)
#define TimeADTGetDatum(X) Float8GetDatum(X) #define TimeADTGetDatum(X) Float8GetDatum(X)
#define TimeTzADTPGetDatum(X) PointerGetDatum(X) #define TimeTzADTPGetDatum(X) PointerGetDatum(X)
#endif /* HAVE_INT64_TIMESTAMP */ #endif /* HAVE_INT64_TIMESTAMP */
#define PG_GETARG_DATEADT(n) DatumGetDateADT(PG_GETARG_DATUM(n)) #define PG_GETARG_DATEADT(n) DatumGetDateADT(PG_GETARG_DATUM(n))

49
src/include/utils/timestamp.h
View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $PostgreSQL: pgsql/src/include/utils/timestamp.h,v 1.75 2008/02/17 02:09:31 tgl Exp $ * $PostgreSQL: pgsql/src/include/utils/timestamp.h,v 1.76 2008/03/21 01:31:43 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -25,31 +25,42 @@
/* /*
* Timestamp represents absolute time. * Timestamp represents absolute time.
*
* Interval represents delta time. Keep track of months (and years), days, * Interval represents delta time. Keep track of months (and years), days,
* and time separately since the elapsed time spanned is unknown until * and hours/minutes/seconds separately since the elapsed time spanned is
* instantiated relative to an absolute time. * unknown until instantiated relative to an absolute time.
* *
* Note that Postgres uses "time interval" to mean a bounded interval, * Note that Postgres uses "time interval" to mean a bounded interval,
* consisting of a beginning and ending time, not a time span - thomas 97/03/20 * consisting of a beginning and ending time, not a time span - thomas 97/03/20
*
* We have two implementations, one that uses int64 values with units of
* microseconds, and one that uses double values with units of seconds.
*
* TimeOffset and fsec_t are convenience typedefs for temporary variables
* that are of different types in the two cases. Do not use fsec_t in values
* stored on-disk, since it is not the same size in both implementations.
*/ */
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
typedef int64 Timestamp; typedef int64 Timestamp;
typedef int64 TimestampTz; typedef int64 TimestampTz;
typedef int64 TimeOffset;
typedef int32 fsec_t; /* fractional seconds (in microseconds) */
#else #else
typedef double Timestamp; typedef double Timestamp;
typedef double TimestampTz; typedef double TimestampTz;
typedef double TimeOffset;
typedef double fsec_t; /* fractional seconds (in seconds) */
#endif #endif
typedef struct typedef struct
{ {
#ifdef HAVE_INT64_TIMESTAMP TimeOffset time; /* all time units other than days, months and
int64 time; /* all time units other than days, months and
* years */ * years */
#else
double time; /* all time units other than days, months and
* years */
#endif
int32 day; /* days, after time for alignment */ int32 day; /* days, after time for alignment */
int32 month; /* months and years, after time for alignment */ int32 month; /* months and years, after time for alignment */
} Interval; } Interval;
@ -106,17 +117,18 @@ typedef struct
#define TimestampTzGetDatum(X) Int64GetDatum(X) #define TimestampTzGetDatum(X) Int64GetDatum(X)
#define IntervalPGetDatum(X) PointerGetDatum(X) #define IntervalPGetDatum(X) PointerGetDatum(X)
#define PG_GETARG_TIMESTAMP(n) PG_GETARG_INT64(n) #define PG_GETARG_TIMESTAMP(n) DatumGetTimestamp(PG_GETARG_DATUM(n))
#define PG_GETARG_TIMESTAMPTZ(n) PG_GETARG_INT64(n) #define PG_GETARG_TIMESTAMPTZ(n) DatumGetTimestampTz(PG_GETARG_DATUM(n))
#define PG_GETARG_INTERVAL_P(n) DatumGetIntervalP(PG_GETARG_DATUM(n)) #define PG_GETARG_INTERVAL_P(n) DatumGetIntervalP(PG_GETARG_DATUM(n))
#define PG_RETURN_TIMESTAMP(x) PG_RETURN_INT64(x) #define PG_RETURN_TIMESTAMP(x) return TimestampGetDatum(x)
#define PG_RETURN_TIMESTAMPTZ(x) PG_RETURN_INT64(x) #define PG_RETURN_TIMESTAMPTZ(x) return TimestampTzGetDatum(x)
#define PG_RETURN_INTERVAL_P(x) return IntervalPGetDatum(x) #define PG_RETURN_INTERVAL_P(x) return IntervalPGetDatum(x)
#define DT_NOBEGIN (-INT64CONST(0x7fffffffffffffff) - 1) #define DT_NOBEGIN (-INT64CONST(0x7fffffffffffffff) - 1)
#define DT_NOEND (INT64CONST(0x7fffffffffffffff)) #define DT_NOEND (INT64CONST(0x7fffffffffffffff))
#else
#else /* !HAVE_INT64_TIMESTAMP */
#define DatumGetTimestamp(X) ((Timestamp) DatumGetFloat8(X)) #define DatumGetTimestamp(X) ((Timestamp) DatumGetFloat8(X))
#define DatumGetTimestampTz(X) ((TimestampTz) DatumGetFloat8(X)) #define DatumGetTimestampTz(X) ((TimestampTz) DatumGetFloat8(X))
@ -141,6 +153,7 @@ typedef struct
#define DT_NOBEGIN (-DBL_MAX) #define DT_NOBEGIN (-DBL_MAX)
#define DT_NOEND (DBL_MAX) #define DT_NOEND (DBL_MAX)
#endif #endif
#endif /* HAVE_INT64_TIMESTAMP */ #endif /* HAVE_INT64_TIMESTAMP */
@ -154,14 +167,6 @@ typedef struct
#define TIMESTAMP_NOT_FINITE(j) (TIMESTAMP_IS_NOBEGIN(j) || TIMESTAMP_IS_NOEND(j)) #define TIMESTAMP_NOT_FINITE(j) (TIMESTAMP_IS_NOBEGIN(j) || TIMESTAMP_IS_NOEND(j))
#ifdef HAVE_INT64_TIMESTAMP
typedef int32 fsec_t;
#else
typedef double fsec_t;
#endif
/* /*
* Round off to MAX_TIMESTAMP_PRECISION decimal places. * Round off to MAX_TIMESTAMP_PRECISION decimal places.
* Note: this is also used for rounding off intervals. * Note: this is also used for rounding off intervals.