From 47098f333956b66271751d9bc43068b09c24f867 Mon Sep 17 00:00:00 2001 From: Hao <1780095+hnrainll@users.noreply.github.com> Date: Mon, 7 Aug 2023 17:30:14 +0800 Subject: [PATCH] [INLONG-8641][Sort] SingleTableCustomFieldsPartitioner package name does not match path (#8644) --- .../inlong/sort/kafka/DynamicKafkaSerializationSchema.java | 1 + .../kafka/partitioner/SingleTableCustomFieldsPartitioner.java | 2 +- .../inlong/sort/kafka/table/KafkaDynamicTableFactory.java | 2 +- .../inlong/sort/kafka/table/UpsertKafkaDynamicTableFactory.java | 2 +- .../partitioner/SingleTableCustomFieldsPartitionerTest.java | 2 -- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/kafka/src/main/java/org/apache/inlong/sort/kafka/DynamicKafkaSerializationSchema.java b/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/kafka/src/main/java/org/apache/inlong/sort/kafka/DynamicKafkaSerializationSchema.java index 0413bb4cbb8..0cfb19e8d31 100644 --- a/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/kafka/src/main/java/org/apache/inlong/sort/kafka/DynamicKafkaSerializationSchema.java +++ b/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/kafka/src/main/java/org/apache/inlong/sort/kafka/DynamicKafkaSerializationSchema.java @@ -25,6 +25,7 @@ import org.apache.inlong.sort.base.format.JsonDynamicSchemaFormat; import org.apache.inlong.sort.base.metric.sub.SinkTopicMetricData; import org.apache.inlong.sort.kafka.KafkaDynamicSink.WritableMetadata; +import org.apache.inlong.sort.kafka.partitioner.SingleTableCustomFieldsPartitioner; import org.apache.inlong.sort.protocol.ddl.operations.Operation; import org.apache.inlong.sort.protocol.enums.SchemaChangePolicy; import org.apache.inlong.sort.protocol.enums.SchemaChangeType; diff --git a/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/kafka/src/main/java/org/apache/inlong/sort/kafka/partitioner/SingleTableCustomFieldsPartitioner.java b/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/kafka/src/main/java/org/apache/inlong/sort/kafka/partitioner/SingleTableCustomFieldsPartitioner.java index 19c5ae9382e..aa1d0f05a5b 100644 --- a/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/kafka/src/main/java/org/apache/inlong/sort/kafka/partitioner/SingleTableCustomFieldsPartitioner.java +++ b/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/kafka/src/main/java/org/apache/inlong/sort/kafka/partitioner/SingleTableCustomFieldsPartitioner.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.kafka; +package org.apache.inlong.sort.kafka.partitioner; import org.apache.flink.streaming.connectors.kafka.partitioner.FlinkKafkaPartitioner; import org.apache.flink.table.api.TableSchema; diff --git a/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/kafka/src/main/java/org/apache/inlong/sort/kafka/table/KafkaDynamicTableFactory.java b/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/kafka/src/main/java/org/apache/inlong/sort/kafka/table/KafkaDynamicTableFactory.java index 33402983056..97e0e88ba5e 100644 --- a/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/kafka/src/main/java/org/apache/inlong/sort/kafka/table/KafkaDynamicTableFactory.java +++ b/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/kafka/src/main/java/org/apache/inlong/sort/kafka/table/KafkaDynamicTableFactory.java @@ -22,9 +22,9 @@ import org.apache.inlong.sort.base.dirty.utils.DirtySinkFactoryUtils; import org.apache.inlong.sort.base.format.DynamicSchemaFormatFactory; import org.apache.inlong.sort.kafka.KafkaDynamicSink; -import org.apache.inlong.sort.kafka.SingleTableCustomFieldsPartitioner; import org.apache.inlong.sort.kafka.partitioner.InLongFixedPartitionPartitioner; import org.apache.inlong.sort.kafka.partitioner.RawDataHashPartitioner; +import org.apache.inlong.sort.kafka.partitioner.SingleTableCustomFieldsPartitioner; import org.apache.inlong.sort.protocol.enums.SchemaChangePolicy; import org.apache.inlong.sort.protocol.enums.SchemaChangeType; import org.apache.inlong.sort.util.SchemaChangeUtils; diff --git a/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/kafka/src/main/java/org/apache/inlong/sort/kafka/table/UpsertKafkaDynamicTableFactory.java b/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/kafka/src/main/java/org/apache/inlong/sort/kafka/table/UpsertKafkaDynamicTableFactory.java index cb5b054867f..2d23853fec4 100644 --- a/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/kafka/src/main/java/org/apache/inlong/sort/kafka/table/UpsertKafkaDynamicTableFactory.java +++ b/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/kafka/src/main/java/org/apache/inlong/sort/kafka/table/UpsertKafkaDynamicTableFactory.java @@ -21,7 +21,7 @@ import org.apache.inlong.sort.base.dirty.sink.DirtySink; import org.apache.inlong.sort.base.dirty.utils.DirtySinkFactoryUtils; import org.apache.inlong.sort.kafka.KafkaDynamicSink; -import org.apache.inlong.sort.kafka.SingleTableCustomFieldsPartitioner; +import org.apache.inlong.sort.kafka.partitioner.SingleTableCustomFieldsPartitioner; import org.apache.inlong.sort.protocol.enums.SchemaChangePolicy; import org.apache.inlong.sort.protocol.enums.SchemaChangeType; import org.apache.inlong.sort.util.SchemaChangeUtils; diff --git a/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/kafka/src/test/java/org/apache/inlong/sort/kafka/partitioner/SingleTableCustomFieldsPartitionerTest.java b/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/kafka/src/test/java/org/apache/inlong/sort/kafka/partitioner/SingleTableCustomFieldsPartitionerTest.java index 1df59dfe5b5..0180391d493 100644 --- a/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/kafka/src/test/java/org/apache/inlong/sort/kafka/partitioner/SingleTableCustomFieldsPartitionerTest.java +++ b/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/kafka/src/test/java/org/apache/inlong/sort/kafka/partitioner/SingleTableCustomFieldsPartitionerTest.java @@ -17,8 +17,6 @@ package org.apache.inlong.sort.kafka.partitioner; -import org.apache.inlong.sort.kafka.SingleTableCustomFieldsPartitioner; - import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.api.TableSchema; import org.apache.flink.table.data.RowData;