Skip to content

Commit 4311cdd

Browse files
tglsfdctglsfdc
committed
Sync our copy of the timezone library with IANA release tzcode2018g.
This patch absorbs an upstream fix to "zic" for a recently-introduced bug that made it output data that some 32-bit clients couldn't read. Given the current source data, the bug only manifests in zones with leap seconds, which we don't generate, so that there's no actual change in our installed timezone data files from this. Still, in case somebody uses our copy of "zic" to do something else, it seems best to apply the fix promptly. Also, update the README's notes about converting upstream code to our conventions.
1 parent d651e9e commit 4311cdd

File tree

2 files changed

+49
-37
lines changed

2 files changed

+49
-37
lines changed

‎src/timezone/README

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ match properly on the old version.
5555
Time Zone code
5656
==============
5757

58-
The code in this directory is currently synced with tzcode release 2018f.
58+
The code in this directory is currently synced with tzcode release 2018g.
5959
There are many cosmetic (and not so cosmetic) differences from the
6060
original tzcode library, but diffs in the upstream version should usually
6161
be propagated to our version. Here are some notes about that.
@@ -73,13 +73,18 @@ fixed that.)
7373
includes relying on configure's results rather than hand-hacked #defines,
7474
and not relying on <stdint.h> features that may not exist on old systems.
7575
(In particular this means using Postgres' definitions of the int32 and
76-
int64 typedefs, not int_fast32_t/int_fast64_t.)
76+
int64 typedefs, not int_fast32_t/int_fast64_t. Likewise we use
77+
PG_INT32_MIN/MAX not INT32_MIN/MAX.)
7778

7879
* Since Postgres is typically built on a system that has its own copy
7980
of the <time.h> functions, we must avoid conflicting with those. This
8081
mandates renaming typedef time_t to pg_time_t, and similarly for most
8182
other exposed names.
8283

84+
* zic.c's typedef "lineno" is renamed to "lineno_t", because having
85+
"lineno" in our typedefs list would cause unfortunate pgindent behavior
86+
in some other files where we have variables named that.
87+
8388
* We have exposed the tzload() and tzparse() internal functions, and
8489
slightly modified the API of the former, in part because it now relies
8590
on our own pg_open_tzfile() rather than opening files for itself.
@@ -108,8 +113,11 @@ to first run the tzcode source files through a sed filter like this:
108113
-e 's/\bregister[ \t]//g' \
109114
-e 's/int_fast32_t/int32/g' \
110115
-e 's/int_fast64_t/int64/g' \
116+
-e 's/INT32_MIN/PG_INT32_MIN/g' \
117+
-e 's/INT32_MAX/PG_INT32_MAX/g' \
111118
-e 's/struct[ \t]+tm\b/struct pg_tm/g' \
112119
-e 's/\btime_t\b/pg_time_t/g' \
120+
-e 's/lineno/lineno_t/g' \
113121

114122
and then run them through pgindent. (The first three sed patterns deal
115123
with conversion of their block comment style to something pgindent

‎src/timezone/zic.c

Lines changed: 39 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,11 @@ PERCENT_Z_LEN_BOUND = sizeof "+995959" - 1};
175175
QTBUG-53071 <https://bugreports.qt.io/browse/QTBUG-53071>. This
176176
workaround will no longer be needed when Qt 5.6.1 and earlier are
177177
obsolete, say in the year 2021. */
178+
#ifndef WORK_AROUND_QTBUG_53071
178179
enum
179180
{
180181
WORK_AROUND_QTBUG_53071 = true};
182+
#endif
181183

182184
static int charcnt;
183185
static bool errors;
@@ -1920,12 +1922,6 @@ atcomp(const void *avp, const void *bvp)
19201922
return (a < b) ? -1 : (a > b);
19211923
}
19221924

1923-
static bool
1924-
is32(const zic_t x)
1925-
{
1926-
return x == ((zic_t) ((int32) x));
1927-
}
1928-
19291925
static void
19301926
swaptypes(int i, int j)
19311927
{
@@ -1979,7 +1975,12 @@ writezone(const char *const name, const char *const string, char version,
19791975
zic_t one = 1;
19801976
zic_t y2038_boundary = one << 31;
19811977
ptrdiff_t nats = timecnt + WORK_AROUND_QTBUG_53071;
1982-
zic_t *ats = emalloc(size_product(nats, sizeof *ats + 1));
1978+
1979+
/*
1980+
* Allocate the ATS and TYPES arrays via a single malloc, as this is a bit
1981+
* faster.
1982+
*/
1983+
zic_t *ats = emalloc(MAXALIGN(size_product(nats, sizeof *ats + 1)));
19831984
void *typesptr = ats + nats;
19841985
unsigned char *types = typesptr;
19851986

@@ -2037,20 +2038,6 @@ writezone(const char *const name, const char *const string, char version,
20372038
types[i] = attypes[i].type;
20382039
}
20392040

2040-
/*
2041-
* Work around QTBUG-53071 for timestamps less than y2038_boundary - 1, by
2042-
* inserting a no-op transition at time y2038_boundary - 1. This works
2043-
* only for timestamps before the boundary, which should be good enough in
2044-
* practice as QTBUG-53071 should be long-dead by 2038.
2045-
*/
2046-
if (WORK_AROUND_QTBUG_53071 && timecnt != 0
2047-
&& ats[timecnt - 1] < y2038_boundary - 1 && strchr(string, '<'))
2048-
{
2049-
ats[timecnt] = y2038_boundary - 1;
2050-
types[timecnt] = types[timecnt - 1];
2051-
timecnt++;
2052-
}
2053-
20542041
/*
20552042
* Correct for leap seconds.
20562043
*/
@@ -2065,32 +2052,48 @@ writezone(const char *const name, const char *const string, char version,
20652052
}
20662053
}
20672054

2055+
/*
2056+
* Work around QTBUG-53071 for timestamps less than y2038_boundary - 1, by
2057+
* inserting a no-op transition at time y2038_boundary - 1. This works
2058+
* only for timestamps before the boundary, which should be good enough in
2059+
* practice as QTBUG-53071 should be long-dead by 2038. Do this after
2060+
* correcting for leap seconds, as the idea is to insert a transition just
2061+
* before 32-bit pg_time_t rolls around, and this occurs at a slightly
2062+
* different moment if transitions are leap-second corrected.
2063+
*/
2064+
if (WORK_AROUND_QTBUG_53071 && timecnt != 0
2065+
&& ats[timecnt - 1] < y2038_boundary - 1 && strchr(string, '<'))
2066+
{
2067+
ats[timecnt] = y2038_boundary - 1;
2068+
types[timecnt] = types[timecnt - 1];
2069+
timecnt++;
2070+
}
2071+
20682072
/*
20692073
* Figure out 32-bit-limited starts and counts.
20702074
*/
20712075
timecnt32 = timecnt;
20722076
timei32 = 0;
20732077
leapcnt32 = leapcnt;
20742078
leapi32 = 0;
2075-
while (timecnt32 > 0 && !is32(ats[timecnt32 - 1]))
2079+
while (0 < timecnt32 && PG_INT32_MAX < ats[timecnt32 - 1])
20762080
--timecnt32;
2077-
while (timecnt32 > 0 && !is32(ats[timei32]))
2081+
while (1 < timecnt32 && ats[timei32] < PG_INT32_MIN
2082+
&& ats[timei32 + 1] <= PG_INT32_MIN)
20782083
{
2084+
/*
2085+
* Discard too-low transitions, except keep any last too-low
2086+
* transition if no transition is exactly at PG_INT32_MIN. The kept
2087+
* transition will be output as an PG_INT32_MIN "transition"
2088+
* appropriate for buggy 32-bit clients that do not use time type 0
2089+
* for timestamps before the first transition; see below.
2090+
*/
20792091
--timecnt32;
20802092
++timei32;
20812093
}
2082-
2083-
/*
2084-
* Output an INT32_MIN "transition" if appropriate; see below.
2085-
*/
2086-
if (timei32 > 0 && ats[timei32] > PG_INT32_MIN)
2087-
{
2088-
--timei32;
2089-
++timecnt32;
2090-
}
2091-
while (leapcnt32 > 0 && !is32(trans[leapcnt32 - 1]))
2094+
while (0 < leapcnt32 && PG_INT32_MAX < trans[leapcnt32 - 1])
20922095
--leapcnt32;
2093-
while (leapcnt32 > 0 && !is32(trans[leapi32]))
2096+
while (0 < leapcnt32 && trans[leapi32] < PG_INT32_MIN)
20942097
{
20952098
--leapcnt32;
20962099
++leapi32;
@@ -2323,7 +2326,8 @@ writezone(const char *const name, const char *const string, char version,
23232326
if (pass == 1)
23242327

23252328
/*
2326-
* Output an INT32_MIN "transition" if appropriate; see above.
2329+
* Output an PG_INT32_MIN "transition" if appropriate; see
2330+
* above.
23272331
*/
23282332
puttzcode(((ats[i] < PG_INT32_MIN) ?
23292333
PG_INT32_MIN : ats[i]), fp);

0 commit comments

Comments
 (0)