Re: Add support for AT LOCAL

Поиск
Список
Период
Сортировка
От Tom Lane
Тема Re: Add support for AT LOCAL
Дата
Msg-id 2820407.1697561128@sss.pgh.pa.us
обсуждение исходный текст
Ответ на Re: Add support for AT LOCAL  (Tom Lane <tgl@sss.pgh.pa.us>)
Ответы Re: Add support for AT LOCAL  (Thomas Munro <thomas.munro@gmail.com>)
Re: Add support for AT LOCAL  (Michael Paquier <michael@paquier.xyz>)
Список pgsql-hackers
I wrote:
> Yeah, the same thing occurred to me in the shower this morning, and it
> does seem to work!  We can replace both loops with a %= operator, at
> least if we're willing to assume C99 division semantics, which seems
> pretty safe in 2023.

Whoops, no: for negative starting values we'd need truncate-towards-
minus-infinity division whereas C99 specifies truncate-towards-zero.
However, the attached does pass for me on cfarm111 as well as my
usual dev machine.

Presumably this is a pre-existing bug that also appears in back
branches.  But in the interests of science I propose that we
back-patch only the test case and see which machine(s) fail it
before back-patching the code change.

            regards, tom lane

diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c
index c4da10d47a..56c7746c11 100644
--- a/src/backend/utils/adt/date.c
+++ b/src/backend/utils/adt/date.c
@@ -3083,10 +3083,11 @@ timetz_zone(PG_FUNCTION_ARGS)
     result = (TimeTzADT *) palloc(sizeof(TimeTzADT));

     result->time = t->time + (t->zone - tz) * USECS_PER_SEC;
+    /* C99 modulo has the wrong sign convention for negative input */
     while (result->time < INT64CONST(0))
         result->time += USECS_PER_DAY;
-    while (result->time >= USECS_PER_DAY)
-        result->time -= USECS_PER_DAY;
+    if (result->time >= USECS_PER_DAY)
+        result->time %= USECS_PER_DAY;

     result->zone = tz;

@@ -3116,10 +3117,11 @@ timetz_izone(PG_FUNCTION_ARGS)
     result = (TimeTzADT *) palloc(sizeof(TimeTzADT));

     result->time = time->time + (time->zone - tz) * USECS_PER_SEC;
+    /* C99 modulo has the wrong sign convention for negative input */
     while (result->time < INT64CONST(0))
         result->time += USECS_PER_DAY;
-    while (result->time >= USECS_PER_DAY)
-        result->time -= USECS_PER_DAY;
+    if (result->time >= USECS_PER_DAY)
+        result->time %= USECS_PER_DAY;

     result->zone = tz;

diff --git a/src/test/regress/expected/timetz.out b/src/test/regress/expected/timetz.out
index 3f8e005ce7..cbab6cfe5d 100644
--- a/src/test/regress/expected/timetz.out
+++ b/src/test/regress/expected/timetz.out
@@ -304,4 +304,25 @@ TABLE timetz_local_view;
  23:59:59.99-07 | 06:59:59.99+00 | 06:59:59.99+00 | 06:59:59.99+00 | 06:59:59.99+00
 (12 rows)

+SELECT f1 AS dat,
+       f1 AT TIME ZONE 'UTC+10' AS dat_at_tz,
+       f1 AT TIME ZONE INTERVAL '-10:00' AS dat_at_int
+  FROM TIMETZ_TBL
+  ORDER BY f1;
+      dat       |   dat_at_tz    |   dat_at_int
+----------------+----------------+----------------
+ 00:01:00-07    | 21:01:00-10    | 21:01:00-10
+ 01:00:00-07    | 22:00:00-10    | 22:00:00-10
+ 02:03:00-07    | 23:03:00-10    | 23:03:00-10
+ 08:08:00-04    | 02:08:00-10    | 02:08:00-10
+ 07:07:00-08    | 05:07:00-10    | 05:07:00-10
+ 11:59:00-07    | 08:59:00-10    | 08:59:00-10
+ 12:00:00-07    | 09:00:00-10    | 09:00:00-10
+ 12:01:00-07    | 09:01:00-10    | 09:01:00-10
+ 15:36:39-04    | 09:36:39-10    | 09:36:39-10
+ 15:36:39-05    | 10:36:39-10    | 10:36:39-10
+ 23:59:00-07    | 20:59:00-10    | 20:59:00-10
+ 23:59:59.99-07 | 20:59:59.99-10 | 20:59:59.99-10
+(12 rows)
+
 ROLLBACK;
diff --git a/src/test/regress/sql/timetz.sql b/src/test/regress/sql/timetz.sql
index 33f7f8aafb..d797f478f0 100644
--- a/src/test/regress/sql/timetz.sql
+++ b/src/test/regress/sql/timetz.sql
@@ -100,4 +100,9 @@ CREATE VIEW timetz_local_view AS
   ORDER BY f1;
 SELECT pg_get_viewdef('timetz_local_view', true);
 TABLE timetz_local_view;
+SELECT f1 AS dat,
+       f1 AT TIME ZONE 'UTC+10' AS dat_at_tz,
+       f1 AT TIME ZONE INTERVAL '-10:00' AS dat_at_int
+  FROM TIMETZ_TBL
+  ORDER BY f1;
 ROLLBACK;

В списке pgsql-hackers по дате отправления:

Предыдущее
От: Nathan Bossart
Дата:
Сообщение: Re: stopgap fix for signal handling during restore_command
Следующее
От: Robert Haas
Дата:
Сообщение: Re: New WAL record to detect the checkpoint redo location