Skip to content

P
Postgres FD Implementation
Commit 531e60ae authored by Peter Eisentraut's avatar Peter Eisentraut
Browse files
Options

Remove unused tzn arguments for timestamp2tm()

parent 7c8cfed7
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 22 deletions
src/backend/utils/adt/date.c
View file @ 531e60ae
...@@ -969,7 +969,6 @@ timestamptz_date(PG_FUNCTION_ARGS) ...@@ -969,7 +969,6 @@ timestamptz_date(PG_FUNCTION_ARGS)
*tm = &tt; *tm = &tt;
fsec_t fsec; fsec_t fsec;
int tz; int tz;
char *tzn;
if (TIMESTAMP_IS_NOBEGIN(timestamp)) if (TIMESTAMP_IS_NOBEGIN(timestamp))
DATE_NOBEGIN(result); DATE_NOBEGIN(result);
...@@ -977,7 +976,7 @@ timestamptz_date(PG_FUNCTION_ARGS) ...@@ -977,7 +976,7 @@ timestamptz_date(PG_FUNCTION_ARGS)
DATE_NOEND(result); DATE_NOEND(result);
else else
{ {
if (timestamp2tm(timestamp, &tz, tm, &fsec, &tzn, NULL) != 0) if (timestamp2tm(timestamp, &tz, tm, &fsec, NULL, NULL) != 0)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
errmsg("timestamp out of range"))); errmsg("timestamp out of range")));
...@@ -1576,12 +1575,11 @@ timestamptz_time(PG_FUNCTION_ARGS) ...@@ -1576,12 +1575,11 @@ timestamptz_time(PG_FUNCTION_ARGS)
*tm = &tt; *tm = &tt;
int tz; int tz;
fsec_t fsec; fsec_t fsec;
char *tzn;
if (TIMESTAMP_NOT_FINITE(timestamp)) if (TIMESTAMP_NOT_FINITE(timestamp))
PG_RETURN_NULL(); PG_RETURN_NULL();
if (timestamp2tm(timestamp, &tz, tm, &fsec, &tzn, NULL) != 0) if (timestamp2tm(timestamp, &tz, tm, &fsec, NULL, NULL) != 0)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
errmsg("timestamp out of range"))); errmsg("timestamp out of range")));
...@@ -2450,12 +2448,11 @@ timestamptz_timetz(PG_FUNCTION_ARGS) ...@@ -2450,12 +2448,11 @@ timestamptz_timetz(PG_FUNCTION_ARGS)
*tm = &tt; *tm = &tt;
int tz; int tz;
fsec_t fsec; fsec_t fsec;
char *tzn;
if (TIMESTAMP_NOT_FINITE(timestamp)) if (TIMESTAMP_NOT_FINITE(timestamp))
PG_RETURN_NULL(); PG_RETURN_NULL();
if (timestamp2tm(timestamp, &tz, tm, &fsec, &tzn, NULL) != 0) if (timestamp2tm(timestamp, &tz, tm, &fsec, NULL, NULL) != 0)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
errmsg("timestamp out of range"))); errmsg("timestamp out of range")));
......
src/backend/utils/adt/timestamp.c
View file @ 531e60ae
...@@ -530,7 +530,6 @@ timestamptz_recv(PG_FUNCTION_ARGS) ...@@ -530,7 +530,6 @@ timestamptz_recv(PG_FUNCTION_ARGS)
struct pg_tm tt, struct pg_tm tt,
*tm = &tt; *tm = &tt;
fsec_t fsec; fsec_t fsec;
char *tzn;
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
timestamp = (TimestampTz) pq_getmsgint64(buf); timestamp = (TimestampTz) pq_getmsgint64(buf);
...@@ -541,7 +540,7 @@ timestamptz_recv(PG_FUNCTION_ARGS) ...@@ -541,7 +540,7 @@ timestamptz_recv(PG_FUNCTION_ARGS)
/* rangecheck: see if timestamptz_out would like it */ /* rangecheck: see if timestamptz_out would like it */
if (TIMESTAMP_NOT_FINITE(timestamp)) if (TIMESTAMP_NOT_FINITE(timestamp))
/* ok */ ; /* ok */ ;
else if (timestamp2tm(timestamp, &tz, tm, &fsec, &tzn, NULL) != 0) else if (timestamp2tm(timestamp, &tz, tm, &fsec, NULL, NULL) != 0)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
errmsg("timestamp out of range"))); errmsg("timestamp out of range")));
...@@ -2723,7 +2722,6 @@ timestamptz_pl_interval(PG_FUNCTION_ARGS) ...@@ -2723,7 +2722,6 @@ timestamptz_pl_interval(PG_FUNCTION_ARGS)
Interval *span = PG_GETARG_INTERVAL_P(1); Interval *span = PG_GETARG_INTERVAL_P(1);
TimestampTz result; TimestampTz result;
int tz; int tz;
char *tzn;
if (TIMESTAMP_NOT_FINITE(timestamp)) if (TIMESTAMP_NOT_FINITE(timestamp))
result = timestamp; result = timestamp;
...@@ -2735,7 +2733,7 @@ timestamptz_pl_interval(PG_FUNCTION_ARGS) ...@@ -2735,7 +2733,7 @@ timestamptz_pl_interval(PG_FUNCTION_ARGS)
*tm = &tt; *tm = &tt;
fsec_t fsec; fsec_t fsec;
if (timestamp2tm(timestamp, &tz, tm, &fsec, &tzn, NULL) != 0) if (timestamp2tm(timestamp, &tz, tm, &fsec, NULL, NULL) != 0)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
errmsg("timestamp out of range"))); errmsg("timestamp out of range")));
...@@ -2771,7 +2769,7 @@ timestamptz_pl_interval(PG_FUNCTION_ARGS) ...@@ -2771,7 +2769,7 @@ timestamptz_pl_interval(PG_FUNCTION_ARGS)
fsec_t fsec; fsec_t fsec;
int julian; int julian;
if (timestamp2tm(timestamp, &tz, tm, &fsec, &tzn, NULL) != 0) if (timestamp2tm(timestamp, &tz, tm, &fsec, NULL, NULL) != 0)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
errmsg("timestamp out of range"))); errmsg("timestamp out of range")));
...@@ -3250,12 +3248,11 @@ timestamptz_age(PG_FUNCTION_ARGS) ...@@ -3250,12 +3248,11 @@ timestamptz_age(PG_FUNCTION_ARGS)
*tm2 = &tt2; *tm2 = &tt2;
int tz1; int tz1;
int tz2; int tz2;
char *tzn;
result = (Interval *) palloc(sizeof(Interval)); result = (Interval *) palloc(sizeof(Interval));
if (timestamp2tm(dt1, &tz1, tm1, &fsec1, &tzn, NULL) == 0 && if (timestamp2tm(dt1, &tz1, tm1, &fsec1, NULL, NULL) == 0 &&
timestamp2tm(dt2, &tz2, tm2, &fsec2, &tzn, NULL) == 0) timestamp2tm(dt2, &tz2, tm2, &fsec2, NULL, NULL) == 0)
{ {
/* form the symbolic difference */ /* form the symbolic difference */
fsec = fsec1 - fsec2; fsec = fsec1 - fsec2;
...@@ -3509,7 +3506,6 @@ timestamptz_trunc(PG_FUNCTION_ARGS) ...@@ -3509,7 +3506,6 @@ timestamptz_trunc(PG_FUNCTION_ARGS)
bool redotz = false; bool redotz = false;
char *lowunits; char *lowunits;
fsec_t fsec; fsec_t fsec;
char *tzn;
struct pg_tm tt, struct pg_tm tt,
*tm = &tt; *tm = &tt;
...@@ -3524,7 +3520,7 @@ timestamptz_trunc(PG_FUNCTION_ARGS) ...@@ -3524,7 +3520,7 @@ timestamptz_trunc(PG_FUNCTION_ARGS)
if (type == UNITS) if (type == UNITS)
{ {
if (timestamp2tm(timestamp, &tz, tm, &fsec, &tzn, NULL) != 0) if (timestamp2tm(timestamp, &tz, tm, &fsec, NULL, NULL) != 0)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
errmsg("timestamp out of range"))); errmsg("timestamp out of range")));
...@@ -4159,7 +4155,6 @@ timestamptz_part(PG_FUNCTION_ARGS) ...@@ -4159,7 +4155,6 @@ timestamptz_part(PG_FUNCTION_ARGS)
char *lowunits; char *lowunits;
double dummy; double dummy;
fsec_t fsec; fsec_t fsec;
char *tzn;
struct pg_tm tt, struct pg_tm tt,
*tm = &tt; *tm = &tt;
...@@ -4179,7 +4174,7 @@ timestamptz_part(PG_FUNCTION_ARGS) ...@@ -4179,7 +4174,7 @@ timestamptz_part(PG_FUNCTION_ARGS)
if (type == UNITS) if (type == UNITS)
{ {
if (timestamp2tm(timestamp, &tz, tm, &fsec, &tzn, NULL) != 0) if (timestamp2tm(timestamp, &tz, tm, &fsec, NULL, NULL) != 0)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
errmsg("timestamp out of range"))); errmsg("timestamp out of range")));
...@@ -4319,7 +4314,7 @@ timestamptz_part(PG_FUNCTION_ARGS) ...@@ -4319,7 +4314,7 @@ timestamptz_part(PG_FUNCTION_ARGS)
case DTK_DOW: case DTK_DOW:
case DTK_ISODOW: case DTK_ISODOW:
if (timestamp2tm(timestamp, &tz, tm, &fsec, &tzn, NULL) != 0) if (timestamp2tm(timestamp, &tz, tm, &fsec, NULL, NULL) != 0)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
errmsg("timestamp out of range"))); errmsg("timestamp out of range")));
...@@ -4329,7 +4324,7 @@ timestamptz_part(PG_FUNCTION_ARGS) ...@@ -4329,7 +4324,7 @@ timestamptz_part(PG_FUNCTION_ARGS)
break; break;
case DTK_DOY: case DTK_DOY:
if (timestamp2tm(timestamp, &tz, tm, &fsec, &tzn, NULL) != 0) if (timestamp2tm(timestamp, &tz, tm, &fsec, NULL, NULL) != 0)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
errmsg("timestamp out of range"))); errmsg("timestamp out of range")));
...@@ -4650,14 +4645,13 @@ timestamptz_timestamp(PG_FUNCTION_ARGS) ...@@ -4650,14 +4645,13 @@ timestamptz_timestamp(PG_FUNCTION_ARGS)
struct pg_tm tt, struct pg_tm tt,
*tm = &tt; *tm = &tt;
fsec_t fsec; fsec_t fsec;
char *tzn;
int tz; int tz;
if (TIMESTAMP_NOT_FINITE(timestamp)) if (TIMESTAMP_NOT_FINITE(timestamp))
result = timestamp; result = timestamp;
else else
{ {
if (timestamp2tm(timestamp, &tz, tm, &fsec, &tzn, NULL) != 0) if (timestamp2tm(timestamp, &tz, tm, &fsec, NULL, NULL) != 0)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
errmsg("timestamp out of range"))); errmsg("timestamp out of range")));
......
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