This is an automated email from the ASF dual-hosted git repository. zirui pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push: new 4864117038 [INLONG-9560][Sort]Support rowdata way for all sort message format (#9573) 4864117038 is described below commit 48641170384d37db31c82f1f97c389cef4d7c691 Author: baomingyu <baomingy...@163.com> AuthorDate: Mon Jan 15 16:30:21 2024 +0800 [INLONG-9560][Sort]Support rowdata way for all sort message format (#9573) --- .../{ => format-row}/format-base/pom.xml | 6 +-- .../formats/base/DefaultDeserializationSchema.java | 0 .../formats/base/DefaultSerializationSchema.java | 0 .../base/DefaultTableFormatDeserializer.java | 0 .../formats/base/DefaultTableFormatSerializer.java | 0 .../inlong/sort/formats/base/FormatDescriptor.java | 0 .../formats/base/FormatDescriptorValidator.java | 0 .../ProjectedDeserializationSchemaFactory.java | 0 .../base/ProjectedSerializationSchemaFactory.java | 0 .../sort/formats/base/TableFormatConstants.java | 0 .../sort/formats/base/TableFormatDeserializer.java | 0 .../base/TableFormatDeserializerFactory.java | 0 .../sort/formats/base/TableFormatSerializer.java | 0 .../formats/base/TableFormatSerializerFactory.java | 0 .../inlong/sort/formats/base/TableFormatUtils.java | 0 .../sort/formats/base/TextFormatBuilder.java | 0 .../sort/formats/base/TextFormatDescriptor.java | 0 .../base/TextFormatDescriptorValidator.java | 0 .../base/collectors/TimestampedCollector.java | 0 .../inlong/sort/formats/base/util/LogCounter.java | 0 .../sort/formats/base/TableFormatUtilsTest.java | 0 .../{ => format-row}/format-csv/pom.xml | 6 +-- .../org/apache/inlong/sort/formats/csv/Csv.java | 0 .../sort/formats/csv/CsvDeserializationSchema.java | 0 .../inlong/sort/formats/csv/CsvFormatBuilder.java | 0 .../inlong/sort/formats/csv/CsvFormatFactory.java | 0 .../sort/formats/csv/CsvSerializationSchema.java | 0 .../inlong/sort/formats/csv/CsvValidator.java | 0 .../org.apache.flink.table.factories.TableFactory | 0 .../formats/csv/CsvDeserializationSchemaTest.java | 0 .../sort/formats/csv/CsvFormatFactoryTest.java | 0 .../formats/csv/CsvSerializationSchemaTest.java | 0 .../apache/inlong/sort/formats/csv/CsvTest.java | 0 .../inlong/sort/formats/csv/CsvUtilsTest.java | 0 .../{ => format-row}/format-inlongmsg-base/pom.xml | 6 +-- .../AbstractInLongMsgFormatDeserializer.java | 0 .../AbstractInLongMsgMixedFormatConverter.java | 0 .../AbstractInLongMsgMixedFormatDeserializer.java | 0 .../sort/formats/inlongmsg/FailureHandler.java | 0 .../formats/inlongmsg/IgnoreFailureHandler.java | 0 .../sort/formats/inlongmsg/InLongMsgBody.java | 0 .../formats/inlongmsg/InLongMsgDecodingFormat.java | 0 .../inlongmsg/InLongMsgDeserializationSchema.java | 0 .../formats/inlongmsg/InLongMsgFormatFactory.java | 0 .../sort/formats/inlongmsg/InLongMsgHead.java | 0 .../inlongmsg/InLongMsgMixedFormatConverter.java | 0 .../InLongMsgMixedFormatConverterBuilder.java | 0 .../InLongMsgMixedFormatConverterValidator.java | 0 .../InLongMsgMixedFormatDeserializerValidator.java | 0 .../inlongmsg/InLongMsgMixedFormatFactory.java | 0 .../formats/inlongmsg/InLongMsgMixedValidator.java | 0 .../sort/formats/inlongmsg/InLongMsgOptions.java | 0 ...nLongMsgTextMixedFormatDeserializerBuilder.java | 0 .../sort/formats/inlongmsg/InLongMsgUtils.java | 0 .../sort/formats/inlongmsg/InLongMsgValidator.java | 0 .../sort/formats/inlongmsg/NoOpFailureHandler.java | 0 .../org.apache.flink.table.factories.Factory | 0 .../inlongmsg/InLongMsgFormatFactoryTest.java | 0 .../inlongmsg/InLongMsgRowDataSerDeTest.java | 0 .../org.apache.flink.table.factories.Factory | 0 .../{ => format-row}/format-inlongmsg-csv/pom.xml | 6 +-- .../sort/formats/inlongmsgcsv/InLongMsgCsv.java | 0 .../InLongMsgCsvFormatDeserializer.java | 0 .../inlongmsgcsv/InLongMsgCsvFormatFactory.java | 0 .../InLongMsgCsvMixedFormatConverter.java | 0 .../InLongMsgCsvMixedFormatDeserializer.java | 0 .../formats/inlongmsgcsv/InLongMsgCsvUtils.java | 0 .../inlongmsgcsv/InLongMsgCsvValidator.java | 0 .../org.apache.flink.table.factories.TableFactory | 0 .../InLongMsgCsvFormatDeserializerTest.java | 0 .../InLongMsgCsvFormatFactoryTest.java | 0 .../formats/inlongmsgcsv/InLongMsgCsvTest.java | 0 .../{ => format-row}/format-inlongmsg-kv/pom.xml | 6 +-- .../sort/formats/inlongmsgkv/InLongMsgKv.java | 0 .../inlongmsgkv/InLongMsgKvFormatDeserializer.java | 0 .../inlongmsgkv/InLongMsgKvFormatFactory.java | 0 .../InLongMsgKvMixedFormatConverter.java | 0 .../InLongMsgKvMixedFormatDeserializer.java | 0 .../sort/formats/inlongmsgkv/InLongMsgKvUtils.java | 0 .../formats/inlongmsgkv/InLongMsgKvValidator.java | 0 .../org.apache.flink.table.factories.TableFactory | 0 .../InLongMsgKvFormatDeserializerTest.java | 0 .../inlongmsgkv/InLongMsgKvFormatFactoryTest.java | 0 .../sort/formats/inlongmsgkv/InLongMsgKvTest.java | 0 .../{ => format-row}/format-inlongmsg-pb/pom.xml | 6 +-- .../inlongmsgpb/InLongMsgPbDecodingFormat.java | 0 .../InLongMsgPbDeserializationSchema.java | 0 .../inlongmsgpb/InLongMsgPbFormatFactory.java | 0 .../formats/inlongmsgpb/InLongMsgPbOptions.java | 0 .../org.apache.flink.table.factories.Factory | 0 .../{ => format-row}/format-json-v1.13/pom.xml | 6 +-- .../inlong/sort/formats/json/MysqlBinLogData.java | 0 .../inlong/sort/formats/json/canal/CanalJson.java | 0 .../json/canal/CanalJsonDecodingFormat.java | 0 .../json/canal/CanalJsonDeserializationSchema.java | 0 .../canal/CanalJsonEnhancedDecodingFormat.java | 0 .../CanalJsonEnhancedDeserializationSchema.java | 0 .../canal/CanalJsonEnhancedEncodingFormat.java | 0 .../json/canal/CanalJsonEnhancedFormatFactory.java | 0 .../CanalJsonEnhancedSerializationSchema.java | 0 .../json/canal/CanalJsonSerializationSchema.java | 0 .../inlong/sort/formats/json/canal/CanalUtils.java | 0 .../sort/formats/json/debezium/DebeziumJson.java | 0 .../json/debezium/DebeziumJsonDecodingFormat.java | 0 .../DebeziumJsonDeserializationSchema.java | 0 .../sort/formats/json/debezium/DebeziumUtils.java | 0 .../sort/formats/json/utils/FormatJsonUtil.java | 0 .../org.apache.flink.table.factories.Factory | 0 .../canal/CanalJsonEnhancedFormatFactoryTest.java | 0 .../canal/CanalJsonEnhancedSerDeSchemaTest.java | 0 .../json/canal/CanalJsonSerializationTest.java | 0 .../json/canal/DebeziumJsonSerializationTest.java | 0 .../src/test/resources/canal-json-inlong-data.txt | 0 .../src/test/resources/log4j2-test.properties | 0 .../{ => format-row}/format-json-v1.15/pom.xml | 6 +-- .../inlong/sort/formats/json/MysqlBinLogData.java | 0 .../inlong/sort/formats/json/canal/CanalJson.java | 0 .../json/canal/CanalJsonDecodingFormat.java | 0 .../json/canal/CanalJsonDeserializationSchema.java | 0 .../canal/CanalJsonEnhancedDecodingFormat.java | 0 .../CanalJsonEnhancedDeserializationSchema.java | 0 .../canal/CanalJsonEnhancedEncodingFormat.java | 0 .../json/canal/CanalJsonEnhancedFormatFactory.java | 0 .../CanalJsonEnhancedSerializationSchema.java | 0 .../json/canal/CanalJsonSerializationSchema.java | 0 .../inlong/sort/formats/json/canal/CanalUtils.java | 0 .../sort/formats/json/debezium/DebeziumJson.java | 0 .../json/debezium/DebeziumJsonDecodingFormat.java | 0 .../DebeziumJsonDeserializationSchema.java | 0 .../sort/formats/json/debezium/DebeziumUtils.java | 0 .../sort/formats/json/utils/FormatJsonUtil.java | 0 .../org.apache.flink.table.factories.Factory | 0 .../canal/CanalJsonEnhancedFormatFactoryTest.java | 0 .../canal/CanalJsonEnhancedSerDeSchemaTest.java | 0 .../json/canal/CanalJsonSerializationTest.java | 0 .../json/canal/DebeziumJsonSerializationTest.java | 0 .../src/test/resources/canal-json-inlong-data.txt | 0 .../src/test/resources/log4j2-test.properties | 0 .../{ => format-row}/format-kv/pom.xml | 6 +-- .../java/org/apache/inlong/sort/formats/kv/Kv.java | 0 .../sort/formats/kv/KvDeserializationSchema.java | 0 .../inlong/sort/formats/kv/KvFormatBuilder.java | 0 .../inlong/sort/formats/kv/KvFormatFactory.java | 0 .../sort/formats/kv/KvSerializationSchema.java | 0 .../apache/inlong/sort/formats/kv/KvValidator.java | 0 .../org.apache.flink.table.factories.TableFactory | 0 .../formats/kv/KvDeserializationSchemaTest.java | 0 .../sort/formats/kv/KvFormatFactoryTest.java | 0 .../sort/formats/kv/KvSerializationSchemaTest.java | 0 .../org/apache/inlong/sort/formats/kv/KvTest.java | 0 .../apache/inlong/sort/formats/kv/KvUtilsTest.java | 0 .../src/test/resources/log4j2-test.properties | 0 .../{format-base => format-row}/pom.xml | 58 ++++++++++++---------- .../{format-base => format-rowdata}/pom.xml | 30 ++--------- inlong-sort/sort-formats/pom.xml | 27 +--------- 155 files changed, 65 insertions(+), 104 deletions(-) diff --git a/inlong-sort/sort-formats/format-base/pom.xml b/inlong-sort/sort-formats/format-row/format-base/pom.xml similarity index 91% copy from inlong-sort/sort-formats/format-base/pom.xml copy to inlong-sort/sort-formats/format-row/format-base/pom.xml index 94224a72aa..dbcdd4ff6d 100644 --- a/inlong-sort/sort-formats/format-base/pom.xml +++ b/inlong-sort/sort-formats/format-row/format-base/pom.xml @@ -22,15 +22,15 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.inlong</groupId> - <artifactId>sort-formats</artifactId> + <artifactId>format-row</artifactId> <version>1.11.0-SNAPSHOT</version> </parent> <artifactId>sort-format-base</artifactId> - <name>Apache InLong - Sort Format-base</name> + <name>Apache InLong - Sort Format-Base</name> <properties> - <inlong.root.dir>${project.parent.parent.parent.basedir}</inlong.root.dir> + <inlong.root.dir>${project.parent.parent.parent.parent.basedir}</inlong.root.dir> </properties> <dependencies> diff --git a/inlong-sort/sort-formats/format-base/src/main/java/org/apache/inlong/sort/formats/base/DefaultDeserializationSchema.java b/inlong-sort/sort-formats/format-row/format-base/src/main/java/org/apache/inlong/sort/formats/base/DefaultDeserializationSchema.java similarity index 100% rename from inlong-sort/sort-formats/format-base/src/main/java/org/apache/inlong/sort/formats/base/DefaultDeserializationSchema.java rename to inlong-sort/sort-formats/format-row/format-base/src/main/java/org/apache/inlong/sort/formats/base/DefaultDeserializationSchema.java diff --git a/inlong-sort/sort-formats/format-base/src/main/java/org/apache/inlong/sort/formats/base/DefaultSerializationSchema.java b/inlong-sort/sort-formats/format-row/format-base/src/main/java/org/apache/inlong/sort/formats/base/DefaultSerializationSchema.java similarity index 100% rename from inlong-sort/sort-formats/format-base/src/main/java/org/apache/inlong/sort/formats/base/DefaultSerializationSchema.java rename to inlong-sort/sort-formats/format-row/format-base/src/main/java/org/apache/inlong/sort/formats/base/DefaultSerializationSchema.java diff --git a/inlong-sort/sort-formats/format-base/src/main/java/org/apache/inlong/sort/formats/base/DefaultTableFormatDeserializer.java b/inlong-sort/sort-formats/format-row/format-base/src/main/java/org/apache/inlong/sort/formats/base/DefaultTableFormatDeserializer.java similarity index 100% rename from inlong-sort/sort-formats/format-base/src/main/java/org/apache/inlong/sort/formats/base/DefaultTableFormatDeserializer.java rename to inlong-sort/sort-formats/format-row/format-base/src/main/java/org/apache/inlong/sort/formats/base/DefaultTableFormatDeserializer.java diff --git a/inlong-sort/sort-formats/format-base/src/main/java/org/apache/inlong/sort/formats/base/DefaultTableFormatSerializer.java b/inlong-sort/sort-formats/format-row/format-base/src/main/java/org/apache/inlong/sort/formats/base/DefaultTableFormatSerializer.java similarity index 100% rename from inlong-sort/sort-formats/format-base/src/main/java/org/apache/inlong/sort/formats/base/DefaultTableFormatSerializer.java rename to inlong-sort/sort-formats/format-row/format-base/src/main/java/org/apache/inlong/sort/formats/base/DefaultTableFormatSerializer.java diff --git a/inlong-sort/sort-formats/format-base/src/main/java/org/apache/inlong/sort/formats/base/FormatDescriptor.java b/inlong-sort/sort-formats/format-row/format-base/src/main/java/org/apache/inlong/sort/formats/base/FormatDescriptor.java similarity index 100% rename from inlong-sort/sort-formats/format-base/src/main/java/org/apache/inlong/sort/formats/base/FormatDescriptor.java rename to inlong-sort/sort-formats/format-row/format-base/src/main/java/org/apache/inlong/sort/formats/base/FormatDescriptor.java diff --git a/inlong-sort/sort-formats/format-base/src/main/java/org/apache/inlong/sort/formats/base/FormatDescriptorValidator.java b/inlong-sort/sort-formats/format-row/format-base/src/main/java/org/apache/inlong/sort/formats/base/FormatDescriptorValidator.java similarity index 100% rename from inlong-sort/sort-formats/format-base/src/main/java/org/apache/inlong/sort/formats/base/FormatDescriptorValidator.java rename to inlong-sort/sort-formats/format-row/format-base/src/main/java/org/apache/inlong/sort/formats/base/FormatDescriptorValidator.java diff --git a/inlong-sort/sort-formats/format-base/src/main/java/org/apache/inlong/sort/formats/base/ProjectedDeserializationSchemaFactory.java b/inlong-sort/sort-formats/format-row/format-base/src/main/java/org/apache/inlong/sort/formats/base/ProjectedDeserializationSchemaFactory.java similarity index 100% rename from inlong-sort/sort-formats/format-base/src/main/java/org/apache/inlong/sort/formats/base/ProjectedDeserializationSchemaFactory.java rename to inlong-sort/sort-formats/format-row/format-base/src/main/java/org/apache/inlong/sort/formats/base/ProjectedDeserializationSchemaFactory.java diff --git a/inlong-sort/sort-formats/format-base/src/main/java/org/apache/inlong/sort/formats/base/ProjectedSerializationSchemaFactory.java b/inlong-sort/sort-formats/format-row/format-base/src/main/java/org/apache/inlong/sort/formats/base/ProjectedSerializationSchemaFactory.java similarity index 100% rename from inlong-sort/sort-formats/format-base/src/main/java/org/apache/inlong/sort/formats/base/ProjectedSerializationSchemaFactory.java rename to inlong-sort/sort-formats/format-row/format-base/src/main/java/org/apache/inlong/sort/formats/base/ProjectedSerializationSchemaFactory.java diff --git a/inlong-sort/sort-formats/format-base/src/main/java/org/apache/inlong/sort/formats/base/TableFormatConstants.java b/inlong-sort/sort-formats/format-row/format-base/src/main/java/org/apache/inlong/sort/formats/base/TableFormatConstants.java similarity index 100% rename from inlong-sort/sort-formats/format-base/src/main/java/org/apache/inlong/sort/formats/base/TableFormatConstants.java rename to inlong-sort/sort-formats/format-row/format-base/src/main/java/org/apache/inlong/sort/formats/base/TableFormatConstants.java diff --git a/inlong-sort/sort-formats/format-base/src/main/java/org/apache/inlong/sort/formats/base/TableFormatDeserializer.java b/inlong-sort/sort-formats/format-row/format-base/src/main/java/org/apache/inlong/sort/formats/base/TableFormatDeserializer.java similarity index 100% rename from inlong-sort/sort-formats/format-base/src/main/java/org/apache/inlong/sort/formats/base/TableFormatDeserializer.java rename to inlong-sort/sort-formats/format-row/format-base/src/main/java/org/apache/inlong/sort/formats/base/TableFormatDeserializer.java diff --git a/inlong-sort/sort-formats/format-base/src/main/java/org/apache/inlong/sort/formats/base/TableFormatDeserializerFactory.java b/inlong-sort/sort-formats/format-row/format-base/src/main/java/org/apache/inlong/sort/formats/base/TableFormatDeserializerFactory.java similarity index 100% rename from inlong-sort/sort-formats/format-base/src/main/java/org/apache/inlong/sort/formats/base/TableFormatDeserializerFactory.java rename to inlong-sort/sort-formats/format-row/format-base/src/main/java/org/apache/inlong/sort/formats/base/TableFormatDeserializerFactory.java diff --git a/inlong-sort/sort-formats/format-base/src/main/java/org/apache/inlong/sort/formats/base/TableFormatSerializer.java b/inlong-sort/sort-formats/format-row/format-base/src/main/java/org/apache/inlong/sort/formats/base/TableFormatSerializer.java similarity index 100% rename from inlong-sort/sort-formats/format-base/src/main/java/org/apache/inlong/sort/formats/base/TableFormatSerializer.java rename to inlong-sort/sort-formats/format-row/format-base/src/main/java/org/apache/inlong/sort/formats/base/TableFormatSerializer.java diff --git a/inlong-sort/sort-formats/format-base/src/main/java/org/apache/inlong/sort/formats/base/TableFormatSerializerFactory.java b/inlong-sort/sort-formats/format-row/format-base/src/main/java/org/apache/inlong/sort/formats/base/TableFormatSerializerFactory.java similarity index 100% rename from inlong-sort/sort-formats/format-base/src/main/java/org/apache/inlong/sort/formats/base/TableFormatSerializerFactory.java rename to inlong-sort/sort-formats/format-row/format-base/src/main/java/org/apache/inlong/sort/formats/base/TableFormatSerializerFactory.java diff --git a/inlong-sort/sort-formats/format-base/src/main/java/org/apache/inlong/sort/formats/base/TableFormatUtils.java b/inlong-sort/sort-formats/format-row/format-base/src/main/java/org/apache/inlong/sort/formats/base/TableFormatUtils.java similarity index 100% rename from inlong-sort/sort-formats/format-base/src/main/java/org/apache/inlong/sort/formats/base/TableFormatUtils.java rename to inlong-sort/sort-formats/format-row/format-base/src/main/java/org/apache/inlong/sort/formats/base/TableFormatUtils.java diff --git a/inlong-sort/sort-formats/format-base/src/main/java/org/apache/inlong/sort/formats/base/TextFormatBuilder.java b/inlong-sort/sort-formats/format-row/format-base/src/main/java/org/apache/inlong/sort/formats/base/TextFormatBuilder.java similarity index 100% rename from inlong-sort/sort-formats/format-base/src/main/java/org/apache/inlong/sort/formats/base/TextFormatBuilder.java rename to inlong-sort/sort-formats/format-row/format-base/src/main/java/org/apache/inlong/sort/formats/base/TextFormatBuilder.java diff --git a/inlong-sort/sort-formats/format-base/src/main/java/org/apache/inlong/sort/formats/base/TextFormatDescriptor.java b/inlong-sort/sort-formats/format-row/format-base/src/main/java/org/apache/inlong/sort/formats/base/TextFormatDescriptor.java similarity index 100% rename from inlong-sort/sort-formats/format-base/src/main/java/org/apache/inlong/sort/formats/base/TextFormatDescriptor.java rename to inlong-sort/sort-formats/format-row/format-base/src/main/java/org/apache/inlong/sort/formats/base/TextFormatDescriptor.java diff --git a/inlong-sort/sort-formats/format-base/src/main/java/org/apache/inlong/sort/formats/base/TextFormatDescriptorValidator.java b/inlong-sort/sort-formats/format-row/format-base/src/main/java/org/apache/inlong/sort/formats/base/TextFormatDescriptorValidator.java similarity index 100% rename from inlong-sort/sort-formats/format-base/src/main/java/org/apache/inlong/sort/formats/base/TextFormatDescriptorValidator.java rename to inlong-sort/sort-formats/format-row/format-base/src/main/java/org/apache/inlong/sort/formats/base/TextFormatDescriptorValidator.java diff --git a/inlong-sort/sort-formats/format-base/src/main/java/org/apache/inlong/sort/formats/base/collectors/TimestampedCollector.java b/inlong-sort/sort-formats/format-row/format-base/src/main/java/org/apache/inlong/sort/formats/base/collectors/TimestampedCollector.java similarity index 100% rename from inlong-sort/sort-formats/format-base/src/main/java/org/apache/inlong/sort/formats/base/collectors/TimestampedCollector.java rename to inlong-sort/sort-formats/format-row/format-base/src/main/java/org/apache/inlong/sort/formats/base/collectors/TimestampedCollector.java diff --git a/inlong-sort/sort-formats/format-base/src/main/java/org/apache/inlong/sort/formats/base/util/LogCounter.java b/inlong-sort/sort-formats/format-row/format-base/src/main/java/org/apache/inlong/sort/formats/base/util/LogCounter.java similarity index 100% rename from inlong-sort/sort-formats/format-base/src/main/java/org/apache/inlong/sort/formats/base/util/LogCounter.java rename to inlong-sort/sort-formats/format-row/format-base/src/main/java/org/apache/inlong/sort/formats/base/util/LogCounter.java diff --git a/inlong-sort/sort-formats/format-base/src/test/java/org/apache/inlong/sort/formats/base/TableFormatUtilsTest.java b/inlong-sort/sort-formats/format-row/format-base/src/test/java/org/apache/inlong/sort/formats/base/TableFormatUtilsTest.java similarity index 100% rename from inlong-sort/sort-formats/format-base/src/test/java/org/apache/inlong/sort/formats/base/TableFormatUtilsTest.java rename to inlong-sort/sort-formats/format-row/format-base/src/test/java/org/apache/inlong/sort/formats/base/TableFormatUtilsTest.java diff --git a/inlong-sort/sort-formats/format-csv/pom.xml b/inlong-sort/sort-formats/format-row/format-csv/pom.xml similarity index 95% rename from inlong-sort/sort-formats/format-csv/pom.xml rename to inlong-sort/sort-formats/format-row/format-csv/pom.xml index 51315baec5..8a72f01240 100644 --- a/inlong-sort/sort-formats/format-csv/pom.xml +++ b/inlong-sort/sort-formats/format-row/format-csv/pom.xml @@ -22,15 +22,15 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.inlong</groupId> - <artifactId>sort-formats</artifactId> + <artifactId>format-row</artifactId> <version>1.11.0-SNAPSHOT</version> </parent> <artifactId>sort-format-csv</artifactId> - <name>Apache InLong - Sort Format-csv</name> + <name>Apache InLong - Sort Format-CSV</name> <properties> - <inlong.root.dir>${project.parent.parent.parent.basedir}</inlong.root.dir> + <inlong.root.dir>${project.parent.parent.parent.parent.basedir}</inlong.root.dir> </properties> <dependencies> diff --git a/inlong-sort/sort-formats/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/Csv.java b/inlong-sort/sort-formats/format-row/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/Csv.java similarity index 100% rename from inlong-sort/sort-formats/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/Csv.java rename to inlong-sort/sort-formats/format-row/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/Csv.java diff --git a/inlong-sort/sort-formats/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvDeserializationSchema.java b/inlong-sort/sort-formats/format-row/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvDeserializationSchema.java similarity index 100% rename from inlong-sort/sort-formats/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvDeserializationSchema.java rename to inlong-sort/sort-formats/format-row/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvDeserializationSchema.java diff --git a/inlong-sort/sort-formats/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvFormatBuilder.java b/inlong-sort/sort-formats/format-row/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvFormatBuilder.java similarity index 100% rename from inlong-sort/sort-formats/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvFormatBuilder.java rename to inlong-sort/sort-formats/format-row/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvFormatBuilder.java diff --git a/inlong-sort/sort-formats/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvFormatFactory.java b/inlong-sort/sort-formats/format-row/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvFormatFactory.java similarity index 100% rename from inlong-sort/sort-formats/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvFormatFactory.java rename to inlong-sort/sort-formats/format-row/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvFormatFactory.java diff --git a/inlong-sort/sort-formats/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvSerializationSchema.java b/inlong-sort/sort-formats/format-row/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvSerializationSchema.java similarity index 100% rename from inlong-sort/sort-formats/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvSerializationSchema.java rename to inlong-sort/sort-formats/format-row/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvSerializationSchema.java diff --git a/inlong-sort/sort-formats/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvValidator.java b/inlong-sort/sort-formats/format-row/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvValidator.java similarity index 100% rename from inlong-sort/sort-formats/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvValidator.java rename to inlong-sort/sort-formats/format-row/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvValidator.java diff --git a/inlong-sort/sort-formats/format-csv/src/main/resources/META-INF/services/org.apache.flink.table.factories.TableFactory b/inlong-sort/sort-formats/format-row/format-csv/src/main/resources/META-INF/services/org.apache.flink.table.factories.TableFactory similarity index 100% rename from inlong-sort/sort-formats/format-csv/src/main/resources/META-INF/services/org.apache.flink.table.factories.TableFactory rename to inlong-sort/sort-formats/format-row/format-csv/src/main/resources/META-INF/services/org.apache.flink.table.factories.TableFactory diff --git a/inlong-sort/sort-formats/format-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvDeserializationSchemaTest.java b/inlong-sort/sort-formats/format-row/format-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvDeserializationSchemaTest.java similarity index 100% rename from inlong-sort/sort-formats/format-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvDeserializationSchemaTest.java rename to inlong-sort/sort-formats/format-row/format-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvDeserializationSchemaTest.java diff --git a/inlong-sort/sort-formats/format-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvFormatFactoryTest.java b/inlong-sort/sort-formats/format-row/format-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvFormatFactoryTest.java similarity index 100% rename from inlong-sort/sort-formats/format-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvFormatFactoryTest.java rename to inlong-sort/sort-formats/format-row/format-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvFormatFactoryTest.java diff --git a/inlong-sort/sort-formats/format-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvSerializationSchemaTest.java b/inlong-sort/sort-formats/format-row/format-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvSerializationSchemaTest.java similarity index 100% rename from inlong-sort/sort-formats/format-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvSerializationSchemaTest.java rename to inlong-sort/sort-formats/format-row/format-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvSerializationSchemaTest.java diff --git a/inlong-sort/sort-formats/format-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvTest.java b/inlong-sort/sort-formats/format-row/format-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvTest.java similarity index 100% rename from inlong-sort/sort-formats/format-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvTest.java rename to inlong-sort/sort-formats/format-row/format-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvTest.java diff --git a/inlong-sort/sort-formats/format-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvUtilsTest.java b/inlong-sort/sort-formats/format-row/format-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvUtilsTest.java similarity index 100% rename from inlong-sort/sort-formats/format-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvUtilsTest.java rename to inlong-sort/sort-formats/format-row/format-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvUtilsTest.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-base/pom.xml b/inlong-sort/sort-formats/format-row/format-inlongmsg-base/pom.xml similarity index 94% rename from inlong-sort/sort-formats/format-inlongmsg-base/pom.xml rename to inlong-sort/sort-formats/format-row/format-inlongmsg-base/pom.xml index 8846aa0446..a05114d803 100644 --- a/inlong-sort/sort-formats/format-inlongmsg-base/pom.xml +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-base/pom.xml @@ -22,15 +22,15 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.inlong</groupId> - <artifactId>sort-formats</artifactId> + <artifactId>format-row</artifactId> <version>1.11.0-SNAPSHOT</version> </parent> <artifactId>sort-format-inlongmsg-base</artifactId> - <name>Apache InLong - Sort Format-inlongmsg-base</name> + <name>Apache InLong - Sort Format-InLongMsg-Base</name> <properties> - <inlong.root.dir>${project.parent.parent.parent.basedir}</inlong.root.dir> + <inlong.root.dir>${project.parent.parent.parent.parent.basedir}</inlong.root.dir> </properties> <dependencies> diff --git a/inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/AbstractInLongMsgFormatDeserializer.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/AbstractInLongMsgFormatDeserializer.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/AbstractInLongMsgFormatDeserializer.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/AbstractInLongMsgFormatDeserializer.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/AbstractInLongMsgMixedFormatConverter.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/AbstractInLongMsgMixedFormatConverter.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/AbstractInLongMsgMixedFormatConverter.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/AbstractInLongMsgMixedFormatConverter.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/AbstractInLongMsgMixedFormatDeserializer.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/AbstractInLongMsgMixedFormatDeserializer.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/AbstractInLongMsgMixedFormatDeserializer.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/AbstractInLongMsgMixedFormatDeserializer.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/FailureHandler.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/FailureHandler.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/FailureHandler.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/FailureHandler.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/IgnoreFailureHandler.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/IgnoreFailureHandler.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/IgnoreFailureHandler.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/IgnoreFailureHandler.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgBody.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgBody.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgBody.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgBody.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgDecodingFormat.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgDecodingFormat.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgDecodingFormat.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgDecodingFormat.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgDeserializationSchema.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgDeserializationSchema.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgDeserializationSchema.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgDeserializationSchema.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgFormatFactory.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgFormatFactory.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgFormatFactory.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgFormatFactory.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgHead.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgHead.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgHead.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgHead.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgMixedFormatConverter.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgMixedFormatConverter.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgMixedFormatConverter.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgMixedFormatConverter.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgMixedFormatConverterBuilder.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgMixedFormatConverterBuilder.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgMixedFormatConverterBuilder.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgMixedFormatConverterBuilder.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgMixedFormatConverterValidator.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgMixedFormatConverterValidator.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgMixedFormatConverterValidator.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgMixedFormatConverterValidator.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgMixedFormatDeserializerValidator.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgMixedFormatDeserializerValidator.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgMixedFormatDeserializerValidator.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgMixedFormatDeserializerValidator.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgMixedFormatFactory.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgMixedFormatFactory.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgMixedFormatFactory.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgMixedFormatFactory.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgMixedValidator.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgMixedValidator.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgMixedValidator.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgMixedValidator.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgOptions.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgOptions.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgOptions.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgOptions.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgTextMixedFormatDeserializerBuilder.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgTextMixedFormatDeserializerBuilder.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgTextMixedFormatDeserializerBuilder.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgTextMixedFormatDeserializerBuilder.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgUtils.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgUtils.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgUtils.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgUtils.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgValidator.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgValidator.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgValidator.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgValidator.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/NoOpFailureHandler.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/NoOpFailureHandler.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/NoOpFailureHandler.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/NoOpFailureHandler.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-base/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-base/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory rename to inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory diff --git a/inlong-sort/sort-formats/format-inlongmsg-base/src/test/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgFormatFactoryTest.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/test/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgFormatFactoryTest.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-base/src/test/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgFormatFactoryTest.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/test/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgFormatFactoryTest.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-base/src/test/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgRowDataSerDeTest.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/test/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgRowDataSerDeTest.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-base/src/test/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgRowDataSerDeTest.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/test/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgRowDataSerDeTest.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-base/src/test/resources/META-INF/services/org.apache.flink.table.factories.Factory b/inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/test/resources/META-INF/services/org.apache.flink.table.factories.Factory similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-base/src/test/resources/META-INF/services/org.apache.flink.table.factories.Factory rename to inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/test/resources/META-INF/services/org.apache.flink.table.factories.Factory diff --git a/inlong-sort/sort-formats/format-inlongmsg-csv/pom.xml b/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/pom.xml similarity index 95% rename from inlong-sort/sort-formats/format-inlongmsg-csv/pom.xml rename to inlong-sort/sort-formats/format-row/format-inlongmsg-csv/pom.xml index e5cc71bd9b..c7b536e5d9 100644 --- a/inlong-sort/sort-formats/format-inlongmsg-csv/pom.xml +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/pom.xml @@ -22,15 +22,15 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.inlong</groupId> - <artifactId>sort-formats</artifactId> + <artifactId>format-row</artifactId> <version>1.11.0-SNAPSHOT</version> </parent> <artifactId>sort-format-inlongmsg-csv</artifactId> - <name>Apache InLong - Sort Format-inlongmsg-csv</name> + <name>Apache InLong - Sort Format-InLongMsg-CSV</name> <properties> - <inlong.root.dir>${project.parent.parent.parent.basedir}</inlong.root.dir> + <inlong.root.dir>${project.parent.parent.parent.parent.basedir}</inlong.root.dir> </properties> <dependencies> diff --git a/inlong-sort/sort-formats/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsv.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsv.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsv.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsv.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatDeserializer.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatDeserializer.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatDeserializer.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatDeserializer.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatFactory.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatFactory.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatFactory.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatFactory.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvMixedFormatConverter.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvMixedFormatConverter.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvMixedFormatConverter.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvMixedFormatConverter.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvMixedFormatDeserializer.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvMixedFormatDeserializer.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvMixedFormatDeserializer.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvMixedFormatDeserializer.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvUtils.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvUtils.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvUtils.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvUtils.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvValidator.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvValidator.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvValidator.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvValidator.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-csv/src/main/resources/META-INF/services/org.apache.flink.table.factories.TableFactory b/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/resources/META-INF/services/org.apache.flink.table.factories.TableFactory similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-csv/src/main/resources/META-INF/services/org.apache.flink.table.factories.TableFactory rename to inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/resources/META-INF/services/org.apache.flink.table.factories.TableFactory diff --git a/inlong-sort/sort-formats/format-inlongmsg-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatDeserializerTest.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatDeserializerTest.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatDeserializerTest.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatDeserializerTest.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatFactoryTest.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatFactoryTest.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatFactoryTest.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatFactoryTest.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvTest.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvTest.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvTest.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvTest.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-kv/pom.xml b/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/pom.xml similarity index 95% rename from inlong-sort/sort-formats/format-inlongmsg-kv/pom.xml rename to inlong-sort/sort-formats/format-row/format-inlongmsg-kv/pom.xml index 4c105fc19b..8126ea51dd 100644 --- a/inlong-sort/sort-formats/format-inlongmsg-kv/pom.xml +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/pom.xml @@ -22,15 +22,15 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.inlong</groupId> - <artifactId>sort-formats</artifactId> + <artifactId>format-row</artifactId> <version>1.11.0-SNAPSHOT</version> </parent> <artifactId>sort-format-inlongmsg-kv</artifactId> - <name>Apache InLong - Sort Format-inlongmsg-kv</name> + <name>Apache InLong - Sort Format-InLongMsg-KV</name> <properties> - <inlong.root.dir>${project.parent.parent.parent.basedir}</inlong.root.dir> + <inlong.root.dir>${project.parent.parent.parent.parent.basedir}</inlong.root.dir> </properties> <dependencies> diff --git a/inlong-sort/sort-formats/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKv.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKv.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKv.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKv.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatDeserializer.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatDeserializer.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatDeserializer.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatDeserializer.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatFactory.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatFactory.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatFactory.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatFactory.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvMixedFormatConverter.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvMixedFormatConverter.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvMixedFormatConverter.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvMixedFormatConverter.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvMixedFormatDeserializer.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvMixedFormatDeserializer.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvMixedFormatDeserializer.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvMixedFormatDeserializer.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvUtils.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvUtils.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvUtils.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvUtils.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvValidator.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvValidator.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvValidator.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvValidator.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-kv/src/main/resources/META-INF/services/org.apache.flink.table.factories.TableFactory b/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/resources/META-INF/services/org.apache.flink.table.factories.TableFactory similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-kv/src/main/resources/META-INF/services/org.apache.flink.table.factories.TableFactory rename to inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/resources/META-INF/services/org.apache.flink.table.factories.TableFactory diff --git a/inlong-sort/sort-formats/format-inlongmsg-kv/src/test/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatDeserializerTest.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/test/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatDeserializerTest.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-kv/src/test/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatDeserializerTest.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/test/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatDeserializerTest.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-kv/src/test/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatFactoryTest.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/test/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatFactoryTest.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-kv/src/test/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatFactoryTest.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/test/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatFactoryTest.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-kv/src/test/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvTest.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/test/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvTest.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-kv/src/test/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvTest.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/test/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvTest.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-pb/pom.xml b/inlong-sort/sort-formats/format-row/format-inlongmsg-pb/pom.xml similarity index 94% rename from inlong-sort/sort-formats/format-inlongmsg-pb/pom.xml rename to inlong-sort/sort-formats/format-row/format-inlongmsg-pb/pom.xml index 6c26d53368..e343e59860 100644 --- a/inlong-sort/sort-formats/format-inlongmsg-pb/pom.xml +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-pb/pom.xml @@ -22,15 +22,15 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.inlong</groupId> - <artifactId>sort-formats</artifactId> + <artifactId>format-row</artifactId> <version>1.11.0-SNAPSHOT</version> </parent> <artifactId>sort-format-inlongmsg-pb</artifactId> - <name>Apache InLong - Sort Format-inlongmsg-pb</name> + <name>Apache InLong - Sort Format-InLongMsg-PB</name> <properties> - <inlong.root.dir>${project.parent.parent.parent.basedir}</inlong.root.dir> + <inlong.root.dir>${project.parent.parent.parent.parent.basedir}</inlong.root.dir> </properties> <dependencies> diff --git a/inlong-sort/sort-formats/format-inlongmsg-pb/src/main/java/org/apache/inlong/sort/formats/inlongmsgpb/InLongMsgPbDecodingFormat.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-pb/src/main/java/org/apache/inlong/sort/formats/inlongmsgpb/InLongMsgPbDecodingFormat.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-pb/src/main/java/org/apache/inlong/sort/formats/inlongmsgpb/InLongMsgPbDecodingFormat.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-pb/src/main/java/org/apache/inlong/sort/formats/inlongmsgpb/InLongMsgPbDecodingFormat.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-pb/src/main/java/org/apache/inlong/sort/formats/inlongmsgpb/InLongMsgPbDeserializationSchema.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-pb/src/main/java/org/apache/inlong/sort/formats/inlongmsgpb/InLongMsgPbDeserializationSchema.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-pb/src/main/java/org/apache/inlong/sort/formats/inlongmsgpb/InLongMsgPbDeserializationSchema.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-pb/src/main/java/org/apache/inlong/sort/formats/inlongmsgpb/InLongMsgPbDeserializationSchema.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-pb/src/main/java/org/apache/inlong/sort/formats/inlongmsgpb/InLongMsgPbFormatFactory.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-pb/src/main/java/org/apache/inlong/sort/formats/inlongmsgpb/InLongMsgPbFormatFactory.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-pb/src/main/java/org/apache/inlong/sort/formats/inlongmsgpb/InLongMsgPbFormatFactory.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-pb/src/main/java/org/apache/inlong/sort/formats/inlongmsgpb/InLongMsgPbFormatFactory.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-pb/src/main/java/org/apache/inlong/sort/formats/inlongmsgpb/InLongMsgPbOptions.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-pb/src/main/java/org/apache/inlong/sort/formats/inlongmsgpb/InLongMsgPbOptions.java similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-pb/src/main/java/org/apache/inlong/sort/formats/inlongmsgpb/InLongMsgPbOptions.java rename to inlong-sort/sort-formats/format-row/format-inlongmsg-pb/src/main/java/org/apache/inlong/sort/formats/inlongmsgpb/InLongMsgPbOptions.java diff --git a/inlong-sort/sort-formats/format-inlongmsg-pb/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/inlong-sort/sort-formats/format-row/format-inlongmsg-pb/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory similarity index 100% rename from inlong-sort/sort-formats/format-inlongmsg-pb/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory rename to inlong-sort/sort-formats/format-row/format-inlongmsg-pb/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory diff --git a/inlong-sort/sort-formats/format-json-v1.13/pom.xml b/inlong-sort/sort-formats/format-row/format-json-v1.13/pom.xml similarity index 94% rename from inlong-sort/sort-formats/format-json-v1.13/pom.xml rename to inlong-sort/sort-formats/format-row/format-json-v1.13/pom.xml index 1fa6efa3a4..f1b77cf7b8 100644 --- a/inlong-sort/sort-formats/format-json-v1.13/pom.xml +++ b/inlong-sort/sort-formats/format-row/format-json-v1.13/pom.xml @@ -22,15 +22,15 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.inlong</groupId> - <artifactId>sort-formats</artifactId> + <artifactId>format-row</artifactId> <version>1.11.0-SNAPSHOT</version> </parent> <artifactId>sort-format-json-v1.13</artifactId> - <name>Apache InLong - Sort Format-json-v1.13</name> + <name>Apache InLong - Sort Format-Json-V1.13</name> <properties> - <inlong.root.dir>${project.parent.parent.parent.basedir}</inlong.root.dir> + <inlong.root.dir>${project.parent.parent.parent.parent.basedir}</inlong.root.dir> <flink.version>1.13.5</flink.version> </properties> diff --git a/inlong-sort/sort-formats/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/MysqlBinLogData.java b/inlong-sort/sort-formats/format-row/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/MysqlBinLogData.java similarity index 100% rename from inlong-sort/sort-formats/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/MysqlBinLogData.java rename to inlong-sort/sort-formats/format-row/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/MysqlBinLogData.java diff --git a/inlong-sort/sort-formats/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJson.java b/inlong-sort/sort-formats/format-row/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJson.java similarity index 100% rename from inlong-sort/sort-formats/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJson.java rename to inlong-sort/sort-formats/format-row/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJson.java diff --git a/inlong-sort/sort-formats/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonDecodingFormat.java b/inlong-sort/sort-formats/format-row/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonDecodingFormat.java similarity index 100% rename from inlong-sort/sort-formats/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonDecodingFormat.java rename to inlong-sort/sort-formats/format-row/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonDecodingFormat.java diff --git a/inlong-sort/sort-formats/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonDeserializationSchema.java b/inlong-sort/sort-formats/format-row/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonDeserializationSchema.java similarity index 100% rename from inlong-sort/sort-formats/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonDeserializationSchema.java rename to inlong-sort/sort-formats/format-row/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonDeserializationSchema.java diff --git a/inlong-sort/sort-formats/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedDecodingFormat.java b/inlong-sort/sort-formats/format-row/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedDecodingFormat.java similarity index 100% rename from inlong-sort/sort-formats/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedDecodingFormat.java rename to inlong-sort/sort-formats/format-row/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedDecodingFormat.java diff --git a/inlong-sort/sort-formats/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedDeserializationSchema.java b/inlong-sort/sort-formats/format-row/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedDeserializationSchema.java similarity index 100% rename from inlong-sort/sort-formats/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedDeserializationSchema.java rename to inlong-sort/sort-formats/format-row/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedDeserializationSchema.java diff --git a/inlong-sort/sort-formats/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedEncodingFormat.java b/inlong-sort/sort-formats/format-row/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedEncodingFormat.java similarity index 100% rename from inlong-sort/sort-formats/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedEncodingFormat.java rename to inlong-sort/sort-formats/format-row/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedEncodingFormat.java diff --git a/inlong-sort/sort-formats/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedFormatFactory.java b/inlong-sort/sort-formats/format-row/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedFormatFactory.java similarity index 100% rename from inlong-sort/sort-formats/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedFormatFactory.java rename to inlong-sort/sort-formats/format-row/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedFormatFactory.java diff --git a/inlong-sort/sort-formats/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedSerializationSchema.java b/inlong-sort/sort-formats/format-row/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedSerializationSchema.java similarity index 100% rename from inlong-sort/sort-formats/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedSerializationSchema.java rename to inlong-sort/sort-formats/format-row/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedSerializationSchema.java diff --git a/inlong-sort/sort-formats/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonSerializationSchema.java b/inlong-sort/sort-formats/format-row/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonSerializationSchema.java similarity index 100% rename from inlong-sort/sort-formats/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonSerializationSchema.java rename to inlong-sort/sort-formats/format-row/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonSerializationSchema.java diff --git a/inlong-sort/sort-formats/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalUtils.java b/inlong-sort/sort-formats/format-row/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalUtils.java similarity index 100% rename from inlong-sort/sort-formats/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalUtils.java rename to inlong-sort/sort-formats/format-row/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalUtils.java diff --git a/inlong-sort/sort-formats/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/debezium/DebeziumJson.java b/inlong-sort/sort-formats/format-row/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/debezium/DebeziumJson.java similarity index 100% rename from inlong-sort/sort-formats/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/debezium/DebeziumJson.java rename to inlong-sort/sort-formats/format-row/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/debezium/DebeziumJson.java diff --git a/inlong-sort/sort-formats/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/debezium/DebeziumJsonDecodingFormat.java b/inlong-sort/sort-formats/format-row/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/debezium/DebeziumJsonDecodingFormat.java similarity index 100% rename from inlong-sort/sort-formats/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/debezium/DebeziumJsonDecodingFormat.java rename to inlong-sort/sort-formats/format-row/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/debezium/DebeziumJsonDecodingFormat.java diff --git a/inlong-sort/sort-formats/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/debezium/DebeziumJsonDeserializationSchema.java b/inlong-sort/sort-formats/format-row/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/debezium/DebeziumJsonDeserializationSchema.java similarity index 100% rename from inlong-sort/sort-formats/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/debezium/DebeziumJsonDeserializationSchema.java rename to inlong-sort/sort-formats/format-row/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/debezium/DebeziumJsonDeserializationSchema.java diff --git a/inlong-sort/sort-formats/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/debezium/DebeziumUtils.java b/inlong-sort/sort-formats/format-row/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/debezium/DebeziumUtils.java similarity index 100% rename from inlong-sort/sort-formats/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/debezium/DebeziumUtils.java rename to inlong-sort/sort-formats/format-row/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/debezium/DebeziumUtils.java diff --git a/inlong-sort/sort-formats/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/utils/FormatJsonUtil.java b/inlong-sort/sort-formats/format-row/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/utils/FormatJsonUtil.java similarity index 100% rename from inlong-sort/sort-formats/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/utils/FormatJsonUtil.java rename to inlong-sort/sort-formats/format-row/format-json-v1.13/src/main/java/org/apache/inlong/sort/formats/json/utils/FormatJsonUtil.java diff --git a/inlong-sort/sort-formats/format-json-v1.13/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/inlong-sort/sort-formats/format-row/format-json-v1.13/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory similarity index 100% rename from inlong-sort/sort-formats/format-json-v1.13/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory rename to inlong-sort/sort-formats/format-row/format-json-v1.13/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory diff --git a/inlong-sort/sort-formats/format-json-v1.13/src/test/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedFormatFactoryTest.java b/inlong-sort/sort-formats/format-row/format-json-v1.13/src/test/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedFormatFactoryTest.java similarity index 100% rename from inlong-sort/sort-formats/format-json-v1.13/src/test/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedFormatFactoryTest.java rename to inlong-sort/sort-formats/format-row/format-json-v1.13/src/test/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedFormatFactoryTest.java diff --git a/inlong-sort/sort-formats/format-json-v1.13/src/test/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedSerDeSchemaTest.java b/inlong-sort/sort-formats/format-row/format-json-v1.13/src/test/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedSerDeSchemaTest.java similarity index 100% rename from inlong-sort/sort-formats/format-json-v1.13/src/test/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedSerDeSchemaTest.java rename to inlong-sort/sort-formats/format-row/format-json-v1.13/src/test/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedSerDeSchemaTest.java diff --git a/inlong-sort/sort-formats/format-json-v1.13/src/test/java/org/apache/inlong/sort/formats/json/canal/CanalJsonSerializationTest.java b/inlong-sort/sort-formats/format-row/format-json-v1.13/src/test/java/org/apache/inlong/sort/formats/json/canal/CanalJsonSerializationTest.java similarity index 100% rename from inlong-sort/sort-formats/format-json-v1.13/src/test/java/org/apache/inlong/sort/formats/json/canal/CanalJsonSerializationTest.java rename to inlong-sort/sort-formats/format-row/format-json-v1.13/src/test/java/org/apache/inlong/sort/formats/json/canal/CanalJsonSerializationTest.java diff --git a/inlong-sort/sort-formats/format-json-v1.13/src/test/java/org/apache/inlong/sort/formats/json/canal/DebeziumJsonSerializationTest.java b/inlong-sort/sort-formats/format-row/format-json-v1.13/src/test/java/org/apache/inlong/sort/formats/json/canal/DebeziumJsonSerializationTest.java similarity index 100% rename from inlong-sort/sort-formats/format-json-v1.13/src/test/java/org/apache/inlong/sort/formats/json/canal/DebeziumJsonSerializationTest.java rename to inlong-sort/sort-formats/format-row/format-json-v1.13/src/test/java/org/apache/inlong/sort/formats/json/canal/DebeziumJsonSerializationTest.java diff --git a/inlong-sort/sort-formats/format-json-v1.13/src/test/resources/canal-json-inlong-data.txt b/inlong-sort/sort-formats/format-row/format-json-v1.13/src/test/resources/canal-json-inlong-data.txt similarity index 100% rename from inlong-sort/sort-formats/format-json-v1.13/src/test/resources/canal-json-inlong-data.txt rename to inlong-sort/sort-formats/format-row/format-json-v1.13/src/test/resources/canal-json-inlong-data.txt diff --git a/inlong-sort/sort-formats/format-json-v1.13/src/test/resources/log4j2-test.properties b/inlong-sort/sort-formats/format-row/format-json-v1.13/src/test/resources/log4j2-test.properties similarity index 100% rename from inlong-sort/sort-formats/format-json-v1.13/src/test/resources/log4j2-test.properties rename to inlong-sort/sort-formats/format-row/format-json-v1.13/src/test/resources/log4j2-test.properties diff --git a/inlong-sort/sort-formats/format-json-v1.15/pom.xml b/inlong-sort/sort-formats/format-row/format-json-v1.15/pom.xml similarity index 94% rename from inlong-sort/sort-formats/format-json-v1.15/pom.xml rename to inlong-sort/sort-formats/format-row/format-json-v1.15/pom.xml index c82d1825d9..ea1a68ebc4 100644 --- a/inlong-sort/sort-formats/format-json-v1.15/pom.xml +++ b/inlong-sort/sort-formats/format-row/format-json-v1.15/pom.xml @@ -22,15 +22,15 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.inlong</groupId> - <artifactId>sort-formats</artifactId> + <artifactId>format-row</artifactId> <version>1.11.0-SNAPSHOT</version> </parent> <artifactId>sort-format-json-v1.15</artifactId> - <name>Apache InLong - Sort Format-json-v1.15</name> + <name>Apache InLong - Sort Format-Json-V1.15</name> <properties> - <inlong.root.dir>${project.parent.parent.parent.basedir}</inlong.root.dir> + <inlong.root.dir>${project.parent.parent.parent.parent.basedir}</inlong.root.dir> <flink.version>1.15.4</flink.version> <flink.shaded.guava.version>30.1.1-jre-15.0</flink.shaded.guava.version> </properties> diff --git a/inlong-sort/sort-formats/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/MysqlBinLogData.java b/inlong-sort/sort-formats/format-row/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/MysqlBinLogData.java similarity index 100% rename from inlong-sort/sort-formats/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/MysqlBinLogData.java rename to inlong-sort/sort-formats/format-row/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/MysqlBinLogData.java diff --git a/inlong-sort/sort-formats/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJson.java b/inlong-sort/sort-formats/format-row/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJson.java similarity index 100% rename from inlong-sort/sort-formats/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJson.java rename to inlong-sort/sort-formats/format-row/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJson.java diff --git a/inlong-sort/sort-formats/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonDecodingFormat.java b/inlong-sort/sort-formats/format-row/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonDecodingFormat.java similarity index 100% rename from inlong-sort/sort-formats/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonDecodingFormat.java rename to inlong-sort/sort-formats/format-row/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonDecodingFormat.java diff --git a/inlong-sort/sort-formats/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonDeserializationSchema.java b/inlong-sort/sort-formats/format-row/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonDeserializationSchema.java similarity index 100% rename from inlong-sort/sort-formats/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonDeserializationSchema.java rename to inlong-sort/sort-formats/format-row/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonDeserializationSchema.java diff --git a/inlong-sort/sort-formats/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedDecodingFormat.java b/inlong-sort/sort-formats/format-row/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedDecodingFormat.java similarity index 100% rename from inlong-sort/sort-formats/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedDecodingFormat.java rename to inlong-sort/sort-formats/format-row/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedDecodingFormat.java diff --git a/inlong-sort/sort-formats/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedDeserializationSchema.java b/inlong-sort/sort-formats/format-row/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedDeserializationSchema.java similarity index 100% rename from inlong-sort/sort-formats/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedDeserializationSchema.java rename to inlong-sort/sort-formats/format-row/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedDeserializationSchema.java diff --git a/inlong-sort/sort-formats/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedEncodingFormat.java b/inlong-sort/sort-formats/format-row/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedEncodingFormat.java similarity index 100% rename from inlong-sort/sort-formats/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedEncodingFormat.java rename to inlong-sort/sort-formats/format-row/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedEncodingFormat.java diff --git a/inlong-sort/sort-formats/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedFormatFactory.java b/inlong-sort/sort-formats/format-row/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedFormatFactory.java similarity index 100% rename from inlong-sort/sort-formats/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedFormatFactory.java rename to inlong-sort/sort-formats/format-row/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedFormatFactory.java diff --git a/inlong-sort/sort-formats/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedSerializationSchema.java b/inlong-sort/sort-formats/format-row/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedSerializationSchema.java similarity index 100% rename from inlong-sort/sort-formats/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedSerializationSchema.java rename to inlong-sort/sort-formats/format-row/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedSerializationSchema.java diff --git a/inlong-sort/sort-formats/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonSerializationSchema.java b/inlong-sort/sort-formats/format-row/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonSerializationSchema.java similarity index 100% rename from inlong-sort/sort-formats/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonSerializationSchema.java rename to inlong-sort/sort-formats/format-row/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalJsonSerializationSchema.java diff --git a/inlong-sort/sort-formats/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalUtils.java b/inlong-sort/sort-formats/format-row/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalUtils.java similarity index 100% rename from inlong-sort/sort-formats/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalUtils.java rename to inlong-sort/sort-formats/format-row/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/canal/CanalUtils.java diff --git a/inlong-sort/sort-formats/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/debezium/DebeziumJson.java b/inlong-sort/sort-formats/format-row/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/debezium/DebeziumJson.java similarity index 100% rename from inlong-sort/sort-formats/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/debezium/DebeziumJson.java rename to inlong-sort/sort-formats/format-row/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/debezium/DebeziumJson.java diff --git a/inlong-sort/sort-formats/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/debezium/DebeziumJsonDecodingFormat.java b/inlong-sort/sort-formats/format-row/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/debezium/DebeziumJsonDecodingFormat.java similarity index 100% rename from inlong-sort/sort-formats/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/debezium/DebeziumJsonDecodingFormat.java rename to inlong-sort/sort-formats/format-row/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/debezium/DebeziumJsonDecodingFormat.java diff --git a/inlong-sort/sort-formats/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/debezium/DebeziumJsonDeserializationSchema.java b/inlong-sort/sort-formats/format-row/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/debezium/DebeziumJsonDeserializationSchema.java similarity index 100% rename from inlong-sort/sort-formats/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/debezium/DebeziumJsonDeserializationSchema.java rename to inlong-sort/sort-formats/format-row/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/debezium/DebeziumJsonDeserializationSchema.java diff --git a/inlong-sort/sort-formats/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/debezium/DebeziumUtils.java b/inlong-sort/sort-formats/format-row/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/debezium/DebeziumUtils.java similarity index 100% rename from inlong-sort/sort-formats/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/debezium/DebeziumUtils.java rename to inlong-sort/sort-formats/format-row/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/debezium/DebeziumUtils.java diff --git a/inlong-sort/sort-formats/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/utils/FormatJsonUtil.java b/inlong-sort/sort-formats/format-row/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/utils/FormatJsonUtil.java similarity index 100% rename from inlong-sort/sort-formats/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/utils/FormatJsonUtil.java rename to inlong-sort/sort-formats/format-row/format-json-v1.15/src/main/java/org/apache/inlong/sort/formats/json/utils/FormatJsonUtil.java diff --git a/inlong-sort/sort-formats/format-json-v1.15/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/inlong-sort/sort-formats/format-row/format-json-v1.15/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory similarity index 100% rename from inlong-sort/sort-formats/format-json-v1.15/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory rename to inlong-sort/sort-formats/format-row/format-json-v1.15/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory diff --git a/inlong-sort/sort-formats/format-json-v1.15/src/test/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedFormatFactoryTest.java b/inlong-sort/sort-formats/format-row/format-json-v1.15/src/test/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedFormatFactoryTest.java similarity index 100% rename from inlong-sort/sort-formats/format-json-v1.15/src/test/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedFormatFactoryTest.java rename to inlong-sort/sort-formats/format-row/format-json-v1.15/src/test/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedFormatFactoryTest.java diff --git a/inlong-sort/sort-formats/format-json-v1.15/src/test/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedSerDeSchemaTest.java b/inlong-sort/sort-formats/format-row/format-json-v1.15/src/test/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedSerDeSchemaTest.java similarity index 100% rename from inlong-sort/sort-formats/format-json-v1.15/src/test/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedSerDeSchemaTest.java rename to inlong-sort/sort-formats/format-row/format-json-v1.15/src/test/java/org/apache/inlong/sort/formats/json/canal/CanalJsonEnhancedSerDeSchemaTest.java diff --git a/inlong-sort/sort-formats/format-json-v1.15/src/test/java/org/apache/inlong/sort/formats/json/canal/CanalJsonSerializationTest.java b/inlong-sort/sort-formats/format-row/format-json-v1.15/src/test/java/org/apache/inlong/sort/formats/json/canal/CanalJsonSerializationTest.java similarity index 100% rename from inlong-sort/sort-formats/format-json-v1.15/src/test/java/org/apache/inlong/sort/formats/json/canal/CanalJsonSerializationTest.java rename to inlong-sort/sort-formats/format-row/format-json-v1.15/src/test/java/org/apache/inlong/sort/formats/json/canal/CanalJsonSerializationTest.java diff --git a/inlong-sort/sort-formats/format-json-v1.15/src/test/java/org/apache/inlong/sort/formats/json/canal/DebeziumJsonSerializationTest.java b/inlong-sort/sort-formats/format-row/format-json-v1.15/src/test/java/org/apache/inlong/sort/formats/json/canal/DebeziumJsonSerializationTest.java similarity index 100% rename from inlong-sort/sort-formats/format-json-v1.15/src/test/java/org/apache/inlong/sort/formats/json/canal/DebeziumJsonSerializationTest.java rename to inlong-sort/sort-formats/format-row/format-json-v1.15/src/test/java/org/apache/inlong/sort/formats/json/canal/DebeziumJsonSerializationTest.java diff --git a/inlong-sort/sort-formats/format-json-v1.15/src/test/resources/canal-json-inlong-data.txt b/inlong-sort/sort-formats/format-row/format-json-v1.15/src/test/resources/canal-json-inlong-data.txt similarity index 100% rename from inlong-sort/sort-formats/format-json-v1.15/src/test/resources/canal-json-inlong-data.txt rename to inlong-sort/sort-formats/format-row/format-json-v1.15/src/test/resources/canal-json-inlong-data.txt diff --git a/inlong-sort/sort-formats/format-json-v1.15/src/test/resources/log4j2-test.properties b/inlong-sort/sort-formats/format-row/format-json-v1.15/src/test/resources/log4j2-test.properties similarity index 100% rename from inlong-sort/sort-formats/format-json-v1.15/src/test/resources/log4j2-test.properties rename to inlong-sort/sort-formats/format-row/format-json-v1.15/src/test/resources/log4j2-test.properties diff --git a/inlong-sort/sort-formats/format-kv/pom.xml b/inlong-sort/sort-formats/format-row/format-kv/pom.xml similarity index 95% rename from inlong-sort/sort-formats/format-kv/pom.xml rename to inlong-sort/sort-formats/format-row/format-kv/pom.xml index 3de35e9b7a..788230ff2a 100644 --- a/inlong-sort/sort-formats/format-kv/pom.xml +++ b/inlong-sort/sort-formats/format-row/format-kv/pom.xml @@ -22,15 +22,15 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.inlong</groupId> - <artifactId>sort-formats</artifactId> + <artifactId>format-row</artifactId> <version>1.11.0-SNAPSHOT</version> </parent> <artifactId>sort-format-kv</artifactId> - <name>Apache InLong - Sort Format-kv</name> + <name>Apache InLong - Sort Format-KV</name> <properties> - <inlong.root.dir>${project.parent.parent.parent.basedir}</inlong.root.dir> + <inlong.root.dir>${project.parent.parent.parent.parent.basedir}</inlong.root.dir> </properties> <dependencies> diff --git a/inlong-sort/sort-formats/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/Kv.java b/inlong-sort/sort-formats/format-row/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/Kv.java similarity index 100% rename from inlong-sort/sort-formats/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/Kv.java rename to inlong-sort/sort-formats/format-row/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/Kv.java diff --git a/inlong-sort/sort-formats/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvDeserializationSchema.java b/inlong-sort/sort-formats/format-row/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvDeserializationSchema.java similarity index 100% rename from inlong-sort/sort-formats/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvDeserializationSchema.java rename to inlong-sort/sort-formats/format-row/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvDeserializationSchema.java diff --git a/inlong-sort/sort-formats/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvFormatBuilder.java b/inlong-sort/sort-formats/format-row/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvFormatBuilder.java similarity index 100% rename from inlong-sort/sort-formats/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvFormatBuilder.java rename to inlong-sort/sort-formats/format-row/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvFormatBuilder.java diff --git a/inlong-sort/sort-formats/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvFormatFactory.java b/inlong-sort/sort-formats/format-row/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvFormatFactory.java similarity index 100% rename from inlong-sort/sort-formats/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvFormatFactory.java rename to inlong-sort/sort-formats/format-row/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvFormatFactory.java diff --git a/inlong-sort/sort-formats/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvSerializationSchema.java b/inlong-sort/sort-formats/format-row/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvSerializationSchema.java similarity index 100% rename from inlong-sort/sort-formats/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvSerializationSchema.java rename to inlong-sort/sort-formats/format-row/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvSerializationSchema.java diff --git a/inlong-sort/sort-formats/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvValidator.java b/inlong-sort/sort-formats/format-row/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvValidator.java similarity index 100% rename from inlong-sort/sort-formats/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvValidator.java rename to inlong-sort/sort-formats/format-row/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvValidator.java diff --git a/inlong-sort/sort-formats/format-kv/src/main/resources/META-INF/services/org.apache.flink.table.factories.TableFactory b/inlong-sort/sort-formats/format-row/format-kv/src/main/resources/META-INF/services/org.apache.flink.table.factories.TableFactory similarity index 100% rename from inlong-sort/sort-formats/format-kv/src/main/resources/META-INF/services/org.apache.flink.table.factories.TableFactory rename to inlong-sort/sort-formats/format-row/format-kv/src/main/resources/META-INF/services/org.apache.flink.table.factories.TableFactory diff --git a/inlong-sort/sort-formats/format-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvDeserializationSchemaTest.java b/inlong-sort/sort-formats/format-row/format-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvDeserializationSchemaTest.java similarity index 100% rename from inlong-sort/sort-formats/format-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvDeserializationSchemaTest.java rename to inlong-sort/sort-formats/format-row/format-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvDeserializationSchemaTest.java diff --git a/inlong-sort/sort-formats/format-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvFormatFactoryTest.java b/inlong-sort/sort-formats/format-row/format-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvFormatFactoryTest.java similarity index 100% rename from inlong-sort/sort-formats/format-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvFormatFactoryTest.java rename to inlong-sort/sort-formats/format-row/format-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvFormatFactoryTest.java diff --git a/inlong-sort/sort-formats/format-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvSerializationSchemaTest.java b/inlong-sort/sort-formats/format-row/format-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvSerializationSchemaTest.java similarity index 100% rename from inlong-sort/sort-formats/format-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvSerializationSchemaTest.java rename to inlong-sort/sort-formats/format-row/format-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvSerializationSchemaTest.java diff --git a/inlong-sort/sort-formats/format-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvTest.java b/inlong-sort/sort-formats/format-row/format-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvTest.java similarity index 100% rename from inlong-sort/sort-formats/format-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvTest.java rename to inlong-sort/sort-formats/format-row/format-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvTest.java diff --git a/inlong-sort/sort-formats/format-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvUtilsTest.java b/inlong-sort/sort-formats/format-row/format-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvUtilsTest.java similarity index 100% rename from inlong-sort/sort-formats/format-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvUtilsTest.java rename to inlong-sort/sort-formats/format-row/format-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvUtilsTest.java diff --git a/inlong-sort/sort-formats/format-kv/src/test/resources/log4j2-test.properties b/inlong-sort/sort-formats/format-row/format-kv/src/test/resources/log4j2-test.properties similarity index 100% rename from inlong-sort/sort-formats/format-kv/src/test/resources/log4j2-test.properties rename to inlong-sort/sort-formats/format-row/format-kv/src/test/resources/log4j2-test.properties diff --git a/inlong-sort/sort-formats/format-base/pom.xml b/inlong-sort/sort-formats/format-row/pom.xml similarity index 60% copy from inlong-sort/sort-formats/format-base/pom.xml copy to inlong-sort/sort-formats/format-row/pom.xml index 94224a72aa..2e36aa9777 100644 --- a/inlong-sort/sort-formats/format-base/pom.xml +++ b/inlong-sort/sort-formats/format-row/pom.xml @@ -26,35 +26,41 @@ <version>1.11.0-SNAPSHOT</version> </parent> - <artifactId>sort-format-base</artifactId> - <name>Apache InLong - Sort Format-base</name> + <artifactId>format-row</artifactId> + <packaging>pom</packaging> + + <name>Apache InLong - Sort Format-Row</name> + + <modules> + <module>format-base</module> + <module>format-csv</module> + <module>format-kv</module> + <module>format-inlongmsg-base</module> + <module>format-inlongmsg-csv</module> + <module>format-inlongmsg-kv</module> + <module>format-inlongmsg-pb</module> + </modules> <properties> <inlong.root.dir>${project.parent.parent.parent.basedir}</inlong.root.dir> </properties> + <url>http://maven.apache.org</url> - <dependencies> - <dependency> - <groupId>org.apache.inlong</groupId> - <artifactId>sort-format-common</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-core</artifactId> - <version>${flink.version}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-table-common</artifactId> - <version>${flink.version}</version> - <scope>provided</scope> - </dependency> - - </dependencies> - + <profiles> + <profile> + <id>v1.13</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <modules> + <module>format-json-v1.13</module> + </modules> + </profile> + <profile> + <id>v1.15</id> + <modules> + <module>format-json-v1.15</module> + </modules> + </profile> + </profiles> </project> diff --git a/inlong-sort/sort-formats/format-base/pom.xml b/inlong-sort/sort-formats/format-rowdata/pom.xml similarity index 62% rename from inlong-sort/sort-formats/format-base/pom.xml rename to inlong-sort/sort-formats/format-rowdata/pom.xml index 94224a72aa..2c2a07f66b 100644 --- a/inlong-sort/sort-formats/format-base/pom.xml +++ b/inlong-sort/sort-formats/format-rowdata/pom.xml @@ -26,35 +26,13 @@ <version>1.11.0-SNAPSHOT</version> </parent> - <artifactId>sort-format-base</artifactId> - <name>Apache InLong - Sort Format-base</name> + <artifactId>format-rowdata</artifactId> <properties> + <maven.compiler.source>8</maven.compiler.source> + <maven.compiler.target>8</maven.compiler.target> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <inlong.root.dir>${project.parent.parent.parent.basedir}</inlong.root.dir> </properties> - <dependencies> - <dependency> - <groupId>org.apache.inlong</groupId> - <artifactId>sort-format-common</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-core</artifactId> - <version>${flink.version}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-table-common</artifactId> - <version>${flink.version}</version> - <scope>provided</scope> - </dependency> - - </dependencies> - </project> diff --git a/inlong-sort/sort-formats/pom.xml b/inlong-sort/sort-formats/pom.xml index 3f668091db..57cd3bca7b 100644 --- a/inlong-sort/sort-formats/pom.xml +++ b/inlong-sort/sort-formats/pom.xml @@ -32,13 +32,8 @@ <modules> <module>format-common</module> - <module>format-base</module> - <module>format-csv</module> - <module>format-kv</module> - <module>format-inlongmsg-base</module> - <module>format-inlongmsg-csv</module> - <module>format-inlongmsg-kv</module> - <module>format-inlongmsg-pb</module> + <module>format-row</module> + <module>format-rowdata</module> </modules> <properties> @@ -211,22 +206,4 @@ <url>https://git.code.oa.com/flink/flink-formats</url> </scm> - <profiles> - <profile> - <id>v1.13</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <modules> - <module>format-json-v1.13</module> - </modules> - </profile> - <profile> - <id>v1.15</id> - <modules> - <module>format-json-v1.15</module> - </modules> - </profile> - </profiles> - </project>