This is an automated email from the ASF dual-hosted git repository.
jincheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push:
new 731c38b [FLINK-12990][python] Fix LocalTimeZone issue for Date type.
731c38b is described below
commit 731c38baf1e72f963db1c067ada20dc23e9fc23c
Author: Dian Fu <[email protected]>
AuthorDate: Mon Jun 24 15:10:50 2019 +0800
[FLINK-12990][python] Fix LocalTimeZone issue for Date type.
This closes #8892
---
.../flink/table/util/python/PythonTableUtils.scala | 29 ++++++++++-
.../table/util/python/PythonTableUtilsTest.scala | 56 ++++++++++++++++++++++
2 files changed, 84 insertions(+), 1 deletion(-)
diff --git
a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/util/python/PythonTableUtils.scala
b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/util/python/PythonTableUtils.scala
index e56b3d2..73524f0 100644
---
a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/util/python/PythonTableUtils.scala
+++
b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/util/python/PythonTableUtils.scala
@@ -20,6 +20,8 @@ package org.apache.flink.table.util.python
import java.nio.charset.StandardCharsets
import java.sql.{Date, Time, Timestamp}
+import java.time.{LocalDate, LocalDateTime, LocalTime}
+import java.util.TimeZone
import java.util.function.BiConsumer
import org.apache.flink.api.common.functions.MapFunction
@@ -131,7 +133,10 @@ object PythonTableUtils {
}
case _ if dataType == Types.SQL_DATE => (obj: Any) => nullSafeConvert(obj)
{
- case c: Int => new Date(c * 86400000)
+ case c: Int =>
+ val millisLocal = c.toLong * 86400000
+ val millisUtc = millisLocal - getOffsetFromLocalMillis(millisLocal)
+ new Date(millisUtc)
}
case _ if dataType == Types.SQL_TIME => (obj: Any) => nullSafeConvert(obj)
{
@@ -389,4 +394,26 @@ object PythonTableUtils {
array
}
}
+
+ def getOffsetFromLocalMillis(millisLocal: Long): Int = {
+ val localZone = TimeZone.getDefault
+ var result = localZone.getRawOffset
+ // the actual offset should be calculated based on milliseconds in UTC
+ val offset = localZone.getOffset(millisLocal - result)
+ if (offset != result) {
+ // DayLight Saving Time
+ result = localZone.getOffset(millisLocal - offset)
+ if (result != offset) {
+ // fallback to do the reverse lookup using java.time.LocalDateTime
+ // this should only happen near the start or end of DST
+ val localDate = LocalDate.ofEpochDay(millisLocal / 86400000)
+ val localTime = LocalTime.ofNanoOfDay(
+ Math.floorMod(millisLocal, 86400000) * 1000 * 1000)
+ val localDateTime = LocalDateTime.of(localDate, localTime)
+ val millisEpoch =
localDateTime.atZone(localZone.toZoneId).toInstant.toEpochMilli
+ result = (millisLocal - millisEpoch).toInt
+ }
+ }
+ result
+ }
}
diff --git
a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/util/python/PythonTableUtilsTest.scala
b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/util/python/PythonTableUtilsTest.scala
new file mode 100644
index 0000000..822e748
--- /dev/null
+++
b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/util/python/PythonTableUtilsTest.scala
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.table.util.python
+
+import java.time.ZoneId
+import java.util.TimeZone
+
+import org.apache.calcite.avatica.util.DateTimeUtils
+import org.junit.Test
+import org.junit.Assert.assertEquals
+
+class PythonTableUtilsTest {
+
+ @Test
+ def testGetOffsetFromLocalMillis(): Unit = {
+ def testOffset(localMillis: Long, expected: Long): Unit = {
+ assertEquals(expected,
PythonTableUtils.getOffsetFromLocalMillis(localMillis))
+ }
+
+ val originalZone = TimeZone.getDefault
+ try {
+ // Daylight Saving Time Test
+ TimeZone.setDefault(TimeZone.getTimeZone(ZoneId.of("PST",
ZoneId.SHORT_IDS)))
+
+ // 2018-03-11 01:59:59.0 PST
+ testOffset(DateTimeUtils.timestampStringToUnixDate("2018-03-11
01:59:59.0"), -28800000)
+
+ // 2018-03-11 03:00:00.0 PST
+ testOffset(DateTimeUtils.timestampStringToUnixDate("2018-03-11
03:00:00.0"), -25200000)
+
+ // 2018-11-04 00:59:59.0 PST
+ testOffset(DateTimeUtils.timestampStringToUnixDate("2018-11-04
00:59:59.0"), -25200000)
+
+ // 2018-11-04 02:00:00.0 PST
+ testOffset(DateTimeUtils.timestampStringToUnixDate("2018-11-04
02:00:00.0"), -28800000)
+ } finally {
+ TimeZone.setDefault(originalZone)
+ }
+ }
+}
