Resolve conflicts

apache · Aug 8, 2024 · 2859296 · 2859296
1 parent 2c5102c
commit 2859296
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/...eline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/TransformE2eITCase.java b/...eline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/TransformE2eITCase.java
@@ -25,7 +25,6 @@
 import org.apache.flink.cdc.runtime.operators.transform.PostTransformOperator;
 import org.apache.flink.cdc.runtime.operators.transform.PreTransformOperator;
 
-import org.jetbrains.annotations.NotNull;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

diff --git a/.../src/main/java/org/apache/flink/cdc/runtime/operators/transform/PreTransformOperator.java b/.../src/main/java/org/apache/flink/cdc/runtime/operators/transform/PreTransformOperator.java
@@ -21,7 +21,6 @@
 import org.apache.flink.api.common.state.ListStateDescriptor;
 import org.apache.flink.api.common.state.OperatorStateStore;
 import org.apache.flink.api.java.tuple.Tuple2;
-import org.apache.flink.api.java.tuple.Tuple5;
 import org.apache.flink.cdc.common.data.binary.BinaryRecordData;
 import org.apache.flink.cdc.common.event.CreateTableEvent;
 import org.apache.flink.cdc.common.event.DataChangeEvent;
@@ -45,7 +44,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 

diff --git a/...test/java/org/apache/flink/cdc/runtime/operators/transform/PostTransformOperatorTest.java b/...test/java/org/apache/flink/cdc/runtime/operators/transform/PostTransformOperatorTest.java
@@ -676,15 +676,15 @@ void testTimestampDiffTransform() throws Exception {
 
     @Test
     void testTimezoneTransform() throws Exception {
-        TransformDataOperator transform =
-                TransformDataOperator.newBuilder()
+        PostTransformOperator transform =
+                PostTransformOperator.newBuilder()
                         .addTransform(
                                 TIMEZONE_TABLEID.identifier(),
                                 "col1, DATE_FORMAT(TO_TIMESTAMP('2024-08-01 00:00:00'), 'yyyy-MM-dd HH:mm:ss') as datetime",
                                 null)
                         .addTimezone("UTC")
                         .build();
-        EventOperatorTestHarness<TransformDataOperator, Event>
+        EventOperatorTestHarness<PostTransformOperator, Event>
                 transformFunctionEventEventOperatorTestHarness =
                         new EventOperatorTestHarness<>(transform, 1);
         // Initialization
@@ -1368,7 +1368,7 @@ void testCastErrorTransform() throws Exception {
                                         + ",cast(castFloat as char) as castChar"
                                         + ",cast(castFloat as varchar) as castVarchar"
                                         + ",cast(castFloat as DECIMAL(4,2)) as castDecimal"
-                                        + ",cast(castFloat as TIMESTAMP) as castTimestamp",
+                                        + ",cast(castFloat as TIMESTAMP(3)) as castTimestamp",
                                 "col1 = '1'")
                         .build();
         EventOperatorTestHarness<PostTransformOperator, Event>