|
23 | 23 | import org.apache.flink.cdc.common.data.ArrayData; |
24 | 24 | import org.apache.flink.cdc.common.data.DateData; |
25 | 25 | import org.apache.flink.cdc.common.data.DecimalData; |
26 | | -import org.apache.flink.cdc.common.data.LocalZonedTimestampData; |
27 | 26 | import org.apache.flink.cdc.common.data.RecordData; |
28 | 27 | import org.apache.flink.cdc.common.data.TimeData; |
29 | 28 | import org.apache.flink.cdc.common.data.TimestampData; |
| 29 | +import org.apache.flink.cdc.common.data.ZonedTimestampData; |
30 | 30 | import org.apache.flink.cdc.common.data.binary.BinaryMapData; |
31 | 31 | import org.apache.flink.cdc.common.data.binary.BinaryStringData; |
32 | 32 | import org.apache.flink.cdc.common.event.CreateTableEvent; |
|
68 | 68 | import java.time.Instant; |
69 | 69 | import java.time.LocalDateTime; |
70 | 70 | import java.time.LocalTime; |
| 71 | +import java.time.OffsetDateTime; |
71 | 72 | import java.time.ZoneId; |
72 | 73 | import java.util.ArrayList; |
73 | 74 | import java.util.HashMap; |
@@ -298,7 +299,8 @@ public void testTimeTypesWithTemporalModeAdaptive() throws Exception { |
298 | 299 | TimestampData.fromLocalDateTime( |
299 | 300 | LocalDateTime.parse("2020-07-17T18:00:22.123456")), |
300 | 301 | TimestampData.fromLocalDateTime(LocalDateTime.parse("2020-07-17T18:00:22")), |
301 | | - LocalZonedTimestampData.fromInstant(toInstant("2020-07-17 18:00:22")), |
| 302 | + ZonedTimestampData.fromOffsetDateTime( |
| 303 | + OffsetDateTime.parse("2020-07-17T10:00:22Z")), |
302 | 304 | }; |
303 | 305 |
|
304 | 306 | List<Event> snapshotResults = fetchResultsAndCreateTableEvent(events, 1).f0; |
@@ -354,7 +356,8 @@ public void testTimeTypesWithTemporalModeMicroSeconds() throws Exception { |
354 | 356 | TimestampData.fromLocalDateTime( |
355 | 357 | LocalDateTime.parse("2020-07-17T18:00:22.123456")), |
356 | 358 | TimestampData.fromLocalDateTime(LocalDateTime.parse("2020-07-17T18:00:22")), |
357 | | - LocalZonedTimestampData.fromInstant(toInstant("2020-07-17 18:00:22")), |
| 359 | + ZonedTimestampData.fromOffsetDateTime( |
| 360 | + OffsetDateTime.parse("2020-07-17T10:00:22Z")), |
358 | 361 | }; |
359 | 362 |
|
360 | 363 | List<Event> snapshotResults = fetchResultsAndCreateTableEvent(events, 1).f0; |
@@ -409,7 +412,8 @@ public void testTimeTypesWithTemporalModeConnect() throws Exception { |
409 | 412 | TimestampData.fromLocalDateTime(LocalDateTime.parse("2020-07-17T18:00:22.123")), |
410 | 413 | TimestampData.fromLocalDateTime(LocalDateTime.parse("2020-07-17T18:00:22.123")), |
411 | 414 | TimestampData.fromLocalDateTime(LocalDateTime.parse("2020-07-17T18:00:22")), |
412 | | - LocalZonedTimestampData.fromInstant(toInstant("2020-07-17 18:00:22")), |
| 415 | + ZonedTimestampData.fromOffsetDateTime( |
| 416 | + OffsetDateTime.parse("2020-07-17T10:00:22Z")), |
413 | 417 | }; |
414 | 418 |
|
415 | 419 | List<Event> snapshotResults = fetchResultsAndCreateTableEvent(events, 1).f0; |
@@ -1042,7 +1046,7 @@ private Instant toInstant(String ts) { |
1042 | 1046 | DataTypes.TIMESTAMP(3), |
1043 | 1047 | DataTypes.TIMESTAMP(6), |
1044 | 1048 | DataTypes.TIMESTAMP(), |
1045 | | - DataTypes.TIMESTAMP_LTZ(0)); |
| 1049 | + DataTypes.TIMESTAMP_TZ(0)); |
1046 | 1050 |
|
1047 | 1051 | private static final RowType HSTORE_TYPES_WITH_ADAPTIVE = |
1048 | 1052 | RowType.of(DataTypes.INT(), DataTypes.MAP(DataTypes.STRING(), DataTypes.STRING())); |
|
0 commit comments