You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hawq.apache.org by rl...@apache.org on 2017/12/01 06:30:41 UTC
[1/3] incubator-hawq git commit: HAWQ-1532. Fix conflict in Asia
timezone
Repository: incubator-hawq
Updated Branches:
refs/heads/master e5c75a032 -> 5e152951d
HAWQ-1532. Fix conflict in Asia timezone
Timezone abbreviation 'IST' is multiply defined in Asia.txt, which
is backported from latest PostgreSQL. In this commit we fix this
issue and add a standard timezone set 'Asia' in OVERRIDE mode.
Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/7d522a83
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/7d522a83
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/7d522a83
Branch: refs/heads/master
Commit: 7d522a83a97817177e36d35ac25af5cc46a1585c
Parents: e4042df
Author: Kuien Liu <ku...@alibaba-inc.com>
Authored: Thu Oct 19 17:18:11 2017 +0800
Committer: rlei <rl...@pivotal.io>
Committed: Fri Dec 1 14:29:50 2017 +0800
----------------------------------------------------------------------
src/backend/utils/misc/postgresql.conf.sample | 1 +
src/timezone/tznames/Asia | 64 ++++++++++++++++++++++
src/timezone/tznames/Makefile | 2 +-
3 files changed, 66 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/7d522a83/src/backend/utils/misc/postgresql.conf.sample
----------------------------------------------------------------------
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index 0d4ca06..880ae06 100755
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -392,6 +392,7 @@ log_autostats=off # print additional autostats information
# Default
# Australia
# India
+ # Asia
# You can create your own file in
# share/timezonesets/.
#extra_float_digits = 0 # min -15, max 2
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/7d522a83/src/timezone/tznames/Asia
----------------------------------------------------------------------
diff --git a/src/timezone/tznames/Asia b/src/timezone/tznames/Asia
new file mode 100755
index 0000000..360e2a6
--- /dev/null
+++ b/src/timezone/tznames/Asia
@@ -0,0 +1,64 @@
+# Time zone configuration file for set "Asia"
+
+# In order to use this file, you need to set the run-time parameter
+# timezone_abbreviations to 'Asia'. See the `Date/Time Support'
+# appendix in the PostgreSQL documentation for more information.
+#
+# src/timezone/tznames/Asia
+
+
+# include the default set
+@INCLUDE Default
+
+# most timezones are already defined in the default set. With the OVERRIDE
+# option, PostgreSQL will use the new definitions instead of throwing an error
+# in case of a conflict.
+@OVERRIDE
+
+AQTT 18000 # Aqtau Time
+ # Aqtobe Time
+ # (Asia/Aqtau)
+ # (Asia/Aqtobe)
+AST 10800 # Arabia Standard Time
+ # (Asia/Aden)
+ # (Asia/Baghdad)
+ # (Asia/Bahrain)
+ # (Asia/Kuwait)
+ # (Asia/Qatar)
+ # (Asia/Riyadh)
+CHOST 36000 D # Choibalsan Summer Time
+ # (Asia/Choibalsan)
+CHOT 32400 # Choibalsan Time
+ # (Asia/Choibalsan)
+CIT 28800 # Central Indonesia Time (obsolete, WITA is now preferred)
+CST 28800 # China Standard Time
+ # (Asia/Macau)
+ # (Asia/Shanghai)
+ # (Asia/Taipei)
+EIT 32400 # East Indonesia Time
+ # (Asia/Jayapura)
+GST 14400 # Gulf Standard Time
+ # (Asia/Dubai)
+ # (Asia/Muscat)
+HOVST 28800 D # Hovd Summer Time
+ # (Asia/Hovd)
+HOVT 25200 # Hovd Time
+ # (Asia/Hovd)
+IRDT 16200 D # Iran Daylight Time
+ # (Asia/Tehran)
+IST 19800 # Indian Standard Time
+ # (Asia/Calcutta)
+ORAT 18000 # Oral Time
+ # (Asia/Oral)
+QYZT 21600 # Kizilorda Time
+ # (Asia/Qyzylorda)
+SAKST 39600 D # Sakhalin Summer Time
+ # (Asia/Sakhalin)
+SAKT 36000 # Sakhalin Time
+ # (Asia/Sakhalin)
+TLT 32400 # East Timor Time
+ # (Asia/Dili)
+WIT 25200 # Waktu Indonesia Timur
+ # West Indonesia Time
+ # (Asia/Jakarta)
+ # (Asia/Pontianak)
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/7d522a83/src/timezone/tznames/Makefile
----------------------------------------------------------------------
diff --git a/src/timezone/tznames/Makefile b/src/timezone/tznames/Makefile
index e80bf53..2f3291c 100644
--- a/src/timezone/tznames/Makefile
+++ b/src/timezone/tznames/Makefile
@@ -16,7 +16,7 @@ TZNAMES_TEMPLATES = Africa.txt America.txt Antarctica.txt Asia.txt \
Atlantic.txt Australia.txt Etc.txt Europe.txt Indian.txt Pacific.txt
TZNAMES_TEMPLATES_FILES = $(TZNAMES_TEMPLATES:%=$(srcdir)/%)
-TZNAMES_SETS = Default Australia India
+TZNAMES_SETS = Default Australia India Asia
TZNAMES_SETS_FILES = $(TZNAMES_SETS:%=$(srcdir)/%)
install: installdirs
[3/3] incubator-hawq git commit: HAWQ-1532. test cases on 'Asia'
timezone
Posted by rl...@apache.org.
HAWQ-1532. test cases on 'Asia' timezone
Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/5e152951
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/5e152951
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/5e152951
Branch: refs/heads/master
Commit: 5e152951d9a648a797199f2d21513bb8e30e4644
Parents: 7d522a8
Author: Kuien Liu <ku...@alibaba-inc.com>
Authored: Thu Nov 30 17:43:12 2017 +0800
Committer: rlei <rl...@pivotal.io>
Committed: Fri Dec 1 14:29:51 2017 +0800
----------------------------------------------------------------------
src/test/feature/catalog/ans/time.ans | 76 ++++++++++++++++++++++++++++++
src/test/feature/catalog/sql/time.sql | 25 ++++++++++
2 files changed, 101 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/5e152951/src/test/feature/catalog/ans/time.ans
----------------------------------------------------------------------
diff --git a/src/test/feature/catalog/ans/time.ans b/src/test/feature/catalog/ans/time.ans
index ddeea98..f854cdb 100755
--- a/src/test/feature/catalog/ans/time.ans
+++ b/src/test/feature/catalog/ans/time.ans
@@ -95,3 +95,79 @@ psql:/tmp/TestType_time.sql:44: ERROR: operator is not unique: time without tim
LINE 1: SELECT f1 + time '00:01' AS "Illegal" FROM TIME_TBL;
^
HINT: Could not choose a best candidate operator. You may need to add explicit type casts.
+--
+-- Support timezone_abbreviations = 'Asia'
+--
+-- For some reason this seems to have been missed to support
+-- CST (China Standard Time). On some platforms, for example,
+-- Linux, CST is used as time string suffix of GMT+8, especially
+-- for users in China. In such case, the timestamp of log is
+-- '14 hours' ahead of the actual China time (GMT+8).
+SHOW timezone_abbreviations; -- info for debug, should always be 'Default'
+ timezone_abbreviations
+------------------------
+ Default
+(1 row)
+
+SET timezone_abbreviations TO 'Asia';
+SET
+SELECT abbrev, utc_offset FROM pg_timezone_abbrevs WHERE abbrev = 'CST';
+ abbrev | utc_offset
+--------+------------
+ CST | 08:00:00
+(1 row)
+
+SELECT '2002-09-24 10:10 CST'::TIMESTAMP WITH TIME ZONE;
+ timestamptz
+------------------------------
+ Mon Sep 23 19:10:00 2002 PDT
+(1 row)
+
+SELECT '2002-09-24 10:10 Asia/Shanghai'::TIMESTAMP WITH TIME ZONE; -- won't change
+ timestamptz
+------------------------------
+ Mon Sep 23 19:10:00 2002 PDT
+(1 row)
+
+SELECT '2002-09-24 10:10 GST'::TIMESTAMP WITH TIME ZONE; -- Gulf Standard Time, Asia/Dubai
+ timestamptz
+------------------------------
+ Mon Sep 23 23:10:00 2002 PDT
+(1 row)
+
+SELECT '2002-09-24 10:10 IST'::TIMESTAMP WITH TIME ZONE; -- Indian Standard Time
+ timestamptz
+------------------------------
+ Mon Sep 23 21:40:00 2002 PDT
+(1 row)
+
+SET timezone_abbreviations TO 'Default';
+SET
+SELECT abbrev, utc_offset FROM pg_timezone_abbrevs WHERE abbrev = 'CST';
+ abbrev | utc_offset
+--------+------------
+ CST | -06:00:00
+(1 row)
+
+SELECT '2002-09-24 10:10 CST'::TIMESTAMP WITH TIME ZONE;
+ timestamptz
+------------------------------
+ Tue Sep 24 09:10:00 2002 PDT
+(1 row)
+
+SELECT '2002-09-24 10:10 Asia/Shanghai'::TIMESTAMP WITH TIME ZONE; -- won't change
+ timestamptz
+------------------------------
+ Mon Sep 23 19:10:00 2002 PDT
+(1 row)
+
+SELECT '2002-09-24 10:10 GST'::TIMESTAMP WITH TIME ZONE; -- 'GST' is invalid in Default
+psql:/tmp/TestType_time.sql:68: ERROR: invalid input syntax for type timestamp with time zone: "2002-09-24 10:10 GST"
+LINE 1: SELECT '2002-09-24 10:10 GST'::TIMESTAMP WITH TIME ZONE;
+ ^
+SELECT '2002-09-24 10:10 IST'::TIMESTAMP WITH TIME ZONE; -- Israel Standard Time
+ timestamptz
+------------------------------
+ Tue Sep 24 01:10:00 2002 PDT
+(1 row)
+
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/5e152951/src/test/feature/catalog/sql/time.sql
----------------------------------------------------------------------
diff --git a/src/test/feature/catalog/sql/time.sql b/src/test/feature/catalog/sql/time.sql
index 02c4b7e..94a944e 100644
--- a/src/test/feature/catalog/sql/time.sql
+++ b/src/test/feature/catalog/sql/time.sql
@@ -39,3 +39,28 @@ SELECT f1 AS "Eight" FROM TIME_TBL WHERE f1 >= '00:00' ORDER BY 1;
-- where we do mixed-type arithmetic. - thomas 2000-12-02
SELECT f1 + time '00:01' AS "Illegal" FROM TIME_TBL;
+
+--
+-- Support timezone_abbreviations = 'Asia'
+--
+-- For some reason this seems to have been missed to support
+-- CST (China Standard Time). On some platforms, for example,
+-- Linux, CST is used as time string suffix of GMT+8, especially
+-- for users in China. In such case, the timestamp of log is
+-- '14 hours' ahead of the actual China time (GMT+8).
+
+SHOW timezone_abbreviations; -- info for debug, should always be 'Default'
+
+SET timezone_abbreviations TO 'Asia';
+SELECT abbrev, utc_offset FROM pg_timezone_abbrevs WHERE abbrev = 'CST';
+SELECT '2002-09-24 10:10 CST'::TIMESTAMP WITH TIME ZONE;
+SELECT '2002-09-24 10:10 Asia/Shanghai'::TIMESTAMP WITH TIME ZONE; -- won't change
+SELECT '2002-09-24 10:10 GST'::TIMESTAMP WITH TIME ZONE; -- Gulf Standard Time, Asia/Dubai
+SELECT '2002-09-24 10:10 IST'::TIMESTAMP WITH TIME ZONE; -- Indian Standard Time
+
+SET timezone_abbreviations TO 'Default';
+SELECT abbrev, utc_offset FROM pg_timezone_abbrevs WHERE abbrev = 'CST';
+SELECT '2002-09-24 10:10 CST'::TIMESTAMP WITH TIME ZONE;
+SELECT '2002-09-24 10:10 Asia/Shanghai'::TIMESTAMP WITH TIME ZONE; -- won't change
+SELECT '2002-09-24 10:10 GST'::TIMESTAMP WITH TIME ZONE; -- 'GST' is invalid in Default
+SELECT '2002-09-24 10:10 IST'::TIMESTAMP WITH TIME ZONE; -- Israel Standard Time
[2/3] incubator-hawq git commit: HAWQ-1532. recognize timezone 'CST'
correctly in China
Posted by rl...@apache.org.
HAWQ-1532. recognize timezone 'CST' correctly in China
On some platforms, CST (China Standard Time) is used as time string
suffix of GMT+8, especially for users in China. I tracked that change in
Postgres to this commit:
commit 5b89473d870dc2a9fec0926c5afccf53042dbb0a
Author: Tom Lane <tg...@sss.pgh.pa.us>
Date: Wed Dec 24 16:35:23 2014 -0500
Add CST (China Standard Time) to our lists of timezone abbreviations.
For some reason this seems to have been missed when the lists in
src/timezone/tznames/ were first constructed. We can't put it in Default
because of the conflict with US CST, but we should certainly list it among
the alternative entries in Asia.txt. (I checked for other oversights, but
all the other abbreviations that are in current use according to the IANA
files seem to be accounted for.) Noted while responding to bug #12326.
Then, we may set timezone_abbreviations = 'Asia' to recognize CST
naturally.
Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/e4042dfa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/e4042dfa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/e4042dfa
Branch: refs/heads/master
Commit: e4042dfa6cf6bd6362bd67923509663812a7411a
Parents: e5c75a0
Author: Tom Lane <tg...@sss.pgh.pa.us>
Authored: Wed Dec 24 16:35:23 2014 -0500
Committer: rlei <rl...@pivotal.io>
Committed: Fri Dec 1 14:29:50 2017 +0800
----------------------------------------------------------------------
src/timezone/tznames/America.txt | 2 ++
src/timezone/tznames/Asia.txt | 12 ++++++++++--
src/timezone/tznames/Australia.txt | 1 +
src/timezone/tznames/Default | 1 +
4 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/e4042dfa/src/timezone/tznames/America.txt
----------------------------------------------------------------------
diff --git a/src/timezone/tznames/America.txt b/src/timezone/tznames/America.txt
index b6104b8..abcc934 100644
--- a/src/timezone/tznames/America.txt
+++ b/src/timezone/tznames/America.txt
@@ -142,11 +142,13 @@ COT -18000 # Columbia Time (not in zic)
# Other timezones:
# - CST: Central Standard Time (Australia)
# - CST: Central Standard Time (America)
+# - CST: China Standard Time (Asia)
CST -18000 # Cuba Central Standard Time (America)
# (America/Havana)
# CONFLICT! CST is not unique
# Other timezones:
# - CST: Central Standard Time (Australia)
+# - CST: China Standard Time (Asia)
# - CST: Cuba Central Standard Time (America)
CST -21600 # Central Standard Time (America)
# (America/Cancun)
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/e4042dfa/src/timezone/tznames/Asia.txt
----------------------------------------------------------------------
diff --git a/src/timezone/tznames/Asia.txt b/src/timezone/tznames/Asia.txt
index 1c6f276..162459b 100644
--- a/src/timezone/tznames/Asia.txt
+++ b/src/timezone/tznames/Asia.txt
@@ -67,8 +67,16 @@ CHOST 36000 D # Choibalsan Summer Time
# (Asia/Choibalsan)
CHOT 32400 # Choibalsan Time
# (Asia/Choibalsan)
-CIT 28800 # Central Indonesia Time
- # (Asia/Makassar)
+CIT 28800 # Central Indonesia Time (obsolete, WITA is now preferred)
+# CONFLICT! CST is not unique
+# Other timezones:
+# - CST: Central Standard Time (Australia)
+# - CST: Central Standard Time (America)
+# - CST: Cuba Central Standard Time (America)
+CST 28800 # China Standard Time
+ # (Asia/Macau)
+ # (Asia/Shanghai)
+ # (Asia/Taipei)
EEST 10800 D # East-Egypt Summer Time
# Eastern Europe Summer Time
# (Africa/Cairo)
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/e4042dfa/src/timezone/tznames/Australia.txt
----------------------------------------------------------------------
diff --git a/src/timezone/tznames/Australia.txt b/src/timezone/tznames/Australia.txt
index 906c7fc..59132a4 100644
--- a/src/timezone/tznames/Australia.txt
+++ b/src/timezone/tznames/Australia.txt
@@ -21,6 +21,7 @@ CAST 34200 # Central Australia Standard Time (not in zic)
# CONFLICT! CST is not unique
# Other timezones:
# - CST: Central Standard Time (America)
+# - CST: China Standard Time (Asia)
# - CST: Cuba Central Standard Time (America)
CST 34200 # Central Standard Time (Australia)
# (Australia/Adelaide)
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/e4042dfa/src/timezone/tznames/Default
----------------------------------------------------------------------
diff --git a/src/timezone/tznames/Default b/src/timezone/tznames/Default
index 7a7a87e..b36fd4e 100755
--- a/src/timezone/tznames/Default
+++ b/src/timezone/tznames/Default
@@ -106,6 +106,7 @@ CLT -14400 # Chile Time
# CONFLICT! CST is not unique
# Other timezones:
# - CST: Central Standard Time (Australia)
+# - CST: China Standard Time (Asia)
# - CST: Cuba Central Standard Time (America)
CST -21600 # Central Standard Time (America)
# (America/Cancun)