[Feature] use system timezone

liunaijie · Sep 6, 2023 · c5063da · c5063da
1 parent fa5b96c
commit c5063da
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/...onnector-paimon-e2e/src/test/java/org/apache/seatunnel/e2e/connector/paimon/PaimonIT.java b/...onnector-paimon-e2e/src/test/java/org/apache/seatunnel/e2e/connector/paimon/PaimonIT.java
@@ -34,7 +34,7 @@
 import java.nio.file.Path;
 
 @DisabledOnContainer(
-        value = {TestContainerId.FLINK_1_13, TestContainerId.FLINK_1_16},
+        value = {TestContainerId.FLINK_1_13},
         disabledReason = "Paimon does not support flink 1.13")
 public class PaimonIT extends TestSuiteBase {
 

diff --git a/...tunnel-format-avro/src/main/java/org/apache/seatunnel/format/avro/AvroToRowConverter.java b/...tunnel-format-avro/src/main/java/org/apache/seatunnel/format/avro/AvroToRowConverter.java
@@ -40,7 +40,7 @@
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.time.ZoneOffset;
+import java.time.ZoneId;
 import java.util.List;
 
 public class AvroToRowConverter implements Serializable {
@@ -120,7 +120,7 @@ private Object convertField(SeaTunnelDataType<?> dataType, Schema.Field field, O
                 return LocalDate.ofEpochDay((Long) val);
             case TIMESTAMP:
                 return LocalDateTime.ofInstant(
-                        Instant.ofEpochMilli((Long) val), ZoneOffset.of("+8"));
+                        Instant.ofEpochMilli((Long) val), ZoneId.systemDefault());
             case ROW:
                 SeaTunnelRowType subRow = (SeaTunnelRowType) dataType;
                 return converter((GenericRecord) val, subRow);

diff --git a/...tunnel-format-avro/src/main/java/org/apache/seatunnel/format/avro/RowToAvroConverter.java b/...tunnel-format-avro/src/main/java/org/apache/seatunnel/format/avro/RowToAvroConverter.java
@@ -42,7 +42,7 @@
 import java.nio.ByteBuffer;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.time.ZoneOffset;
+import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -221,7 +221,7 @@ private Object resolveObject(Object data, SeaTunnelDataType<?> seaTunnelDataType
                 return recordBuilder.build();
             case TIMESTAMP:
                 LocalDateTime dateTime = (LocalDateTime) data;
-                return (dateTime).toInstant(ZoneOffset.of("+8")).toEpochMilli();
+                return (dateTime).atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
             default:
                 String errorMsg =
                         String.format(