diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/utils/adt/date.c | 33 | ||||
| -rw-r--r-- | src/backend/utils/adt/selfuncs.c | 3 | ||||
| -rw-r--r-- | src/include/utils/date.h | 2 |
3 files changed, 36 insertions, 2 deletions
diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c index b5dfe08c9bb..c97ecf4a1ad 100644 --- a/src/backend/utils/adt/date.c +++ b/src/backend/utils/adt/date.c @@ -459,6 +459,39 @@ date2timestamptz(DateADT dateVal) return result; } +/* + * date2timestamp_no_overflow + * + * This is chartered to produce a double value that is numerically + * equivalent to the corresponding Timestamp value, if the date is in the + * valid range of Timestamps, but in any case not throw an overflow error. + * We can do this since the numerical range of double is greater than + * that of non-erroneous timestamps. The results are currently only + * used for statistical estimation purposes. + */ +double +date2timestamp_no_overflow(DateADT dateVal) +{ + double result; + + if (DATE_IS_NOBEGIN(dateVal)) + result = -DBL_MAX; + else if (DATE_IS_NOEND(dateVal)) + result = DBL_MAX; + else + { +#ifdef HAVE_INT64_TIMESTAMP + /* date is days since 2000, timestamp is microseconds since same... */ + result = dateVal * (double) USECS_PER_DAY; +#else + /* date is days since 2000, timestamp is seconds since same... */ + result = dateVal * (double) SECS_PER_DAY; +#endif + } + + return result; +} + /* * Crosstype comparison functions for dates diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index 5925a913739..c08310ba415 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -3865,8 +3865,7 @@ convert_timevalue_to_scalar(Datum value, Oid typid) return DatumGetTimestamp(DirectFunctionCall1(abstime_timestamp, value)); case DATEOID: - return DatumGetTimestamp(DirectFunctionCall1(date_timestamp, - value)); + return date2timestamp_no_overflow(DatumGetDateADT(value)); case INTERVALOID: { Interval *interval = DatumGetIntervalP(value); diff --git a/src/include/utils/date.h b/src/include/utils/date.h index 98570e663c0..227a7c897e0 100644 --- a/src/include/utils/date.h +++ b/src/include/utils/date.h @@ -91,6 +91,8 @@ typedef struct /* date.c */ +extern double date2timestamp_no_overflow(DateADT dateVal); + extern Datum date_in(PG_FUNCTION_ARGS); extern Datum date_out(PG_FUNCTION_ARGS); extern Datum date_recv(PG_FUNCTION_ARGS); |