diff options
| author | Alexander Korotkov <akorotkov@postgresql.org> | 2019-10-21 23:04:14 +0300 |
|---|---|---|
| committer | Alexander Korotkov <akorotkov@postgresql.org> | 2019-10-21 23:07:07 +0300 |
| commit | 52ad1e659967896ed153185328ffe806d69abcb6 (patch) | |
| tree | 03ab5a5db0c8bac802160dcf538a38a4025f92c9 /src/backend/utils/adt/date.c | |
| parent | a6888fde7f0dbe865559b31ba2ce01ac1150debe (diff) | |
| download | postgresql-52ad1e659967896ed153185328ffe806d69abcb6.tar.gz postgresql-52ad1e659967896ed153185328ffe806d69abcb6.zip | |
Refactor jsonpath's compareDatetime()
This commit refactors come ridiculous coding in compareDatetime(). Also, it
provides correct cross-datatype comparison even when one of values overflows
during cast. That eliminates dilemma on whether we should suppress overflow
errors during cast.
Reported-by: Tom Lane
Discussion: https://postgr.es/m/32308.1569455803%40sss.pgh.pa.us
Discussion: https://postgr.es/m/a5629d0c-8162-7559-16aa-0c8390d6ba5f%40postgrespro.ru
Author: Nikita Glukhov, Alexander Korotkov
Diffstat (limited to 'src/backend/utils/adt/date.c')
| -rw-r--r-- | src/backend/utils/adt/date.c | 40 |
1 files changed, 24 insertions, 16 deletions
diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c index fa50d79c05d..709bbaaf5a0 100644 --- a/src/backend/utils/adt/date.c +++ b/src/backend/utils/adt/date.c @@ -554,11 +554,12 @@ date_mii(PG_FUNCTION_ARGS) /* * Promote date to timestamp. * - * If 'have_error' is NULL, then errors are thrown, else '*have_error' is set - * and zero is returned. + * On overflow error is thrown if 'overflow' is NULL. Otherwise, '*overflow' + * is set to -1 (+1) when result value exceed lower (upper) boundary and zero + * returned. */ Timestamp -date2timestamp_opt_error(DateADT dateVal, bool *have_error) +date2timestamp_opt_overflow(DateADT dateVal, int *overflow) { Timestamp result; @@ -575,9 +576,9 @@ date2timestamp_opt_error(DateADT dateVal, bool *have_error) */ if (dateVal >= (TIMESTAMP_END_JULIAN - POSTGRES_EPOCH_JDATE)) { - if (have_error) + if (overflow) { - *have_error = true; + *overflow = 1; return (Timestamp) 0; } else @@ -596,22 +597,23 @@ date2timestamp_opt_error(DateADT dateVal, bool *have_error) } /* - * Single-argument version of date2timestamp_opt_error(). + * Single-argument version of date2timestamp_opt_overflow(). */ static TimestampTz date2timestamp(DateADT dateVal) { - return date2timestamp_opt_error(dateVal, NULL); + return date2timestamp_opt_overflow(dateVal, NULL); } /* * Promote date to timestamp with time zone. * - * If 'have_error' is NULL, then errors are thrown, else '*have_error' is set - * and zero is returned. + * On overflow error is thrown if 'overflow' is NULL. Otherwise, '*overflow' + * is set to -1 (+1) when result value exceed lower (upper) boundary and zero + * returned. */ TimestampTz -date2timestamptz_opt_error(DateADT dateVal, bool *have_error) +date2timestamptz_opt_overflow(DateADT dateVal, int *overflow) { TimestampTz result; struct pg_tm tt, @@ -631,9 +633,9 @@ date2timestamptz_opt_error(DateADT dateVal, bool *have_error) */ if (dateVal >= (TIMESTAMP_END_JULIAN - POSTGRES_EPOCH_JDATE)) { - if (have_error) + if (overflow) { - *have_error = true; + *overflow = 1; return (TimestampTz) 0; } else @@ -659,9 +661,15 @@ date2timestamptz_opt_error(DateADT dateVal, bool *have_error) */ if (!IS_VALID_TIMESTAMP(result)) { - if (have_error) + if (overflow) { - *have_error = true; + if (result < MIN_TIMESTAMP) + *overflow = -1; + else + { + Assert(result >= END_TIMESTAMP); + *overflow = 1; + } return (TimestampTz) 0; } else @@ -677,12 +685,12 @@ date2timestamptz_opt_error(DateADT dateVal, bool *have_error) } /* - * Single-argument version of date2timestamptz_opt_error(). + * Single-argument version of date2timestamptz_opt_overflow(). */ static TimestampTz date2timestamptz(DateADT dateVal) { - return date2timestamptz_opt_error(dateVal, NULL); + return date2timestamptz_opt_overflow(dateVal, NULL); } /* |