You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by do...@apache.org on 2023/01/09 11:55:59 UTC
[inlong] 06/07: [INLONG-7186][Sort] Fix time zone incorrect (#7187)
This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch branch-1.5
in repository https://gitbox.apache.org/repos/asf/inlong.git
commit 3652e39734c226cb8f079a4bf8c69228b1a1cb17
Author: emhui <11...@users.noreply.github.com>
AuthorDate: Mon Jan 9 10:57:06 2023 +0800
[INLONG-7186][Sort] Fix time zone incorrect (#7187)
* [INLONG-7186][Sort] Fix time zone incorrect
* [INLONG-7186][Sort] Remove unused imports
---
.../apache/inlong/sort/base/format/JsonToRowDataConverters.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/inlong-sort/sort-connectors/base/src/main/java/org/apache/inlong/sort/base/format/JsonToRowDataConverters.java b/inlong-sort/sort-connectors/base/src/main/java/org/apache/inlong/sort/base/format/JsonToRowDataConverters.java
index b30e707ec..5d8b8206b 100644
--- a/inlong-sort/sort-connectors/base/src/main/java/org/apache/inlong/sort/base/format/JsonToRowDataConverters.java
+++ b/inlong-sort/sort-connectors/base/src/main/java/org/apache/inlong/sort/base/format/JsonToRowDataConverters.java
@@ -17,6 +17,8 @@
package org.apache.inlong.sort.base.format;
+import java.sql.Timestamp;
+import java.time.ZoneId;
import org.apache.flink.annotation.Internal;
import org.apache.flink.formats.common.TimestampFormat;
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
@@ -49,7 +51,6 @@ import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
-import java.time.ZoneOffset;
import java.time.format.DateTimeParseException;
import java.time.temporal.TemporalAccessor;
import java.time.temporal.TemporalQueries;
@@ -253,7 +254,7 @@ public class JsonToRowDataConverters implements Serializable {
LocalTime localTime = parsedTimestamp.query(TemporalQueries.localTime());
LocalDate localDate = parsedTimestamp.query(TemporalQueries.localDate());
- return TimestampData.fromLocalDateTime(LocalDateTime.of(localDate, localTime));
+ return TimestampData.fromEpochMillis(Timestamp.valueOf(LocalDateTime.of(localDate, localTime)).getTime());
}
private TimestampData convertToTimestampWithLocalZone(JsonNode jsonNode) {
@@ -277,7 +278,7 @@ public class JsonToRowDataConverters implements Serializable {
LocalDate localDate = parsedTimestampWithLocalZone.query(TemporalQueries.localDate());
return TimestampData.fromInstant(
- LocalDateTime.of(localDate, localTime).toInstant(ZoneOffset.UTC));
+ LocalDateTime.of(localDate, localTime).atZone(ZoneId.systemDefault()).toInstant());
}
private StringData convertToString(JsonNode jsonNode) {