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:42 UTC
[2/3] incubator-hawq git commit: HAWQ-1532. recognize timezone 'CST'
correctly in China
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)