Resolve conflicts

apache · Jul 12, 2024 · 83a6174 · 83a6174
1 parent b0c0e60
commit 83a6174
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 9 deletions.
diff --git a/...rc/main/java/org/apache/flink/cdc/composer/flink/translator/SchemaOperatorTranslator.java b/...rc/main/java/org/apache/flink/cdc/composer/flink/translator/SchemaOperatorTranslator.java
@@ -17,11 +17,9 @@
 
 package org.apache.flink.cdc.composer.flink.translator;
 
-import org.apache.flink.api.java.tuple.Tuple2;
 import org.apache.flink.cdc.common.annotation.Internal;
 import org.apache.flink.cdc.common.event.Event;
 import org.apache.flink.cdc.common.event.SchemaChangeEvent;
-import org.apache.flink.cdc.common.event.TableId;
 import org.apache.flink.cdc.common.pipeline.SchemaChangeBehavior;
 import org.apache.flink.cdc.common.route.RouteRule;
 import org.apache.flink.cdc.common.sink.MetadataApplier;

diff --git a/...me/src/main/java/org/apache/flink/cdc/runtime/operators/schema/SchemaOperatorFactory.java b/...me/src/main/java/org/apache/flink/cdc/runtime/operators/schema/SchemaOperatorFactory.java
@@ -19,7 +19,6 @@
 
 import org.apache.flink.cdc.common.annotation.Internal;
 import org.apache.flink.cdc.common.event.Event;
-import org.apache.flink.cdc.common.event.TableId;
 import org.apache.flink.cdc.common.pipeline.SchemaChangeBehavior;
 import org.apache.flink.cdc.common.route.RouteRule;
 import org.apache.flink.cdc.common.sink.MetadataApplier;

diff --git a/...c/main/java/org/apache/flink/cdc/runtime/operators/schema/coordinator/SchemaRegistry.java b/...c/main/java/org/apache/flink/cdc/runtime/operators/schema/coordinator/SchemaRegistry.java
@@ -19,7 +19,6 @@
 
 import org.apache.flink.cdc.common.event.TableId;
 import org.apache.flink.cdc.common.pipeline.SchemaChangeBehavior;
-import org.apache.flink.cdc.common.schema.Selectors;
 import org.apache.flink.cdc.common.route.RouteRule;
 import org.apache.flink.cdc.common.sink.MetadataApplier;
 import org.apache.flink.cdc.runtime.operators.schema.SchemaOperator;

diff --git a/...ava/org/apache/flink/cdc/runtime/operators/schema/coordinator/SchemaRegistryProvider.java b/...ava/org/apache/flink/cdc/runtime/operators/schema/coordinator/SchemaRegistryProvider.java
@@ -17,18 +17,14 @@
 
 package org.apache.flink.cdc.runtime.operators.schema.coordinator;
 
-import org.apache.flink.api.java.tuple.Tuple2;
 import org.apache.flink.cdc.common.annotation.Internal;
-import org.apache.flink.cdc.common.event.TableId;
 import org.apache.flink.cdc.common.pipeline.SchemaChangeBehavior;
-import org.apache.flink.cdc.common.schema.Selectors;
 import org.apache.flink.cdc.common.route.RouteRule;
 import org.apache.flink.cdc.common.sink.MetadataApplier;
 import org.apache.flink.runtime.jobgraph.OperatorID;
 import org.apache.flink.runtime.operators.coordination.OperatorCoordinator;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 /** Provider of {@link SchemaRegistry}. */
 @Internal
@@ -62,6 +58,5 @@ public OperatorID getOperatorId() {
     @Override
     public OperatorCoordinator create(OperatorCoordinator.Context context) throws Exception {
         return new SchemaRegistry(operatorName, context, metadataApplier, routingRules);
-
     }
 }