Merge branch '5.2.x' into 5.3.x

confluentinc · Oct 2, 2019 · b99e5ba · b99e5ba
2 parents 02dfbc8 + 848b5ed
commit b99e5ba
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/docs/developer-guide/syntax-reference.rst b/docs/developer-guide/syntax-reference.rst
@@ -1576,7 +1576,7 @@ Scalar functions
 |                        |                                                                           | example: ``'yyyy-MM-dd''T''HH:mm:ssX'``.          |
 |                        |                                                                           | TIMEZONE is an optional parameter and it is a     |
 |                        |                                                                           | java.util.TimeZone ID format, for example: "UTC", |
-|                        |                                                                           | "America/Los_Angeles", "PDT", "Europe/London". For|
+|                        |                                                                           | "America/Los_Angeles", "PST", "Europe/London". For|
 |                        |                                                                           | more information on timestamp formats, see        |
 |                        |                                                                           | `DateTimeFormatter <https://cnfl.io/java-dtf>`__. |
 +------------------------+---------------------------------------------------------------------------+---------------------------------------------------+
@@ -1611,7 +1611,7 @@ Scalar functions
 |                        |                                                                           | ``'yyyy-MM-dd''T''HH:mm:ssX'``.                   |
 |                        |                                                                           | TIMEZONE is an optional parameter and it is a     |
 |                        |                                                                           | java.util.TimeZone ID format, for example: "UTC", |
-|                        |                                                                           | "America/Los_Angeles", "PDT", "Europe/London". For|
+|                        |                                                                           | "America/Los_Angeles", "PST", "Europe/London". For|
 |                        |                                                                           | more information on timestamp formats, see        |
 |                        |                                                                           | `DateTimeFormatter <https://cnfl.io/java-dtf>`__. |
 +------------------------+---------------------------------------------------------------------------+---------------------------------------------------+

diff --git a/ksql-engine/src/main/java/io/confluent/ksql/function/udf/datetime/StringToTimestamp.java b/ksql-engine/src/main/java/io/confluent/ksql/function/udf/datetime/StringToTimestamp.java
@@ -68,7 +68,7 @@ public long stringToTimestamp(
               + " java.time.format.DateTimeFormatter.") final String formatPattern,
       @UdfParameter(
           description =  " timeZone is a java.util.TimeZone ID format, for example: \"UTC\","
-              + " \"America/Los_Angeles\", \"PDT\", \"Europe/London\"") final String timeZone) {
+              + " \"America/Los_Angeles\", \"PST\", \"Europe/London\"") final String timeZone) {
     try {
       final StringToTimestampParser timestampParser = parsers.get(formatPattern);
       final ZoneId zoneId = ZoneId.of(timeZone);

diff --git a/ksql-engine/src/main/java/io/confluent/ksql/function/udf/datetime/TimestampToString.java b/ksql-engine/src/main/java/io/confluent/ksql/function/udf/datetime/TimestampToString.java
@@ -76,7 +76,7 @@ public String timestampToString(
               + " java.time.format.DateTimeFormatter.") final String formatPattern,
       @UdfParameter(
           description =  " timeZone is a java.util.TimeZone ID format, for example: \"UTC\","
-              + " \"America/Los_Angeles\", \"PDT\", \"Europe/London\"") final String timeZone) {
+              + " \"America/Los_Angeles\", \"PST\", \"Europe/London\"") final String timeZone) {
     try {
       final Timestamp timestamp = new Timestamp(epochMilli);
       final DateTimeFormatter formatter = formatters.get(formatPattern);