From c095fa5ce6a1f868be7b364a6ac051d0071be560 Mon Sep 17 00:00:00 2001 From: ZhouJinsong Date: Thu, 30 Nov 2023 15:41:48 +0800 Subject: [PATCH] [AMORO-2369]Optimize project module structure (#2374) * change module structure * add ams/dist * rollback docs format change * Rollback README format change * Rollback README format change * Rollback docs format change * Change Github CI configuration & docker build scripts * Change Github CI configurations --- .github/workflows/core-hadoop2-ci.yml | 8 ++-- .github/workflows/core-hadoop3-ci.yml | 8 ++-- .github/workflows/docker-images.yml | 6 +-- .github/workflows/trino-ci.yml | 8 ++-- .gitignore | 8 ++-- README.md | 19 ++++---- {dist => ams/dist}/pom.xml | 4 +- .../dist}/src/main/arctic-bin/bin/ams.sh | 0 .../src/main/arctic-bin/bin/load-config.sh | 0 .../src/main/arctic-bin/bin/optimizer.sh | 0 .../src/main/arctic-bin/conf/config.yaml | 0 .../src/main/arctic-bin/conf/jvm.properties | 0 .../dist}/src/main/arctic-bin/conf/log4j2.xml | 0 .../main/arctic-bin/conf/optimize/log4j2.xml | 0 .../main/arctic-bin/metrics/log_emitter.yaml | 0 .../dist}/src/main/assemblies/bin.xml | 14 +++--- ams/optimizer/common/pom.xml | 4 +- ams/optimizer/flink-optimizer/pom.xml | 2 +- ams/optimizer/pom.xml | 2 +- ams/optimizer/standalone-optimizer/pom.xml | 2 +- ams/pom.xml | 3 +- ams/server/pom.xml | 6 +-- docker/amoro/Dockerfile | 2 +- docker/build.sh | 10 ++-- docker/quickdemo/Dockerfile | 4 +- docs/admin-guides/deployment.md | 32 ++++++------- docs/engines/flink/flink-get-started.md | 8 ++-- docs/engines/spark/spark-get-started.md | 14 +++--- docs/engines/trino.md | 6 +-- .../flink}/flink-common-format/pom.xml | 6 +-- .../arctic/flink/shuffle/LogRecordV1.java | 0 .../arctic/flink/shuffle/RowKindUtil.java | 0 .../flink-common-iceberg-bridge/pom.xml | 10 ++-- .../data/AdaptHiveFlinkParquetReaders.java | 0 .../data/AdaptHiveFlinkParquetWriters.java | 0 ...daptHiveParquetWithFlinkSchemaVisitor.java | 0 .../source/RowDataFileScanTaskReader.java | 0 .../iceberg/flink/source/ScanContext.java | 0 {flink => mixed/flink}/flink-common/pom.xml | 14 +++--- .../netease/arctic/flink/FlinkSchemaUtil.java | 0 .../arctic/flink/InternalCatalogBuilder.java | 0 .../arctic/flink/catalog/ArcticCatalog.java | 0 .../factories/ArcticCatalogFactory.java | 0 .../ArcticCatalogFactoryOptions.java | 0 ...FlinkTablePropertiesInvocationHandler.java | 0 .../interceptor/KerberosInterceptor.java | 0 .../KerberosInvocationHandler.java | 0 .../flink/interceptor/ProxyFactory.java | 0 .../lookup/ArcticRowDataLookupFunction.java | 0 .../flink/lookup/BasicLookupFunction.java | 0 .../BinaryRowDataSerializerWrapper.java | 0 .../flink/lookup/ByteArraySetSerializer.java | 0 .../arctic/flink/lookup/ByteArrayWrapper.java | 0 .../netease/arctic/flink/lookup/KVTable.java | 0 .../arctic/flink/lookup/KVTableFactory.java | 0 .../arctic/flink/lookup/KeyRowData.java | 0 .../arctic/flink/lookup/LookupMetrics.java | 0 .../arctic/flink/lookup/LookupOptions.java | 0 .../arctic/flink/lookup/LookupRecord.java | 0 .../flink/lookup/RocksDBCacheState.java | 0 .../flink/lookup/RocksDBRecordState.java | 0 .../flink/lookup/RocksDBSetSpilledState.java | 0 .../arctic/flink/lookup/RocksDBSetState.java | 0 .../flink/lookup/RowDataStateFactory.java | 0 .../flink/lookup/SecondaryIndexTable.java | 0 .../arctic/flink/lookup/TableFactory.java | 0 .../arctic/flink/lookup/UniqueIndexTable.java | 0 .../flink/lookup/filter/RowDataPredicate.java | 0 .../RowDataPredicateExpressionVisitor.java | 0 .../arctic/flink/metric/MetricConstant.java | 0 .../arctic/flink/metric/MetricsGenerator.java | 0 .../planner/calcite/FlinkTypeSystem.java | 0 .../read/AdaptHiveFlinkParquetReaders.java | 0 .../arctic/flink/read/ArcticSource.java | 0 .../arctic/flink/read/FlinkSplitPlanner.java | 0 .../flink/read/MixedIncrementalLoader.java | 0 .../flink/read/PartitionAndNodeGroup.java | 0 .../hybrid/assigner/ShuffleSplitAssigner.java | 0 .../flink/read/hybrid/assigner/Split.java | 0 .../read/hybrid/assigner/SplitAssigner.java | 0 .../hybrid/assigner/StaticSplitAssigner.java | 0 .../enumerator/AbstractArcticEnumerator.java | 0 .../enumerator/ArcticEnumeratorOffset.java | 0 .../ArcticEnumeratorOffsetSerializer.java | 0 .../enumerator/ArcticSourceEnumState.java | 0 .../ArcticSourceEnumStateSerializer.java | 0 .../enumerator/ArcticSourceEnumerator.java | 0 .../ContinuousEnumerationResult.java | 0 .../enumerator/ContinuousSplitPlanner.java | 0 .../ContinuousSplitPlannerImpl.java | 0 .../InitializationFinishedEvent.java | 0 .../MergeOnReadIncrementalPlanner.java | 0 .../enumerator/MergeOnReadPlannerImpl.java | 0 .../StaticArcticSourceEnumerator.java | 0 .../hybrid/reader/ArcticRecordEmitter.java | 0 .../hybrid/reader/ArcticRecordWithOffset.java | 0 .../hybrid/reader/ArcticSourceReader.java | 0 .../read/hybrid/reader/ArrayBatchRecords.java | 0 .../reader/ArrayPoolDataIteratorBatcher.java | 0 .../hybrid/reader/DataIteratorBatcher.java | 0 .../reader/DataIteratorReaderFunction.java | 0 .../read/hybrid/reader/HybridSplitReader.java | 0 .../read/hybrid/reader/ReaderFunction.java | 0 .../hybrid/reader/ReaderStartedEvent.java | 0 .../read/hybrid/reader/RecordFactory.java | 0 .../read/hybrid/reader/RecordPosition.java | 0 .../hybrid/reader/RowDataReaderFunction.java | 0 .../hybrid/reader/RowDataRecordFactory.java | 0 .../flink/read/hybrid/split/ArcticSplit.java | 0 .../hybrid/split/ArcticSplitSerializer.java | 0 .../read/hybrid/split/ArcticSplitState.java | 0 .../read/hybrid/split/ChangelogSplit.java | 0 .../read/hybrid/split/MergeOnReadSplit.java | 0 .../read/hybrid/split/SnapshotSplit.java | 0 .../read/hybrid/split/SplitRequestEvent.java | 0 .../read/hybrid/split/TemporalJoinSplits.java | 0 .../internals/KafkaPartitionSplitReader.java | 0 .../flink/read/internals/KafkaSource.java | 0 .../internals/KafkaSourceFetcherManager.java | 0 .../read/internals/KafkaSourceReader.java | 0 .../metrics/KafkaConsumerMetricConstants.java | 0 .../flink/read/source/ArcticScanContext.java | 0 .../read/source/ChangeLogDataIterator.java | 0 .../flink/read/source/DataIterator.java | 0 .../flink/read/source/FileScanTaskReader.java | 0 .../read/source/FlinkArcticDataReader.java | 0 .../read/source/FlinkArcticMORDataReader.java | 0 .../read/source/MergeOnReadDataIterator.java | 0 .../read/source/log/LogSourceHelper.java | 0 .../log/kafka/LogKafkaPartitionSplit.java | 0 .../kafka/LogKafkaPartitionSplitReader.java | 0 .../kafka/LogKafkaPartitionSplitState.java | 0 .../log/kafka/LogKafkaRecordEmitter.java | 0 .../read/source/log/kafka/LogKafkaSource.java | 0 .../log/kafka/LogKafkaSourceBuilder.java | 0 .../log/kafka/LogKafkaSourceReader.java | 0 .../log/kafka/LogRecordWithRetractInfo.java | 0 .../flink/shuffle/ReadShuffleRulePolicy.java | 0 .../shuffle/RoundRobinShuffleRulePolicy.java | 0 .../arctic/flink/shuffle/ShuffleHelper.java | 0 .../arctic/flink/shuffle/ShuffleKey.java | 0 .../flink/shuffle/ShuffleRulePolicy.java | 0 .../arctic/flink/table/ArcticDynamicSink.java | 0 .../flink/table/ArcticDynamicSource.java | 0 .../arctic/flink/table/ArcticFileSource.java | 0 .../arctic/flink/table/ArcticTableLoader.java | 0 .../flink/table/DynamicTableFactory.java | 0 .../arctic/flink/table/FlinkSource.java | 0 .../table/KafkaConnectorOptionsUtil.java | 0 .../arctic/flink/table/LogDynamicSource.java | 0 .../UnkeyedInputFormatOperatorFactory.java | 0 .../UnkeyedInputFormatSourceFunction.java | 0 .../table/descriptors/ArcticValidator.java | 0 .../arctic/flink/util/ArcticUtils.java | 0 .../util/CompatibleFlinkPropertyUtil.java | 0 .../arctic/flink/util/DateTimeUtils.java | 0 .../netease/arctic/flink/util/FilterUtil.java | 0 .../flink/util/FlinkClassReflectionUtil.java | 0 .../flink/util/IcebergAndFlinkFilters.java | 0 .../arctic/flink/util/IcebergClassUtil.java | 0 .../netease/arctic/flink/util/LookupUtil.java | 0 .../netease/arctic/flink/util/Projection.java | 0 .../netease/arctic/flink/util/ProxyUtil.java | 0 .../arctic/flink/util/ReflectionUtil.java | 0 .../arctic/flink/util/ThreadLocalCache.java | 0 .../write/AdaptHiveFlinkAppenderFactory.java | 0 .../arctic/flink/write/ArcticFileWriter.java | 0 .../arctic/flink/write/ArcticLogWriter.java | 0 .../write/ArcticRowDataTaskWriterFactory.java | 0 .../arctic/flink/write/ArcticWriter.java | 0 .../write/AutomaticDoubleWriteStatus.java | 0 .../flink/write/AutomaticLogWriter.java | 0 .../write/AutomaticWriteSpecification.java | 0 .../flink/write/FlinkBaseTaskWriter.java | 0 .../flink/write/FlinkChangeTaskWriter.java | 0 .../netease/arctic/flink/write/FlinkSink.java | 0 .../flink/write/FlinkTaskWriterBuilder.java | 0 .../write/hidden/AbstractHiddenLogWriter.java | 0 .../write/hidden/ArcticLogPartitioner.java | 0 .../write/hidden/GlobalFlipCommitter.java | 0 .../flink/write/hidden/HiddenLogWriter.java | 0 .../flink/write/hidden/LogMsgFactory.java | 0 .../hidden/kafka/HiddenKafkaFactory.java | 0 .../hidden/kafka/HiddenKafkaProducer.java | 0 .../org.apache.flink.table.factories.Factory | 0 .../src/main/resources/log4j.properties | 0 .../flink/DynamicTableSourceTestBase.java | 0 .../arctic/flink/FlinkTableTestBase.java | 0 .../netease/arctic/flink/FlinkTestBase.java | 0 .../arctic/flink/TestFlinkSchemaUtil.java | 0 .../TestArcticCatalogTablePartitions.java | 0 .../arctic/flink/catalog/TestCatalog.java | 0 .../kafka/testutils/KafkaConfigGenerate.java | 0 .../kafka/testutils/KafkaContainerTest.java | 0 .../flink/kafka/testutils/KafkaUtil.java | 0 .../kafka/testutils/SuccessException.java | 0 .../lookup/ByteArraySetSerializerTest.java | 0 .../arctic/flink/lookup/TestKVTable.java | 0 .../TestRowDataPredicateAllFieldTypes.java | 0 .../filter/TestRowDataPredicateBase.java | 0 ...TestRowDataPredicateExpressionVisitor.java | 0 .../arctic/flink/read/TestArcticSource.java | 0 .../arctic/flink/read/TestFlinkSource.java | 0 .../flink/read/TestFlinkSplitPlanner.java | 0 .../read/hidden/kafka/TestKafkaConsumer.java | 0 .../hidden/kafka/TestKafkaSourceReader.java | 0 .../TestLogKafkaPartitionSplitReader.java | 0 .../assigner/TestShuffleSplitAssigner.java | 0 .../assigner/TestSplitAssignerAwaiting.java | 0 .../assigner/TestStaticSplitAssigner.java | 0 .../TestArcticSourceEnumStateSerializer.java | 0 .../TestArcticSourceEnumerator.java | 0 .../TestContinuousSplitPlannerImpl.java | 0 .../TestTemporalJoinSplitsThreadSafe.java | 0 .../reader/MixedIncrementalLoaderTest.java | 0 .../reader/TestRowDataReaderFunction.java | 0 .../split/TestArcticSplitSerializer.java | 0 .../arctic/flink/shuffle/TestLogRecordV1.java | 0 .../TestRoundRobinShuffleRulePolicy.java | 0 .../arctic/flink/table/CatalogITCaseBase.java | 0 .../arctic/flink/table/LookupITCase.java | 0 .../netease/arctic/flink/table/TestJoin.java | 0 .../netease/arctic/flink/table/TestKeyed.java | 0 .../flink/table/TestLookupSecondary.java | 0 .../arctic/flink/table/TestTableRefresh.java | 0 .../arctic/flink/table/TestUnkeyed.java | 0 .../flink/table/TestUnkeyedOverwrite.java | 0 .../arctic/flink/table/TestWatermark.java | 0 .../arctic/flink/util/ClassLoaderUtils.java | 0 .../netease/arctic/flink/util/DataUtil.java | 0 .../flink/util/MockEnvironmentArctic.java | 0 .../flink/util/MockEnvironmentBuilder.java | 0 .../util/TestCompatibleFlinkPropertyUtil.java | 0 .../util/TestGlobalAggregateManager.java | 0 .../TestOneInputStreamOperatorIntern.java | 0 .../arctic/flink/util/TestProjection.java | 0 .../netease/arctic/flink/util/TestUtil.java | 0 .../flink/write/ArcticFileWriterITCase.java | 0 .../flink/write/FlinkTaskWriterBaseTest.java | 0 .../flink/write/TestAdaptHiveWriter.java | 0 .../flink/write/TestArcticFileCommitter.java | 0 .../flink/write/TestArcticFileWriter.java | 0 .../write/TestAutomaticDoubleWriteStatus.java | 0 .../flink/write/TestAutomaticLogWriter.java | 0 .../arctic/flink/write/TestFlinkSink.java | 0 .../flink/write/hidden/kafka/TestBaseLog.java | 0 .../hidden/kafka/TestHiddenKafkaProducer.java | 0 .../hidden/kafka/TestHiddenLogOperators.java | 0 .../org.apache.flink.table.factories.Factory | 0 .../src/test/resources/log4j2-test.xml | 0 .../resources/log4j2.component.properties | 0 {flink => mixed/flink}/pom.xml | 12 ++--- .../flink}/v1.15/flink-runtime/pom.xml | 10 ++-- {flink => mixed/flink}/v1.15/flink/pom.xml | 8 ++-- .../flink}/v1.16/flink-runtime/pom.xml | 10 ++-- {flink => mixed/flink}/v1.16/flink/pom.xml | 8 ++-- .../flink}/v1.17/flink-runtime/pom.xml | 10 ++-- {flink => mixed/flink}/v1.17/flink/pom.xml | 8 ++-- {hive => mixed/hive}/pom.xml | 6 +-- .../arctic/hive/ArcticHiveClientPool.java | 0 .../arctic/hive/CachedHiveClientPool.java | 0 .../com/netease/arctic/hive/HMSClient.java | 0 .../netease/arctic/hive/HMSClientImpl.java | 0 .../netease/arctic/hive/HMSClientPool.java | 0 .../arctic/hive/HiveTableProperties.java | 0 .../hive/catalog/ArcticHiveCatalog.java | 0 .../arctic/hive/catalog/MixedHiveTables.java | 0 .../CannotAlterHiveLocationException.java | 0 .../AbstractAdaptHiveKeyedDataReader.java | 0 .../AbstractAdaptHiveUnkeyedDataReader.java | 0 .../reader/AdaptHiveArcticDeleteFilter.java | 0 .../AdaptHiveGenericKeyedDataReader.java | 0 .../AdaptHiveGenericUnkeyedDataReader.java | 0 .../AdaptHiveGenericTaskWriterBuilder.java | 0 .../AdaptHiveOperateToTableRelation.java | 0 .../io/writer/AdaptHiveOutputFileFactory.java | 0 .../io/writer/OperateToTableRelation.java | 0 .../arctic/hive/op/BaseSchemaUpdate.java | 0 .../hive/op/HiveOperationTransaction.java | 0 .../arctic/hive/op/HiveSchemaUpdate.java | 0 .../arctic/hive/op/OverwriteHiveFiles.java | 0 .../arctic/hive/op/ReplaceHivePartitions.java | 0 .../arctic/hive/op/RewriteHiveFiles.java | 0 .../arctic/hive/op/UpdateHiveFiles.java | 0 .../MixFormatOptimizingDataReader.java | 0 .../optimizing/MixFormatRewriteExecutor.java | 0 .../MixFormatRewriteExecutorFactory.java | 0 .../arctic/hive/table/HiveLocationKind.java | 0 .../arctic/hive/table/KeyedHiveTable.java | 0 .../arctic/hive/table/SupportHive.java | 0 .../arctic/hive/table/UnkeyedHiveTable.java | 0 .../arctic/hive/utils/CatalogUtil.java | 0 .../arctic/hive/utils/ChangeFieldName.java | 0 .../utils/CompatibleHivePropertyUtil.java | 0 .../arctic/hive/utils/HiveCommitUtil.java | 0 .../hive/utils/HiveMetaSynchronizer.java | 0 .../arctic/hive/utils/HivePartitionUtil.java | 0 .../arctic/hive/utils/HiveSchemaUtil.java | 0 .../arctic/hive/utils/HiveTableUtil.java | 0 .../arctic/hive/utils/TableTypeUtil.java | 0 .../netease/arctic/hive/utils/TimeUtil.java | 0 .../hive/utils/UpgradeHiveTableUtil.java | 0 .../ppr/PartitionExpressionForMetastore.java | 0 .../AuthorizationPreEventListener.java | 0 .../org/apache/iceberg/IcebergSchemaUtil.java | 0 .../data/AdaptHiveGenericAppenderFactory.java | 0 .../parquet/AdaptHiveBaseParquetReaders.java | 0 .../parquet/AdaptHiveBaseParquetWriter.java | 0 .../AdaptHiveGenericParquetReaders.java | 0 .../AdaptHiveGenericParquetWriter.java | 0 .../parquet/AdaptHiveApplyNameMapping.java | 0 .../parquet/AdaptHiveColumnWriter.java | 0 .../iceberg/parquet/AdaptHiveParquet.java | 0 .../parquet/AdaptHiveParquetConversions.java | 0 ...ptHiveParquetDictionaryRowGroupFilter.java | 0 ...AdaptHiveParquetMetricsRowGroupFilter.java | 0 .../parquet/AdaptHiveParquetReader.java | 0 .../parquet/AdaptHiveParquetSchemaUtil.java | 0 .../iceberg/parquet/AdaptHiveParquetUtil.java | 0 .../parquet/AdaptHiveParquetWriter.java | 0 .../parquet/AdaptHivePrimitiveWriter.java | 0 .../iceberg/parquet/AdaptHiveReadConf.java | 0 .../parquet/AdaptHiveTypeToMessageType.java | 0 .../netease/arctic/hive/HMSMockServer.java | 0 .../arctic/hive/MixedHiveTableTestBase.java | 0 .../java/com/netease/arctic/hive/TestHMS.java | 0 .../hive/catalog/HiveCatalogTestHelper.java | 0 .../hive/catalog/HiveTableTestHelper.java | 0 .../hive/catalog/TestHiveCatalogLoader.java | 0 .../hive/catalog/TestMixedHiveCatalog.java | 0 .../formats/IcebergHiveCatalogTestHelper.java | 0 .../MixedIcebergHiveCatalogTestHelper.java | 0 .../formats/PaimonHiveCatalogTestHelper.java | 0 .../formats/TestIcebergHiveAmoroCatalog.java | 0 .../TestMixedIcebergHiveAmoroCatalog.java | 0 .../formats/TestPaimonHiveAmoroCatalog.java | 0 .../arctic/hive/io/HiveDataTestHelpers.java | 0 .../hive/io/TestHiveTableTrashManagers.java | 0 .../arctic/hive/io/TestHiveTaskReader.java | 0 .../arctic/hive/io/TestHiveTaskWriter.java | 0 .../arctic/hive/io/TestImpalaParquet.java | 0 .../arctic/hive/op/TestHiveSchemaUpdate.java | 0 .../arctic/hive/op/TestOverwriteFiles.java | 0 .../arctic/hive/op/TestRewriteFiles.java | 0 .../arctic/hive/op/TestRewritePartitions.java | 0 .../arctic/hive/op/TestSyncHiveMeta.java | 0 .../hive/op/UpdateHiveFilesTestHelpers.java | 0 .../utils/TestCompatibleHivePropertyUtil.java | 0 .../hive/utils/TestHiveMetaSynchronizer.java | 0 .../arctic/hive/utils/TestHiveSchemaUtil.java | 0 .../arctic/hive/utils/TestTimeUtil.java | 0 .../hive/utils/TestUpgradeHiveTableUtil.java | 0 .../parquet/TestAdaptHiveReadConf.java | 0 .../resources/hive-schema-3.1.0.derby.sql | 0 .../hive}/src/test/resources/hive.parquet | Bin .../hive}/src/test/resources/log4j2.xml | 0 .../test/resources/string_is_bytes.parquet | Bin mixed/pom.xml | 43 ++++++++++++++++++ {spark => mixed/spark}/common/pom.xml | 10 ++-- .../arctic/spark/ArcticTableStoreType.java | 0 .../arctic/spark/SparkSQLProperties.java | 0 .../spark/utils/MixedFormatSparkUtil.java | 0 .../arctic/spark/test/SparkTableTestBase.java | 0 .../arctic/spark/test/SparkTestBase.java | 0 .../arctic/spark/test/SparkTestContext.java | 0 .../extensions/DefaultParameterContext.java | 0 .../extensions/EachParameterResolver.java | 0 .../test/extensions/EnableCatalogSelect.java | 0 .../EnableCatalogSelectExtension.java | 0 .../arctic/spark/test/utils/Asserts.java | 0 .../spark/test/utils/DataComparator.java | 0 .../spark/test/utils/ExpectResultUtil.java | 0 .../spark/test/utils/RecordGenerator.java | 0 .../spark/test/utils/ResourceInputFile.java | 0 .../spark/test/utils/ScalaTestUtil.java | 0 .../arctic/spark/test/utils/TableFiles.java | 0 .../arctic/spark/test/utils/TestTable.java | 0 .../spark/test/utils/TestTableUtil.java | 0 .../arctic/spark/test/utils/TestTables.java | 0 {spark => mixed/spark}/pom.xml | 6 +-- .../spark}/v3.1/spark-runtime/pom.xml | 16 +++---- {spark => mixed/spark}/v3.1/spark/pom.xml | 14 +++--- .../spark/sql/parser/ArcticSqlCommand.g4 | 0 .../spark/sql/parser/ArcticSqlExtend.g4 | 0 .../v3.1/spark/src/main/gen-antlr/.gitignore | 0 .../parser/ArcticSqlCommandBaseListener.java | 0 .../parser/ArcticSqlCommandBaseVisitor.java | 0 .../sql/parser/ArcticSqlCommandLexer.java | 0 .../sql/parser/ArcticSqlCommandListener.java | 0 .../sql/parser/ArcticSqlCommandParser.java | 0 .../sql/parser/ArcticSqlCommandVisitor.java | 0 .../parser/ArcticSqlExtendBaseListener.java | 0 .../parser/ArcticSqlExtendBaseVisitor.java | 0 .../sql/parser/ArcticSqlExtendLexer.java | 0 .../sql/parser/ArcticSqlExtendListener.java | 0 .../sql/parser/ArcticSqlExtendParser.java | 0 .../sql/parser/ArcticSqlExtendVisitor.java | 0 .../arctic/spark/ArcticSparkCatalog.java | 0 .../spark/ArcticSparkSessionCatalog.java | 0 .../spark/MultiDelegateSessionCatalog.java | 0 .../netease/arctic/spark/Spark31Adapter.java | 0 .../netease/arctic/spark/SparkAdapter.java | 0 .../arctic/spark/SparkAdapterLoader.java | 0 .../spark/SparkInternalRowCastWrapper.java | 0 .../arctic/spark/SparkInternalRowWrapper.java | 0 .../spark/command/ArcticSparkCommand.java | 0 .../spark/command/MigrateToArcticCommand.java | 0 .../spark/io/ArcticSparkBaseTaskWriter.java | 0 .../spark/io/ArcticSparkChangeTaskWriter.java | 0 .../io/InternalRowFileAppenderFactory.java | 0 .../netease/arctic/spark/io/TaskWriters.java | 0 .../spark/io/UnkeyedUpsertSparkWriter.java | 0 .../reader/ArcticSparkKeyedDataReader.java | 0 .../reader/ArcticSparkUnkeyedDataReader.java | 0 .../spark/reader/KeyedSparkBatchScan.java | 0 .../spark/reader/SparkParquetReaders.java | 0 .../arctic/spark/reader/SparkScanBuilder.java | 0 .../spark/reader/UnkeyedSparkBatchScan.java | 0 .../arctic/spark/source/ArcticSource.java | 0 .../netease/arctic/spark/sql/Exceptions.java | 0 .../parser/ArcticCommandAstParser.java | 0 .../connector/expressions/Expressions.java | 0 .../expressions/FileIndexBucket.java | 0 .../spark/table/ArcticIcebergSparkTable.java | 0 .../spark/table/ArcticSparkChangeTable.java | 0 .../arctic/spark/table/ArcticSparkTable.java | 0 .../table/SupportsExtendIdentColumns.java | 0 .../spark/table/SupportsRowLevelOperator.java | 0 .../arctic/spark/util/ArcticSparkUtils.java | 0 .../util/DistributionAndOrderingUtil.java | 0 .../arctic/spark/util/ExpressionHelper.java | 0 .../arctic/spark/util/SortOrderToSpark.java | 0 .../com/netease/arctic/spark/util/Stats.java | 0 .../spark/writer/ArcticSparkWriteBuilder.java | 0 .../spark/writer/KeyedSparkBatchWrite.java | 0 .../arctic/spark/writer/RowLevelWriter.java | 0 .../writer/SimpleInternalRowDataWriter.java | 0 .../writer/SimpleRowLevelDataWriter.java | 0 .../spark/writer/UnkeyedSparkBatchWrite.java | 0 .../arctic/spark/writer/WriteMode.java | 0 .../arctic/spark/writer/WriteTaskCommit.java | 0 ...daptHiveParquetWithSparkSchemaVisitor.java | 0 .../data/AdaptHiveSparkParquetWriters.java | 0 ...pache.spark.sql.sources.DataSourceRegister | 0 .../arctic/spark/ArcticSparkExtensions.scala | 0 .../arctic/spark/SupportSparkAdapter.scala | 0 .../spark/sql/ArcticExtensionUtils.scala | 0 .../analysis/QueryWithConstraintCheck.scala | 0 .../analysis/ResolveArcticCommand.scala | 0 .../ResolveMergeIntoTableReferences.scala | 0 .../analysis/RewriteArcticCommand.scala | 0 .../analysis/RewriteMergeIntoTable.scala | 0 .../catalyst/optimize/OptimizeWriteRule.scala | 0 .../optimize/RewriteAppendArcticTable.scala | 0 .../RewriteDeleteFromArcticTable.scala | 0 .../optimize/RewriteUpdateArcticTable.scala | 0 .../catalyst/parser/ArcticParserUtils.scala | 0 .../parser/ArcticSqlExtensionsParser.scala | 0 .../plans/AlterArcticTableDropPartition.scala | 0 .../catalyst/plans/ArcticRowLevelWrite.scala | 0 .../catalyst/plans/MergeIntoArcticTable.scala | 0 .../spark/sql/catalyst/plans/MergeRows.scala | 0 .../plans/MigrateToArcticStatement.scala | 0 .../plans/QueryWithConstraintCheckPlan.scala | 0 .../catalyst/plans/TruncateArcticTable.scala | 0 .../spark/sql/catalyst/plans/logicals.scala | 0 .../AlterArcticTableDropPartitionExec.scala | 0 .../sql/execution/ArcticCommandExec.scala | 0 .../execution/ArcticRowLevelWriteExec.scala | 0 .../execution/DescribeKeyedTableExec.scala | 0 .../execution/ExtendedArcticStrategy.scala | 0 .../execution/ExtendedIcebergStrategy.scala | 0 .../spark/sql/execution/MergeRowsExec.scala | 0 .../QueryWithConstraintCheckExec.scala | 0 .../execution/TruncateArcticTableExec.scala | 0 .../spark/sql/utils/ArcticRewriteHelper.scala | 0 .../sql/utils/ProjectingInternalRow.scala | 0 .../spark/sql/utils/RowDeltaUtils.scala | 0 .../sql/utils/WriteQueryProjections.scala | 0 .../ArcticSpark31CatalystHelper.scala | 0 .../arctic/catalyst/ExpressionHelper.scala | 0 .../ExtendedV2ExistingTableWriteExec.scala | 0 .../arctic/execution/WritingSparkTask.scala | 0 .../sql/arctic/parser/ExtendAstBuilder.scala | 0 .../spark/test/suites/TestImpalaParquet.java | 0 .../api/TestKeyedTableDataFrameAPI.java | 0 .../api/TestUnKeyedTableDataFrameAPI.java | 0 .../suites/catalog/TestSessionCatalog.java | 0 .../test/suites/catalog/TestSparkCatalog.java | 0 .../suites/sql/TestAlterTableColumnSQL.java | 0 .../test/suites/sql/TestArcticCommandSQL.java | 0 .../suites/sql/TestArcticSessionCatalog.java | 0 .../suites/sql/TestCreateTableAsSelect.java | 0 .../suites/sql/TestCreateTableLikeSQL.java | 0 .../test/suites/sql/TestCreateTableSQL.java | 0 .../test/suites/sql/TestDeleteFromSQL.java | 0 .../spark/test/suites/sql/TestDescSQL.java | 0 .../test/suites/sql/TestDropPartitionSQL.java | 0 .../test/suites/sql/TestInsertIntoSQL.java | 0 .../suites/sql/TestInsertOverwriteSQL.java | 0 .../test/suites/sql/TestMergeIntoSQL.java | 0 .../sql/TestMultiDelegateSessionCatalog.java | 0 .../spark/test/suites/sql/TestSelectSQL.java | 0 .../test/suites/sql/TestTruncateSQL.java | 0 .../spark/test/suites/sql/TestUpdateSQL.java | 0 .../ut/sql/parser/TestSqlExtendParser.java | 0 .../arctic/spark/writer/TestSparkWriter.java | 0 .../spark/src/test/resources/log4j.properties | 0 .../spark}/v3.2/spark-runtime/pom.xml | 16 +++---- {spark => mixed/spark}/v3.2/spark/pom.xml | 14 +++--- .../spark/sql/parser/ArcticSqlCommand.g4 | 0 .../spark/sql/parser/ArcticSqlExtend.g4 | 0 .../v3.2/spark/src/main/gen-antlr/.gitignore | 0 .../parser/ArcticSqlCommandBaseListener.java | 0 .../parser/ArcticSqlCommandBaseVisitor.java | 0 .../sql/parser/ArcticSqlCommandLexer.java | 0 .../sql/parser/ArcticSqlCommandListener.java | 0 .../sql/parser/ArcticSqlCommandParser.java | 0 .../sql/parser/ArcticSqlCommandVisitor.java | 0 .../parser/ArcticSqlExtendBaseListener.java | 0 .../parser/ArcticSqlExtendBaseVisitor.java | 0 .../sql/parser/ArcticSqlExtendLexer.java | 0 .../sql/parser/ArcticSqlExtendListener.java | 0 .../sql/parser/ArcticSqlExtendParser.java | 0 .../sql/parser/ArcticSqlExtendVisitor.java | 0 .../arctic/spark/ArcticSparkCatalog.java | 0 .../spark/ArcticSparkSessionCatalog.java | 0 .../spark/MultiDelegateSessionCatalog.java | 0 .../netease/arctic/spark/Spark32Adapter.java | 0 .../netease/arctic/spark/SparkAdapter.java | 0 .../arctic/spark/SparkAdapterLoader.java | 0 .../spark/SparkInternalRowCastWrapper.java | 0 .../arctic/spark/SparkInternalRowWrapper.java | 0 .../spark/command/ArcticSparkCommand.java | 0 .../spark/command/MigrateToArcticCommand.java | 0 .../spark/io/ArcticSparkBaseTaskWriter.java | 0 .../spark/io/ArcticSparkChangeTaskWriter.java | 0 .../io/InternalRowFileAppenderFactory.java | 0 .../netease/arctic/spark/io/TaskWriters.java | 0 .../spark/io/UnkeyedUpsertSparkWriter.java | 0 .../reader/ArcticSparkKeyedDataReader.java | 0 .../reader/ArcticSparkUnkeyedDataReader.java | 0 .../spark/reader/KeyedSparkBatchScan.java | 0 .../spark/reader/SparkParquetReaders.java | 0 .../arctic/spark/reader/SparkScanBuilder.java | 0 .../spark/reader/UnkeyedSparkBatchScan.java | 0 .../arctic/spark/source/ArcticSource.java | 0 .../parser/ArcticCommandAstParser.java | 0 .../expressions/FileIndexBucket.java | 0 .../spark/table/ArcticIcebergSparkTable.java | 0 .../spark/table/ArcticSparkChangeTable.java | 0 .../arctic/spark/table/ArcticSparkTable.java | 0 .../table/SupportsExtendIdentColumns.java | 0 .../spark/table/SupportsRowLevelOperator.java | 0 .../arctic/spark/util/ArcticSparkUtils.java | 0 .../util/DistributionAndOrderingUtil.java | 0 .../arctic/spark/util/ExpressionHelper.java | 0 .../arctic/spark/util/SortOrderToSpark.java | 0 .../com/netease/arctic/spark/util/Stats.java | 0 .../spark/writer/ArcticSparkWriteBuilder.java | 0 .../spark/writer/KeyedSparkBatchWrite.java | 0 .../arctic/spark/writer/RowLevelWriter.java | 0 .../writer/SimpleInternalRowDataWriter.java | 0 .../writer/SimpleRowLevelDataWriter.java | 0 .../spark/writer/UnkeyedSparkBatchWrite.java | 0 .../arctic/spark/writer/WriteMode.java | 0 .../arctic/spark/writer/WriteTaskCommit.java | 0 ...daptHiveParquetWithSparkSchemaVisitor.java | 0 .../data/AdaptHiveSparkParquetWriters.java | 0 ...pache.spark.sql.sources.DataSourceRegister | 0 .../arctic/spark/ArcticSparkExtensions.scala | 0 .../arctic/spark/SupportSparkAdapter.scala | 0 .../spark/sql/ArcticExtensionUtils.scala | 0 .../analysis/QueryWithConstraintCheck.scala | 0 .../analysis/ResolveArcticCommand.scala | 0 ...esolveMergeIntoArcticTableReferences.scala | 0 .../analysis/RewriteArcticCommand.scala | 0 .../RewriteArcticMergeIntoTable.scala | 0 .../catalyst/optimize/OptimizeWriteRule.scala | 0 .../optimize/RewriteAppendArcticTable.scala | 0 .../RewriteDeleteFromArcticTable.scala | 0 .../optimize/RewriteUpdateArcticTable.scala | 0 .../catalyst/parser/ArcticParserUtils.scala | 0 .../parser/ArcticSqlExtensionsParser.scala | 0 .../plans/AlterArcticTableDropPartition.scala | 0 .../catalyst/plans/ArcticRowLevelWrite.scala | 0 .../catalyst/plans/MergeIntoArcticTable.scala | 0 .../spark/sql/catalyst/plans/MergeRows.scala | 0 .../plans/QueryWithConstraintCheckPlan.scala | 0 .../catalyst/plans/TruncateArcticTable.scala | 0 .../UnresolvedMergeIntoArcticTable.scala | 0 .../spark/sql/catalyst/plans/logicals.scala | 0 .../spark/sql/catalyst/plans/statements.scala | 0 .../AlterArcticTableDropPartitionExec.scala | 0 .../sql/execution/ArcticCommandExec.scala | 0 .../execution/ArcticRowLevelWriteExec.scala | 0 .../execution/DescribeKeyedTableExec.scala | 0 .../execution/ExtendedArcticStrategy.scala | 0 .../spark/sql/execution/MergeRowsExec.scala | 0 .../QueryWithConstraintCheckExec.scala | 0 .../execution/TruncateArcticTableExec.scala | 0 .../spark/sql/utils/ArcticRewriteHelper.scala | 0 .../sql/utils/ProjectingInternalRow.scala | 0 .../spark/sql/utils/RowDeltaUtils.scala | 0 .../sql/utils/WriteQueryProjections.scala | 0 .../arctic/spark/sql/utils/expressions.scala | 0 .../arctic/catalyst/ArcticSpark32Helper.scala | 0 .../arctic/catalyst/ExpressionHelper.scala | 0 .../parser/ArcticSqlExtendAstBuilder.scala | 0 .../arctic/parser/QueryParsingErrors.scala | 0 .../arctic/spark/test/TestImpalaParquet.java | 0 .../api/TestKeyedTableDataFrameAPI.java | 0 .../api/TestUnKeyedTableDataFrameAPI.java | 0 .../suites/catalog/TestSessionCatalog.java | 0 .../test/suites/catalog/TestSparkCatalog.java | 0 .../suites/sql/TestAlterTableColumnSQL.java | 0 .../test/suites/sql/TestArcticCommandSQL.java | 0 .../suites/sql/TestArcticSessionCatalog.java | 0 .../suites/sql/TestCreateTableAsSelect.java | 0 .../suites/sql/TestCreateTableLikeSQL.java | 0 .../test/suites/sql/TestCreateTableSQL.java | 0 .../test/suites/sql/TestDeleteFromSQL.java | 0 .../spark/test/suites/sql/TestDescSQL.java | 0 .../test/suites/sql/TestDropPartitionSQL.java | 0 .../test/suites/sql/TestInsertIntoSQL.java | 0 .../suites/sql/TestInsertOverwriteSQL.java | 0 .../test/suites/sql/TestMergeIntoSQL.java | 0 .../sql/TestMultiDelegateSessionCatalog.java | 0 .../spark/test/suites/sql/TestSelectSQL.java | 0 .../test/suites/sql/TestTruncateSQL.java | 0 .../spark/test/suites/sql/TestUpdateSQL.java | 0 .../ut/sql/parser/TestSqlExtendParser.java | 0 .../arctic/spark/writer/TestSparkWriter.java | 0 .../src/test/resources/log4j2.properties | 0 .../spark}/v3.3/spark-runtime/pom.xml | 16 +++---- {spark => mixed/spark}/v3.3/spark/pom.xml | 14 +++--- .../spark/sql/parser/ArcticSqlCommand.g4 | 0 .../spark/sql/parser/ArcticSqlExtend.g4 | 0 .../v3.3/spark/src/main/gen-antlr/.gitignore | 0 .../parser/ArcticSqlCommandBaseListener.java | 0 .../parser/ArcticSqlCommandBaseVisitor.java | 0 .../sql/parser/ArcticSqlCommandLexer.java | 0 .../sql/parser/ArcticSqlCommandListener.java | 0 .../sql/parser/ArcticSqlCommandParser.java | 0 .../sql/parser/ArcticSqlCommandVisitor.java | 0 .../parser/ArcticSqlExtendBaseListener.java | 0 .../parser/ArcticSqlExtendBaseVisitor.java | 0 .../sql/parser/ArcticSqlExtendLexer.java | 0 .../sql/parser/ArcticSqlExtendListener.java | 0 .../sql/parser/ArcticSqlExtendParser.java | 0 .../sql/parser/ArcticSqlExtendVisitor.java | 0 .../arctic/spark/ArcticSparkCatalog.java | 0 .../spark/ArcticSparkSessionCatalog.java | 0 .../spark/MultiDelegateSessionCatalog.java | 0 .../netease/arctic/spark/Spark33Adapter.java | 0 .../netease/arctic/spark/SparkAdapter.java | 0 .../arctic/spark/SparkAdapterLoader.java | 0 .../spark/SparkInternalRowCastWrapper.java | 0 .../arctic/spark/SparkInternalRowWrapper.java | 0 .../spark/command/ArcticSparkCommand.java | 0 .../spark/command/MigrateToArcticCommand.java | 0 .../spark/io/ArcticSparkBaseTaskWriter.java | 0 .../spark/io/ArcticSparkChangeTaskWriter.java | 0 .../io/InternalRowFileAppenderFactory.java | 0 .../netease/arctic/spark/io/TaskWriters.java | 0 .../spark/io/UnkeyedUpsertSparkWriter.java | 0 .../reader/ArcticSparkKeyedDataReader.java | 0 .../reader/ArcticSparkUnkeyedDataReader.java | 0 .../spark/reader/KeyedSparkBatchScan.java | 0 .../spark/reader/SparkParquetReaders.java | 0 .../arctic/spark/reader/SparkScanBuilder.java | 0 .../spark/reader/UnkeyedSparkBatchScan.java | 0 .../arctic/spark/source/ArcticSource.java | 0 .../parser/ArcticCommandAstParser.java | 0 .../expressions/FileIndexBucket.java | 0 .../spark/table/ArcticIcebergSparkTable.java | 0 .../spark/table/ArcticSparkChangeTable.java | 0 .../arctic/spark/table/ArcticSparkTable.java | 0 .../table/SupportsExtendIdentColumns.java | 0 .../spark/table/SupportsRowLevelOperator.java | 0 .../arctic/spark/util/ArcticSparkUtils.java | 0 .../util/DistributionAndOrderingUtil.java | 0 .../arctic/spark/util/ExpressionHelper.java | 0 .../arctic/spark/util/SortOrderToSpark.java | 0 .../com/netease/arctic/spark/util/Stats.java | 0 .../spark/writer/ArcticSparkWriteBuilder.java | 0 .../spark/writer/KeyedSparkBatchWrite.java | 0 .../arctic/spark/writer/RowLevelWriter.java | 0 .../writer/SimpleInternalRowDataWriter.java | 0 .../writer/SimpleRowLevelDataWriter.java | 0 .../spark/writer/UnkeyedSparkBatchWrite.java | 0 .../arctic/spark/writer/WriteMode.java | 0 .../arctic/spark/writer/WriteTaskCommit.java | 0 ...daptHiveParquetWithSparkSchemaVisitor.java | 0 .../data/AdaptHiveSparkParquetWriters.java | 0 ...pache.spark.sql.sources.DataSourceRegister | 0 .../arctic/spark/ArcticSparkExtensions.scala | 0 .../arctic/spark/SupportSparkAdapter.scala | 0 .../spark/sql/ArcticExtensionUtils.scala | 0 .../analysis/QueryWithConstraintCheck.scala | 0 .../analysis/ResolveArcticCommand.scala | 0 ...esolveMergeIntoArcticTableReferences.scala | 0 .../analysis/RewriteArcticCommand.scala | 0 .../RewriteArcticMergeIntoTable.scala | 0 .../catalyst/optimize/OptimizeWriteRule.scala | 0 .../optimize/RewriteAppendArcticTable.scala | 0 .../RewriteDeleteFromArcticTable.scala | 0 .../optimize/RewriteUpdateArcticTable.scala | 0 .../catalyst/parser/ArcticParserUtils.scala | 0 .../parser/ArcticSqlExtensionsParser.scala | 0 .../plans/AlterArcticTableDropPartition.scala | 0 .../catalyst/plans/ArcticRowLevelWrite.scala | 0 .../catalyst/plans/MergeIntoArcticTable.scala | 0 .../spark/sql/catalyst/plans/MergeRows.scala | 0 .../plans/QueryWithConstraintCheckPlan.scala | 0 .../catalyst/plans/TruncateArcticTable.scala | 0 .../UnresolvedMergeIntoArcticTable.scala | 0 .../spark/sql/catalyst/plans/logicals.scala | 0 .../spark/sql/catalyst/plans/statements.scala | 0 .../AlterArcticTableDropPartitionExec.scala | 0 .../sql/execution/ArcticCommandExec.scala | 0 .../execution/ArcticRowLevelWriteExec.scala | 0 .../execution/DescribeKeyedTableExec.scala | 0 .../execution/ExtendedArcticStrategy.scala | 0 .../spark/sql/execution/MergeRowsExec.scala | 0 .../QueryWithConstraintCheckExec.scala | 0 .../execution/TruncateArcticTableExec.scala | 0 .../spark/sql/utils/ArcticRewriteHelper.scala | 0 .../sql/utils/ProjectingInternalRow.scala | 0 .../spark/sql/utils/RowDeltaUtils.scala | 0 .../sql/utils/WriteQueryProjections.scala | 0 .../arctic/spark/sql/utils/expressions.scala | 0 .../arctic/catalyst/ArcticSpark33Helper.scala | 0 .../arctic/catalyst/AssignmentHelper.scala | 0 .../arctic/catalyst/ExpressionHelper.scala | 0 .../parser/ArcticSqlExtendAstBuilder.scala | 0 .../arctic/parser/QueryParsingErrors.scala | 0 .../arctic/spark/test/TestImpalaParquet.java | 0 .../api/TestKeyedTableDataFrameAPI.java | 0 .../api/TestUnKeyedTableDataFrameAPI.java | 0 .../suites/catalog/TestSessionCatalog.java | 0 .../test/suites/catalog/TestSparkCatalog.java | 0 .../suites/sql/TestAlterTableColumnSQL.java | 0 .../test/suites/sql/TestArcticCommandSQL.java | 0 .../suites/sql/TestArcticSessionCatalog.java | 0 .../suites/sql/TestCreateTableAsSelect.java | 0 .../suites/sql/TestCreateTableLikeSQL.java | 0 .../test/suites/sql/TestCreateTableSQL.java | 0 .../test/suites/sql/TestDeleteFromSQL.java | 0 .../spark/test/suites/sql/TestDescSQL.java | 0 .../test/suites/sql/TestDropPartitionSQL.java | 0 .../test/suites/sql/TestInsertIntoSQL.java | 0 .../suites/sql/TestInsertOverwriteSQL.java | 0 .../test/suites/sql/TestMergeIntoSQL.java | 0 .../sql/TestMultiDelegateSessionCatalog.java | 0 .../spark/test/suites/sql/TestSelectSQL.java | 0 .../test/suites/sql/TestTruncateSQL.java | 0 .../spark/test/suites/sql/TestUpdateSQL.java | 0 .../ut/sql/parser/TestSqlExtendParser.java | 0 .../arctic/spark/writer/TestSparkWriter.java | 0 .../src/test/resources/log4j2.properties | 0 {trino => mixed/trino}/assembly.xml | 0 {trino => mixed/trino}/pom.xml | 12 ++--- .../com/netease/arctic/ArcticErrorCode.java | 0 .../arctic/trino/ArcticCatalogFactory.java | 0 .../ArcticCatalogSupportTableSuffix.java | 0 .../netease/arctic/trino/ArcticConfig.java | 0 .../netease/arctic/trino/ArcticConnector.java | 0 .../arctic/trino/ArcticConnectorFactory.java | 0 .../arctic/trino/ArcticConnectorMetadata.java | 0 .../trino/ArcticConnectorSplitManager.java | 0 .../trino/ArcticHadoopAuthentication.java | 0 .../trino/ArcticHdfsAuthentication.java | 0 .../arctic/trino/ArcticHdfsConfiguration.java | 0 .../arctic/trino/ArcticMetadataFactory.java | 0 .../netease/arctic/trino/ArcticModule.java | 0 .../trino/ArcticPageSourceProvider.java | 0 .../netease/arctic/trino/ArcticPlugin.java | 0 .../arctic/trino/ArcticSessionProperties.java | 0 .../trino/ArcticTransactionManager.java | 0 .../trino/DefaultArcticCatalogFactory.java | 0 .../arctic/trino/TableNameResolve.java | 0 .../trino/delete/DummyFileScanTask.java | 0 .../arctic/trino/delete/TrinoDeleteFile.java | 0 .../netease/arctic/trino/delete/TrinoRow.java | 0 .../trino/keyed/KeyedConnectorMetadata.java | 0 .../trino/keyed/KeyedConnectorPageSource.java | 0 .../trino/keyed/KeyedConnectorSplit.java | 0 .../keyed/KeyedConnectorSplitManager.java | 0 .../arctic/trino/keyed/KeyedDeleteFilter.java | 0 .../trino/keyed/KeyedPageSourceProvider.java | 0 .../arctic/trino/keyed/KeyedTableHandle.java | 0 .../unkeyed/AdaptHiveIcebergTableHandle.java | 0 .../trino/unkeyed/ArcticTrinoCatalog.java | 0 .../unkeyed/ArcticTrinoCatalogFactory.java | 0 .../arctic/trino/unkeyed/IcebergMetadata.java | 0 .../trino/unkeyed/IcebergPageSource.java | 0 .../unkeyed/IcebergPageSourceProvider.java | 0 .../arctic/trino/unkeyed/IcebergSplit.java | 0 .../trino/unkeyed/IcebergSplitManager.java | 0 .../trino/unkeyed/IcebergSplitSource.java | 0 .../trino/unkeyed/TrinoDeleteFilter.java | 0 .../netease/arctic/trino/util/MetricUtil.java | 0 .../trino/util/ObjectSerializerUtil.java | 0 .../parquet/reader/ColumnReaderFactory.java | 0 .../parquet/reader/TimestampColumnReader.java | 0 .../hive/metastore/HiveMetaStoreClient.java | 0 .../org/apache/hadoop/util/VersionInfo.java | 0 .../ParquetMetadataConverterUtil.java | 0 .../org/apache/parquet/io/ColumnIOUtil.java | 0 .../META-INF/services/io.trino.spi.Plugin | 0 .../trino/arctic/ArcticQueryRunner.java | 0 .../arctic/trino/arctic/HiveTestRecords.java | 0 .../trino/arctic/TableTestBaseForTrino.java | 0 .../TableTestBaseWithInitDataForTrino.java | 0 .../arctic/TestBaseArcticPrimaryTable.java | 0 .../arctic/trino/arctic/TestHiveTable.java | 0 .../arctic/TestHiveTableBaseForTrino.java | 0 .../trino/iceberg/ArcticQueryRunner.java | 0 .../iceberg/ArcticQueryRunnerForClient.java | 0 .../trino/iceberg/BaseConnectorTest.java | 0 .../trino/iceberg/SchemaInitializer.java | 0 .../iceberg/TestArcticCatalogFactory.java | 0 .../iceberg/TestArcticConnectorFactory.java | 0 .../trino/iceberg/TestArcticPlugin.java | 0 .../arctic/trino/iceberg/TestArcticTable.java | 0 .../iceberg/TestBaseArcticConnectorTest.java | 0 .../trino/iceberg/TestBasicArcticCatalog.java | 0 .../TestOnServerArcticConnectorTest.java | 0 .../arctic/trino/iceberg/TestUnionModule.java | 0 pom.xml | 8 +--- 831 files changed, 240 insertions(+), 201 deletions(-) rename {dist => ams/dist}/pom.xml (97%) rename {dist => ams/dist}/src/main/arctic-bin/bin/ams.sh (100%) rename {dist => ams/dist}/src/main/arctic-bin/bin/load-config.sh (100%) rename {dist => ams/dist}/src/main/arctic-bin/bin/optimizer.sh (100%) rename {dist => ams/dist}/src/main/arctic-bin/conf/config.yaml (100%) rename {dist => ams/dist}/src/main/arctic-bin/conf/jvm.properties (100%) rename {dist => ams/dist}/src/main/arctic-bin/conf/log4j2.xml (100%) rename {dist => ams/dist}/src/main/arctic-bin/conf/optimize/log4j2.xml (100%) rename {dist => ams/dist}/src/main/arctic-bin/metrics/log_emitter.yaml (100%) rename {dist => ams/dist}/src/main/assemblies/bin.xml (84%) rename {flink => mixed/flink}/flink-common-format/pom.xml (92%) rename {flink => mixed/flink}/flink-common-format/src/main/java/com/netease/arctic/flink/shuffle/LogRecordV1.java (100%) rename {flink => mixed/flink}/flink-common-format/src/main/java/com/netease/arctic/flink/shuffle/RowKindUtil.java (100%) rename {flink => mixed/flink}/flink-common-iceberg-bridge/pom.xml (97%) rename {flink => mixed/flink}/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveFlinkParquetReaders.java (100%) rename {flink => mixed/flink}/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveFlinkParquetWriters.java (100%) rename {flink => mixed/flink}/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveParquetWithFlinkSchemaVisitor.java (100%) rename {flink => mixed/flink}/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/source/RowDataFileScanTaskReader.java (100%) rename {flink => mixed/flink}/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/source/ScanContext.java (100%) rename {flink => mixed/flink}/flink-common/pom.xml (97%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/FlinkSchemaUtil.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/InternalCatalogBuilder.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/catalog/ArcticCatalog.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/catalog/factories/ArcticCatalogFactory.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/catalog/factories/ArcticCatalogFactoryOptions.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/interceptor/FlinkTablePropertiesInvocationHandler.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/interceptor/KerberosInterceptor.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/interceptor/KerberosInvocationHandler.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/interceptor/ProxyFactory.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/lookup/ArcticRowDataLookupFunction.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/lookup/BasicLookupFunction.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/lookup/BinaryRowDataSerializerWrapper.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/lookup/ByteArraySetSerializer.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/lookup/ByteArrayWrapper.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/lookup/KVTable.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/lookup/KVTableFactory.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/lookup/KeyRowData.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/lookup/LookupMetrics.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/lookup/LookupOptions.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/lookup/LookupRecord.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/lookup/RocksDBCacheState.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/lookup/RocksDBRecordState.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/lookup/RocksDBSetSpilledState.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/lookup/RocksDBSetState.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/lookup/RowDataStateFactory.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/lookup/SecondaryIndexTable.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/lookup/TableFactory.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/lookup/UniqueIndexTable.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/lookup/filter/RowDataPredicate.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/lookup/filter/RowDataPredicateExpressionVisitor.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/metric/MetricConstant.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/metric/MetricsGenerator.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/planner/calcite/FlinkTypeSystem.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/AdaptHiveFlinkParquetReaders.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/ArcticSource.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/FlinkSplitPlanner.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/MixedIncrementalLoader.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/PartitionAndNodeGroup.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/assigner/ShuffleSplitAssigner.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/assigner/Split.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/assigner/SplitAssigner.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/assigner/StaticSplitAssigner.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/AbstractArcticEnumerator.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ArcticEnumeratorOffset.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ArcticEnumeratorOffsetSerializer.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ArcticSourceEnumState.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ArcticSourceEnumStateSerializer.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ArcticSourceEnumerator.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ContinuousEnumerationResult.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ContinuousSplitPlanner.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ContinuousSplitPlannerImpl.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/InitializationFinishedEvent.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/MergeOnReadIncrementalPlanner.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/MergeOnReadPlannerImpl.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/StaticArcticSourceEnumerator.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ArcticRecordEmitter.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ArcticRecordWithOffset.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ArcticSourceReader.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ArrayBatchRecords.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ArrayPoolDataIteratorBatcher.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/DataIteratorBatcher.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/DataIteratorReaderFunction.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/HybridSplitReader.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ReaderFunction.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ReaderStartedEvent.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/RecordFactory.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/RecordPosition.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/RowDataReaderFunction.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/RowDataRecordFactory.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/ArcticSplit.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/ArcticSplitSerializer.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/ArcticSplitState.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/ChangelogSplit.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/MergeOnReadSplit.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/SnapshotSplit.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/SplitRequestEvent.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/TemporalJoinSplits.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/internals/KafkaPartitionSplitReader.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/internals/KafkaSource.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/internals/KafkaSourceFetcherManager.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/internals/KafkaSourceReader.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/internals/metrics/KafkaConsumerMetricConstants.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/source/ArcticScanContext.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/source/ChangeLogDataIterator.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/source/DataIterator.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/source/FileScanTaskReader.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/source/FlinkArcticDataReader.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/source/FlinkArcticMORDataReader.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/source/MergeOnReadDataIterator.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/LogSourceHelper.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaPartitionSplit.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaPartitionSplitReader.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaPartitionSplitState.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaRecordEmitter.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaSource.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaSourceBuilder.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaSourceReader.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogRecordWithRetractInfo.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/shuffle/ReadShuffleRulePolicy.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/shuffle/RoundRobinShuffleRulePolicy.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/shuffle/ShuffleHelper.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/shuffle/ShuffleKey.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/shuffle/ShuffleRulePolicy.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/table/ArcticDynamicSink.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/table/ArcticDynamicSource.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/table/ArcticFileSource.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/table/ArcticTableLoader.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/table/DynamicTableFactory.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/table/FlinkSource.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/table/KafkaConnectorOptionsUtil.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/table/LogDynamicSource.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/table/UnkeyedInputFormatOperatorFactory.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/table/UnkeyedInputFormatSourceFunction.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/table/descriptors/ArcticValidator.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/util/ArcticUtils.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/util/CompatibleFlinkPropertyUtil.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/util/DateTimeUtils.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/util/FilterUtil.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/util/FlinkClassReflectionUtil.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/util/IcebergAndFlinkFilters.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/util/IcebergClassUtil.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/util/LookupUtil.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/util/Projection.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/util/ProxyUtil.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/util/ReflectionUtil.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/util/ThreadLocalCache.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/write/AdaptHiveFlinkAppenderFactory.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/write/ArcticFileWriter.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/write/ArcticLogWriter.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/write/ArcticRowDataTaskWriterFactory.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/write/ArcticWriter.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/write/AutomaticDoubleWriteStatus.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/write/AutomaticLogWriter.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/write/AutomaticWriteSpecification.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/write/FlinkBaseTaskWriter.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/write/FlinkChangeTaskWriter.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/write/FlinkSink.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/write/FlinkTaskWriterBuilder.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/AbstractHiddenLogWriter.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/ArcticLogPartitioner.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/GlobalFlipCommitter.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/HiddenLogWriter.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/LogMsgFactory.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/kafka/HiddenKafkaFactory.java (100%) rename {flink => mixed/flink}/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/kafka/HiddenKafkaProducer.java (100%) rename {flink => mixed/flink}/flink-common/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory (100%) rename {flink => mixed/flink}/flink-common/src/main/resources/log4j.properties (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/DynamicTableSourceTestBase.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/FlinkTableTestBase.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/FlinkTestBase.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/TestFlinkSchemaUtil.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/catalog/TestArcticCatalogTablePartitions.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/catalog/TestCatalog.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/kafka/testutils/KafkaConfigGenerate.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/kafka/testutils/KafkaContainerTest.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/kafka/testutils/KafkaUtil.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/kafka/testutils/SuccessException.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/lookup/ByteArraySetSerializerTest.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/lookup/TestKVTable.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/lookup/filter/TestRowDataPredicateAllFieldTypes.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/lookup/filter/TestRowDataPredicateBase.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/lookup/filter/TestRowDataPredicateExpressionVisitor.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/read/TestArcticSource.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/read/TestFlinkSource.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/read/TestFlinkSplitPlanner.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/read/hidden/kafka/TestKafkaConsumer.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/read/hidden/kafka/TestKafkaSourceReader.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/read/hidden/kafka/TestLogKafkaPartitionSplitReader.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/assigner/TestShuffleSplitAssigner.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/assigner/TestSplitAssignerAwaiting.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/assigner/TestStaticSplitAssigner.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/enumerator/TestArcticSourceEnumStateSerializer.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/enumerator/TestArcticSourceEnumerator.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/enumerator/TestContinuousSplitPlannerImpl.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/enumerator/TestTemporalJoinSplitsThreadSafe.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/reader/MixedIncrementalLoaderTest.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/reader/TestRowDataReaderFunction.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/split/TestArcticSplitSerializer.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/shuffle/TestLogRecordV1.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/shuffle/TestRoundRobinShuffleRulePolicy.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/table/CatalogITCaseBase.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/table/LookupITCase.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/table/TestJoin.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/table/TestKeyed.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/table/TestLookupSecondary.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/table/TestTableRefresh.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/table/TestUnkeyed.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/table/TestUnkeyedOverwrite.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/table/TestWatermark.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/util/ClassLoaderUtils.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/util/DataUtil.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/util/MockEnvironmentArctic.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/util/MockEnvironmentBuilder.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/util/TestCompatibleFlinkPropertyUtil.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/util/TestGlobalAggregateManager.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/util/TestOneInputStreamOperatorIntern.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/util/TestProjection.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/util/TestUtil.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/write/ArcticFileWriterITCase.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/write/FlinkTaskWriterBaseTest.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/write/TestAdaptHiveWriter.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/write/TestArcticFileCommitter.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/write/TestArcticFileWriter.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/write/TestAutomaticDoubleWriteStatus.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/write/TestAutomaticLogWriter.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/write/TestFlinkSink.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/write/hidden/kafka/TestBaseLog.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/write/hidden/kafka/TestHiddenKafkaProducer.java (100%) rename {flink => mixed/flink}/flink-common/src/test/java/com/netease/arctic/flink/write/hidden/kafka/TestHiddenLogOperators.java (100%) rename {flink => mixed/flink}/flink-common/src/test/resources/META-INF/services/org.apache.flink.table.factories.Factory (100%) rename {flink => mixed/flink}/flink-common/src/test/resources/log4j2-test.xml (100%) rename {flink => mixed/flink}/flink-common/src/test/resources/log4j2.component.properties (100%) rename {flink => mixed/flink}/pom.xml (93%) rename {flink => mixed/flink}/v1.15/flink-runtime/pom.xml (98%) rename {flink => mixed/flink}/v1.15/flink/pom.xml (94%) rename {flink => mixed/flink}/v1.16/flink-runtime/pom.xml (98%) rename {flink => mixed/flink}/v1.16/flink/pom.xml (94%) rename {flink => mixed/flink}/v1.17/flink-runtime/pom.xml (98%) rename {flink => mixed/flink}/v1.17/flink/pom.xml (94%) rename {hive => mixed/hive}/pom.xml (97%) rename {hive => mixed/hive}/src/main/java/com/netease/arctic/hive/ArcticHiveClientPool.java (100%) rename {hive => mixed/hive}/src/main/java/com/netease/arctic/hive/CachedHiveClientPool.java (100%) rename {hive => mixed/hive}/src/main/java/com/netease/arctic/hive/HMSClient.java (100%) rename {hive => mixed/hive}/src/main/java/com/netease/arctic/hive/HMSClientImpl.java (100%) rename {hive => mixed/hive}/src/main/java/com/netease/arctic/hive/HMSClientPool.java (100%) rename {hive => mixed/hive}/src/main/java/com/netease/arctic/hive/HiveTableProperties.java (100%) rename {hive => mixed/hive}/src/main/java/com/netease/arctic/hive/catalog/ArcticHiveCatalog.java (100%) rename {hive => mixed/hive}/src/main/java/com/netease/arctic/hive/catalog/MixedHiveTables.java (100%) rename {hive => mixed/hive}/src/main/java/com/netease/arctic/hive/exceptions/CannotAlterHiveLocationException.java (100%) rename {hive => mixed/hive}/src/main/java/com/netease/arctic/hive/io/reader/AbstractAdaptHiveKeyedDataReader.java (100%) rename {hive => mixed/hive}/src/main/java/com/netease/arctic/hive/io/reader/AbstractAdaptHiveUnkeyedDataReader.java (100%) rename {hive => mixed/hive}/src/main/java/com/netease/arctic/hive/io/reader/AdaptHiveArcticDeleteFilter.java (100%) rename {hive => mixed/hive}/src/main/java/com/netease/arctic/hive/io/reader/AdaptHiveGenericKeyedDataReader.java (100%) rename {hive => mixed/hive}/src/main/java/com/netease/arctic/hive/io/reader/AdaptHiveGenericUnkeyedDataReader.java (100%) rename {hive => mixed/hive}/src/main/java/com/netease/arctic/hive/io/writer/AdaptHiveGenericTaskWriterBuilder.java (100%) rename {hive => mixed/hive}/src/main/java/com/netease/arctic/hive/io/writer/AdaptHiveOperateToTableRelation.java (100%) rename {hive => mixed/hive}/src/main/java/com/netease/arctic/hive/io/writer/AdaptHiveOutputFileFactory.java (100%) rename {hive => mixed/hive}/src/main/java/com/netease/arctic/hive/io/writer/OperateToTableRelation.java (100%) rename {hive => mixed/hive}/src/main/java/com/netease/arctic/hive/op/BaseSchemaUpdate.java (100%) rename {hive => mixed/hive}/src/main/java/com/netease/arctic/hive/op/HiveOperationTransaction.java (100%) rename {hive => mixed/hive}/src/main/java/com/netease/arctic/hive/op/HiveSchemaUpdate.java (100%) rename {hive => mixed/hive}/src/main/java/com/netease/arctic/hive/op/OverwriteHiveFiles.java (100%) rename {hive => mixed/hive}/src/main/java/com/netease/arctic/hive/op/ReplaceHivePartitions.java (100%) rename {hive => mixed/hive}/src/main/java/com/netease/arctic/hive/op/RewriteHiveFiles.java (100%) rename {hive => mixed/hive}/src/main/java/com/netease/arctic/hive/op/UpdateHiveFiles.java (100%) rename {hive => mixed/hive}/src/main/java/com/netease/arctic/hive/optimizing/MixFormatOptimizingDataReader.java (100%) rename {hive => mixed/hive}/src/main/java/com/netease/arctic/hive/optimizing/MixFormatRewriteExecutor.java (100%) rename {hive => mixed/hive}/src/main/java/com/netease/arctic/hive/optimizing/MixFormatRewriteExecutorFactory.java (100%) rename {hive => mixed/hive}/src/main/java/com/netease/arctic/hive/table/HiveLocationKind.java (100%) rename {hive => mixed/hive}/src/main/java/com/netease/arctic/hive/table/KeyedHiveTable.java (100%) rename {hive => mixed/hive}/src/main/java/com/netease/arctic/hive/table/SupportHive.java (100%) rename {hive => mixed/hive}/src/main/java/com/netease/arctic/hive/table/UnkeyedHiveTable.java (100%) rename {hive => mixed/hive}/src/main/java/com/netease/arctic/hive/utils/CatalogUtil.java (100%) rename {hive => mixed/hive}/src/main/java/com/netease/arctic/hive/utils/ChangeFieldName.java (100%) rename {hive => mixed/hive}/src/main/java/com/netease/arctic/hive/utils/CompatibleHivePropertyUtil.java (100%) rename {hive => mixed/hive}/src/main/java/com/netease/arctic/hive/utils/HiveCommitUtil.java (100%) rename {hive => mixed/hive}/src/main/java/com/netease/arctic/hive/utils/HiveMetaSynchronizer.java (100%) rename {hive => mixed/hive}/src/main/java/com/netease/arctic/hive/utils/HivePartitionUtil.java (100%) rename {hive => mixed/hive}/src/main/java/com/netease/arctic/hive/utils/HiveSchemaUtil.java (100%) rename {hive => mixed/hive}/src/main/java/com/netease/arctic/hive/utils/HiveTableUtil.java (100%) rename {hive => mixed/hive}/src/main/java/com/netease/arctic/hive/utils/TableTypeUtil.java (100%) rename {hive => mixed/hive}/src/main/java/com/netease/arctic/hive/utils/TimeUtil.java (100%) rename {hive => mixed/hive}/src/main/java/com/netease/arctic/hive/utils/UpgradeHiveTableUtil.java (100%) rename {hive => mixed/hive}/src/main/java/org/apache/hadoop/hive/ql/optimizer/ppr/PartitionExpressionForMetastore.java (100%) rename {hive => mixed/hive}/src/main/java/org/apache/hadoop/hive/ql/security/authorization/AuthorizationPreEventListener.java (100%) rename {hive => mixed/hive}/src/main/java/org/apache/iceberg/IcebergSchemaUtil.java (100%) rename {hive => mixed/hive}/src/main/java/org/apache/iceberg/data/AdaptHiveGenericAppenderFactory.java (100%) rename {hive => mixed/hive}/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveBaseParquetReaders.java (100%) rename {hive => mixed/hive}/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveBaseParquetWriter.java (100%) rename {hive => mixed/hive}/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveGenericParquetReaders.java (100%) rename {hive => mixed/hive}/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveGenericParquetWriter.java (100%) rename {hive => mixed/hive}/src/main/java/org/apache/iceberg/parquet/AdaptHiveApplyNameMapping.java (100%) rename {hive => mixed/hive}/src/main/java/org/apache/iceberg/parquet/AdaptHiveColumnWriter.java (100%) rename {hive => mixed/hive}/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquet.java (100%) rename {hive => mixed/hive}/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetConversions.java (100%) rename {hive => mixed/hive}/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetDictionaryRowGroupFilter.java (100%) rename {hive => mixed/hive}/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetMetricsRowGroupFilter.java (100%) rename {hive => mixed/hive}/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetReader.java (100%) rename {hive => mixed/hive}/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetSchemaUtil.java (100%) rename {hive => mixed/hive}/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetUtil.java (100%) rename {hive => mixed/hive}/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetWriter.java (100%) rename {hive => mixed/hive}/src/main/java/org/apache/iceberg/parquet/AdaptHivePrimitiveWriter.java (100%) rename {hive => mixed/hive}/src/main/java/org/apache/iceberg/parquet/AdaptHiveReadConf.java (100%) rename {hive => mixed/hive}/src/main/java/org/apache/iceberg/parquet/AdaptHiveTypeToMessageType.java (100%) rename {hive => mixed/hive}/src/test/java/com/netease/arctic/hive/HMSMockServer.java (100%) rename {hive => mixed/hive}/src/test/java/com/netease/arctic/hive/MixedHiveTableTestBase.java (100%) rename {hive => mixed/hive}/src/test/java/com/netease/arctic/hive/TestHMS.java (100%) rename {hive => mixed/hive}/src/test/java/com/netease/arctic/hive/catalog/HiveCatalogTestHelper.java (100%) rename {hive => mixed/hive}/src/test/java/com/netease/arctic/hive/catalog/HiveTableTestHelper.java (100%) rename {hive => mixed/hive}/src/test/java/com/netease/arctic/hive/catalog/TestHiveCatalogLoader.java (100%) rename {hive => mixed/hive}/src/test/java/com/netease/arctic/hive/catalog/TestMixedHiveCatalog.java (100%) rename {hive => mixed/hive}/src/test/java/com/netease/arctic/hive/formats/IcebergHiveCatalogTestHelper.java (100%) rename {hive => mixed/hive}/src/test/java/com/netease/arctic/hive/formats/MixedIcebergHiveCatalogTestHelper.java (100%) rename {hive => mixed/hive}/src/test/java/com/netease/arctic/hive/formats/PaimonHiveCatalogTestHelper.java (100%) rename {hive => mixed/hive}/src/test/java/com/netease/arctic/hive/formats/TestIcebergHiveAmoroCatalog.java (100%) rename {hive => mixed/hive}/src/test/java/com/netease/arctic/hive/formats/TestMixedIcebergHiveAmoroCatalog.java (100%) rename {hive => mixed/hive}/src/test/java/com/netease/arctic/hive/formats/TestPaimonHiveAmoroCatalog.java (100%) rename {hive => mixed/hive}/src/test/java/com/netease/arctic/hive/io/HiveDataTestHelpers.java (100%) rename {hive => mixed/hive}/src/test/java/com/netease/arctic/hive/io/TestHiveTableTrashManagers.java (100%) rename {hive => mixed/hive}/src/test/java/com/netease/arctic/hive/io/TestHiveTaskReader.java (100%) rename {hive => mixed/hive}/src/test/java/com/netease/arctic/hive/io/TestHiveTaskWriter.java (100%) rename {hive => mixed/hive}/src/test/java/com/netease/arctic/hive/io/TestImpalaParquet.java (100%) rename {hive => mixed/hive}/src/test/java/com/netease/arctic/hive/op/TestHiveSchemaUpdate.java (100%) rename {hive => mixed/hive}/src/test/java/com/netease/arctic/hive/op/TestOverwriteFiles.java (100%) rename {hive => mixed/hive}/src/test/java/com/netease/arctic/hive/op/TestRewriteFiles.java (100%) rename {hive => mixed/hive}/src/test/java/com/netease/arctic/hive/op/TestRewritePartitions.java (100%) rename {hive => mixed/hive}/src/test/java/com/netease/arctic/hive/op/TestSyncHiveMeta.java (100%) rename {hive => mixed/hive}/src/test/java/com/netease/arctic/hive/op/UpdateHiveFilesTestHelpers.java (100%) rename {hive => mixed/hive}/src/test/java/com/netease/arctic/hive/utils/TestCompatibleHivePropertyUtil.java (100%) rename {hive => mixed/hive}/src/test/java/com/netease/arctic/hive/utils/TestHiveMetaSynchronizer.java (100%) rename {hive => mixed/hive}/src/test/java/com/netease/arctic/hive/utils/TestHiveSchemaUtil.java (100%) rename {hive => mixed/hive}/src/test/java/com/netease/arctic/hive/utils/TestTimeUtil.java (100%) rename {hive => mixed/hive}/src/test/java/com/netease/arctic/hive/utils/TestUpgradeHiveTableUtil.java (100%) rename {hive => mixed/hive}/src/test/java/org/apache/iceberg/parquet/TestAdaptHiveReadConf.java (100%) rename {hive => mixed/hive}/src/test/resources/hive-schema-3.1.0.derby.sql (100%) rename {hive => mixed/hive}/src/test/resources/hive.parquet (100%) rename {hive => mixed/hive}/src/test/resources/log4j2.xml (100%) rename {hive => mixed/hive}/src/test/resources/string_is_bytes.parquet (100%) create mode 100644 mixed/pom.xml rename {spark => mixed/spark}/common/pom.xml (97%) rename {spark => mixed/spark}/common/src/main/java/com/netease/arctic/spark/ArcticTableStoreType.java (100%) rename {spark => mixed/spark}/common/src/main/java/com/netease/arctic/spark/SparkSQLProperties.java (100%) rename {spark => mixed/spark}/common/src/main/java/com/netease/arctic/spark/utils/MixedFormatSparkUtil.java (100%) rename {spark => mixed/spark}/common/src/test/java/com/netease/arctic/spark/test/SparkTableTestBase.java (100%) rename {spark => mixed/spark}/common/src/test/java/com/netease/arctic/spark/test/SparkTestBase.java (100%) rename {spark => mixed/spark}/common/src/test/java/com/netease/arctic/spark/test/SparkTestContext.java (100%) rename {spark => mixed/spark}/common/src/test/java/com/netease/arctic/spark/test/extensions/DefaultParameterContext.java (100%) rename {spark => mixed/spark}/common/src/test/java/com/netease/arctic/spark/test/extensions/EachParameterResolver.java (100%) rename {spark => mixed/spark}/common/src/test/java/com/netease/arctic/spark/test/extensions/EnableCatalogSelect.java (100%) rename {spark => mixed/spark}/common/src/test/java/com/netease/arctic/spark/test/extensions/EnableCatalogSelectExtension.java (100%) rename {spark => mixed/spark}/common/src/test/java/com/netease/arctic/spark/test/utils/Asserts.java (100%) rename {spark => mixed/spark}/common/src/test/java/com/netease/arctic/spark/test/utils/DataComparator.java (100%) rename {spark => mixed/spark}/common/src/test/java/com/netease/arctic/spark/test/utils/ExpectResultUtil.java (100%) rename {spark => mixed/spark}/common/src/test/java/com/netease/arctic/spark/test/utils/RecordGenerator.java (100%) rename {spark => mixed/spark}/common/src/test/java/com/netease/arctic/spark/test/utils/ResourceInputFile.java (100%) rename {spark => mixed/spark}/common/src/test/java/com/netease/arctic/spark/test/utils/ScalaTestUtil.java (100%) rename {spark => mixed/spark}/common/src/test/java/com/netease/arctic/spark/test/utils/TableFiles.java (100%) rename {spark => mixed/spark}/common/src/test/java/com/netease/arctic/spark/test/utils/TestTable.java (100%) rename {spark => mixed/spark}/common/src/test/java/com/netease/arctic/spark/test/utils/TestTableUtil.java (100%) rename {spark => mixed/spark}/common/src/test/java/com/netease/arctic/spark/test/utils/TestTables.java (100%) rename {spark => mixed/spark}/pom.xml (91%) rename {spark => mixed/spark}/v3.1/spark-runtime/pom.xml (98%) rename {spark => mixed/spark}/v3.1/spark/pom.xml (97%) rename {spark => mixed/spark}/v3.1/spark/src/main/antlr4/com/netease/arctic/spark/sql/parser/ArcticSqlCommand.g4 (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/antlr4/com/netease/arctic/spark/sql/parser/ArcticSqlExtend.g4 (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/gen-antlr/.gitignore (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandBaseListener.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandBaseVisitor.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandLexer.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandListener.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandParser.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandVisitor.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendBaseListener.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendBaseVisitor.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendLexer.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendListener.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendParser.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendVisitor.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/java/com/netease/arctic/spark/ArcticSparkCatalog.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/java/com/netease/arctic/spark/ArcticSparkSessionCatalog.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/java/com/netease/arctic/spark/MultiDelegateSessionCatalog.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/java/com/netease/arctic/spark/Spark31Adapter.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/java/com/netease/arctic/spark/SparkAdapter.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/java/com/netease/arctic/spark/SparkAdapterLoader.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/java/com/netease/arctic/spark/SparkInternalRowCastWrapper.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/java/com/netease/arctic/spark/SparkInternalRowWrapper.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/java/com/netease/arctic/spark/command/ArcticSparkCommand.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/java/com/netease/arctic/spark/command/MigrateToArcticCommand.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/java/com/netease/arctic/spark/io/ArcticSparkBaseTaskWriter.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/java/com/netease/arctic/spark/io/ArcticSparkChangeTaskWriter.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/java/com/netease/arctic/spark/io/InternalRowFileAppenderFactory.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/java/com/netease/arctic/spark/io/TaskWriters.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/java/com/netease/arctic/spark/io/UnkeyedUpsertSparkWriter.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/java/com/netease/arctic/spark/reader/ArcticSparkKeyedDataReader.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/java/com/netease/arctic/spark/reader/ArcticSparkUnkeyedDataReader.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/java/com/netease/arctic/spark/reader/KeyedSparkBatchScan.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/java/com/netease/arctic/spark/reader/SparkParquetReaders.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/java/com/netease/arctic/spark/reader/SparkScanBuilder.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/java/com/netease/arctic/spark/reader/UnkeyedSparkBatchScan.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/java/com/netease/arctic/spark/source/ArcticSource.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/java/com/netease/arctic/spark/sql/Exceptions.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/java/com/netease/arctic/spark/sql/catalyst/parser/ArcticCommandAstParser.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/java/com/netease/arctic/spark/sql/connector/expressions/Expressions.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/java/com/netease/arctic/spark/sql/connector/expressions/FileIndexBucket.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/java/com/netease/arctic/spark/table/ArcticIcebergSparkTable.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/java/com/netease/arctic/spark/table/ArcticSparkChangeTable.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/java/com/netease/arctic/spark/table/ArcticSparkTable.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/java/com/netease/arctic/spark/table/SupportsExtendIdentColumns.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/java/com/netease/arctic/spark/table/SupportsRowLevelOperator.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/java/com/netease/arctic/spark/util/ArcticSparkUtils.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/java/com/netease/arctic/spark/util/DistributionAndOrderingUtil.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/java/com/netease/arctic/spark/util/ExpressionHelper.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/java/com/netease/arctic/spark/util/SortOrderToSpark.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/java/com/netease/arctic/spark/util/Stats.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/java/com/netease/arctic/spark/writer/ArcticSparkWriteBuilder.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/java/com/netease/arctic/spark/writer/KeyedSparkBatchWrite.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/java/com/netease/arctic/spark/writer/RowLevelWriter.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/java/com/netease/arctic/spark/writer/SimpleInternalRowDataWriter.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/java/com/netease/arctic/spark/writer/SimpleRowLevelDataWriter.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/java/com/netease/arctic/spark/writer/UnkeyedSparkBatchWrite.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/java/com/netease/arctic/spark/writer/WriteMode.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/java/com/netease/arctic/spark/writer/WriteTaskCommit.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/java/org/apache/iceberg/spark/data/AdaptHiveParquetWithSparkSchemaVisitor.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/java/org/apache/iceberg/spark/data/AdaptHiveSparkParquetWriters.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/scala/com/netease/arctic/spark/ArcticSparkExtensions.scala (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/scala/com/netease/arctic/spark/SupportSparkAdapter.scala (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/ArcticExtensionUtils.scala (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/QueryWithConstraintCheck.scala (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/ResolveArcticCommand.scala (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/ResolveMergeIntoTableReferences.scala (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/RewriteArcticCommand.scala (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/RewriteMergeIntoTable.scala (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/OptimizeWriteRule.scala (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/RewriteAppendArcticTable.scala (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/RewriteDeleteFromArcticTable.scala (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/RewriteUpdateArcticTable.scala (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/parser/ArcticParserUtils.scala (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/parser/ArcticSqlExtensionsParser.scala (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/AlterArcticTableDropPartition.scala (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/ArcticRowLevelWrite.scala (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/MergeIntoArcticTable.scala (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/MergeRows.scala (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/MigrateToArcticStatement.scala (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/QueryWithConstraintCheckPlan.scala (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/TruncateArcticTable.scala (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/logicals.scala (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/execution/AlterArcticTableDropPartitionExec.scala (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ArcticCommandExec.scala (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ArcticRowLevelWriteExec.scala (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/execution/DescribeKeyedTableExec.scala (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ExtendedArcticStrategy.scala (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ExtendedIcebergStrategy.scala (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/execution/MergeRowsExec.scala (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/execution/QueryWithConstraintCheckExec.scala (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/execution/TruncateArcticTableExec.scala (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/utils/ArcticRewriteHelper.scala (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/utils/ProjectingInternalRow.scala (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/utils/RowDeltaUtils.scala (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/utils/WriteQueryProjections.scala (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/scala/org/apache/spark/sql/arctic/catalyst/ArcticSpark31CatalystHelper.scala (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/scala/org/apache/spark/sql/arctic/catalyst/ExpressionHelper.scala (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/scala/org/apache/spark/sql/arctic/execution/ExtendedV2ExistingTableWriteExec.scala (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/scala/org/apache/spark/sql/arctic/execution/WritingSparkTask.scala (100%) rename {spark => mixed/spark}/v3.1/spark/src/main/scala/org/apache/spark/sql/arctic/parser/ExtendAstBuilder.scala (100%) rename {spark => mixed/spark}/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/TestImpalaParquet.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/api/TestKeyedTableDataFrameAPI.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/api/TestUnKeyedTableDataFrameAPI.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/catalog/TestSessionCatalog.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/catalog/TestSparkCatalog.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestAlterTableColumnSQL.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestArcticCommandSQL.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestArcticSessionCatalog.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestCreateTableAsSelect.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestCreateTableLikeSQL.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestCreateTableSQL.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestDeleteFromSQL.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestDescSQL.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestDropPartitionSQL.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestInsertIntoSQL.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestInsertOverwriteSQL.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestMergeIntoSQL.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestMultiDelegateSessionCatalog.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestSelectSQL.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestTruncateSQL.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestUpdateSQL.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/ut/sql/parser/TestSqlExtendParser.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/test/java/com/netease/arctic/spark/writer/TestSparkWriter.java (100%) rename {spark => mixed/spark}/v3.1/spark/src/test/resources/log4j.properties (100%) rename {spark => mixed/spark}/v3.2/spark-runtime/pom.xml (98%) rename {spark => mixed/spark}/v3.2/spark/pom.xml (97%) rename {spark => mixed/spark}/v3.2/spark/src/main/antlr4/com/netease/arctic/spark/sql/parser/ArcticSqlCommand.g4 (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/antlr4/com/netease/arctic/spark/sql/parser/ArcticSqlExtend.g4 (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/gen-antlr/.gitignore (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandBaseListener.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandBaseVisitor.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandLexer.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandListener.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandParser.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandVisitor.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendBaseListener.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendBaseVisitor.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendLexer.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendListener.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendParser.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendVisitor.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/java/com/netease/arctic/spark/ArcticSparkCatalog.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/java/com/netease/arctic/spark/ArcticSparkSessionCatalog.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/java/com/netease/arctic/spark/MultiDelegateSessionCatalog.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/java/com/netease/arctic/spark/Spark32Adapter.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/java/com/netease/arctic/spark/SparkAdapter.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/java/com/netease/arctic/spark/SparkAdapterLoader.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/java/com/netease/arctic/spark/SparkInternalRowCastWrapper.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/java/com/netease/arctic/spark/SparkInternalRowWrapper.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/java/com/netease/arctic/spark/command/ArcticSparkCommand.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/java/com/netease/arctic/spark/command/MigrateToArcticCommand.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/java/com/netease/arctic/spark/io/ArcticSparkBaseTaskWriter.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/java/com/netease/arctic/spark/io/ArcticSparkChangeTaskWriter.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/java/com/netease/arctic/spark/io/InternalRowFileAppenderFactory.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/java/com/netease/arctic/spark/io/TaskWriters.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/java/com/netease/arctic/spark/io/UnkeyedUpsertSparkWriter.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/java/com/netease/arctic/spark/reader/ArcticSparkKeyedDataReader.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/java/com/netease/arctic/spark/reader/ArcticSparkUnkeyedDataReader.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/java/com/netease/arctic/spark/reader/KeyedSparkBatchScan.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/java/com/netease/arctic/spark/reader/SparkParquetReaders.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/java/com/netease/arctic/spark/reader/SparkScanBuilder.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/java/com/netease/arctic/spark/reader/UnkeyedSparkBatchScan.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/java/com/netease/arctic/spark/source/ArcticSource.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/java/com/netease/arctic/spark/sql/catalyst/parser/ArcticCommandAstParser.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/java/com/netease/arctic/spark/sql/connector/expressions/FileIndexBucket.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/java/com/netease/arctic/spark/table/ArcticIcebergSparkTable.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/java/com/netease/arctic/spark/table/ArcticSparkChangeTable.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/java/com/netease/arctic/spark/table/ArcticSparkTable.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/java/com/netease/arctic/spark/table/SupportsExtendIdentColumns.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/java/com/netease/arctic/spark/table/SupportsRowLevelOperator.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/java/com/netease/arctic/spark/util/ArcticSparkUtils.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/java/com/netease/arctic/spark/util/DistributionAndOrderingUtil.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/java/com/netease/arctic/spark/util/ExpressionHelper.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/java/com/netease/arctic/spark/util/SortOrderToSpark.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/java/com/netease/arctic/spark/util/Stats.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/java/com/netease/arctic/spark/writer/ArcticSparkWriteBuilder.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/java/com/netease/arctic/spark/writer/KeyedSparkBatchWrite.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/java/com/netease/arctic/spark/writer/RowLevelWriter.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/java/com/netease/arctic/spark/writer/SimpleInternalRowDataWriter.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/java/com/netease/arctic/spark/writer/SimpleRowLevelDataWriter.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/java/com/netease/arctic/spark/writer/UnkeyedSparkBatchWrite.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/java/com/netease/arctic/spark/writer/WriteMode.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/java/com/netease/arctic/spark/writer/WriteTaskCommit.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/java/org/apache/iceberg/spark/data/AdaptHiveParquetWithSparkSchemaVisitor.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/java/org/apache/iceberg/spark/data/AdaptHiveSparkParquetWriters.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/scala/com/netease/arctic/spark/ArcticSparkExtensions.scala (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/scala/com/netease/arctic/spark/SupportSparkAdapter.scala (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/ArcticExtensionUtils.scala (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/QueryWithConstraintCheck.scala (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/ResolveArcticCommand.scala (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/ResolveMergeIntoArcticTableReferences.scala (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/RewriteArcticCommand.scala (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/RewriteArcticMergeIntoTable.scala (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/OptimizeWriteRule.scala (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/RewriteAppendArcticTable.scala (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/RewriteDeleteFromArcticTable.scala (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/RewriteUpdateArcticTable.scala (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/parser/ArcticParserUtils.scala (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/parser/ArcticSqlExtensionsParser.scala (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/AlterArcticTableDropPartition.scala (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/ArcticRowLevelWrite.scala (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/MergeIntoArcticTable.scala (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/MergeRows.scala (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/QueryWithConstraintCheckPlan.scala (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/TruncateArcticTable.scala (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/UnresolvedMergeIntoArcticTable.scala (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/logicals.scala (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/statements.scala (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/execution/AlterArcticTableDropPartitionExec.scala (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ArcticCommandExec.scala (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ArcticRowLevelWriteExec.scala (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/execution/DescribeKeyedTableExec.scala (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ExtendedArcticStrategy.scala (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/execution/MergeRowsExec.scala (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/execution/QueryWithConstraintCheckExec.scala (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/execution/TruncateArcticTableExec.scala (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/utils/ArcticRewriteHelper.scala (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/utils/ProjectingInternalRow.scala (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/utils/RowDeltaUtils.scala (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/utils/WriteQueryProjections.scala (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/utils/expressions.scala (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/scala/org/apache/spark/sql/arctic/catalyst/ArcticSpark32Helper.scala (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/scala/org/apache/spark/sql/arctic/catalyst/ExpressionHelper.scala (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/scala/org/apache/spark/sql/arctic/parser/ArcticSqlExtendAstBuilder.scala (100%) rename {spark => mixed/spark}/v3.2/spark/src/main/scala/org/apache/spark/sql/arctic/parser/QueryParsingErrors.scala (100%) rename {spark => mixed/spark}/v3.2/spark/src/test/java/com/netease/arctic/spark/test/TestImpalaParquet.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/api/TestKeyedTableDataFrameAPI.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/api/TestUnKeyedTableDataFrameAPI.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/catalog/TestSessionCatalog.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/catalog/TestSparkCatalog.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestAlterTableColumnSQL.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestArcticCommandSQL.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestArcticSessionCatalog.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestCreateTableAsSelect.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestCreateTableLikeSQL.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestCreateTableSQL.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestDeleteFromSQL.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestDescSQL.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestDropPartitionSQL.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestInsertIntoSQL.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestInsertOverwriteSQL.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestMergeIntoSQL.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestMultiDelegateSessionCatalog.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestSelectSQL.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestTruncateSQL.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestUpdateSQL.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/ut/sql/parser/TestSqlExtendParser.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/test/java/com/netease/arctic/spark/writer/TestSparkWriter.java (100%) rename {spark => mixed/spark}/v3.2/spark/src/test/resources/log4j2.properties (100%) rename {spark => mixed/spark}/v3.3/spark-runtime/pom.xml (98%) rename {spark => mixed/spark}/v3.3/spark/pom.xml (97%) rename {spark => mixed/spark}/v3.3/spark/src/main/antlr4/com/netease/arctic/spark/sql/parser/ArcticSqlCommand.g4 (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/antlr4/com/netease/arctic/spark/sql/parser/ArcticSqlExtend.g4 (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/gen-antlr/.gitignore (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandBaseListener.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandBaseVisitor.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandLexer.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandListener.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandParser.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandVisitor.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendBaseListener.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendBaseVisitor.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendLexer.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendListener.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendParser.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendVisitor.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/java/com/netease/arctic/spark/ArcticSparkCatalog.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/java/com/netease/arctic/spark/ArcticSparkSessionCatalog.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/java/com/netease/arctic/spark/MultiDelegateSessionCatalog.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/java/com/netease/arctic/spark/Spark33Adapter.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/java/com/netease/arctic/spark/SparkAdapter.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/java/com/netease/arctic/spark/SparkAdapterLoader.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/java/com/netease/arctic/spark/SparkInternalRowCastWrapper.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/java/com/netease/arctic/spark/SparkInternalRowWrapper.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/java/com/netease/arctic/spark/command/ArcticSparkCommand.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/java/com/netease/arctic/spark/command/MigrateToArcticCommand.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/java/com/netease/arctic/spark/io/ArcticSparkBaseTaskWriter.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/java/com/netease/arctic/spark/io/ArcticSparkChangeTaskWriter.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/java/com/netease/arctic/spark/io/InternalRowFileAppenderFactory.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/java/com/netease/arctic/spark/io/TaskWriters.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/java/com/netease/arctic/spark/io/UnkeyedUpsertSparkWriter.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/java/com/netease/arctic/spark/reader/ArcticSparkKeyedDataReader.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/java/com/netease/arctic/spark/reader/ArcticSparkUnkeyedDataReader.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/java/com/netease/arctic/spark/reader/KeyedSparkBatchScan.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/java/com/netease/arctic/spark/reader/SparkParquetReaders.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/java/com/netease/arctic/spark/reader/SparkScanBuilder.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/java/com/netease/arctic/spark/reader/UnkeyedSparkBatchScan.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/java/com/netease/arctic/spark/source/ArcticSource.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/java/com/netease/arctic/spark/sql/catalyst/parser/ArcticCommandAstParser.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/java/com/netease/arctic/spark/sql/connector/expressions/FileIndexBucket.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/java/com/netease/arctic/spark/table/ArcticIcebergSparkTable.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/java/com/netease/arctic/spark/table/ArcticSparkChangeTable.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/java/com/netease/arctic/spark/table/ArcticSparkTable.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/java/com/netease/arctic/spark/table/SupportsExtendIdentColumns.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/java/com/netease/arctic/spark/table/SupportsRowLevelOperator.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/java/com/netease/arctic/spark/util/ArcticSparkUtils.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/java/com/netease/arctic/spark/util/DistributionAndOrderingUtil.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/java/com/netease/arctic/spark/util/ExpressionHelper.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/java/com/netease/arctic/spark/util/SortOrderToSpark.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/java/com/netease/arctic/spark/util/Stats.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/java/com/netease/arctic/spark/writer/ArcticSparkWriteBuilder.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/java/com/netease/arctic/spark/writer/KeyedSparkBatchWrite.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/java/com/netease/arctic/spark/writer/RowLevelWriter.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/java/com/netease/arctic/spark/writer/SimpleInternalRowDataWriter.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/java/com/netease/arctic/spark/writer/SimpleRowLevelDataWriter.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/java/com/netease/arctic/spark/writer/UnkeyedSparkBatchWrite.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/java/com/netease/arctic/spark/writer/WriteMode.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/java/com/netease/arctic/spark/writer/WriteTaskCommit.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/java/org/apache/iceberg/spark/data/AdaptHiveParquetWithSparkSchemaVisitor.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/java/org/apache/iceberg/spark/data/AdaptHiveSparkParquetWriters.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/scala/com/netease/arctic/spark/ArcticSparkExtensions.scala (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/scala/com/netease/arctic/spark/SupportSparkAdapter.scala (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/ArcticExtensionUtils.scala (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/QueryWithConstraintCheck.scala (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/ResolveArcticCommand.scala (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/ResolveMergeIntoArcticTableReferences.scala (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/RewriteArcticCommand.scala (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/RewriteArcticMergeIntoTable.scala (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/OptimizeWriteRule.scala (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/RewriteAppendArcticTable.scala (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/RewriteDeleteFromArcticTable.scala (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/RewriteUpdateArcticTable.scala (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/parser/ArcticParserUtils.scala (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/parser/ArcticSqlExtensionsParser.scala (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/AlterArcticTableDropPartition.scala (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/ArcticRowLevelWrite.scala (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/MergeIntoArcticTable.scala (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/MergeRows.scala (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/QueryWithConstraintCheckPlan.scala (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/TruncateArcticTable.scala (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/UnresolvedMergeIntoArcticTable.scala (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/logicals.scala (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/statements.scala (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/execution/AlterArcticTableDropPartitionExec.scala (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ArcticCommandExec.scala (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ArcticRowLevelWriteExec.scala (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/execution/DescribeKeyedTableExec.scala (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ExtendedArcticStrategy.scala (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/execution/MergeRowsExec.scala (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/execution/QueryWithConstraintCheckExec.scala (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/execution/TruncateArcticTableExec.scala (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/utils/ArcticRewriteHelper.scala (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/utils/ProjectingInternalRow.scala (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/utils/RowDeltaUtils.scala (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/utils/WriteQueryProjections.scala (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/utils/expressions.scala (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/scala/org/apache/spark/sql/arctic/catalyst/ArcticSpark33Helper.scala (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/scala/org/apache/spark/sql/arctic/catalyst/AssignmentHelper.scala (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/scala/org/apache/spark/sql/arctic/catalyst/ExpressionHelper.scala (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/scala/org/apache/spark/sql/arctic/parser/ArcticSqlExtendAstBuilder.scala (100%) rename {spark => mixed/spark}/v3.3/spark/src/main/scala/org/apache/spark/sql/arctic/parser/QueryParsingErrors.scala (100%) rename {spark => mixed/spark}/v3.3/spark/src/test/java/com/netease/arctic/spark/test/TestImpalaParquet.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/api/TestKeyedTableDataFrameAPI.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/api/TestUnKeyedTableDataFrameAPI.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/catalog/TestSessionCatalog.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/catalog/TestSparkCatalog.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestAlterTableColumnSQL.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestArcticCommandSQL.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestArcticSessionCatalog.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestCreateTableAsSelect.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestCreateTableLikeSQL.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestCreateTableSQL.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestDeleteFromSQL.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestDescSQL.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestDropPartitionSQL.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestInsertIntoSQL.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestInsertOverwriteSQL.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestMergeIntoSQL.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestMultiDelegateSessionCatalog.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestSelectSQL.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestTruncateSQL.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestUpdateSQL.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/ut/sql/parser/TestSqlExtendParser.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/test/java/com/netease/arctic/spark/writer/TestSparkWriter.java (100%) rename {spark => mixed/spark}/v3.3/spark/src/test/resources/log4j2.properties (100%) rename {trino => mixed/trino}/assembly.xml (100%) rename {trino => mixed/trino}/pom.xml (98%) rename {trino => mixed/trino}/src/main/java/com/netease/arctic/ArcticErrorCode.java (100%) rename {trino => mixed/trino}/src/main/java/com/netease/arctic/trino/ArcticCatalogFactory.java (100%) rename {trino => mixed/trino}/src/main/java/com/netease/arctic/trino/ArcticCatalogSupportTableSuffix.java (100%) rename {trino => mixed/trino}/src/main/java/com/netease/arctic/trino/ArcticConfig.java (100%) rename {trino => mixed/trino}/src/main/java/com/netease/arctic/trino/ArcticConnector.java (100%) rename {trino => mixed/trino}/src/main/java/com/netease/arctic/trino/ArcticConnectorFactory.java (100%) rename {trino => mixed/trino}/src/main/java/com/netease/arctic/trino/ArcticConnectorMetadata.java (100%) rename {trino => mixed/trino}/src/main/java/com/netease/arctic/trino/ArcticConnectorSplitManager.java (100%) rename {trino => mixed/trino}/src/main/java/com/netease/arctic/trino/ArcticHadoopAuthentication.java (100%) rename {trino => mixed/trino}/src/main/java/com/netease/arctic/trino/ArcticHdfsAuthentication.java (100%) rename {trino => mixed/trino}/src/main/java/com/netease/arctic/trino/ArcticHdfsConfiguration.java (100%) rename {trino => mixed/trino}/src/main/java/com/netease/arctic/trino/ArcticMetadataFactory.java (100%) rename {trino => mixed/trino}/src/main/java/com/netease/arctic/trino/ArcticModule.java (100%) rename {trino => mixed/trino}/src/main/java/com/netease/arctic/trino/ArcticPageSourceProvider.java (100%) rename {trino => mixed/trino}/src/main/java/com/netease/arctic/trino/ArcticPlugin.java (100%) rename {trino => mixed/trino}/src/main/java/com/netease/arctic/trino/ArcticSessionProperties.java (100%) rename {trino => mixed/trino}/src/main/java/com/netease/arctic/trino/ArcticTransactionManager.java (100%) rename {trino => mixed/trino}/src/main/java/com/netease/arctic/trino/DefaultArcticCatalogFactory.java (100%) rename {trino => mixed/trino}/src/main/java/com/netease/arctic/trino/TableNameResolve.java (100%) rename {trino => mixed/trino}/src/main/java/com/netease/arctic/trino/delete/DummyFileScanTask.java (100%) rename {trino => mixed/trino}/src/main/java/com/netease/arctic/trino/delete/TrinoDeleteFile.java (100%) rename {trino => mixed/trino}/src/main/java/com/netease/arctic/trino/delete/TrinoRow.java (100%) rename {trino => mixed/trino}/src/main/java/com/netease/arctic/trino/keyed/KeyedConnectorMetadata.java (100%) rename {trino => mixed/trino}/src/main/java/com/netease/arctic/trino/keyed/KeyedConnectorPageSource.java (100%) rename {trino => mixed/trino}/src/main/java/com/netease/arctic/trino/keyed/KeyedConnectorSplit.java (100%) rename {trino => mixed/trino}/src/main/java/com/netease/arctic/trino/keyed/KeyedConnectorSplitManager.java (100%) rename {trino => mixed/trino}/src/main/java/com/netease/arctic/trino/keyed/KeyedDeleteFilter.java (100%) rename {trino => mixed/trino}/src/main/java/com/netease/arctic/trino/keyed/KeyedPageSourceProvider.java (100%) rename {trino => mixed/trino}/src/main/java/com/netease/arctic/trino/keyed/KeyedTableHandle.java (100%) rename {trino => mixed/trino}/src/main/java/com/netease/arctic/trino/unkeyed/AdaptHiveIcebergTableHandle.java (100%) rename {trino => mixed/trino}/src/main/java/com/netease/arctic/trino/unkeyed/ArcticTrinoCatalog.java (100%) rename {trino => mixed/trino}/src/main/java/com/netease/arctic/trino/unkeyed/ArcticTrinoCatalogFactory.java (100%) rename {trino => mixed/trino}/src/main/java/com/netease/arctic/trino/unkeyed/IcebergMetadata.java (100%) rename {trino => mixed/trino}/src/main/java/com/netease/arctic/trino/unkeyed/IcebergPageSource.java (100%) rename {trino => mixed/trino}/src/main/java/com/netease/arctic/trino/unkeyed/IcebergPageSourceProvider.java (100%) rename {trino => mixed/trino}/src/main/java/com/netease/arctic/trino/unkeyed/IcebergSplit.java (100%) rename {trino => mixed/trino}/src/main/java/com/netease/arctic/trino/unkeyed/IcebergSplitManager.java (100%) rename {trino => mixed/trino}/src/main/java/com/netease/arctic/trino/unkeyed/IcebergSplitSource.java (100%) rename {trino => mixed/trino}/src/main/java/com/netease/arctic/trino/unkeyed/TrinoDeleteFilter.java (100%) rename {trino => mixed/trino}/src/main/java/com/netease/arctic/trino/util/MetricUtil.java (100%) rename {trino => mixed/trino}/src/main/java/com/netease/arctic/trino/util/ObjectSerializerUtil.java (100%) rename {trino => mixed/trino}/src/main/java/io/trino/parquet/reader/ColumnReaderFactory.java (100%) rename {trino => mixed/trino}/src/main/java/io/trino/parquet/reader/TimestampColumnReader.java (100%) rename {trino => mixed/trino}/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java (100%) rename {trino => mixed/trino}/src/main/java/org/apache/hadoop/util/VersionInfo.java (100%) rename {trino => mixed/trino}/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverterUtil.java (100%) rename {trino => mixed/trino}/src/main/java/org/apache/parquet/io/ColumnIOUtil.java (100%) rename {trino => mixed/trino}/src/main/resources/META-INF/services/io.trino.spi.Plugin (100%) rename {trino => mixed/trino}/src/test/java/com/netease/arctic/trino/arctic/ArcticQueryRunner.java (100%) rename {trino => mixed/trino}/src/test/java/com/netease/arctic/trino/arctic/HiveTestRecords.java (100%) rename {trino => mixed/trino}/src/test/java/com/netease/arctic/trino/arctic/TableTestBaseForTrino.java (100%) rename {trino => mixed/trino}/src/test/java/com/netease/arctic/trino/arctic/TableTestBaseWithInitDataForTrino.java (100%) rename {trino => mixed/trino}/src/test/java/com/netease/arctic/trino/arctic/TestBaseArcticPrimaryTable.java (100%) rename {trino => mixed/trino}/src/test/java/com/netease/arctic/trino/arctic/TestHiveTable.java (100%) rename {trino => mixed/trino}/src/test/java/com/netease/arctic/trino/arctic/TestHiveTableBaseForTrino.java (100%) rename {trino => mixed/trino}/src/test/java/com/netease/arctic/trino/iceberg/ArcticQueryRunner.java (100%) rename {trino => mixed/trino}/src/test/java/com/netease/arctic/trino/iceberg/ArcticQueryRunnerForClient.java (100%) rename {trino => mixed/trino}/src/test/java/com/netease/arctic/trino/iceberg/BaseConnectorTest.java (100%) rename {trino => mixed/trino}/src/test/java/com/netease/arctic/trino/iceberg/SchemaInitializer.java (100%) rename {trino => mixed/trino}/src/test/java/com/netease/arctic/trino/iceberg/TestArcticCatalogFactory.java (100%) rename {trino => mixed/trino}/src/test/java/com/netease/arctic/trino/iceberg/TestArcticConnectorFactory.java (100%) rename {trino => mixed/trino}/src/test/java/com/netease/arctic/trino/iceberg/TestArcticPlugin.java (100%) rename {trino => mixed/trino}/src/test/java/com/netease/arctic/trino/iceberg/TestArcticTable.java (100%) rename {trino => mixed/trino}/src/test/java/com/netease/arctic/trino/iceberg/TestBaseArcticConnectorTest.java (100%) rename {trino => mixed/trino}/src/test/java/com/netease/arctic/trino/iceberg/TestBasicArcticCatalog.java (100%) rename {trino => mixed/trino}/src/test/java/com/netease/arctic/trino/iceberg/TestOnServerArcticConnectorTest.java (100%) rename {trino => mixed/trino}/src/test/java/com/netease/arctic/trino/iceberg/TestUnionModule.java (100%) diff --git a/.github/workflows/core-hadoop2-ci.yml b/.github/workflows/core-hadoop2-ci.yml index 7f3f8a8354..eba2d800b9 100644 --- a/.github/workflows/core-hadoop2-ci.yml +++ b/.github/workflows/core-hadoop2-ci.yml @@ -20,9 +20,9 @@ on: paths: - "ams/**" - "core/**" - - "flink/**" - - "hive/**" - - "spark/**" + - "mixed/flink/**" + - "mixed/hive/**" + - "mixed/spark/**" - "pom.xml" jobs: @@ -42,7 +42,7 @@ jobs: run: mvn validate - name: Build all module with Maven - run: mvn clean install -pl '!trino' -Djacoco.flink.skip=true -B -ntp -Dhadoop=v2 + run: mvn clean install -pl '!mixed/trino' -Djacoco.flink.skip=true -B -ntp -Dhadoop=v2 - name: Code coverage uses: codecov/codecov-action@v3 diff --git a/.github/workflows/core-hadoop3-ci.yml b/.github/workflows/core-hadoop3-ci.yml index 16b4ce3c5f..4a3d1fbb30 100644 --- a/.github/workflows/core-hadoop3-ci.yml +++ b/.github/workflows/core-hadoop3-ci.yml @@ -20,9 +20,9 @@ on: paths: - "ams/**" - "core/**" - - "flink/**" - - "hive/**" - - "spark/**" + - "mixed/flink/**" + - "mixed/hive/**" + - "mixed/spark/**" - "pom.xml" jobs: @@ -42,7 +42,7 @@ jobs: run: mvn validate - name: Build all module with Maven - run: mvn clean install -pl '!trino' -Djacoco.flink.skip=true -B -ntp + run: mvn clean install -pl '!mixed/trino' -Djacoco.flink.skip=true -B -ntp - name: Code coverage uses: codecov/codecov-action@v3 diff --git a/.github/workflows/docker-images.yml b/.github/workflows/docker-images.yml index aa9f2a66bc..0cedba5a4d 100644 --- a/.github/workflows/docker-images.yml +++ b/.github/workflows/docker-images.yml @@ -40,7 +40,7 @@ jobs: if: ${{ startsWith(github.repository, 'NetEase/') }} strategy: matrix: - hadoop: ["v3"] + hadoop: [ "v3" ] steps: - uses: actions/checkout@v3 - name: Set up JDK 8 @@ -85,7 +85,7 @@ jobs: echo "MVN_HADOOP=-Dhadoop=${{ matrix.hadoop }}" >> $GITHUB_ENV - name: Build dist module with Maven - run: mvn clean install -pl 'dist' -am -e ${MVN_HADOOP} -DskipTests -B -ntp + run: mvn clean install -pl 'ams/dist' -am -e ${MVN_HADOOP} -DskipTests -B -ntp - name: Build and Push Amoro Docker Image uses: docker/build-push-action@v4 @@ -218,7 +218,7 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build optimizer module with Maven - run: mvn clean package -pl 'flink/v1.17/flink-runtime' -am -e -DskipTests -B -ntp + run: mvn clean package -pl 'mixed/flink/v1.17/flink-runtime' -am -e -DskipTests -B -ntp - name: Build and Push Flink Optimizer Docker Image uses: docker/build-push-action@v4 diff --git a/.github/workflows/trino-ci.yml b/.github/workflows/trino-ci.yml index 345959f746..3ab9082d83 100644 --- a/.github/workflows/trino-ci.yml +++ b/.github/workflows/trino-ci.yml @@ -20,8 +20,8 @@ on: paths: - "ams/**" - "core/**" - - "hive/**" - - "trino/**" + - "mixed/hive/**" + - "mixed/trino/**" - "pom.xml" jobs: @@ -40,10 +40,10 @@ jobs: run: mvn validate -P trino-spotless - name: Install dependency with Maven - run: mvn clean install -DskipTests -pl 'ams/api,core,hive' -Dhadoop=v2 -am -B -P trino-spotless + run: mvn clean install -DskipTests -pl 'ams/api,core,mixed/hive' -Dhadoop=v2 -am -B -P trino-spotless - name: Build with Maven - run: mvn clean test -pl 'trino' -B -ntp -Dhadoop=v2 -P trino-spotless + run: mvn clean test -pl 'mixed/trino' -B -ntp -Dhadoop=v2 -P trino-spotless - name: Code coverage uses: codecov/codecov-action@v3 diff --git a/.gitignore b/.gitignore index 8223edf466..18037e387c 100644 --- a/.gitignore +++ b/.gitignore @@ -28,8 +28,6 @@ venv/ *.egg-info/ test-reports build/ -dist/ -sdist/ .coverage coverage.xml .pytest_cache/ @@ -62,8 +60,12 @@ target/ # local config conf/ + # test resources *unit_test_base_tmp/ */.gitignore -*.tgz \ No newline at end of file +*.tgz + +!ams/dist/src/main/arctic-bin/bin/ +!ams/dist/src/main/arctic-bin/conf/ \ No newline at end of file diff --git a/README.md b/README.md index 91b1c51c99..d35ea8704b 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ Here is the architecture diagram of Amoro: * Terminal: SQL command-line tools, provide various implementations like local Spark and Kyuubi. * LogStore: Provide millisecond to second level SLAs for real-time data processing based on message queues like Kafka and Pulsar. -## Supported table formats +## Supported table formats Amoro can manage tables of different table formats, similar to how MySQL/ClickHouse can choose different storage engines. Amoro meets diverse user needs by using different table formats. Currently, Amoro supports four table formats: @@ -102,15 +102,16 @@ Amoro contains modules as below: - `ams-dashboard` is the dashboard frontend for ams - `ams-server` is the backend server for ams - `ams-optimizer` provides default optimizer implementation -- `amoro-hive` integrates with Apache Hive and implements Mixed Hive format -- `amoro-flink` provides Flink connectors for Mixed format tables (use amoro-flink-runtime for a shaded version) -- `amoro-spark` provides Spark connectors for Mixed format tables (use amoro-spark-runtime for a shaded version) -- `amoro-trino` provides Trino connectors for Mixed format tables +- `amoro-mixed` provides Mixed format implementation + - `amoro-hive` integrates with Apache Hive and implements Mixed Hive format + - `amoro-flink` provides Flink connectors for Mixed format tables (use amoro-flink-runtime for a shaded version) + - `amoro-spark` provides Spark connectors for Mixed format tables (use amoro-spark-runtime for a shaded version) + - `amoro-trino` provides Trino connectors for Mixed format tables ## Building -Amoro is built using Maven with Java 1.8 and Java 17(only for `trino` module). +Amoro is built using Maven with Java 1.8 and Java 17(only for `mixed/trino` module). * To build Trino module need config `toolchains.xml` in `${user.home}/.m2/` dir, the content is @@ -132,15 +133,15 @@ Amoro is built using Maven with Java 1.8 and Java 17(only for `trino` module). * To invoke a build and run tests: `mvn package -P toolchain` * To skip tests: `mvn -DskipTests package -P toolchain` -* To package without trino module and JAVA 17 dependency: `mvn clean package -DskipTests -pl '!trino'` +* To package without trino module and JAVA 17 dependency: `mvn clean package -DskipTests -pl '!mixed/trino'` * To build with hadoop 2.x(the default is 3.x) `mvn clean package -DskipTests -Dhadoop=v2` * To indicate flink version for optimizer(the default is 1.14, 1.15 and 1.16 are available) `mvn clean package -DskipTests -Doptimizer.flink=1.15` >Spotless is skipped by default in `trino` module. So if you want to perform checkstyle when building `trino` module, you must be in a Java 17 environment. -* To invoke a build include `trino` module in Java 17 environment: `mvn clean package -DskipTests -P trino-spotless` -* To only build `trino` and its dependent modules in Java 17 environment: `mvn clean package -DskipTests -P trino-spotless -pl 'trino' -am` +* To invoke a build include `mixed/trino` module in Java 17 environment: `mvn clean package -DskipTests -P trino-spotless` +* To only build `mixed/trino` and its dependent modules in Java 17 environment: `mvn clean package -DskipTests -P trino-spotless -pl 'trino' -am` ## Quickstart Visit [https://amoro.netease.com/quick-demo/](https://amoro.netease.com/quick-demo/) to quickly diff --git a/dist/pom.xml b/ams/dist/pom.xml similarity index 97% rename from dist/pom.xml rename to ams/dist/pom.xml index 9d6c398025..1cd8e05162 100644 --- a/dist/pom.xml +++ b/ams/dist/pom.xml @@ -22,12 +22,12 @@ 4.0.0 com.netease.amoro - amoro-parent + amoro-ams 0.7.0-SNAPSHOT dist - Amoro Project Dist + Amoro Project AMS Dist https://amoro.netease.com diff --git a/dist/src/main/arctic-bin/bin/ams.sh b/ams/dist/src/main/arctic-bin/bin/ams.sh similarity index 100% rename from dist/src/main/arctic-bin/bin/ams.sh rename to ams/dist/src/main/arctic-bin/bin/ams.sh diff --git a/dist/src/main/arctic-bin/bin/load-config.sh b/ams/dist/src/main/arctic-bin/bin/load-config.sh similarity index 100% rename from dist/src/main/arctic-bin/bin/load-config.sh rename to ams/dist/src/main/arctic-bin/bin/load-config.sh diff --git a/dist/src/main/arctic-bin/bin/optimizer.sh b/ams/dist/src/main/arctic-bin/bin/optimizer.sh similarity index 100% rename from dist/src/main/arctic-bin/bin/optimizer.sh rename to ams/dist/src/main/arctic-bin/bin/optimizer.sh diff --git a/dist/src/main/arctic-bin/conf/config.yaml b/ams/dist/src/main/arctic-bin/conf/config.yaml similarity index 100% rename from dist/src/main/arctic-bin/conf/config.yaml rename to ams/dist/src/main/arctic-bin/conf/config.yaml diff --git a/dist/src/main/arctic-bin/conf/jvm.properties b/ams/dist/src/main/arctic-bin/conf/jvm.properties similarity index 100% rename from dist/src/main/arctic-bin/conf/jvm.properties rename to ams/dist/src/main/arctic-bin/conf/jvm.properties diff --git a/dist/src/main/arctic-bin/conf/log4j2.xml b/ams/dist/src/main/arctic-bin/conf/log4j2.xml similarity index 100% rename from dist/src/main/arctic-bin/conf/log4j2.xml rename to ams/dist/src/main/arctic-bin/conf/log4j2.xml diff --git a/dist/src/main/arctic-bin/conf/optimize/log4j2.xml b/ams/dist/src/main/arctic-bin/conf/optimize/log4j2.xml similarity index 100% rename from dist/src/main/arctic-bin/conf/optimize/log4j2.xml rename to ams/dist/src/main/arctic-bin/conf/optimize/log4j2.xml diff --git a/dist/src/main/arctic-bin/metrics/log_emitter.yaml b/ams/dist/src/main/arctic-bin/metrics/log_emitter.yaml similarity index 100% rename from dist/src/main/arctic-bin/metrics/log_emitter.yaml rename to ams/dist/src/main/arctic-bin/metrics/log_emitter.yaml diff --git a/dist/src/main/assemblies/bin.xml b/ams/dist/src/main/assemblies/bin.xml similarity index 84% rename from dist/src/main/assemblies/bin.xml rename to ams/dist/src/main/assemblies/bin.xml index 8125c2c6fa..a96042a934 100644 --- a/dist/src/main/assemblies/bin.xml +++ b/ams/dist/src/main/assemblies/bin.xml @@ -29,13 +29,15 @@ - ../ams/optimizer/flink-optimizer/target/flink-optimizer-${project.version}-jar-with-dependencies.jar + + ../optimizer/flink-optimizer/target/flink-optimizer-${project.version}-jar-with-dependencies.jar + plugin/optimizer/flink optimizer-job.jar 0644 - ../ams/server/target/amoro-ams-server-${project.version}.jar + ../server/target/amoro-ams-server-${project.version}.jar lib/ amoro-ams-server-${project.version}.jar 0644 @@ -59,22 +61,22 @@ 0644 - ../ams/server/src/main/resources/mysql + ../server/src/main/resources/mysql conf/mysql 0644 - ../ams/server/src/main/resources/postgres + ../server/src/main/resources/postgres conf/postgres 0644 - ../ams/server/src/main/resources/derby + ../server/src/main/resources/derby conf/derby 0644 - ../ams/server/target/amoro-ams-server-dependency/lib + ../server/target/amoro-ams-server-dependency/lib lib/ 0644 diff --git a/ams/optimizer/common/pom.xml b/ams/optimizer/common/pom.xml index fcbd65e7fe..4bf8388803 100644 --- a/ams/optimizer/common/pom.xml +++ b/ams/optimizer/common/pom.xml @@ -29,7 +29,7 @@ 4.0.0 optimizer-common - Amoro Project Optimizer Common + Amoro Project AMS Optimizer Common https://amoro.netease.com @@ -40,7 +40,7 @@ com.netease.amoro - amoro-hive + amoro-mixed-hive diff --git a/ams/optimizer/flink-optimizer/pom.xml b/ams/optimizer/flink-optimizer/pom.xml index 3bbb69ebbd..0e8377cd76 100644 --- a/ams/optimizer/flink-optimizer/pom.xml +++ b/ams/optimizer/flink-optimizer/pom.xml @@ -29,7 +29,7 @@ 4.0.0 flink-optimizer - Amoro Project Flink Optimizer + Amoro Project AMS Flink Optimizer https://amoro.netease.com diff --git a/ams/optimizer/pom.xml b/ams/optimizer/pom.xml index 18500a756d..8bf6ea6d11 100644 --- a/ams/optimizer/pom.xml +++ b/ams/optimizer/pom.xml @@ -29,7 +29,7 @@ amoro-optimizer pom - Amoro Project Optimizer Parent + Amoro Project AMS Optimizer Parent https://amoro.netease.com diff --git a/ams/optimizer/standalone-optimizer/pom.xml b/ams/optimizer/standalone-optimizer/pom.xml index 5f9f83a1ab..6bcd2741d4 100644 --- a/ams/optimizer/standalone-optimizer/pom.xml +++ b/ams/optimizer/standalone-optimizer/pom.xml @@ -29,7 +29,7 @@ 4.0.0 standalone-optimizer - Amoro Project Standalone Optimizer + Amoro Project AMS Standalone Optimizer https://amoro.netease.com diff --git a/ams/pom.xml b/ams/pom.xml index a8e054fced..d9a7207dbc 100644 --- a/ams/pom.xml +++ b/ams/pom.xml @@ -34,9 +34,10 @@ api - optimizer server dashboard + optimizer + dist diff --git a/ams/server/pom.xml b/ams/server/pom.xml index abf69e2f7c..8e7d5856d1 100644 --- a/ams/server/pom.xml +++ b/ams/server/pom.xml @@ -43,7 +43,7 @@ com.netease.amoro - amoro-hive + amoro-mixed-hive org.eclipse.jetty.orbit @@ -132,7 +132,7 @@ com.netease.amoro - amoro-spark-${terminal.spark.major.version} + amoro-mixed-spark-${terminal.spark.major.version} ${project.version} runtime @@ -340,7 +340,7 @@ com.netease.amoro - amoro-hive + amoro-mixed-hive ${project.version} test test-jar diff --git a/docker/amoro/Dockerfile b/docker/amoro/Dockerfile index 141b0770c3..efe43bcaf1 100644 --- a/docker/amoro/Dockerfile +++ b/docker/amoro/Dockerfile @@ -35,7 +35,7 @@ RUN apt-get update \ && apt-get install -y unzip RUN AMORO_VERSION=`cat pom.xml | grep 'amoro-parent' -C 3 | grep -Eo '.*' | awk -F'[><]' '{print $3}'` \ - && cp dist/target/*.zip /usr/local \ + && cp ams/dist/target/*.zip /usr/local \ && unzip /usr/local/amoro-${AMORO_VERSION}-bin.zip -d /usr/local \ && rm /usr/local/amoro-${AMORO_VERSION}/plugin/optimizer/flink -rf \ && mv /usr/local/amoro-${AMORO_VERSION} /usr/local/amoro \ diff --git a/docker/build.sh b/docker/build.sh index 2b00fdbff8..91b146e256 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -215,10 +215,10 @@ function build_amoro() { local IMAGE_TAG=$AMORO_TAG print_image $IMAGE_REF $IMAGE_TAG - local DIST_FILE=${PROJECT_HOME}/dist/target/amoro-${AMORO_VERSION}-bin.zip + local DIST_FILE=${PROJECT_HOME}/ams/dist/target/amoro-${AMORO_VERSION}-bin.zip if [ ! -f "${DIST_FILE}" ]; then - local BUILD_CMD="mvn clean package -am -e -pl dist -DskipTests " + local BUILD_CMD="mvn clean package -am -e -pl ams/dist -DskipTests " echo "Amoro dist package is not exists in ${DIST_FILE}" echo "please check file or run '$BUILD_CMD' first" fi @@ -234,10 +234,10 @@ function build_quickdemo() { local IMAGE_REF=arctic163/quickdemo local IMAGE_TAG=$AMORO_TAG - local FLINK_CONNECTOR_BINARY=${PROJECT_HOME}/flink/v${FLINK_MAJOR_VERSION}/flink-runtime/target/amoro-flink-runtime-${FLINK_MAJOR_VERSION}-${AMORO_VERSION}.jar + local FLINK_CONNECTOR_BINARY=${PROJECT_HOME}/mixed/flink/v${FLINK_MAJOR_VERSION}/flink-runtime/target/amoro-mixed-flink-runtime-${FLINK_MAJOR_VERSION}-${AMORO_VERSION}.jar if [ ! -f "${FLINK_CONNECTOR_BINARY}" ]; then - echo "amoro-flink-connector not exists in ${FLINK_CONNECTOR_BINARY}, run 'mvn clean package -pl !trino' first. " + echo "amoro-mixed-flink-connector not exists in ${FLINK_CONNECTOR_BINARY}, run 'mvn clean package -pl !mixed/trino' first. " exit 1 fi @@ -245,7 +245,7 @@ function build_quickdemo() { echo "Build dependency Amoro image." build_amoro if [ "$?" -ne 0 ]; then - echo "Build required Amor image failed." + echo "Build required Amoro image failed." exit 1 fi fi diff --git a/docker/quickdemo/Dockerfile b/docker/quickdemo/Dockerfile index 6e84ec939d..24836556e8 100644 --- a/docker/quickdemo/Dockerfile +++ b/docker/quickdemo/Dockerfile @@ -34,8 +34,8 @@ WORKDIR /workspace/amoro RUN AMORO_VERSION=`cat pom.xml | grep 'amoro-parent' -C 3 | grep -Eo '.*' | awk -F'[><]' '{print $3}'` \ && FLINK_VERSION=${FLINK_VERSION} \ && FLINK_MAJOR_VERSION="${FLINK_VERSION%.*}" \ - && cp flink/v${FLINK_MAJOR_VERSION}/flink-runtime/target/amoro-flink-runtime-${FLINK_MAJOR_VERSION}-${AMORO_VERSION}.jar \ - /opt/amoro-flink-runtime-${FLINK_MAJOR_VERSION}-${AMORO_VERSION}.jar \ + && cp mixed/flink/v${FLINK_MAJOR_VERSION}/flink-runtime/target/amoro-mixed-flink-runtime-${FLINK_MAJOR_VERSION}-${AMORO_VERSION}.jar \ + /opt/amoro-mixed-flink-runtime-${FLINK_MAJOR_VERSION}-${AMORO_VERSION}.jar \ && rm -rf /workspace/amoro diff --git a/docs/admin-guides/deployment.md b/docs/admin-guides/deployment.md index 7f55d7d8aa..af5c1c3ca1 100644 --- a/docs/admin-guides/deployment.md +++ b/docs/admin-guides/deployment.md @@ -35,8 +35,8 @@ You can build based on the master branch without compiling Trino. The compilatio git clone https://github.com/NetEase/amoro.git cd amoro base_dir=$(pwd) -mvn clean package -DskipTests -pl '!Trino' -cd dist/target/ +mvn clean package -DskipTests -pl '!mixed/trino' +cd ams/dist/target/ ls amoro-x.y.z-bin.zip # AMS release package dist-x.y.z-tests.jar @@ -44,19 +44,19 @@ dist-x.y.z.jar archive-tmp/ maven-archiver/ -cd ${base_dir}/flink/v1.15/flink-runtime/target +cd ${base_dir}/mixed/flink/v1.15/flink-runtime/target ls -amoro-flink-runtime-1.15-x.y.z-tests.jar -amoro-flink-runtime-1.15-x.y.z.jar # Flink 1.15 runtime package -original-amoro-flink-runtime-1.15-x.y.z.jar +amoro-mixed-flink-runtime-1.15-x.y.z-tests.jar +amoro-mixed-flink-runtime-1.15-x.y.z.jar # Flink 1.15 runtime package +original-amoro-mixed-flink-runtime-1.15-x.y.z.jar maven-archiver/ -cd ${base_dir}/spark/v3.1/spark-runtime/target +cd ${base_dir}/mixed/spark/v3.1/spark-runtime/target ls -amoro-spark-3.1-runtime-x.y.z.jar # Spark v3.1 runtime package) -amoro-spark-3.1-runtime-x.y.z-tests.jar -amoro-spark-3.1-runtime-x.y.z-sources.jar -original-amoro-spark-3.1-runtime-x.y.z.jar +amoro-mixed-spark-3.1-runtime-x.y.z.jar # Spark v3.1 runtime package) +amoro-mixed-spark-3.1-runtime-x.y.z-tests.jar +amoro-mixed-spark-3.1-runtime-x.y.z-sources.jar +original-amoro-mixed-spark-3.1-runtime-x.y.z.jar ``` If you need to compile the Trino module at the same time, you need to install jdk17 locally and configure `toolchains.xml` in the user's `${user.home}/.m2/` directory, @@ -113,7 +113,7 @@ Make sure the port is not used before configuring it. You can use MySQL/PostgreSQL as the system database instead of the default Derby. -If you would like to use MySQL as the system database, you need to manually download the [MySQL JDBC Connector](https://repo1.maven.org/maven2/com/mysql/mysql-connector-j/8.1.0/mysql-connector-j-8.1.0.jar) +If you would like to use MySQL as the system database, you need to manually download the [MySQL JDBC Connector](https://repo1.maven.org/maven2/com/mysql/mysql-connector-j/8.1.0/mysql-connector-j-8.1.0.jar) and move it into the `{AMORO_HOME}/lib/` directory. You can use the following command to complete these operations: ```shell cd ${AMORO_HOME} @@ -161,7 +161,7 @@ ams: ### Configure optimizer containers -To scale out the optimizer through AMS, container configuration is required. +To scale out the optimizer through AMS, container configuration is required. If you choose to manually start an external optimizer, no additional container configuration is required. AMS will initialize a container named `external` by default to store all externally started optimizers. AMS provides implementations of `LocalContainer` and `FlinkContainer` by default. Configuration for both container types can be found below: @@ -199,7 +199,7 @@ ams: ### Environments variables -The following environment variables take effect during the startup process of AMS, +The following environment variables take effect during the startup process of AMS, you can set up those environments to overwrite the default value. | Environments variable name | Default value | Description | @@ -219,7 +219,7 @@ The following JVM options could be set in `${AMORO_CONF_DIR}/jvm.properties`. | xmx | "-Xmx${value}m | Xmx config for jvm | | jmx.remote.port | "-Dcom.sun.management.jmxremote.port=${value} | Enable remote debug | | extra.options | "JAVA_OPTS="${JAVA_OPTS} ${JVM_EXTRA_CONFIG}" | The addition jvm options | - + ## Start AMS @@ -230,7 +230,7 @@ cd amoro-x.y.z bin/ams.sh start ``` -Then, access http://localhost:1630 through a browser to see the login page. If it appears, it means that the startup is +Then, access http://localhost:1630 through a browser to see the login page. If it appears, it means that the startup is successful. The default username and password for login are both "admin". You can also restart/stop AMS with the following command: diff --git a/docs/engines/flink/flink-get-started.md b/docs/engines/flink/flink-get-started.md index 7a6e0ec8b2..01e43b81b5 100644 --- a/docs/engines/flink/flink-get-started.md +++ b/docs/engines/flink/flink-get-started.md @@ -46,7 +46,7 @@ Version Description: The Amoro project can be self-compiled to obtain the runtime jar. -`mvn clean package -pl ':amoro-flink-runtime-1.15' -am -DskipTests` +`mvn clean package -pl ':amoro-mixed-flink-runtime-1.15' -am -DskipTests` The Flink Runtime Jar is located in the `flink/v1.15/flink-runtime/target` directory. @@ -72,11 +72,11 @@ cd flink-${FLINK_VERSION} # Download Flink Hadoop dependency wget ${FLINK_CONNECTOR_URL}/flink-shaded-hadoop-2-uber/${FLINK_HADOOP_SHADE_VERSION}-10.0/flink-shaded-hadoop-2-uber-${FLINK_HADOOP_SHADE_VERSION}-10.0.jar # Download Flink Amoro Connector -wget ${AMORO_CONNECTOR_URL}/amoro-flink-runtime-${FLINK_MAJOR_VERSION}/${AMORO_VERSION}/amoro-flink-runtime-${FLINK_MAJOR_VERSION}-${AMORO_VERSION}.jar +wget ${AMORO_CONNECTOR_URL}/amoro-mixed-flink-runtime-${FLINK_MAJOR_VERSION}/${AMORO_VERSION}/amoro-mixed-flink-runtime-${FLINK_MAJOR_VERSION}-${AMORO_VERSION}.jar # Copy the necessary JAR files to the lib directory mv flink-shaded-hadoop-2-uber-${FLINK_HADOOP_SHADE_VERSION}-10.0.jar lib -mv amoro-flink-runtime-${FLINK_MAJOR_VERSION}-${AMORO_VERSION}.jar lib +mv amoro-mixed-flink-runtime-${FLINK_MAJOR_VERSION}-${AMORO_VERSION}.jar lib ``` Modify Flink related configuration files: @@ -100,7 +100,7 @@ Move the dependencies to the lib directory of Flink: # Used to create a socket connector for inputting CDC data via sockets. Not necessary for non-quickstart examples. cp examples/table/ChangelogSocketExample.jar lib -cp ../amoro-flink-runtime-${FLINK_MAJOR_VERSION}-${AMORO_VERSION}.jar lib +cp ../amoro-mixed-flink-runtime-${FLINK_MAJOR_VERSION}-${AMORO_VERSION}.jar lib cp ../flink-shaded-hadoop-2-uber-${FLINK_HADOOP_SHADE_VERSION}-10.0.jar lib ``` diff --git a/docs/engines/spark/spark-get-started.md b/docs/engines/spark/spark-get-started.md index 21745425b7..a7f7b4fd38 100644 --- a/docs/engines/spark/spark-get-started.md +++ b/docs/engines/spark/spark-get-started.md @@ -12,7 +12,7 @@ menu: # Iceberg Format The Iceberg Format can be accessed using the Connector provided by Iceberg. -Refer to the documentation at [Iceberg Spark Connector](https://iceberg.apache.org/docs/latest/getting-started/) +Refer to the documentation at [Iceberg Spark Connector](https://iceberg.apache.org/docs/latest/getting-started/) for more information. # Paimon Format @@ -27,10 +27,10 @@ for more information. To use Amoro in a Spark shell, use the --packages option: ```bash -spark-shell --packages com.netease.amoro:amoro-spark-3.3-runtime:0.5.0 +spark-shell --packages com.netease.amoro:amoro-mixed-spark-3.3-runtime:0.5.0 ``` -> If you want to include the connector in your Spark installation, add the `amoro-spark-3.3-runtime` Jar to +> If you want to include the connector in your Spark installation, add the `amoro-mixed-spark-3.3-runtime` Jar to > Spark's `jars` folder. ## Adding catalogs @@ -42,10 +42,10 @@ ${SPARK_HOME}/bin/spark-sql \ --conf spark.sql.catalog.local_catalog.url=thrift://${AMS_HOST}:${AMS_PORT}/${AMS_CATALOG_NAME} ``` -> Amoro manages the Catalog through AMS, and Spark catalog needs to be mapped to Amoro Catalog via URL, +> Amoro manages the Catalog through AMS, and Spark catalog needs to be mapped to Amoro Catalog via URL, > in the following format: -> `thrift://${AMS_HOST}:${AMS_PORT}/${AMS_CATALOG_NAME}`, -> The arctic-spark-connector will automatically download the Hadoop site configuration file through +> `thrift://${AMS_HOST}:${AMS_PORT}/${AMS_CATALOG_NAME}`, +> The arctic-spark-connector will automatically download the Hadoop site configuration file through > the thrift protocol for accessing the HDFS cluster > @@ -126,7 +126,7 @@ from test2 group by data; ``` -For table with primary keys defined, you can query on `ChangeStore` by `.change` +For table with primary keys defined, you can query on `ChangeStore` by `.change` ``` select count(1) as count, data diff --git a/docs/engines/trino.md b/docs/engines/trino.md index d0144a4cd7..e1acc56f6f 100644 --- a/docs/engines/trino.md +++ b/docs/engines/trino.md @@ -21,8 +21,8 @@ please refer to the documentation at [Paimon Trino user manual](https://paimon.a ## Mixed format ### Install -- Create the {trino_home}/plugin/amoro directory in the Trino installation package, - and extract the contents of the amoro-trino package trino-amoro-xx-SNAPSHOT.tar.gz to the {trino_home}/plugin/amoro directory. +- Create the {trino_home}/plugin/amoro directory in the Trino installation package, + and extract the contents of the amoro-trino package amoro-mixed-trino-xx.tar.gz to the {trino_home}/plugin/amoro directory. - Configure the Catalog configuration file for Amoro in the {trino_home}/etc/catalog directory, for example: ```tex connector.name=arctic @@ -47,7 +47,7 @@ SELECT * FROM "{TABLE_NAME}" #### Query BaseStore of Table -Directly querying the BaseStore in a table with a primary key is supported. The BaseStore stores the stock data of the table, which is usually generated by batch job or optimization. +Directly querying the BaseStore in a table with a primary key is supported. The BaseStore stores the stock data of the table, which is usually generated by batch job or optimization. The queried data is static, and the query efficiency is very high, but the timeliness is not good. The syntax is as follows: ```sql diff --git a/flink/flink-common-format/pom.xml b/mixed/flink/flink-common-format/pom.xml similarity index 92% rename from flink/flink-common-format/pom.xml rename to mixed/flink/flink-common-format/pom.xml index 82395b8811..9bd5996ef6 100644 --- a/flink/flink-common-format/pom.xml +++ b/mixed/flink/flink-common-format/pom.xml @@ -21,13 +21,13 @@ 4.0.0 com.netease.amoro - amoro-flink + amoro-mixed-flink 0.7.0-SNAPSHOT ../pom.xml - flink-common-format - Amoro Project Flink Common Format + amoro-mixed-flink-common-format + Amoro Project Mixed Format Flink Common Format https://amoro.netease.com diff --git a/flink/flink-common-format/src/main/java/com/netease/arctic/flink/shuffle/LogRecordV1.java b/mixed/flink/flink-common-format/src/main/java/com/netease/arctic/flink/shuffle/LogRecordV1.java similarity index 100% rename from flink/flink-common-format/src/main/java/com/netease/arctic/flink/shuffle/LogRecordV1.java rename to mixed/flink/flink-common-format/src/main/java/com/netease/arctic/flink/shuffle/LogRecordV1.java diff --git a/flink/flink-common-format/src/main/java/com/netease/arctic/flink/shuffle/RowKindUtil.java b/mixed/flink/flink-common-format/src/main/java/com/netease/arctic/flink/shuffle/RowKindUtil.java similarity index 100% rename from flink/flink-common-format/src/main/java/com/netease/arctic/flink/shuffle/RowKindUtil.java rename to mixed/flink/flink-common-format/src/main/java/com/netease/arctic/flink/shuffle/RowKindUtil.java diff --git a/flink/flink-common-iceberg-bridge/pom.xml b/mixed/flink/flink-common-iceberg-bridge/pom.xml similarity index 97% rename from flink/flink-common-iceberg-bridge/pom.xml rename to mixed/flink/flink-common-iceberg-bridge/pom.xml index 06fa60d4ff..75bc364d74 100644 --- a/flink/flink-common-iceberg-bridge/pom.xml +++ b/mixed/flink/flink-common-iceberg-bridge/pom.xml @@ -21,13 +21,13 @@ 4.0.0 com.netease.amoro - amoro-flink + amoro-mixed-flink 0.7.0-SNAPSHOT ../pom.xml - flink-common-iceberg-bridge - Amoro Project Flink Iceberg Bridge + amoro-mixed-flink-common-iceberg-bridge + Amoro Project Mixed Format Flink Iceberg Bridge https://amoro.netease.com @@ -52,7 +52,7 @@ com.netease.amoro - amoro-hive + amoro-mixed-hive ${project.version} @@ -306,7 +306,7 @@ com.netease.amoro - amoro-hive + amoro-mixed-hive ${project.version} tests test diff --git a/flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveFlinkParquetReaders.java b/mixed/flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveFlinkParquetReaders.java similarity index 100% rename from flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveFlinkParquetReaders.java rename to mixed/flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveFlinkParquetReaders.java diff --git a/flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveFlinkParquetWriters.java b/mixed/flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveFlinkParquetWriters.java similarity index 100% rename from flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveFlinkParquetWriters.java rename to mixed/flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveFlinkParquetWriters.java diff --git a/flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveParquetWithFlinkSchemaVisitor.java b/mixed/flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveParquetWithFlinkSchemaVisitor.java similarity index 100% rename from flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveParquetWithFlinkSchemaVisitor.java rename to mixed/flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveParquetWithFlinkSchemaVisitor.java diff --git a/flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/source/RowDataFileScanTaskReader.java b/mixed/flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/source/RowDataFileScanTaskReader.java similarity index 100% rename from flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/source/RowDataFileScanTaskReader.java rename to mixed/flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/source/RowDataFileScanTaskReader.java diff --git a/flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/source/ScanContext.java b/mixed/flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/source/ScanContext.java similarity index 100% rename from flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/source/ScanContext.java rename to mixed/flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/source/ScanContext.java diff --git a/flink/flink-common/pom.xml b/mixed/flink/flink-common/pom.xml similarity index 97% rename from flink/flink-common/pom.xml rename to mixed/flink/flink-common/pom.xml index af24ff5962..ccc0a547cc 100644 --- a/flink/flink-common/pom.xml +++ b/mixed/flink/flink-common/pom.xml @@ -22,13 +22,13 @@ 4.0.0 com.netease.amoro - amoro-flink + amoro-mixed-flink 0.7.0-SNAPSHOT ../pom.xml - flink-common - Amoro Project Flink Common + amoro-mixed-flink-common + Amoro Project Mixed Format Flink Common https://amoro.netease.com jar @@ -55,12 +55,12 @@ com.netease.amoro - amoro-hive + amoro-mixed-hive com.netease.amoro - flink-common-iceberg-bridge + amoro-mixed-flink-common-iceberg-bridge ${project.version} @@ -87,7 +87,7 @@ com.netease.amoro - flink-common-format + amoro-mixed-flink-common-format ${project.parent.version} @@ -317,7 +317,7 @@ com.netease.amoro - amoro-hive + amoro-mixed-hive ${project.version} tests test diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/FlinkSchemaUtil.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/FlinkSchemaUtil.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/FlinkSchemaUtil.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/FlinkSchemaUtil.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/InternalCatalogBuilder.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/InternalCatalogBuilder.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/InternalCatalogBuilder.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/InternalCatalogBuilder.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/ArcticCatalog.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/ArcticCatalog.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/ArcticCatalog.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/ArcticCatalog.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/factories/ArcticCatalogFactory.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/factories/ArcticCatalogFactory.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/factories/ArcticCatalogFactory.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/factories/ArcticCatalogFactory.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/factories/ArcticCatalogFactoryOptions.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/factories/ArcticCatalogFactoryOptions.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/factories/ArcticCatalogFactoryOptions.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/catalog/factories/ArcticCatalogFactoryOptions.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/interceptor/FlinkTablePropertiesInvocationHandler.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/interceptor/FlinkTablePropertiesInvocationHandler.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/interceptor/FlinkTablePropertiesInvocationHandler.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/interceptor/FlinkTablePropertiesInvocationHandler.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/interceptor/KerberosInterceptor.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/interceptor/KerberosInterceptor.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/interceptor/KerberosInterceptor.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/interceptor/KerberosInterceptor.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/interceptor/KerberosInvocationHandler.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/interceptor/KerberosInvocationHandler.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/interceptor/KerberosInvocationHandler.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/interceptor/KerberosInvocationHandler.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/interceptor/ProxyFactory.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/interceptor/ProxyFactory.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/interceptor/ProxyFactory.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/interceptor/ProxyFactory.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/ArcticRowDataLookupFunction.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/ArcticRowDataLookupFunction.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/ArcticRowDataLookupFunction.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/ArcticRowDataLookupFunction.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/BasicLookupFunction.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/BasicLookupFunction.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/BasicLookupFunction.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/BasicLookupFunction.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/BinaryRowDataSerializerWrapper.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/BinaryRowDataSerializerWrapper.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/BinaryRowDataSerializerWrapper.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/BinaryRowDataSerializerWrapper.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/ByteArraySetSerializer.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/ByteArraySetSerializer.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/ByteArraySetSerializer.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/ByteArraySetSerializer.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/ByteArrayWrapper.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/ByteArrayWrapper.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/ByteArrayWrapper.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/ByteArrayWrapper.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/KVTable.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/KVTable.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/KVTable.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/KVTable.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/KVTableFactory.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/KVTableFactory.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/KVTableFactory.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/KVTableFactory.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/KeyRowData.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/KeyRowData.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/KeyRowData.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/KeyRowData.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/LookupMetrics.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/LookupMetrics.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/LookupMetrics.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/LookupMetrics.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/LookupOptions.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/LookupOptions.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/LookupOptions.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/LookupOptions.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/LookupRecord.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/LookupRecord.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/LookupRecord.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/LookupRecord.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/RocksDBCacheState.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/RocksDBCacheState.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/RocksDBCacheState.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/RocksDBCacheState.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/RocksDBRecordState.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/RocksDBRecordState.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/RocksDBRecordState.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/RocksDBRecordState.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/RocksDBSetSpilledState.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/RocksDBSetSpilledState.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/RocksDBSetSpilledState.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/RocksDBSetSpilledState.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/RocksDBSetState.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/RocksDBSetState.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/RocksDBSetState.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/RocksDBSetState.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/RowDataStateFactory.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/RowDataStateFactory.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/RowDataStateFactory.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/RowDataStateFactory.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/SecondaryIndexTable.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/SecondaryIndexTable.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/SecondaryIndexTable.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/SecondaryIndexTable.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/TableFactory.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/TableFactory.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/TableFactory.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/TableFactory.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/UniqueIndexTable.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/UniqueIndexTable.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/UniqueIndexTable.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/UniqueIndexTable.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/filter/RowDataPredicate.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/filter/RowDataPredicate.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/filter/RowDataPredicate.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/filter/RowDataPredicate.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/filter/RowDataPredicateExpressionVisitor.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/filter/RowDataPredicateExpressionVisitor.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/filter/RowDataPredicateExpressionVisitor.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/lookup/filter/RowDataPredicateExpressionVisitor.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/metric/MetricConstant.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/metric/MetricConstant.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/metric/MetricConstant.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/metric/MetricConstant.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/metric/MetricsGenerator.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/metric/MetricsGenerator.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/metric/MetricsGenerator.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/metric/MetricsGenerator.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/planner/calcite/FlinkTypeSystem.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/planner/calcite/FlinkTypeSystem.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/planner/calcite/FlinkTypeSystem.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/planner/calcite/FlinkTypeSystem.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/AdaptHiveFlinkParquetReaders.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/AdaptHiveFlinkParquetReaders.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/AdaptHiveFlinkParquetReaders.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/AdaptHiveFlinkParquetReaders.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/ArcticSource.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/ArcticSource.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/ArcticSource.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/ArcticSource.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/FlinkSplitPlanner.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/FlinkSplitPlanner.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/FlinkSplitPlanner.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/FlinkSplitPlanner.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/MixedIncrementalLoader.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/MixedIncrementalLoader.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/MixedIncrementalLoader.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/MixedIncrementalLoader.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/PartitionAndNodeGroup.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/PartitionAndNodeGroup.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/PartitionAndNodeGroup.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/PartitionAndNodeGroup.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/assigner/ShuffleSplitAssigner.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/assigner/ShuffleSplitAssigner.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/assigner/ShuffleSplitAssigner.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/assigner/ShuffleSplitAssigner.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/assigner/Split.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/assigner/Split.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/assigner/Split.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/assigner/Split.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/assigner/SplitAssigner.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/assigner/SplitAssigner.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/assigner/SplitAssigner.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/assigner/SplitAssigner.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/assigner/StaticSplitAssigner.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/assigner/StaticSplitAssigner.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/assigner/StaticSplitAssigner.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/assigner/StaticSplitAssigner.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/AbstractArcticEnumerator.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/AbstractArcticEnumerator.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/AbstractArcticEnumerator.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/AbstractArcticEnumerator.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ArcticEnumeratorOffset.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ArcticEnumeratorOffset.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ArcticEnumeratorOffset.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ArcticEnumeratorOffset.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ArcticEnumeratorOffsetSerializer.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ArcticEnumeratorOffsetSerializer.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ArcticEnumeratorOffsetSerializer.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ArcticEnumeratorOffsetSerializer.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ArcticSourceEnumState.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ArcticSourceEnumState.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ArcticSourceEnumState.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ArcticSourceEnumState.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ArcticSourceEnumStateSerializer.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ArcticSourceEnumStateSerializer.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ArcticSourceEnumStateSerializer.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ArcticSourceEnumStateSerializer.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ArcticSourceEnumerator.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ArcticSourceEnumerator.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ArcticSourceEnumerator.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ArcticSourceEnumerator.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ContinuousEnumerationResult.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ContinuousEnumerationResult.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ContinuousEnumerationResult.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ContinuousEnumerationResult.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ContinuousSplitPlanner.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ContinuousSplitPlanner.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ContinuousSplitPlanner.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ContinuousSplitPlanner.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ContinuousSplitPlannerImpl.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ContinuousSplitPlannerImpl.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ContinuousSplitPlannerImpl.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/ContinuousSplitPlannerImpl.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/InitializationFinishedEvent.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/InitializationFinishedEvent.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/InitializationFinishedEvent.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/InitializationFinishedEvent.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/MergeOnReadIncrementalPlanner.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/MergeOnReadIncrementalPlanner.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/MergeOnReadIncrementalPlanner.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/MergeOnReadIncrementalPlanner.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/MergeOnReadPlannerImpl.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/MergeOnReadPlannerImpl.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/MergeOnReadPlannerImpl.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/MergeOnReadPlannerImpl.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/StaticArcticSourceEnumerator.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/StaticArcticSourceEnumerator.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/StaticArcticSourceEnumerator.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/enumerator/StaticArcticSourceEnumerator.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ArcticRecordEmitter.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ArcticRecordEmitter.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ArcticRecordEmitter.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ArcticRecordEmitter.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ArcticRecordWithOffset.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ArcticRecordWithOffset.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ArcticRecordWithOffset.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ArcticRecordWithOffset.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ArcticSourceReader.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ArcticSourceReader.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ArcticSourceReader.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ArcticSourceReader.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ArrayBatchRecords.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ArrayBatchRecords.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ArrayBatchRecords.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ArrayBatchRecords.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ArrayPoolDataIteratorBatcher.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ArrayPoolDataIteratorBatcher.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ArrayPoolDataIteratorBatcher.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ArrayPoolDataIteratorBatcher.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/DataIteratorBatcher.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/DataIteratorBatcher.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/DataIteratorBatcher.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/DataIteratorBatcher.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/DataIteratorReaderFunction.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/DataIteratorReaderFunction.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/DataIteratorReaderFunction.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/DataIteratorReaderFunction.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/HybridSplitReader.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/HybridSplitReader.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/HybridSplitReader.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/HybridSplitReader.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ReaderFunction.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ReaderFunction.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ReaderFunction.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ReaderFunction.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ReaderStartedEvent.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ReaderStartedEvent.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ReaderStartedEvent.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/ReaderStartedEvent.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/RecordFactory.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/RecordFactory.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/RecordFactory.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/RecordFactory.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/RecordPosition.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/RecordPosition.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/RecordPosition.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/RecordPosition.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/RowDataReaderFunction.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/RowDataReaderFunction.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/RowDataReaderFunction.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/RowDataReaderFunction.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/RowDataRecordFactory.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/RowDataRecordFactory.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/RowDataRecordFactory.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/reader/RowDataRecordFactory.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/ArcticSplit.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/ArcticSplit.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/ArcticSplit.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/ArcticSplit.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/ArcticSplitSerializer.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/ArcticSplitSerializer.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/ArcticSplitSerializer.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/ArcticSplitSerializer.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/ArcticSplitState.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/ArcticSplitState.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/ArcticSplitState.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/ArcticSplitState.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/ChangelogSplit.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/ChangelogSplit.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/ChangelogSplit.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/ChangelogSplit.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/MergeOnReadSplit.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/MergeOnReadSplit.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/MergeOnReadSplit.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/MergeOnReadSplit.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/SnapshotSplit.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/SnapshotSplit.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/SnapshotSplit.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/SnapshotSplit.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/SplitRequestEvent.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/SplitRequestEvent.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/SplitRequestEvent.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/SplitRequestEvent.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/TemporalJoinSplits.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/TemporalJoinSplits.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/TemporalJoinSplits.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/hybrid/split/TemporalJoinSplits.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/internals/KafkaPartitionSplitReader.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/internals/KafkaPartitionSplitReader.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/internals/KafkaPartitionSplitReader.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/internals/KafkaPartitionSplitReader.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/internals/KafkaSource.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/internals/KafkaSource.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/internals/KafkaSource.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/internals/KafkaSource.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/internals/KafkaSourceFetcherManager.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/internals/KafkaSourceFetcherManager.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/internals/KafkaSourceFetcherManager.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/internals/KafkaSourceFetcherManager.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/internals/KafkaSourceReader.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/internals/KafkaSourceReader.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/internals/KafkaSourceReader.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/internals/KafkaSourceReader.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/internals/metrics/KafkaConsumerMetricConstants.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/internals/metrics/KafkaConsumerMetricConstants.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/internals/metrics/KafkaConsumerMetricConstants.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/internals/metrics/KafkaConsumerMetricConstants.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/ArcticScanContext.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/ArcticScanContext.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/ArcticScanContext.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/ArcticScanContext.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/ChangeLogDataIterator.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/ChangeLogDataIterator.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/ChangeLogDataIterator.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/ChangeLogDataIterator.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/DataIterator.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/DataIterator.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/DataIterator.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/DataIterator.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/FileScanTaskReader.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/FileScanTaskReader.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/FileScanTaskReader.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/FileScanTaskReader.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/FlinkArcticDataReader.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/FlinkArcticDataReader.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/FlinkArcticDataReader.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/FlinkArcticDataReader.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/FlinkArcticMORDataReader.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/FlinkArcticMORDataReader.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/FlinkArcticMORDataReader.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/FlinkArcticMORDataReader.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/MergeOnReadDataIterator.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/MergeOnReadDataIterator.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/MergeOnReadDataIterator.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/MergeOnReadDataIterator.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/LogSourceHelper.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/LogSourceHelper.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/LogSourceHelper.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/LogSourceHelper.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaPartitionSplit.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaPartitionSplit.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaPartitionSplit.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaPartitionSplit.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaPartitionSplitReader.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaPartitionSplitReader.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaPartitionSplitReader.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaPartitionSplitReader.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaPartitionSplitState.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaPartitionSplitState.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaPartitionSplitState.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaPartitionSplitState.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaRecordEmitter.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaRecordEmitter.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaRecordEmitter.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaRecordEmitter.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaSource.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaSource.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaSource.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaSource.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaSourceBuilder.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaSourceBuilder.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaSourceBuilder.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaSourceBuilder.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaSourceReader.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaSourceReader.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaSourceReader.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogKafkaSourceReader.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogRecordWithRetractInfo.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogRecordWithRetractInfo.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogRecordWithRetractInfo.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/read/source/log/kafka/LogRecordWithRetractInfo.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/shuffle/ReadShuffleRulePolicy.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/shuffle/ReadShuffleRulePolicy.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/shuffle/ReadShuffleRulePolicy.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/shuffle/ReadShuffleRulePolicy.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/shuffle/RoundRobinShuffleRulePolicy.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/shuffle/RoundRobinShuffleRulePolicy.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/shuffle/RoundRobinShuffleRulePolicy.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/shuffle/RoundRobinShuffleRulePolicy.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/shuffle/ShuffleHelper.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/shuffle/ShuffleHelper.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/shuffle/ShuffleHelper.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/shuffle/ShuffleHelper.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/shuffle/ShuffleKey.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/shuffle/ShuffleKey.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/shuffle/ShuffleKey.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/shuffle/ShuffleKey.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/shuffle/ShuffleRulePolicy.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/shuffle/ShuffleRulePolicy.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/shuffle/ShuffleRulePolicy.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/shuffle/ShuffleRulePolicy.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/table/ArcticDynamicSink.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/ArcticDynamicSink.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/table/ArcticDynamicSink.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/ArcticDynamicSink.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/table/ArcticDynamicSource.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/ArcticDynamicSource.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/table/ArcticDynamicSource.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/ArcticDynamicSource.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/table/ArcticFileSource.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/ArcticFileSource.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/table/ArcticFileSource.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/ArcticFileSource.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/table/ArcticTableLoader.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/ArcticTableLoader.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/table/ArcticTableLoader.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/ArcticTableLoader.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/table/DynamicTableFactory.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/DynamicTableFactory.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/table/DynamicTableFactory.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/DynamicTableFactory.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/table/FlinkSource.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/FlinkSource.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/table/FlinkSource.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/FlinkSource.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/table/KafkaConnectorOptionsUtil.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/KafkaConnectorOptionsUtil.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/table/KafkaConnectorOptionsUtil.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/KafkaConnectorOptionsUtil.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/table/LogDynamicSource.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/LogDynamicSource.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/table/LogDynamicSource.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/LogDynamicSource.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/table/UnkeyedInputFormatOperatorFactory.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/UnkeyedInputFormatOperatorFactory.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/table/UnkeyedInputFormatOperatorFactory.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/UnkeyedInputFormatOperatorFactory.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/table/UnkeyedInputFormatSourceFunction.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/UnkeyedInputFormatSourceFunction.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/table/UnkeyedInputFormatSourceFunction.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/UnkeyedInputFormatSourceFunction.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/table/descriptors/ArcticValidator.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/descriptors/ArcticValidator.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/table/descriptors/ArcticValidator.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/table/descriptors/ArcticValidator.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/util/ArcticUtils.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/ArcticUtils.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/util/ArcticUtils.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/ArcticUtils.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/util/CompatibleFlinkPropertyUtil.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/CompatibleFlinkPropertyUtil.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/util/CompatibleFlinkPropertyUtil.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/CompatibleFlinkPropertyUtil.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/util/DateTimeUtils.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/DateTimeUtils.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/util/DateTimeUtils.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/DateTimeUtils.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/util/FilterUtil.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/FilterUtil.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/util/FilterUtil.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/FilterUtil.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/util/FlinkClassReflectionUtil.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/FlinkClassReflectionUtil.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/util/FlinkClassReflectionUtil.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/FlinkClassReflectionUtil.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/util/IcebergAndFlinkFilters.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/IcebergAndFlinkFilters.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/util/IcebergAndFlinkFilters.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/IcebergAndFlinkFilters.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/util/IcebergClassUtil.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/IcebergClassUtil.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/util/IcebergClassUtil.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/IcebergClassUtil.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/util/LookupUtil.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/LookupUtil.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/util/LookupUtil.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/LookupUtil.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/util/Projection.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/Projection.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/util/Projection.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/Projection.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/util/ProxyUtil.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/ProxyUtil.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/util/ProxyUtil.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/ProxyUtil.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/util/ReflectionUtil.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/ReflectionUtil.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/util/ReflectionUtil.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/ReflectionUtil.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/util/ThreadLocalCache.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/ThreadLocalCache.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/util/ThreadLocalCache.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/util/ThreadLocalCache.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/write/AdaptHiveFlinkAppenderFactory.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/AdaptHiveFlinkAppenderFactory.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/write/AdaptHiveFlinkAppenderFactory.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/AdaptHiveFlinkAppenderFactory.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/write/ArcticFileWriter.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/ArcticFileWriter.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/write/ArcticFileWriter.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/ArcticFileWriter.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/write/ArcticLogWriter.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/ArcticLogWriter.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/write/ArcticLogWriter.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/ArcticLogWriter.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/write/ArcticRowDataTaskWriterFactory.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/ArcticRowDataTaskWriterFactory.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/write/ArcticRowDataTaskWriterFactory.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/ArcticRowDataTaskWriterFactory.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/write/ArcticWriter.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/ArcticWriter.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/write/ArcticWriter.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/ArcticWriter.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/write/AutomaticDoubleWriteStatus.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/AutomaticDoubleWriteStatus.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/write/AutomaticDoubleWriteStatus.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/AutomaticDoubleWriteStatus.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/write/AutomaticLogWriter.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/AutomaticLogWriter.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/write/AutomaticLogWriter.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/AutomaticLogWriter.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/write/AutomaticWriteSpecification.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/AutomaticWriteSpecification.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/write/AutomaticWriteSpecification.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/AutomaticWriteSpecification.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/write/FlinkBaseTaskWriter.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/FlinkBaseTaskWriter.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/write/FlinkBaseTaskWriter.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/FlinkBaseTaskWriter.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/write/FlinkChangeTaskWriter.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/FlinkChangeTaskWriter.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/write/FlinkChangeTaskWriter.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/FlinkChangeTaskWriter.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/write/FlinkSink.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/FlinkSink.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/write/FlinkSink.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/FlinkSink.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/write/FlinkTaskWriterBuilder.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/FlinkTaskWriterBuilder.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/write/FlinkTaskWriterBuilder.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/FlinkTaskWriterBuilder.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/AbstractHiddenLogWriter.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/AbstractHiddenLogWriter.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/AbstractHiddenLogWriter.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/AbstractHiddenLogWriter.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/ArcticLogPartitioner.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/ArcticLogPartitioner.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/ArcticLogPartitioner.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/ArcticLogPartitioner.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/GlobalFlipCommitter.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/GlobalFlipCommitter.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/GlobalFlipCommitter.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/GlobalFlipCommitter.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/HiddenLogWriter.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/HiddenLogWriter.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/HiddenLogWriter.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/HiddenLogWriter.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/LogMsgFactory.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/LogMsgFactory.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/LogMsgFactory.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/LogMsgFactory.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/kafka/HiddenKafkaFactory.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/kafka/HiddenKafkaFactory.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/kafka/HiddenKafkaFactory.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/kafka/HiddenKafkaFactory.java diff --git a/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/kafka/HiddenKafkaProducer.java b/mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/kafka/HiddenKafkaProducer.java similarity index 100% rename from flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/kafka/HiddenKafkaProducer.java rename to mixed/flink/flink-common/src/main/java/com/netease/arctic/flink/write/hidden/kafka/HiddenKafkaProducer.java diff --git a/flink/flink-common/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/mixed/flink/flink-common/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory similarity index 100% rename from flink/flink-common/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory rename to mixed/flink/flink-common/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory diff --git a/flink/flink-common/src/main/resources/log4j.properties b/mixed/flink/flink-common/src/main/resources/log4j.properties similarity index 100% rename from flink/flink-common/src/main/resources/log4j.properties rename to mixed/flink/flink-common/src/main/resources/log4j.properties diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/DynamicTableSourceTestBase.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/DynamicTableSourceTestBase.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/DynamicTableSourceTestBase.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/DynamicTableSourceTestBase.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/FlinkTableTestBase.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/FlinkTableTestBase.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/FlinkTableTestBase.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/FlinkTableTestBase.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/FlinkTestBase.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/FlinkTestBase.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/FlinkTestBase.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/FlinkTestBase.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/TestFlinkSchemaUtil.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/TestFlinkSchemaUtil.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/TestFlinkSchemaUtil.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/TestFlinkSchemaUtil.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/catalog/TestArcticCatalogTablePartitions.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/catalog/TestArcticCatalogTablePartitions.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/catalog/TestArcticCatalogTablePartitions.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/catalog/TestArcticCatalogTablePartitions.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/catalog/TestCatalog.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/catalog/TestCatalog.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/catalog/TestCatalog.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/catalog/TestCatalog.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/kafka/testutils/KafkaConfigGenerate.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/kafka/testutils/KafkaConfigGenerate.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/kafka/testutils/KafkaConfigGenerate.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/kafka/testutils/KafkaConfigGenerate.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/kafka/testutils/KafkaContainerTest.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/kafka/testutils/KafkaContainerTest.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/kafka/testutils/KafkaContainerTest.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/kafka/testutils/KafkaContainerTest.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/kafka/testutils/KafkaUtil.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/kafka/testutils/KafkaUtil.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/kafka/testutils/KafkaUtil.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/kafka/testutils/KafkaUtil.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/kafka/testutils/SuccessException.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/kafka/testutils/SuccessException.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/kafka/testutils/SuccessException.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/kafka/testutils/SuccessException.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/lookup/ByteArraySetSerializerTest.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/lookup/ByteArraySetSerializerTest.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/lookup/ByteArraySetSerializerTest.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/lookup/ByteArraySetSerializerTest.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/lookup/TestKVTable.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/lookup/TestKVTable.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/lookup/TestKVTable.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/lookup/TestKVTable.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/lookup/filter/TestRowDataPredicateAllFieldTypes.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/lookup/filter/TestRowDataPredicateAllFieldTypes.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/lookup/filter/TestRowDataPredicateAllFieldTypes.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/lookup/filter/TestRowDataPredicateAllFieldTypes.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/lookup/filter/TestRowDataPredicateBase.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/lookup/filter/TestRowDataPredicateBase.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/lookup/filter/TestRowDataPredicateBase.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/lookup/filter/TestRowDataPredicateBase.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/lookup/filter/TestRowDataPredicateExpressionVisitor.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/lookup/filter/TestRowDataPredicateExpressionVisitor.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/lookup/filter/TestRowDataPredicateExpressionVisitor.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/lookup/filter/TestRowDataPredicateExpressionVisitor.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/read/TestArcticSource.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/TestArcticSource.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/read/TestArcticSource.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/TestArcticSource.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/read/TestFlinkSource.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/TestFlinkSource.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/read/TestFlinkSource.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/TestFlinkSource.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/read/TestFlinkSplitPlanner.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/TestFlinkSplitPlanner.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/read/TestFlinkSplitPlanner.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/TestFlinkSplitPlanner.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hidden/kafka/TestKafkaConsumer.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hidden/kafka/TestKafkaConsumer.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/read/hidden/kafka/TestKafkaConsumer.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hidden/kafka/TestKafkaConsumer.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hidden/kafka/TestKafkaSourceReader.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hidden/kafka/TestKafkaSourceReader.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/read/hidden/kafka/TestKafkaSourceReader.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hidden/kafka/TestKafkaSourceReader.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hidden/kafka/TestLogKafkaPartitionSplitReader.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hidden/kafka/TestLogKafkaPartitionSplitReader.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/read/hidden/kafka/TestLogKafkaPartitionSplitReader.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hidden/kafka/TestLogKafkaPartitionSplitReader.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/assigner/TestShuffleSplitAssigner.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/assigner/TestShuffleSplitAssigner.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/assigner/TestShuffleSplitAssigner.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/assigner/TestShuffleSplitAssigner.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/assigner/TestSplitAssignerAwaiting.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/assigner/TestSplitAssignerAwaiting.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/assigner/TestSplitAssignerAwaiting.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/assigner/TestSplitAssignerAwaiting.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/assigner/TestStaticSplitAssigner.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/assigner/TestStaticSplitAssigner.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/assigner/TestStaticSplitAssigner.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/assigner/TestStaticSplitAssigner.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/enumerator/TestArcticSourceEnumStateSerializer.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/enumerator/TestArcticSourceEnumStateSerializer.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/enumerator/TestArcticSourceEnumStateSerializer.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/enumerator/TestArcticSourceEnumStateSerializer.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/enumerator/TestArcticSourceEnumerator.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/enumerator/TestArcticSourceEnumerator.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/enumerator/TestArcticSourceEnumerator.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/enumerator/TestArcticSourceEnumerator.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/enumerator/TestContinuousSplitPlannerImpl.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/enumerator/TestContinuousSplitPlannerImpl.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/enumerator/TestContinuousSplitPlannerImpl.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/enumerator/TestContinuousSplitPlannerImpl.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/enumerator/TestTemporalJoinSplitsThreadSafe.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/enumerator/TestTemporalJoinSplitsThreadSafe.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/enumerator/TestTemporalJoinSplitsThreadSafe.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/enumerator/TestTemporalJoinSplitsThreadSafe.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/reader/MixedIncrementalLoaderTest.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/reader/MixedIncrementalLoaderTest.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/reader/MixedIncrementalLoaderTest.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/reader/MixedIncrementalLoaderTest.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/reader/TestRowDataReaderFunction.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/reader/TestRowDataReaderFunction.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/reader/TestRowDataReaderFunction.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/reader/TestRowDataReaderFunction.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/split/TestArcticSplitSerializer.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/split/TestArcticSplitSerializer.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/split/TestArcticSplitSerializer.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/read/hybrid/split/TestArcticSplitSerializer.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/shuffle/TestLogRecordV1.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/shuffle/TestLogRecordV1.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/shuffle/TestLogRecordV1.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/shuffle/TestLogRecordV1.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/shuffle/TestRoundRobinShuffleRulePolicy.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/shuffle/TestRoundRobinShuffleRulePolicy.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/shuffle/TestRoundRobinShuffleRulePolicy.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/shuffle/TestRoundRobinShuffleRulePolicy.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/table/CatalogITCaseBase.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/table/CatalogITCaseBase.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/table/CatalogITCaseBase.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/table/CatalogITCaseBase.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/table/LookupITCase.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/table/LookupITCase.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/table/LookupITCase.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/table/LookupITCase.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestJoin.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestJoin.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestJoin.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestJoin.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestKeyed.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestKeyed.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestKeyed.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestKeyed.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestLookupSecondary.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestLookupSecondary.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestLookupSecondary.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestLookupSecondary.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestTableRefresh.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestTableRefresh.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestTableRefresh.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestTableRefresh.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestUnkeyed.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestUnkeyed.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestUnkeyed.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestUnkeyed.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestUnkeyedOverwrite.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestUnkeyedOverwrite.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestUnkeyedOverwrite.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestUnkeyedOverwrite.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestWatermark.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestWatermark.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestWatermark.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/table/TestWatermark.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/util/ClassLoaderUtils.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/util/ClassLoaderUtils.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/util/ClassLoaderUtils.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/util/ClassLoaderUtils.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/util/DataUtil.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/util/DataUtil.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/util/DataUtil.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/util/DataUtil.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/util/MockEnvironmentArctic.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/util/MockEnvironmentArctic.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/util/MockEnvironmentArctic.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/util/MockEnvironmentArctic.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/util/MockEnvironmentBuilder.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/util/MockEnvironmentBuilder.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/util/MockEnvironmentBuilder.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/util/MockEnvironmentBuilder.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/util/TestCompatibleFlinkPropertyUtil.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/util/TestCompatibleFlinkPropertyUtil.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/util/TestCompatibleFlinkPropertyUtil.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/util/TestCompatibleFlinkPropertyUtil.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/util/TestGlobalAggregateManager.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/util/TestGlobalAggregateManager.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/util/TestGlobalAggregateManager.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/util/TestGlobalAggregateManager.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/util/TestOneInputStreamOperatorIntern.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/util/TestOneInputStreamOperatorIntern.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/util/TestOneInputStreamOperatorIntern.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/util/TestOneInputStreamOperatorIntern.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/util/TestProjection.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/util/TestProjection.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/util/TestProjection.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/util/TestProjection.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/util/TestUtil.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/util/TestUtil.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/util/TestUtil.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/util/TestUtil.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/write/ArcticFileWriterITCase.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/ArcticFileWriterITCase.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/write/ArcticFileWriterITCase.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/ArcticFileWriterITCase.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/write/FlinkTaskWriterBaseTest.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/FlinkTaskWriterBaseTest.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/write/FlinkTaskWriterBaseTest.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/FlinkTaskWriterBaseTest.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestAdaptHiveWriter.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestAdaptHiveWriter.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestAdaptHiveWriter.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestAdaptHiveWriter.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestArcticFileCommitter.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestArcticFileCommitter.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestArcticFileCommitter.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestArcticFileCommitter.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestArcticFileWriter.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestArcticFileWriter.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestArcticFileWriter.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestArcticFileWriter.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestAutomaticDoubleWriteStatus.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestAutomaticDoubleWriteStatus.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestAutomaticDoubleWriteStatus.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestAutomaticDoubleWriteStatus.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestAutomaticLogWriter.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestAutomaticLogWriter.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestAutomaticLogWriter.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestAutomaticLogWriter.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestFlinkSink.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestFlinkSink.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestFlinkSink.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/TestFlinkSink.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/write/hidden/kafka/TestBaseLog.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/hidden/kafka/TestBaseLog.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/write/hidden/kafka/TestBaseLog.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/hidden/kafka/TestBaseLog.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/write/hidden/kafka/TestHiddenKafkaProducer.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/hidden/kafka/TestHiddenKafkaProducer.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/write/hidden/kafka/TestHiddenKafkaProducer.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/hidden/kafka/TestHiddenKafkaProducer.java diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/write/hidden/kafka/TestHiddenLogOperators.java b/mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/hidden/kafka/TestHiddenLogOperators.java similarity index 100% rename from flink/flink-common/src/test/java/com/netease/arctic/flink/write/hidden/kafka/TestHiddenLogOperators.java rename to mixed/flink/flink-common/src/test/java/com/netease/arctic/flink/write/hidden/kafka/TestHiddenLogOperators.java diff --git a/flink/flink-common/src/test/resources/META-INF/services/org.apache.flink.table.factories.Factory b/mixed/flink/flink-common/src/test/resources/META-INF/services/org.apache.flink.table.factories.Factory similarity index 100% rename from flink/flink-common/src/test/resources/META-INF/services/org.apache.flink.table.factories.Factory rename to mixed/flink/flink-common/src/test/resources/META-INF/services/org.apache.flink.table.factories.Factory diff --git a/flink/flink-common/src/test/resources/log4j2-test.xml b/mixed/flink/flink-common/src/test/resources/log4j2-test.xml similarity index 100% rename from flink/flink-common/src/test/resources/log4j2-test.xml rename to mixed/flink/flink-common/src/test/resources/log4j2-test.xml diff --git a/flink/flink-common/src/test/resources/log4j2.component.properties b/mixed/flink/flink-common/src/test/resources/log4j2.component.properties similarity index 100% rename from flink/flink-common/src/test/resources/log4j2.component.properties rename to mixed/flink/flink-common/src/test/resources/log4j2.component.properties diff --git a/flink/pom.xml b/mixed/flink/pom.xml similarity index 93% rename from flink/pom.xml rename to mixed/flink/pom.xml index aa3b1410c5..3aad88c84e 100644 --- a/flink/pom.xml +++ b/mixed/flink/pom.xml @@ -23,26 +23,26 @@ com.netease.amoro - amoro-parent + amoro-mixed 0.7.0-SNAPSHOT ../pom.xml - amoro-flink + amoro-mixed-flink pom - Amoro Project Flink Parent + Amoro Project Mixed Format Flink Parent https://amoro.netease.com + flink-common + flink-common-format + flink-common-iceberg-bridge v1.15/flink v1.15/flink-runtime v1.16/flink v1.16/flink-runtime v1.17/flink v1.17/flink-runtime - flink-common - flink-common-format - flink-common-iceberg-bridge diff --git a/flink/v1.15/flink-runtime/pom.xml b/mixed/flink/v1.15/flink-runtime/pom.xml similarity index 98% rename from flink/v1.15/flink-runtime/pom.xml rename to mixed/flink/v1.15/flink-runtime/pom.xml index 1600793281..dee0b60093 100644 --- a/flink/v1.15/flink-runtime/pom.xml +++ b/mixed/flink/v1.15/flink-runtime/pom.xml @@ -22,13 +22,13 @@ 4.0.0 com.netease.amoro - amoro-flink + amoro-mixed-flink 0.7.0-SNAPSHOT ../../pom.xml - amoro-flink-runtime-1.15 - Amoro Project Flink 1.15 Runtime + amoro-mixed-flink-runtime-1.15 + Amoro Project Mixed Format Flink 1.15 Runtime https://amoro.netease.com @@ -38,7 +38,7 @@ com.netease.amoro - amoro-flink-1.15 + amoro-mixed-flink-1.15 ${project.parent.version} @@ -107,7 +107,7 @@ - com.netease.amoro:amoro-hive + com.netease.amoro:amoro-mixed-hive org/apache/hadoop/hive/** diff --git a/flink/v1.15/flink/pom.xml b/mixed/flink/v1.15/flink/pom.xml similarity index 94% rename from flink/v1.15/flink/pom.xml rename to mixed/flink/v1.15/flink/pom.xml index 703994f465..ef3a320f14 100644 --- a/flink/v1.15/flink/pom.xml +++ b/mixed/flink/v1.15/flink/pom.xml @@ -22,13 +22,13 @@ 4.0.0 com.netease.amoro - amoro-flink + amoro-mixed-flink 0.7.0-SNAPSHOT ../../pom.xml - amoro-flink-1.15 - Amoro Project Flink 1.15 + amoro-mixed-flink-1.15 + Amoro Project Mixed Format Flink 1.15 https://amoro.netease.com @@ -41,7 +41,7 @@ com.netease.amoro - flink-common + amoro-mixed-flink-common ${project.parent.version} diff --git a/flink/v1.16/flink-runtime/pom.xml b/mixed/flink/v1.16/flink-runtime/pom.xml similarity index 98% rename from flink/v1.16/flink-runtime/pom.xml rename to mixed/flink/v1.16/flink-runtime/pom.xml index 6559212520..43833ecdea 100644 --- a/flink/v1.16/flink-runtime/pom.xml +++ b/mixed/flink/v1.16/flink-runtime/pom.xml @@ -22,13 +22,13 @@ 4.0.0 com.netease.amoro - amoro-flink + amoro-mixed-flink 0.7.0-SNAPSHOT ../../pom.xml - amoro-flink-runtime-1.16 - Amoro Project Flink 1.16 Runtime + amoro-mixed-flink-runtime-1.16 + Amoro Project Mixed Format Flink 1.16 Runtime https://amoro.netease.com @@ -38,7 +38,7 @@ com.netease.amoro - amoro-flink-1.16 + amoro-mixed-flink-1.16 ${project.parent.version} @@ -106,7 +106,7 @@ - com.netease.amoro:amoro-hive + com.netease.amoro:amoro-mixed-hive org/apache/hadoop/hive/** diff --git a/flink/v1.16/flink/pom.xml b/mixed/flink/v1.16/flink/pom.xml similarity index 94% rename from flink/v1.16/flink/pom.xml rename to mixed/flink/v1.16/flink/pom.xml index bad232e43e..e245e9219d 100644 --- a/flink/v1.16/flink/pom.xml +++ b/mixed/flink/v1.16/flink/pom.xml @@ -22,13 +22,13 @@ 4.0.0 com.netease.amoro - amoro-flink + amoro-mixed-flink 0.7.0-SNAPSHOT ../../pom.xml - amoro-flink-1.16 - Amoro Project Flink 1.16 + amoro-mixed-flink-1.16 + Amoro Project Mixed Format Flink 1.16 https://amoro.netease.com jar @@ -43,7 +43,7 @@ com.netease.amoro - flink-common + amoro-mixed-flink-common ${project.parent.version} diff --git a/flink/v1.17/flink-runtime/pom.xml b/mixed/flink/v1.17/flink-runtime/pom.xml similarity index 98% rename from flink/v1.17/flink-runtime/pom.xml rename to mixed/flink/v1.17/flink-runtime/pom.xml index 5ef955069d..98c9eee85f 100644 --- a/flink/v1.17/flink-runtime/pom.xml +++ b/mixed/flink/v1.17/flink-runtime/pom.xml @@ -22,13 +22,13 @@ 4.0.0 com.netease.amoro - amoro-flink + amoro-mixed-flink 0.7.0-SNAPSHOT ../../pom.xml - amoro-flink-runtime-1.17 - Amoro Project Flink 1.17 Runtime + amoro-mixed-flink-runtime-1.17 + Amoro Project Mixed Format Flink 1.17 Runtime https://amoro.netease.com @@ -38,7 +38,7 @@ com.netease.amoro - amoro-flink-1.17 + amoro-mixed-flink-1.17 ${project.parent.version} @@ -107,7 +107,7 @@ - com.netease.amoro:amoro-hive + com.netease.amoro:amoro-mixed-hive org/apache/hadoop/hive/** diff --git a/flink/v1.17/flink/pom.xml b/mixed/flink/v1.17/flink/pom.xml similarity index 94% rename from flink/v1.17/flink/pom.xml rename to mixed/flink/v1.17/flink/pom.xml index 74017e2093..c60ee0c5e9 100644 --- a/flink/v1.17/flink/pom.xml +++ b/mixed/flink/v1.17/flink/pom.xml @@ -22,13 +22,13 @@ 4.0.0 com.netease.amoro - amoro-flink + amoro-mixed-flink 0.7.0-SNAPSHOT ../../pom.xml - amoro-flink-1.17 - Amoro Project Flink 1.17 + amoro-mixed-flink-1.17 + Amoro Project Mixed Format Flink 1.17 https://amoro.netease.com jar @@ -43,7 +43,7 @@ com.netease.amoro - flink-common + amoro-mixed-flink-common ${project.parent.version} diff --git a/hive/pom.xml b/mixed/hive/pom.xml similarity index 97% rename from hive/pom.xml rename to mixed/hive/pom.xml index bf29eece3e..9df160419f 100644 --- a/hive/pom.xml +++ b/mixed/hive/pom.xml @@ -22,13 +22,13 @@ 4.0.0 com.netease.amoro - amoro-parent + amoro-mixed 0.7.0-SNAPSHOT ../pom.xml - amoro-hive - Amoro Project Hive + amoro-mixed-hive + Amoro Project Mixed Hive Format https://amoro.netease.com diff --git a/hive/src/main/java/com/netease/arctic/hive/ArcticHiveClientPool.java b/mixed/hive/src/main/java/com/netease/arctic/hive/ArcticHiveClientPool.java similarity index 100% rename from hive/src/main/java/com/netease/arctic/hive/ArcticHiveClientPool.java rename to mixed/hive/src/main/java/com/netease/arctic/hive/ArcticHiveClientPool.java diff --git a/hive/src/main/java/com/netease/arctic/hive/CachedHiveClientPool.java b/mixed/hive/src/main/java/com/netease/arctic/hive/CachedHiveClientPool.java similarity index 100% rename from hive/src/main/java/com/netease/arctic/hive/CachedHiveClientPool.java rename to mixed/hive/src/main/java/com/netease/arctic/hive/CachedHiveClientPool.java diff --git a/hive/src/main/java/com/netease/arctic/hive/HMSClient.java b/mixed/hive/src/main/java/com/netease/arctic/hive/HMSClient.java similarity index 100% rename from hive/src/main/java/com/netease/arctic/hive/HMSClient.java rename to mixed/hive/src/main/java/com/netease/arctic/hive/HMSClient.java diff --git a/hive/src/main/java/com/netease/arctic/hive/HMSClientImpl.java b/mixed/hive/src/main/java/com/netease/arctic/hive/HMSClientImpl.java similarity index 100% rename from hive/src/main/java/com/netease/arctic/hive/HMSClientImpl.java rename to mixed/hive/src/main/java/com/netease/arctic/hive/HMSClientImpl.java diff --git a/hive/src/main/java/com/netease/arctic/hive/HMSClientPool.java b/mixed/hive/src/main/java/com/netease/arctic/hive/HMSClientPool.java similarity index 100% rename from hive/src/main/java/com/netease/arctic/hive/HMSClientPool.java rename to mixed/hive/src/main/java/com/netease/arctic/hive/HMSClientPool.java diff --git a/hive/src/main/java/com/netease/arctic/hive/HiveTableProperties.java b/mixed/hive/src/main/java/com/netease/arctic/hive/HiveTableProperties.java similarity index 100% rename from hive/src/main/java/com/netease/arctic/hive/HiveTableProperties.java rename to mixed/hive/src/main/java/com/netease/arctic/hive/HiveTableProperties.java diff --git a/hive/src/main/java/com/netease/arctic/hive/catalog/ArcticHiveCatalog.java b/mixed/hive/src/main/java/com/netease/arctic/hive/catalog/ArcticHiveCatalog.java similarity index 100% rename from hive/src/main/java/com/netease/arctic/hive/catalog/ArcticHiveCatalog.java rename to mixed/hive/src/main/java/com/netease/arctic/hive/catalog/ArcticHiveCatalog.java diff --git a/hive/src/main/java/com/netease/arctic/hive/catalog/MixedHiveTables.java b/mixed/hive/src/main/java/com/netease/arctic/hive/catalog/MixedHiveTables.java similarity index 100% rename from hive/src/main/java/com/netease/arctic/hive/catalog/MixedHiveTables.java rename to mixed/hive/src/main/java/com/netease/arctic/hive/catalog/MixedHiveTables.java diff --git a/hive/src/main/java/com/netease/arctic/hive/exceptions/CannotAlterHiveLocationException.java b/mixed/hive/src/main/java/com/netease/arctic/hive/exceptions/CannotAlterHiveLocationException.java similarity index 100% rename from hive/src/main/java/com/netease/arctic/hive/exceptions/CannotAlterHiveLocationException.java rename to mixed/hive/src/main/java/com/netease/arctic/hive/exceptions/CannotAlterHiveLocationException.java diff --git a/hive/src/main/java/com/netease/arctic/hive/io/reader/AbstractAdaptHiveKeyedDataReader.java b/mixed/hive/src/main/java/com/netease/arctic/hive/io/reader/AbstractAdaptHiveKeyedDataReader.java similarity index 100% rename from hive/src/main/java/com/netease/arctic/hive/io/reader/AbstractAdaptHiveKeyedDataReader.java rename to mixed/hive/src/main/java/com/netease/arctic/hive/io/reader/AbstractAdaptHiveKeyedDataReader.java diff --git a/hive/src/main/java/com/netease/arctic/hive/io/reader/AbstractAdaptHiveUnkeyedDataReader.java b/mixed/hive/src/main/java/com/netease/arctic/hive/io/reader/AbstractAdaptHiveUnkeyedDataReader.java similarity index 100% rename from hive/src/main/java/com/netease/arctic/hive/io/reader/AbstractAdaptHiveUnkeyedDataReader.java rename to mixed/hive/src/main/java/com/netease/arctic/hive/io/reader/AbstractAdaptHiveUnkeyedDataReader.java diff --git a/hive/src/main/java/com/netease/arctic/hive/io/reader/AdaptHiveArcticDeleteFilter.java b/mixed/hive/src/main/java/com/netease/arctic/hive/io/reader/AdaptHiveArcticDeleteFilter.java similarity index 100% rename from hive/src/main/java/com/netease/arctic/hive/io/reader/AdaptHiveArcticDeleteFilter.java rename to mixed/hive/src/main/java/com/netease/arctic/hive/io/reader/AdaptHiveArcticDeleteFilter.java diff --git a/hive/src/main/java/com/netease/arctic/hive/io/reader/AdaptHiveGenericKeyedDataReader.java b/mixed/hive/src/main/java/com/netease/arctic/hive/io/reader/AdaptHiveGenericKeyedDataReader.java similarity index 100% rename from hive/src/main/java/com/netease/arctic/hive/io/reader/AdaptHiveGenericKeyedDataReader.java rename to mixed/hive/src/main/java/com/netease/arctic/hive/io/reader/AdaptHiveGenericKeyedDataReader.java diff --git a/hive/src/main/java/com/netease/arctic/hive/io/reader/AdaptHiveGenericUnkeyedDataReader.java b/mixed/hive/src/main/java/com/netease/arctic/hive/io/reader/AdaptHiveGenericUnkeyedDataReader.java similarity index 100% rename from hive/src/main/java/com/netease/arctic/hive/io/reader/AdaptHiveGenericUnkeyedDataReader.java rename to mixed/hive/src/main/java/com/netease/arctic/hive/io/reader/AdaptHiveGenericUnkeyedDataReader.java diff --git a/hive/src/main/java/com/netease/arctic/hive/io/writer/AdaptHiveGenericTaskWriterBuilder.java b/mixed/hive/src/main/java/com/netease/arctic/hive/io/writer/AdaptHiveGenericTaskWriterBuilder.java similarity index 100% rename from hive/src/main/java/com/netease/arctic/hive/io/writer/AdaptHiveGenericTaskWriterBuilder.java rename to mixed/hive/src/main/java/com/netease/arctic/hive/io/writer/AdaptHiveGenericTaskWriterBuilder.java diff --git a/hive/src/main/java/com/netease/arctic/hive/io/writer/AdaptHiveOperateToTableRelation.java b/mixed/hive/src/main/java/com/netease/arctic/hive/io/writer/AdaptHiveOperateToTableRelation.java similarity index 100% rename from hive/src/main/java/com/netease/arctic/hive/io/writer/AdaptHiveOperateToTableRelation.java rename to mixed/hive/src/main/java/com/netease/arctic/hive/io/writer/AdaptHiveOperateToTableRelation.java diff --git a/hive/src/main/java/com/netease/arctic/hive/io/writer/AdaptHiveOutputFileFactory.java b/mixed/hive/src/main/java/com/netease/arctic/hive/io/writer/AdaptHiveOutputFileFactory.java similarity index 100% rename from hive/src/main/java/com/netease/arctic/hive/io/writer/AdaptHiveOutputFileFactory.java rename to mixed/hive/src/main/java/com/netease/arctic/hive/io/writer/AdaptHiveOutputFileFactory.java diff --git a/hive/src/main/java/com/netease/arctic/hive/io/writer/OperateToTableRelation.java b/mixed/hive/src/main/java/com/netease/arctic/hive/io/writer/OperateToTableRelation.java similarity index 100% rename from hive/src/main/java/com/netease/arctic/hive/io/writer/OperateToTableRelation.java rename to mixed/hive/src/main/java/com/netease/arctic/hive/io/writer/OperateToTableRelation.java diff --git a/hive/src/main/java/com/netease/arctic/hive/op/BaseSchemaUpdate.java b/mixed/hive/src/main/java/com/netease/arctic/hive/op/BaseSchemaUpdate.java similarity index 100% rename from hive/src/main/java/com/netease/arctic/hive/op/BaseSchemaUpdate.java rename to mixed/hive/src/main/java/com/netease/arctic/hive/op/BaseSchemaUpdate.java diff --git a/hive/src/main/java/com/netease/arctic/hive/op/HiveOperationTransaction.java b/mixed/hive/src/main/java/com/netease/arctic/hive/op/HiveOperationTransaction.java similarity index 100% rename from hive/src/main/java/com/netease/arctic/hive/op/HiveOperationTransaction.java rename to mixed/hive/src/main/java/com/netease/arctic/hive/op/HiveOperationTransaction.java diff --git a/hive/src/main/java/com/netease/arctic/hive/op/HiveSchemaUpdate.java b/mixed/hive/src/main/java/com/netease/arctic/hive/op/HiveSchemaUpdate.java similarity index 100% rename from hive/src/main/java/com/netease/arctic/hive/op/HiveSchemaUpdate.java rename to mixed/hive/src/main/java/com/netease/arctic/hive/op/HiveSchemaUpdate.java diff --git a/hive/src/main/java/com/netease/arctic/hive/op/OverwriteHiveFiles.java b/mixed/hive/src/main/java/com/netease/arctic/hive/op/OverwriteHiveFiles.java similarity index 100% rename from hive/src/main/java/com/netease/arctic/hive/op/OverwriteHiveFiles.java rename to mixed/hive/src/main/java/com/netease/arctic/hive/op/OverwriteHiveFiles.java diff --git a/hive/src/main/java/com/netease/arctic/hive/op/ReplaceHivePartitions.java b/mixed/hive/src/main/java/com/netease/arctic/hive/op/ReplaceHivePartitions.java similarity index 100% rename from hive/src/main/java/com/netease/arctic/hive/op/ReplaceHivePartitions.java rename to mixed/hive/src/main/java/com/netease/arctic/hive/op/ReplaceHivePartitions.java diff --git a/hive/src/main/java/com/netease/arctic/hive/op/RewriteHiveFiles.java b/mixed/hive/src/main/java/com/netease/arctic/hive/op/RewriteHiveFiles.java similarity index 100% rename from hive/src/main/java/com/netease/arctic/hive/op/RewriteHiveFiles.java rename to mixed/hive/src/main/java/com/netease/arctic/hive/op/RewriteHiveFiles.java diff --git a/hive/src/main/java/com/netease/arctic/hive/op/UpdateHiveFiles.java b/mixed/hive/src/main/java/com/netease/arctic/hive/op/UpdateHiveFiles.java similarity index 100% rename from hive/src/main/java/com/netease/arctic/hive/op/UpdateHiveFiles.java rename to mixed/hive/src/main/java/com/netease/arctic/hive/op/UpdateHiveFiles.java diff --git a/hive/src/main/java/com/netease/arctic/hive/optimizing/MixFormatOptimizingDataReader.java b/mixed/hive/src/main/java/com/netease/arctic/hive/optimizing/MixFormatOptimizingDataReader.java similarity index 100% rename from hive/src/main/java/com/netease/arctic/hive/optimizing/MixFormatOptimizingDataReader.java rename to mixed/hive/src/main/java/com/netease/arctic/hive/optimizing/MixFormatOptimizingDataReader.java diff --git a/hive/src/main/java/com/netease/arctic/hive/optimizing/MixFormatRewriteExecutor.java b/mixed/hive/src/main/java/com/netease/arctic/hive/optimizing/MixFormatRewriteExecutor.java similarity index 100% rename from hive/src/main/java/com/netease/arctic/hive/optimizing/MixFormatRewriteExecutor.java rename to mixed/hive/src/main/java/com/netease/arctic/hive/optimizing/MixFormatRewriteExecutor.java diff --git a/hive/src/main/java/com/netease/arctic/hive/optimizing/MixFormatRewriteExecutorFactory.java b/mixed/hive/src/main/java/com/netease/arctic/hive/optimizing/MixFormatRewriteExecutorFactory.java similarity index 100% rename from hive/src/main/java/com/netease/arctic/hive/optimizing/MixFormatRewriteExecutorFactory.java rename to mixed/hive/src/main/java/com/netease/arctic/hive/optimizing/MixFormatRewriteExecutorFactory.java diff --git a/hive/src/main/java/com/netease/arctic/hive/table/HiveLocationKind.java b/mixed/hive/src/main/java/com/netease/arctic/hive/table/HiveLocationKind.java similarity index 100% rename from hive/src/main/java/com/netease/arctic/hive/table/HiveLocationKind.java rename to mixed/hive/src/main/java/com/netease/arctic/hive/table/HiveLocationKind.java diff --git a/hive/src/main/java/com/netease/arctic/hive/table/KeyedHiveTable.java b/mixed/hive/src/main/java/com/netease/arctic/hive/table/KeyedHiveTable.java similarity index 100% rename from hive/src/main/java/com/netease/arctic/hive/table/KeyedHiveTable.java rename to mixed/hive/src/main/java/com/netease/arctic/hive/table/KeyedHiveTable.java diff --git a/hive/src/main/java/com/netease/arctic/hive/table/SupportHive.java b/mixed/hive/src/main/java/com/netease/arctic/hive/table/SupportHive.java similarity index 100% rename from hive/src/main/java/com/netease/arctic/hive/table/SupportHive.java rename to mixed/hive/src/main/java/com/netease/arctic/hive/table/SupportHive.java diff --git a/hive/src/main/java/com/netease/arctic/hive/table/UnkeyedHiveTable.java b/mixed/hive/src/main/java/com/netease/arctic/hive/table/UnkeyedHiveTable.java similarity index 100% rename from hive/src/main/java/com/netease/arctic/hive/table/UnkeyedHiveTable.java rename to mixed/hive/src/main/java/com/netease/arctic/hive/table/UnkeyedHiveTable.java diff --git a/hive/src/main/java/com/netease/arctic/hive/utils/CatalogUtil.java b/mixed/hive/src/main/java/com/netease/arctic/hive/utils/CatalogUtil.java similarity index 100% rename from hive/src/main/java/com/netease/arctic/hive/utils/CatalogUtil.java rename to mixed/hive/src/main/java/com/netease/arctic/hive/utils/CatalogUtil.java diff --git a/hive/src/main/java/com/netease/arctic/hive/utils/ChangeFieldName.java b/mixed/hive/src/main/java/com/netease/arctic/hive/utils/ChangeFieldName.java similarity index 100% rename from hive/src/main/java/com/netease/arctic/hive/utils/ChangeFieldName.java rename to mixed/hive/src/main/java/com/netease/arctic/hive/utils/ChangeFieldName.java diff --git a/hive/src/main/java/com/netease/arctic/hive/utils/CompatibleHivePropertyUtil.java b/mixed/hive/src/main/java/com/netease/arctic/hive/utils/CompatibleHivePropertyUtil.java similarity index 100% rename from hive/src/main/java/com/netease/arctic/hive/utils/CompatibleHivePropertyUtil.java rename to mixed/hive/src/main/java/com/netease/arctic/hive/utils/CompatibleHivePropertyUtil.java diff --git a/hive/src/main/java/com/netease/arctic/hive/utils/HiveCommitUtil.java b/mixed/hive/src/main/java/com/netease/arctic/hive/utils/HiveCommitUtil.java similarity index 100% rename from hive/src/main/java/com/netease/arctic/hive/utils/HiveCommitUtil.java rename to mixed/hive/src/main/java/com/netease/arctic/hive/utils/HiveCommitUtil.java diff --git a/hive/src/main/java/com/netease/arctic/hive/utils/HiveMetaSynchronizer.java b/mixed/hive/src/main/java/com/netease/arctic/hive/utils/HiveMetaSynchronizer.java similarity index 100% rename from hive/src/main/java/com/netease/arctic/hive/utils/HiveMetaSynchronizer.java rename to mixed/hive/src/main/java/com/netease/arctic/hive/utils/HiveMetaSynchronizer.java diff --git a/hive/src/main/java/com/netease/arctic/hive/utils/HivePartitionUtil.java b/mixed/hive/src/main/java/com/netease/arctic/hive/utils/HivePartitionUtil.java similarity index 100% rename from hive/src/main/java/com/netease/arctic/hive/utils/HivePartitionUtil.java rename to mixed/hive/src/main/java/com/netease/arctic/hive/utils/HivePartitionUtil.java diff --git a/hive/src/main/java/com/netease/arctic/hive/utils/HiveSchemaUtil.java b/mixed/hive/src/main/java/com/netease/arctic/hive/utils/HiveSchemaUtil.java similarity index 100% rename from hive/src/main/java/com/netease/arctic/hive/utils/HiveSchemaUtil.java rename to mixed/hive/src/main/java/com/netease/arctic/hive/utils/HiveSchemaUtil.java diff --git a/hive/src/main/java/com/netease/arctic/hive/utils/HiveTableUtil.java b/mixed/hive/src/main/java/com/netease/arctic/hive/utils/HiveTableUtil.java similarity index 100% rename from hive/src/main/java/com/netease/arctic/hive/utils/HiveTableUtil.java rename to mixed/hive/src/main/java/com/netease/arctic/hive/utils/HiveTableUtil.java diff --git a/hive/src/main/java/com/netease/arctic/hive/utils/TableTypeUtil.java b/mixed/hive/src/main/java/com/netease/arctic/hive/utils/TableTypeUtil.java similarity index 100% rename from hive/src/main/java/com/netease/arctic/hive/utils/TableTypeUtil.java rename to mixed/hive/src/main/java/com/netease/arctic/hive/utils/TableTypeUtil.java diff --git a/hive/src/main/java/com/netease/arctic/hive/utils/TimeUtil.java b/mixed/hive/src/main/java/com/netease/arctic/hive/utils/TimeUtil.java similarity index 100% rename from hive/src/main/java/com/netease/arctic/hive/utils/TimeUtil.java rename to mixed/hive/src/main/java/com/netease/arctic/hive/utils/TimeUtil.java diff --git a/hive/src/main/java/com/netease/arctic/hive/utils/UpgradeHiveTableUtil.java b/mixed/hive/src/main/java/com/netease/arctic/hive/utils/UpgradeHiveTableUtil.java similarity index 100% rename from hive/src/main/java/com/netease/arctic/hive/utils/UpgradeHiveTableUtil.java rename to mixed/hive/src/main/java/com/netease/arctic/hive/utils/UpgradeHiveTableUtil.java diff --git a/hive/src/main/java/org/apache/hadoop/hive/ql/optimizer/ppr/PartitionExpressionForMetastore.java b/mixed/hive/src/main/java/org/apache/hadoop/hive/ql/optimizer/ppr/PartitionExpressionForMetastore.java similarity index 100% rename from hive/src/main/java/org/apache/hadoop/hive/ql/optimizer/ppr/PartitionExpressionForMetastore.java rename to mixed/hive/src/main/java/org/apache/hadoop/hive/ql/optimizer/ppr/PartitionExpressionForMetastore.java diff --git a/hive/src/main/java/org/apache/hadoop/hive/ql/security/authorization/AuthorizationPreEventListener.java b/mixed/hive/src/main/java/org/apache/hadoop/hive/ql/security/authorization/AuthorizationPreEventListener.java similarity index 100% rename from hive/src/main/java/org/apache/hadoop/hive/ql/security/authorization/AuthorizationPreEventListener.java rename to mixed/hive/src/main/java/org/apache/hadoop/hive/ql/security/authorization/AuthorizationPreEventListener.java diff --git a/hive/src/main/java/org/apache/iceberg/IcebergSchemaUtil.java b/mixed/hive/src/main/java/org/apache/iceberg/IcebergSchemaUtil.java similarity index 100% rename from hive/src/main/java/org/apache/iceberg/IcebergSchemaUtil.java rename to mixed/hive/src/main/java/org/apache/iceberg/IcebergSchemaUtil.java diff --git a/hive/src/main/java/org/apache/iceberg/data/AdaptHiveGenericAppenderFactory.java b/mixed/hive/src/main/java/org/apache/iceberg/data/AdaptHiveGenericAppenderFactory.java similarity index 100% rename from hive/src/main/java/org/apache/iceberg/data/AdaptHiveGenericAppenderFactory.java rename to mixed/hive/src/main/java/org/apache/iceberg/data/AdaptHiveGenericAppenderFactory.java diff --git a/hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveBaseParquetReaders.java b/mixed/hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveBaseParquetReaders.java similarity index 100% rename from hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveBaseParquetReaders.java rename to mixed/hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveBaseParquetReaders.java diff --git a/hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveBaseParquetWriter.java b/mixed/hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveBaseParquetWriter.java similarity index 100% rename from hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveBaseParquetWriter.java rename to mixed/hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveBaseParquetWriter.java diff --git a/hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveGenericParquetReaders.java b/mixed/hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveGenericParquetReaders.java similarity index 100% rename from hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveGenericParquetReaders.java rename to mixed/hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveGenericParquetReaders.java diff --git a/hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveGenericParquetWriter.java b/mixed/hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveGenericParquetWriter.java similarity index 100% rename from hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveGenericParquetWriter.java rename to mixed/hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveGenericParquetWriter.java diff --git a/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveApplyNameMapping.java b/mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveApplyNameMapping.java similarity index 100% rename from hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveApplyNameMapping.java rename to mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveApplyNameMapping.java diff --git a/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveColumnWriter.java b/mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveColumnWriter.java similarity index 100% rename from hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveColumnWriter.java rename to mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveColumnWriter.java diff --git a/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquet.java b/mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquet.java similarity index 100% rename from hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquet.java rename to mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquet.java diff --git a/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetConversions.java b/mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetConversions.java similarity index 100% rename from hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetConversions.java rename to mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetConversions.java diff --git a/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetDictionaryRowGroupFilter.java b/mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetDictionaryRowGroupFilter.java similarity index 100% rename from hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetDictionaryRowGroupFilter.java rename to mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetDictionaryRowGroupFilter.java diff --git a/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetMetricsRowGroupFilter.java b/mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetMetricsRowGroupFilter.java similarity index 100% rename from hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetMetricsRowGroupFilter.java rename to mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetMetricsRowGroupFilter.java diff --git a/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetReader.java b/mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetReader.java similarity index 100% rename from hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetReader.java rename to mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetReader.java diff --git a/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetSchemaUtil.java b/mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetSchemaUtil.java similarity index 100% rename from hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetSchemaUtil.java rename to mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetSchemaUtil.java diff --git a/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetUtil.java b/mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetUtil.java similarity index 100% rename from hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetUtil.java rename to mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetUtil.java diff --git a/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetWriter.java b/mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetWriter.java similarity index 100% rename from hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetWriter.java rename to mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetWriter.java diff --git a/hive/src/main/java/org/apache/iceberg/parquet/AdaptHivePrimitiveWriter.java b/mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHivePrimitiveWriter.java similarity index 100% rename from hive/src/main/java/org/apache/iceberg/parquet/AdaptHivePrimitiveWriter.java rename to mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHivePrimitiveWriter.java diff --git a/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveReadConf.java b/mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveReadConf.java similarity index 100% rename from hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveReadConf.java rename to mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveReadConf.java diff --git a/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveTypeToMessageType.java b/mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveTypeToMessageType.java similarity index 100% rename from hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveTypeToMessageType.java rename to mixed/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveTypeToMessageType.java diff --git a/hive/src/test/java/com/netease/arctic/hive/HMSMockServer.java b/mixed/hive/src/test/java/com/netease/arctic/hive/HMSMockServer.java similarity index 100% rename from hive/src/test/java/com/netease/arctic/hive/HMSMockServer.java rename to mixed/hive/src/test/java/com/netease/arctic/hive/HMSMockServer.java diff --git a/hive/src/test/java/com/netease/arctic/hive/MixedHiveTableTestBase.java b/mixed/hive/src/test/java/com/netease/arctic/hive/MixedHiveTableTestBase.java similarity index 100% rename from hive/src/test/java/com/netease/arctic/hive/MixedHiveTableTestBase.java rename to mixed/hive/src/test/java/com/netease/arctic/hive/MixedHiveTableTestBase.java diff --git a/hive/src/test/java/com/netease/arctic/hive/TestHMS.java b/mixed/hive/src/test/java/com/netease/arctic/hive/TestHMS.java similarity index 100% rename from hive/src/test/java/com/netease/arctic/hive/TestHMS.java rename to mixed/hive/src/test/java/com/netease/arctic/hive/TestHMS.java diff --git a/hive/src/test/java/com/netease/arctic/hive/catalog/HiveCatalogTestHelper.java b/mixed/hive/src/test/java/com/netease/arctic/hive/catalog/HiveCatalogTestHelper.java similarity index 100% rename from hive/src/test/java/com/netease/arctic/hive/catalog/HiveCatalogTestHelper.java rename to mixed/hive/src/test/java/com/netease/arctic/hive/catalog/HiveCatalogTestHelper.java diff --git a/hive/src/test/java/com/netease/arctic/hive/catalog/HiveTableTestHelper.java b/mixed/hive/src/test/java/com/netease/arctic/hive/catalog/HiveTableTestHelper.java similarity index 100% rename from hive/src/test/java/com/netease/arctic/hive/catalog/HiveTableTestHelper.java rename to mixed/hive/src/test/java/com/netease/arctic/hive/catalog/HiveTableTestHelper.java diff --git a/hive/src/test/java/com/netease/arctic/hive/catalog/TestHiveCatalogLoader.java b/mixed/hive/src/test/java/com/netease/arctic/hive/catalog/TestHiveCatalogLoader.java similarity index 100% rename from hive/src/test/java/com/netease/arctic/hive/catalog/TestHiveCatalogLoader.java rename to mixed/hive/src/test/java/com/netease/arctic/hive/catalog/TestHiveCatalogLoader.java diff --git a/hive/src/test/java/com/netease/arctic/hive/catalog/TestMixedHiveCatalog.java b/mixed/hive/src/test/java/com/netease/arctic/hive/catalog/TestMixedHiveCatalog.java similarity index 100% rename from hive/src/test/java/com/netease/arctic/hive/catalog/TestMixedHiveCatalog.java rename to mixed/hive/src/test/java/com/netease/arctic/hive/catalog/TestMixedHiveCatalog.java diff --git a/hive/src/test/java/com/netease/arctic/hive/formats/IcebergHiveCatalogTestHelper.java b/mixed/hive/src/test/java/com/netease/arctic/hive/formats/IcebergHiveCatalogTestHelper.java similarity index 100% rename from hive/src/test/java/com/netease/arctic/hive/formats/IcebergHiveCatalogTestHelper.java rename to mixed/hive/src/test/java/com/netease/arctic/hive/formats/IcebergHiveCatalogTestHelper.java diff --git a/hive/src/test/java/com/netease/arctic/hive/formats/MixedIcebergHiveCatalogTestHelper.java b/mixed/hive/src/test/java/com/netease/arctic/hive/formats/MixedIcebergHiveCatalogTestHelper.java similarity index 100% rename from hive/src/test/java/com/netease/arctic/hive/formats/MixedIcebergHiveCatalogTestHelper.java rename to mixed/hive/src/test/java/com/netease/arctic/hive/formats/MixedIcebergHiveCatalogTestHelper.java diff --git a/hive/src/test/java/com/netease/arctic/hive/formats/PaimonHiveCatalogTestHelper.java b/mixed/hive/src/test/java/com/netease/arctic/hive/formats/PaimonHiveCatalogTestHelper.java similarity index 100% rename from hive/src/test/java/com/netease/arctic/hive/formats/PaimonHiveCatalogTestHelper.java rename to mixed/hive/src/test/java/com/netease/arctic/hive/formats/PaimonHiveCatalogTestHelper.java diff --git a/hive/src/test/java/com/netease/arctic/hive/formats/TestIcebergHiveAmoroCatalog.java b/mixed/hive/src/test/java/com/netease/arctic/hive/formats/TestIcebergHiveAmoroCatalog.java similarity index 100% rename from hive/src/test/java/com/netease/arctic/hive/formats/TestIcebergHiveAmoroCatalog.java rename to mixed/hive/src/test/java/com/netease/arctic/hive/formats/TestIcebergHiveAmoroCatalog.java diff --git a/hive/src/test/java/com/netease/arctic/hive/formats/TestMixedIcebergHiveAmoroCatalog.java b/mixed/hive/src/test/java/com/netease/arctic/hive/formats/TestMixedIcebergHiveAmoroCatalog.java similarity index 100% rename from hive/src/test/java/com/netease/arctic/hive/formats/TestMixedIcebergHiveAmoroCatalog.java rename to mixed/hive/src/test/java/com/netease/arctic/hive/formats/TestMixedIcebergHiveAmoroCatalog.java diff --git a/hive/src/test/java/com/netease/arctic/hive/formats/TestPaimonHiveAmoroCatalog.java b/mixed/hive/src/test/java/com/netease/arctic/hive/formats/TestPaimonHiveAmoroCatalog.java similarity index 100% rename from hive/src/test/java/com/netease/arctic/hive/formats/TestPaimonHiveAmoroCatalog.java rename to mixed/hive/src/test/java/com/netease/arctic/hive/formats/TestPaimonHiveAmoroCatalog.java diff --git a/hive/src/test/java/com/netease/arctic/hive/io/HiveDataTestHelpers.java b/mixed/hive/src/test/java/com/netease/arctic/hive/io/HiveDataTestHelpers.java similarity index 100% rename from hive/src/test/java/com/netease/arctic/hive/io/HiveDataTestHelpers.java rename to mixed/hive/src/test/java/com/netease/arctic/hive/io/HiveDataTestHelpers.java diff --git a/hive/src/test/java/com/netease/arctic/hive/io/TestHiveTableTrashManagers.java b/mixed/hive/src/test/java/com/netease/arctic/hive/io/TestHiveTableTrashManagers.java similarity index 100% rename from hive/src/test/java/com/netease/arctic/hive/io/TestHiveTableTrashManagers.java rename to mixed/hive/src/test/java/com/netease/arctic/hive/io/TestHiveTableTrashManagers.java diff --git a/hive/src/test/java/com/netease/arctic/hive/io/TestHiveTaskReader.java b/mixed/hive/src/test/java/com/netease/arctic/hive/io/TestHiveTaskReader.java similarity index 100% rename from hive/src/test/java/com/netease/arctic/hive/io/TestHiveTaskReader.java rename to mixed/hive/src/test/java/com/netease/arctic/hive/io/TestHiveTaskReader.java diff --git a/hive/src/test/java/com/netease/arctic/hive/io/TestHiveTaskWriter.java b/mixed/hive/src/test/java/com/netease/arctic/hive/io/TestHiveTaskWriter.java similarity index 100% rename from hive/src/test/java/com/netease/arctic/hive/io/TestHiveTaskWriter.java rename to mixed/hive/src/test/java/com/netease/arctic/hive/io/TestHiveTaskWriter.java diff --git a/hive/src/test/java/com/netease/arctic/hive/io/TestImpalaParquet.java b/mixed/hive/src/test/java/com/netease/arctic/hive/io/TestImpalaParquet.java similarity index 100% rename from hive/src/test/java/com/netease/arctic/hive/io/TestImpalaParquet.java rename to mixed/hive/src/test/java/com/netease/arctic/hive/io/TestImpalaParquet.java diff --git a/hive/src/test/java/com/netease/arctic/hive/op/TestHiveSchemaUpdate.java b/mixed/hive/src/test/java/com/netease/arctic/hive/op/TestHiveSchemaUpdate.java similarity index 100% rename from hive/src/test/java/com/netease/arctic/hive/op/TestHiveSchemaUpdate.java rename to mixed/hive/src/test/java/com/netease/arctic/hive/op/TestHiveSchemaUpdate.java diff --git a/hive/src/test/java/com/netease/arctic/hive/op/TestOverwriteFiles.java b/mixed/hive/src/test/java/com/netease/arctic/hive/op/TestOverwriteFiles.java similarity index 100% rename from hive/src/test/java/com/netease/arctic/hive/op/TestOverwriteFiles.java rename to mixed/hive/src/test/java/com/netease/arctic/hive/op/TestOverwriteFiles.java diff --git a/hive/src/test/java/com/netease/arctic/hive/op/TestRewriteFiles.java b/mixed/hive/src/test/java/com/netease/arctic/hive/op/TestRewriteFiles.java similarity index 100% rename from hive/src/test/java/com/netease/arctic/hive/op/TestRewriteFiles.java rename to mixed/hive/src/test/java/com/netease/arctic/hive/op/TestRewriteFiles.java diff --git a/hive/src/test/java/com/netease/arctic/hive/op/TestRewritePartitions.java b/mixed/hive/src/test/java/com/netease/arctic/hive/op/TestRewritePartitions.java similarity index 100% rename from hive/src/test/java/com/netease/arctic/hive/op/TestRewritePartitions.java rename to mixed/hive/src/test/java/com/netease/arctic/hive/op/TestRewritePartitions.java diff --git a/hive/src/test/java/com/netease/arctic/hive/op/TestSyncHiveMeta.java b/mixed/hive/src/test/java/com/netease/arctic/hive/op/TestSyncHiveMeta.java similarity index 100% rename from hive/src/test/java/com/netease/arctic/hive/op/TestSyncHiveMeta.java rename to mixed/hive/src/test/java/com/netease/arctic/hive/op/TestSyncHiveMeta.java diff --git a/hive/src/test/java/com/netease/arctic/hive/op/UpdateHiveFilesTestHelpers.java b/mixed/hive/src/test/java/com/netease/arctic/hive/op/UpdateHiveFilesTestHelpers.java similarity index 100% rename from hive/src/test/java/com/netease/arctic/hive/op/UpdateHiveFilesTestHelpers.java rename to mixed/hive/src/test/java/com/netease/arctic/hive/op/UpdateHiveFilesTestHelpers.java diff --git a/hive/src/test/java/com/netease/arctic/hive/utils/TestCompatibleHivePropertyUtil.java b/mixed/hive/src/test/java/com/netease/arctic/hive/utils/TestCompatibleHivePropertyUtil.java similarity index 100% rename from hive/src/test/java/com/netease/arctic/hive/utils/TestCompatibleHivePropertyUtil.java rename to mixed/hive/src/test/java/com/netease/arctic/hive/utils/TestCompatibleHivePropertyUtil.java diff --git a/hive/src/test/java/com/netease/arctic/hive/utils/TestHiveMetaSynchronizer.java b/mixed/hive/src/test/java/com/netease/arctic/hive/utils/TestHiveMetaSynchronizer.java similarity index 100% rename from hive/src/test/java/com/netease/arctic/hive/utils/TestHiveMetaSynchronizer.java rename to mixed/hive/src/test/java/com/netease/arctic/hive/utils/TestHiveMetaSynchronizer.java diff --git a/hive/src/test/java/com/netease/arctic/hive/utils/TestHiveSchemaUtil.java b/mixed/hive/src/test/java/com/netease/arctic/hive/utils/TestHiveSchemaUtil.java similarity index 100% rename from hive/src/test/java/com/netease/arctic/hive/utils/TestHiveSchemaUtil.java rename to mixed/hive/src/test/java/com/netease/arctic/hive/utils/TestHiveSchemaUtil.java diff --git a/hive/src/test/java/com/netease/arctic/hive/utils/TestTimeUtil.java b/mixed/hive/src/test/java/com/netease/arctic/hive/utils/TestTimeUtil.java similarity index 100% rename from hive/src/test/java/com/netease/arctic/hive/utils/TestTimeUtil.java rename to mixed/hive/src/test/java/com/netease/arctic/hive/utils/TestTimeUtil.java diff --git a/hive/src/test/java/com/netease/arctic/hive/utils/TestUpgradeHiveTableUtil.java b/mixed/hive/src/test/java/com/netease/arctic/hive/utils/TestUpgradeHiveTableUtil.java similarity index 100% rename from hive/src/test/java/com/netease/arctic/hive/utils/TestUpgradeHiveTableUtil.java rename to mixed/hive/src/test/java/com/netease/arctic/hive/utils/TestUpgradeHiveTableUtil.java diff --git a/hive/src/test/java/org/apache/iceberg/parquet/TestAdaptHiveReadConf.java b/mixed/hive/src/test/java/org/apache/iceberg/parquet/TestAdaptHiveReadConf.java similarity index 100% rename from hive/src/test/java/org/apache/iceberg/parquet/TestAdaptHiveReadConf.java rename to mixed/hive/src/test/java/org/apache/iceberg/parquet/TestAdaptHiveReadConf.java diff --git a/hive/src/test/resources/hive-schema-3.1.0.derby.sql b/mixed/hive/src/test/resources/hive-schema-3.1.0.derby.sql similarity index 100% rename from hive/src/test/resources/hive-schema-3.1.0.derby.sql rename to mixed/hive/src/test/resources/hive-schema-3.1.0.derby.sql diff --git a/hive/src/test/resources/hive.parquet b/mixed/hive/src/test/resources/hive.parquet similarity index 100% rename from hive/src/test/resources/hive.parquet rename to mixed/hive/src/test/resources/hive.parquet diff --git a/hive/src/test/resources/log4j2.xml b/mixed/hive/src/test/resources/log4j2.xml similarity index 100% rename from hive/src/test/resources/log4j2.xml rename to mixed/hive/src/test/resources/log4j2.xml diff --git a/hive/src/test/resources/string_is_bytes.parquet b/mixed/hive/src/test/resources/string_is_bytes.parquet similarity index 100% rename from hive/src/test/resources/string_is_bytes.parquet rename to mixed/hive/src/test/resources/string_is_bytes.parquet diff --git a/mixed/pom.xml b/mixed/pom.xml new file mode 100644 index 0000000000..daae2847b3 --- /dev/null +++ b/mixed/pom.xml @@ -0,0 +1,43 @@ + + + + + 4.0.0 + + amoro-parent + com.netease.amoro + 0.7.0-SNAPSHOT + ../pom.xml + + + amoro-mixed + pom + Amoro Project Mixed Format Parent + https://amoro.netease.com + + + flink + spark + hive + trino + + + \ No newline at end of file diff --git a/spark/common/pom.xml b/mixed/spark/common/pom.xml similarity index 97% rename from spark/common/pom.xml rename to mixed/spark/common/pom.xml index 2d5981d39b..326ef500a9 100644 --- a/spark/common/pom.xml +++ b/mixed/spark/common/pom.xml @@ -22,14 +22,14 @@ 4.0.0 com.netease.amoro - amoro-spark + amoro-mixed-spark 0.7.0-SNAPSHOT ../pom.xml - amoro-spark-3-common + amoro-mixed-spark-3-common jar - Amoro Project Spark 3 Common + Amoro Project Mixed Format Spark 3 Common https://amoro.netease.com @@ -46,7 +46,7 @@ com.netease.amoro - amoro-hive + amoro-mixed-hive ${project.version} @@ -201,7 +201,7 @@ com.netease.amoro - amoro-hive + amoro-mixed-hive ${project.version} test-jar test diff --git a/spark/common/src/main/java/com/netease/arctic/spark/ArcticTableStoreType.java b/mixed/spark/common/src/main/java/com/netease/arctic/spark/ArcticTableStoreType.java similarity index 100% rename from spark/common/src/main/java/com/netease/arctic/spark/ArcticTableStoreType.java rename to mixed/spark/common/src/main/java/com/netease/arctic/spark/ArcticTableStoreType.java diff --git a/spark/common/src/main/java/com/netease/arctic/spark/SparkSQLProperties.java b/mixed/spark/common/src/main/java/com/netease/arctic/spark/SparkSQLProperties.java similarity index 100% rename from spark/common/src/main/java/com/netease/arctic/spark/SparkSQLProperties.java rename to mixed/spark/common/src/main/java/com/netease/arctic/spark/SparkSQLProperties.java diff --git a/spark/common/src/main/java/com/netease/arctic/spark/utils/MixedFormatSparkUtil.java b/mixed/spark/common/src/main/java/com/netease/arctic/spark/utils/MixedFormatSparkUtil.java similarity index 100% rename from spark/common/src/main/java/com/netease/arctic/spark/utils/MixedFormatSparkUtil.java rename to mixed/spark/common/src/main/java/com/netease/arctic/spark/utils/MixedFormatSparkUtil.java diff --git a/spark/common/src/test/java/com/netease/arctic/spark/test/SparkTableTestBase.java b/mixed/spark/common/src/test/java/com/netease/arctic/spark/test/SparkTableTestBase.java similarity index 100% rename from spark/common/src/test/java/com/netease/arctic/spark/test/SparkTableTestBase.java rename to mixed/spark/common/src/test/java/com/netease/arctic/spark/test/SparkTableTestBase.java diff --git a/spark/common/src/test/java/com/netease/arctic/spark/test/SparkTestBase.java b/mixed/spark/common/src/test/java/com/netease/arctic/spark/test/SparkTestBase.java similarity index 100% rename from spark/common/src/test/java/com/netease/arctic/spark/test/SparkTestBase.java rename to mixed/spark/common/src/test/java/com/netease/arctic/spark/test/SparkTestBase.java diff --git a/spark/common/src/test/java/com/netease/arctic/spark/test/SparkTestContext.java b/mixed/spark/common/src/test/java/com/netease/arctic/spark/test/SparkTestContext.java similarity index 100% rename from spark/common/src/test/java/com/netease/arctic/spark/test/SparkTestContext.java rename to mixed/spark/common/src/test/java/com/netease/arctic/spark/test/SparkTestContext.java diff --git a/spark/common/src/test/java/com/netease/arctic/spark/test/extensions/DefaultParameterContext.java b/mixed/spark/common/src/test/java/com/netease/arctic/spark/test/extensions/DefaultParameterContext.java similarity index 100% rename from spark/common/src/test/java/com/netease/arctic/spark/test/extensions/DefaultParameterContext.java rename to mixed/spark/common/src/test/java/com/netease/arctic/spark/test/extensions/DefaultParameterContext.java diff --git a/spark/common/src/test/java/com/netease/arctic/spark/test/extensions/EachParameterResolver.java b/mixed/spark/common/src/test/java/com/netease/arctic/spark/test/extensions/EachParameterResolver.java similarity index 100% rename from spark/common/src/test/java/com/netease/arctic/spark/test/extensions/EachParameterResolver.java rename to mixed/spark/common/src/test/java/com/netease/arctic/spark/test/extensions/EachParameterResolver.java diff --git a/spark/common/src/test/java/com/netease/arctic/spark/test/extensions/EnableCatalogSelect.java b/mixed/spark/common/src/test/java/com/netease/arctic/spark/test/extensions/EnableCatalogSelect.java similarity index 100% rename from spark/common/src/test/java/com/netease/arctic/spark/test/extensions/EnableCatalogSelect.java rename to mixed/spark/common/src/test/java/com/netease/arctic/spark/test/extensions/EnableCatalogSelect.java diff --git a/spark/common/src/test/java/com/netease/arctic/spark/test/extensions/EnableCatalogSelectExtension.java b/mixed/spark/common/src/test/java/com/netease/arctic/spark/test/extensions/EnableCatalogSelectExtension.java similarity index 100% rename from spark/common/src/test/java/com/netease/arctic/spark/test/extensions/EnableCatalogSelectExtension.java rename to mixed/spark/common/src/test/java/com/netease/arctic/spark/test/extensions/EnableCatalogSelectExtension.java diff --git a/spark/common/src/test/java/com/netease/arctic/spark/test/utils/Asserts.java b/mixed/spark/common/src/test/java/com/netease/arctic/spark/test/utils/Asserts.java similarity index 100% rename from spark/common/src/test/java/com/netease/arctic/spark/test/utils/Asserts.java rename to mixed/spark/common/src/test/java/com/netease/arctic/spark/test/utils/Asserts.java diff --git a/spark/common/src/test/java/com/netease/arctic/spark/test/utils/DataComparator.java b/mixed/spark/common/src/test/java/com/netease/arctic/spark/test/utils/DataComparator.java similarity index 100% rename from spark/common/src/test/java/com/netease/arctic/spark/test/utils/DataComparator.java rename to mixed/spark/common/src/test/java/com/netease/arctic/spark/test/utils/DataComparator.java diff --git a/spark/common/src/test/java/com/netease/arctic/spark/test/utils/ExpectResultUtil.java b/mixed/spark/common/src/test/java/com/netease/arctic/spark/test/utils/ExpectResultUtil.java similarity index 100% rename from spark/common/src/test/java/com/netease/arctic/spark/test/utils/ExpectResultUtil.java rename to mixed/spark/common/src/test/java/com/netease/arctic/spark/test/utils/ExpectResultUtil.java diff --git a/spark/common/src/test/java/com/netease/arctic/spark/test/utils/RecordGenerator.java b/mixed/spark/common/src/test/java/com/netease/arctic/spark/test/utils/RecordGenerator.java similarity index 100% rename from spark/common/src/test/java/com/netease/arctic/spark/test/utils/RecordGenerator.java rename to mixed/spark/common/src/test/java/com/netease/arctic/spark/test/utils/RecordGenerator.java diff --git a/spark/common/src/test/java/com/netease/arctic/spark/test/utils/ResourceInputFile.java b/mixed/spark/common/src/test/java/com/netease/arctic/spark/test/utils/ResourceInputFile.java similarity index 100% rename from spark/common/src/test/java/com/netease/arctic/spark/test/utils/ResourceInputFile.java rename to mixed/spark/common/src/test/java/com/netease/arctic/spark/test/utils/ResourceInputFile.java diff --git a/spark/common/src/test/java/com/netease/arctic/spark/test/utils/ScalaTestUtil.java b/mixed/spark/common/src/test/java/com/netease/arctic/spark/test/utils/ScalaTestUtil.java similarity index 100% rename from spark/common/src/test/java/com/netease/arctic/spark/test/utils/ScalaTestUtil.java rename to mixed/spark/common/src/test/java/com/netease/arctic/spark/test/utils/ScalaTestUtil.java diff --git a/spark/common/src/test/java/com/netease/arctic/spark/test/utils/TableFiles.java b/mixed/spark/common/src/test/java/com/netease/arctic/spark/test/utils/TableFiles.java similarity index 100% rename from spark/common/src/test/java/com/netease/arctic/spark/test/utils/TableFiles.java rename to mixed/spark/common/src/test/java/com/netease/arctic/spark/test/utils/TableFiles.java diff --git a/spark/common/src/test/java/com/netease/arctic/spark/test/utils/TestTable.java b/mixed/spark/common/src/test/java/com/netease/arctic/spark/test/utils/TestTable.java similarity index 100% rename from spark/common/src/test/java/com/netease/arctic/spark/test/utils/TestTable.java rename to mixed/spark/common/src/test/java/com/netease/arctic/spark/test/utils/TestTable.java diff --git a/spark/common/src/test/java/com/netease/arctic/spark/test/utils/TestTableUtil.java b/mixed/spark/common/src/test/java/com/netease/arctic/spark/test/utils/TestTableUtil.java similarity index 100% rename from spark/common/src/test/java/com/netease/arctic/spark/test/utils/TestTableUtil.java rename to mixed/spark/common/src/test/java/com/netease/arctic/spark/test/utils/TestTableUtil.java diff --git a/spark/common/src/test/java/com/netease/arctic/spark/test/utils/TestTables.java b/mixed/spark/common/src/test/java/com/netease/arctic/spark/test/utils/TestTables.java similarity index 100% rename from spark/common/src/test/java/com/netease/arctic/spark/test/utils/TestTables.java rename to mixed/spark/common/src/test/java/com/netease/arctic/spark/test/utils/TestTables.java diff --git a/spark/pom.xml b/mixed/spark/pom.xml similarity index 91% rename from spark/pom.xml rename to mixed/spark/pom.xml index ecc8d458bf..0b409e63c1 100644 --- a/spark/pom.xml +++ b/mixed/spark/pom.xml @@ -22,13 +22,13 @@ 4.0.0 com.netease.amoro - amoro-parent + amoro-mixed 0.7.0-SNAPSHOT - amoro-spark + amoro-mixed-spark pom - Amoro Project Spark Parent + Amoro Project Mixed Format Spark Parent https://amoro.netease.com diff --git a/spark/v3.1/spark-runtime/pom.xml b/mixed/spark/v3.1/spark-runtime/pom.xml similarity index 98% rename from spark/v3.1/spark-runtime/pom.xml rename to mixed/spark/v3.1/spark-runtime/pom.xml index 5335511cc7..b0d70fb670 100644 --- a/spark/v3.1/spark-runtime/pom.xml +++ b/mixed/spark/v3.1/spark-runtime/pom.xml @@ -22,20 +22,20 @@ 4.0.0 com.netease.amoro - amoro-spark + amoro-mixed-spark 0.7.0-SNAPSHOT ../../pom.xml - amoro-spark-3.1-runtime + amoro-mixed-spark-3.1-runtime jar - Amoro Project Spark 3.1 Runtime + Amoro Project Mixed Format Spark 3.1 Runtime https://amoro.netease.com com.netease.amoro - amoro-spark-3.1 + amoro-mixed-spark-3.1 ${project.parent.version} @@ -52,18 +52,16 @@ package - true - true false false - com.netease.amoro:amoro-spark-3-common - com.netease.amoro:amoro-spark-3.1 + com.netease.amoro:amoro-mixed-spark-3-common + com.netease.amoro:amoro-mixed-spark-3.1 com.netease.amoro:amoro-core com.netease.amoro:amoro-ams-api - com.netease.amoro:amoro-hive + com.netease.amoro:amoro-mixed-hive com.alibaba:fastjson org.apache.curator:curator-framework org.apache.curator:curator-client diff --git a/spark/v3.1/spark/pom.xml b/mixed/spark/v3.1/spark/pom.xml similarity index 97% rename from spark/v3.1/spark/pom.xml rename to mixed/spark/v3.1/spark/pom.xml index b8755e6f15..ed03a7116c 100644 --- a/spark/v3.1/spark/pom.xml +++ b/mixed/spark/v3.1/spark/pom.xml @@ -22,14 +22,14 @@ 4.0.0 com.netease.amoro - amoro-spark + amoro-mixed-spark 0.7.0-SNAPSHOT ../../pom.xml - amoro-spark-3.1 + amoro-mixed-spark-3.1 jar - Amoro Project Spark 3.1 + Amoro Project Mixed Format Spark 3.1 https://amoro.netease.com @@ -201,7 +201,7 @@ com.netease.amoro - amoro-hive + amoro-mixed-hive ${project.version} @@ -217,7 +217,7 @@ com.netease.amoro - amoro-spark-3-common + amoro-mixed-spark-3-common ${project.version} @@ -294,7 +294,7 @@ com.netease.amoro - amoro-spark-3-common + amoro-mixed-spark-3-common ${project.version} test-jar test @@ -327,7 +327,7 @@ com.netease.amoro - amoro-hive + amoro-mixed-hive ${project.version} test-jar test diff --git a/spark/v3.1/spark/src/main/antlr4/com/netease/arctic/spark/sql/parser/ArcticSqlCommand.g4 b/mixed/spark/v3.1/spark/src/main/antlr4/com/netease/arctic/spark/sql/parser/ArcticSqlCommand.g4 similarity index 100% rename from spark/v3.1/spark/src/main/antlr4/com/netease/arctic/spark/sql/parser/ArcticSqlCommand.g4 rename to mixed/spark/v3.1/spark/src/main/antlr4/com/netease/arctic/spark/sql/parser/ArcticSqlCommand.g4 diff --git a/spark/v3.1/spark/src/main/antlr4/com/netease/arctic/spark/sql/parser/ArcticSqlExtend.g4 b/mixed/spark/v3.1/spark/src/main/antlr4/com/netease/arctic/spark/sql/parser/ArcticSqlExtend.g4 similarity index 100% rename from spark/v3.1/spark/src/main/antlr4/com/netease/arctic/spark/sql/parser/ArcticSqlExtend.g4 rename to mixed/spark/v3.1/spark/src/main/antlr4/com/netease/arctic/spark/sql/parser/ArcticSqlExtend.g4 diff --git a/spark/v3.1/spark/src/main/gen-antlr/.gitignore b/mixed/spark/v3.1/spark/src/main/gen-antlr/.gitignore similarity index 100% rename from spark/v3.1/spark/src/main/gen-antlr/.gitignore rename to mixed/spark/v3.1/spark/src/main/gen-antlr/.gitignore diff --git a/spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandBaseListener.java b/mixed/spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandBaseListener.java similarity index 100% rename from spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandBaseListener.java rename to mixed/spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandBaseListener.java diff --git a/spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandBaseVisitor.java b/mixed/spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandBaseVisitor.java similarity index 100% rename from spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandBaseVisitor.java rename to mixed/spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandBaseVisitor.java diff --git a/spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandLexer.java b/mixed/spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandLexer.java similarity index 100% rename from spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandLexer.java rename to mixed/spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandLexer.java diff --git a/spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandListener.java b/mixed/spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandListener.java similarity index 100% rename from spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandListener.java rename to mixed/spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandListener.java diff --git a/spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandParser.java b/mixed/spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandParser.java similarity index 100% rename from spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandParser.java rename to mixed/spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandParser.java diff --git a/spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandVisitor.java b/mixed/spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandVisitor.java similarity index 100% rename from spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandVisitor.java rename to mixed/spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandVisitor.java diff --git a/spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendBaseListener.java b/mixed/spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendBaseListener.java similarity index 100% rename from spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendBaseListener.java rename to mixed/spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendBaseListener.java diff --git a/spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendBaseVisitor.java b/mixed/spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendBaseVisitor.java similarity index 100% rename from spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendBaseVisitor.java rename to mixed/spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendBaseVisitor.java diff --git a/spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendLexer.java b/mixed/spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendLexer.java similarity index 100% rename from spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendLexer.java rename to mixed/spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendLexer.java diff --git a/spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendListener.java b/mixed/spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendListener.java similarity index 100% rename from spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendListener.java rename to mixed/spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendListener.java diff --git a/spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendParser.java b/mixed/spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendParser.java similarity index 100% rename from spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendParser.java rename to mixed/spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendParser.java diff --git a/spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendVisitor.java b/mixed/spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendVisitor.java similarity index 100% rename from spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendVisitor.java rename to mixed/spark/v3.1/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendVisitor.java diff --git a/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/ArcticSparkCatalog.java b/mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/ArcticSparkCatalog.java similarity index 100% rename from spark/v3.1/spark/src/main/java/com/netease/arctic/spark/ArcticSparkCatalog.java rename to mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/ArcticSparkCatalog.java diff --git a/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/ArcticSparkSessionCatalog.java b/mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/ArcticSparkSessionCatalog.java similarity index 100% rename from spark/v3.1/spark/src/main/java/com/netease/arctic/spark/ArcticSparkSessionCatalog.java rename to mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/ArcticSparkSessionCatalog.java diff --git a/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/MultiDelegateSessionCatalog.java b/mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/MultiDelegateSessionCatalog.java similarity index 100% rename from spark/v3.1/spark/src/main/java/com/netease/arctic/spark/MultiDelegateSessionCatalog.java rename to mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/MultiDelegateSessionCatalog.java diff --git a/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/Spark31Adapter.java b/mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/Spark31Adapter.java similarity index 100% rename from spark/v3.1/spark/src/main/java/com/netease/arctic/spark/Spark31Adapter.java rename to mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/Spark31Adapter.java diff --git a/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/SparkAdapter.java b/mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/SparkAdapter.java similarity index 100% rename from spark/v3.1/spark/src/main/java/com/netease/arctic/spark/SparkAdapter.java rename to mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/SparkAdapter.java diff --git a/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/SparkAdapterLoader.java b/mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/SparkAdapterLoader.java similarity index 100% rename from spark/v3.1/spark/src/main/java/com/netease/arctic/spark/SparkAdapterLoader.java rename to mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/SparkAdapterLoader.java diff --git a/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/SparkInternalRowCastWrapper.java b/mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/SparkInternalRowCastWrapper.java similarity index 100% rename from spark/v3.1/spark/src/main/java/com/netease/arctic/spark/SparkInternalRowCastWrapper.java rename to mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/SparkInternalRowCastWrapper.java diff --git a/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/SparkInternalRowWrapper.java b/mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/SparkInternalRowWrapper.java similarity index 100% rename from spark/v3.1/spark/src/main/java/com/netease/arctic/spark/SparkInternalRowWrapper.java rename to mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/SparkInternalRowWrapper.java diff --git a/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/command/ArcticSparkCommand.java b/mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/command/ArcticSparkCommand.java similarity index 100% rename from spark/v3.1/spark/src/main/java/com/netease/arctic/spark/command/ArcticSparkCommand.java rename to mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/command/ArcticSparkCommand.java diff --git a/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/command/MigrateToArcticCommand.java b/mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/command/MigrateToArcticCommand.java similarity index 100% rename from spark/v3.1/spark/src/main/java/com/netease/arctic/spark/command/MigrateToArcticCommand.java rename to mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/command/MigrateToArcticCommand.java diff --git a/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/io/ArcticSparkBaseTaskWriter.java b/mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/io/ArcticSparkBaseTaskWriter.java similarity index 100% rename from spark/v3.1/spark/src/main/java/com/netease/arctic/spark/io/ArcticSparkBaseTaskWriter.java rename to mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/io/ArcticSparkBaseTaskWriter.java diff --git a/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/io/ArcticSparkChangeTaskWriter.java b/mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/io/ArcticSparkChangeTaskWriter.java similarity index 100% rename from spark/v3.1/spark/src/main/java/com/netease/arctic/spark/io/ArcticSparkChangeTaskWriter.java rename to mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/io/ArcticSparkChangeTaskWriter.java diff --git a/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/io/InternalRowFileAppenderFactory.java b/mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/io/InternalRowFileAppenderFactory.java similarity index 100% rename from spark/v3.1/spark/src/main/java/com/netease/arctic/spark/io/InternalRowFileAppenderFactory.java rename to mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/io/InternalRowFileAppenderFactory.java diff --git a/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/io/TaskWriters.java b/mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/io/TaskWriters.java similarity index 100% rename from spark/v3.1/spark/src/main/java/com/netease/arctic/spark/io/TaskWriters.java rename to mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/io/TaskWriters.java diff --git a/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/io/UnkeyedUpsertSparkWriter.java b/mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/io/UnkeyedUpsertSparkWriter.java similarity index 100% rename from spark/v3.1/spark/src/main/java/com/netease/arctic/spark/io/UnkeyedUpsertSparkWriter.java rename to mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/io/UnkeyedUpsertSparkWriter.java diff --git a/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/reader/ArcticSparkKeyedDataReader.java b/mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/reader/ArcticSparkKeyedDataReader.java similarity index 100% rename from spark/v3.1/spark/src/main/java/com/netease/arctic/spark/reader/ArcticSparkKeyedDataReader.java rename to mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/reader/ArcticSparkKeyedDataReader.java diff --git a/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/reader/ArcticSparkUnkeyedDataReader.java b/mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/reader/ArcticSparkUnkeyedDataReader.java similarity index 100% rename from spark/v3.1/spark/src/main/java/com/netease/arctic/spark/reader/ArcticSparkUnkeyedDataReader.java rename to mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/reader/ArcticSparkUnkeyedDataReader.java diff --git a/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/reader/KeyedSparkBatchScan.java b/mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/reader/KeyedSparkBatchScan.java similarity index 100% rename from spark/v3.1/spark/src/main/java/com/netease/arctic/spark/reader/KeyedSparkBatchScan.java rename to mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/reader/KeyedSparkBatchScan.java diff --git a/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/reader/SparkParquetReaders.java b/mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/reader/SparkParquetReaders.java similarity index 100% rename from spark/v3.1/spark/src/main/java/com/netease/arctic/spark/reader/SparkParquetReaders.java rename to mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/reader/SparkParquetReaders.java diff --git a/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/reader/SparkScanBuilder.java b/mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/reader/SparkScanBuilder.java similarity index 100% rename from spark/v3.1/spark/src/main/java/com/netease/arctic/spark/reader/SparkScanBuilder.java rename to mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/reader/SparkScanBuilder.java diff --git a/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/reader/UnkeyedSparkBatchScan.java b/mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/reader/UnkeyedSparkBatchScan.java similarity index 100% rename from spark/v3.1/spark/src/main/java/com/netease/arctic/spark/reader/UnkeyedSparkBatchScan.java rename to mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/reader/UnkeyedSparkBatchScan.java diff --git a/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/source/ArcticSource.java b/mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/source/ArcticSource.java similarity index 100% rename from spark/v3.1/spark/src/main/java/com/netease/arctic/spark/source/ArcticSource.java rename to mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/source/ArcticSource.java diff --git a/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/sql/Exceptions.java b/mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/sql/Exceptions.java similarity index 100% rename from spark/v3.1/spark/src/main/java/com/netease/arctic/spark/sql/Exceptions.java rename to mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/sql/Exceptions.java diff --git a/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/sql/catalyst/parser/ArcticCommandAstParser.java b/mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/sql/catalyst/parser/ArcticCommandAstParser.java similarity index 100% rename from spark/v3.1/spark/src/main/java/com/netease/arctic/spark/sql/catalyst/parser/ArcticCommandAstParser.java rename to mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/sql/catalyst/parser/ArcticCommandAstParser.java diff --git a/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/sql/connector/expressions/Expressions.java b/mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/sql/connector/expressions/Expressions.java similarity index 100% rename from spark/v3.1/spark/src/main/java/com/netease/arctic/spark/sql/connector/expressions/Expressions.java rename to mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/sql/connector/expressions/Expressions.java diff --git a/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/sql/connector/expressions/FileIndexBucket.java b/mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/sql/connector/expressions/FileIndexBucket.java similarity index 100% rename from spark/v3.1/spark/src/main/java/com/netease/arctic/spark/sql/connector/expressions/FileIndexBucket.java rename to mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/sql/connector/expressions/FileIndexBucket.java diff --git a/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/table/ArcticIcebergSparkTable.java b/mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/table/ArcticIcebergSparkTable.java similarity index 100% rename from spark/v3.1/spark/src/main/java/com/netease/arctic/spark/table/ArcticIcebergSparkTable.java rename to mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/table/ArcticIcebergSparkTable.java diff --git a/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/table/ArcticSparkChangeTable.java b/mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/table/ArcticSparkChangeTable.java similarity index 100% rename from spark/v3.1/spark/src/main/java/com/netease/arctic/spark/table/ArcticSparkChangeTable.java rename to mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/table/ArcticSparkChangeTable.java diff --git a/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/table/ArcticSparkTable.java b/mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/table/ArcticSparkTable.java similarity index 100% rename from spark/v3.1/spark/src/main/java/com/netease/arctic/spark/table/ArcticSparkTable.java rename to mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/table/ArcticSparkTable.java diff --git a/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/table/SupportsExtendIdentColumns.java b/mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/table/SupportsExtendIdentColumns.java similarity index 100% rename from spark/v3.1/spark/src/main/java/com/netease/arctic/spark/table/SupportsExtendIdentColumns.java rename to mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/table/SupportsExtendIdentColumns.java diff --git a/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/table/SupportsRowLevelOperator.java b/mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/table/SupportsRowLevelOperator.java similarity index 100% rename from spark/v3.1/spark/src/main/java/com/netease/arctic/spark/table/SupportsRowLevelOperator.java rename to mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/table/SupportsRowLevelOperator.java diff --git a/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/util/ArcticSparkUtils.java b/mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/util/ArcticSparkUtils.java similarity index 100% rename from spark/v3.1/spark/src/main/java/com/netease/arctic/spark/util/ArcticSparkUtils.java rename to mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/util/ArcticSparkUtils.java diff --git a/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/util/DistributionAndOrderingUtil.java b/mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/util/DistributionAndOrderingUtil.java similarity index 100% rename from spark/v3.1/spark/src/main/java/com/netease/arctic/spark/util/DistributionAndOrderingUtil.java rename to mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/util/DistributionAndOrderingUtil.java diff --git a/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/util/ExpressionHelper.java b/mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/util/ExpressionHelper.java similarity index 100% rename from spark/v3.1/spark/src/main/java/com/netease/arctic/spark/util/ExpressionHelper.java rename to mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/util/ExpressionHelper.java diff --git a/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/util/SortOrderToSpark.java b/mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/util/SortOrderToSpark.java similarity index 100% rename from spark/v3.1/spark/src/main/java/com/netease/arctic/spark/util/SortOrderToSpark.java rename to mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/util/SortOrderToSpark.java diff --git a/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/util/Stats.java b/mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/util/Stats.java similarity index 100% rename from spark/v3.1/spark/src/main/java/com/netease/arctic/spark/util/Stats.java rename to mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/util/Stats.java diff --git a/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/writer/ArcticSparkWriteBuilder.java b/mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/writer/ArcticSparkWriteBuilder.java similarity index 100% rename from spark/v3.1/spark/src/main/java/com/netease/arctic/spark/writer/ArcticSparkWriteBuilder.java rename to mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/writer/ArcticSparkWriteBuilder.java diff --git a/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/writer/KeyedSparkBatchWrite.java b/mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/writer/KeyedSparkBatchWrite.java similarity index 100% rename from spark/v3.1/spark/src/main/java/com/netease/arctic/spark/writer/KeyedSparkBatchWrite.java rename to mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/writer/KeyedSparkBatchWrite.java diff --git a/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/writer/RowLevelWriter.java b/mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/writer/RowLevelWriter.java similarity index 100% rename from spark/v3.1/spark/src/main/java/com/netease/arctic/spark/writer/RowLevelWriter.java rename to mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/writer/RowLevelWriter.java diff --git a/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/writer/SimpleInternalRowDataWriter.java b/mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/writer/SimpleInternalRowDataWriter.java similarity index 100% rename from spark/v3.1/spark/src/main/java/com/netease/arctic/spark/writer/SimpleInternalRowDataWriter.java rename to mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/writer/SimpleInternalRowDataWriter.java diff --git a/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/writer/SimpleRowLevelDataWriter.java b/mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/writer/SimpleRowLevelDataWriter.java similarity index 100% rename from spark/v3.1/spark/src/main/java/com/netease/arctic/spark/writer/SimpleRowLevelDataWriter.java rename to mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/writer/SimpleRowLevelDataWriter.java diff --git a/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/writer/UnkeyedSparkBatchWrite.java b/mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/writer/UnkeyedSparkBatchWrite.java similarity index 100% rename from spark/v3.1/spark/src/main/java/com/netease/arctic/spark/writer/UnkeyedSparkBatchWrite.java rename to mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/writer/UnkeyedSparkBatchWrite.java diff --git a/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/writer/WriteMode.java b/mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/writer/WriteMode.java similarity index 100% rename from spark/v3.1/spark/src/main/java/com/netease/arctic/spark/writer/WriteMode.java rename to mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/writer/WriteMode.java diff --git a/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/writer/WriteTaskCommit.java b/mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/writer/WriteTaskCommit.java similarity index 100% rename from spark/v3.1/spark/src/main/java/com/netease/arctic/spark/writer/WriteTaskCommit.java rename to mixed/spark/v3.1/spark/src/main/java/com/netease/arctic/spark/writer/WriteTaskCommit.java diff --git a/spark/v3.1/spark/src/main/java/org/apache/iceberg/spark/data/AdaptHiveParquetWithSparkSchemaVisitor.java b/mixed/spark/v3.1/spark/src/main/java/org/apache/iceberg/spark/data/AdaptHiveParquetWithSparkSchemaVisitor.java similarity index 100% rename from spark/v3.1/spark/src/main/java/org/apache/iceberg/spark/data/AdaptHiveParquetWithSparkSchemaVisitor.java rename to mixed/spark/v3.1/spark/src/main/java/org/apache/iceberg/spark/data/AdaptHiveParquetWithSparkSchemaVisitor.java diff --git a/spark/v3.1/spark/src/main/java/org/apache/iceberg/spark/data/AdaptHiveSparkParquetWriters.java b/mixed/spark/v3.1/spark/src/main/java/org/apache/iceberg/spark/data/AdaptHiveSparkParquetWriters.java similarity index 100% rename from spark/v3.1/spark/src/main/java/org/apache/iceberg/spark/data/AdaptHiveSparkParquetWriters.java rename to mixed/spark/v3.1/spark/src/main/java/org/apache/iceberg/spark/data/AdaptHiveSparkParquetWriters.java diff --git a/spark/v3.1/spark/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister b/mixed/spark/v3.1/spark/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister similarity index 100% rename from spark/v3.1/spark/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister rename to mixed/spark/v3.1/spark/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister diff --git a/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/ArcticSparkExtensions.scala b/mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/ArcticSparkExtensions.scala similarity index 100% rename from spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/ArcticSparkExtensions.scala rename to mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/ArcticSparkExtensions.scala diff --git a/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/SupportSparkAdapter.scala b/mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/SupportSparkAdapter.scala similarity index 100% rename from spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/SupportSparkAdapter.scala rename to mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/SupportSparkAdapter.scala diff --git a/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/ArcticExtensionUtils.scala b/mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/ArcticExtensionUtils.scala similarity index 100% rename from spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/ArcticExtensionUtils.scala rename to mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/ArcticExtensionUtils.scala diff --git a/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/QueryWithConstraintCheck.scala b/mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/QueryWithConstraintCheck.scala similarity index 100% rename from spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/QueryWithConstraintCheck.scala rename to mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/QueryWithConstraintCheck.scala diff --git a/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/ResolveArcticCommand.scala b/mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/ResolveArcticCommand.scala similarity index 100% rename from spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/ResolveArcticCommand.scala rename to mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/ResolveArcticCommand.scala diff --git a/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/ResolveMergeIntoTableReferences.scala b/mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/ResolveMergeIntoTableReferences.scala similarity index 100% rename from spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/ResolveMergeIntoTableReferences.scala rename to mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/ResolveMergeIntoTableReferences.scala diff --git a/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/RewriteArcticCommand.scala b/mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/RewriteArcticCommand.scala similarity index 100% rename from spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/RewriteArcticCommand.scala rename to mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/RewriteArcticCommand.scala diff --git a/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/RewriteMergeIntoTable.scala b/mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/RewriteMergeIntoTable.scala similarity index 100% rename from spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/RewriteMergeIntoTable.scala rename to mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/RewriteMergeIntoTable.scala diff --git a/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/OptimizeWriteRule.scala b/mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/OptimizeWriteRule.scala similarity index 100% rename from spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/OptimizeWriteRule.scala rename to mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/OptimizeWriteRule.scala diff --git a/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/RewriteAppendArcticTable.scala b/mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/RewriteAppendArcticTable.scala similarity index 100% rename from spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/RewriteAppendArcticTable.scala rename to mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/RewriteAppendArcticTable.scala diff --git a/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/RewriteDeleteFromArcticTable.scala b/mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/RewriteDeleteFromArcticTable.scala similarity index 100% rename from spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/RewriteDeleteFromArcticTable.scala rename to mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/RewriteDeleteFromArcticTable.scala diff --git a/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/RewriteUpdateArcticTable.scala b/mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/RewriteUpdateArcticTable.scala similarity index 100% rename from spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/RewriteUpdateArcticTable.scala rename to mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/RewriteUpdateArcticTable.scala diff --git a/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/parser/ArcticParserUtils.scala b/mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/parser/ArcticParserUtils.scala similarity index 100% rename from spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/parser/ArcticParserUtils.scala rename to mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/parser/ArcticParserUtils.scala diff --git a/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/parser/ArcticSqlExtensionsParser.scala b/mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/parser/ArcticSqlExtensionsParser.scala similarity index 100% rename from spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/parser/ArcticSqlExtensionsParser.scala rename to mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/parser/ArcticSqlExtensionsParser.scala diff --git a/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/AlterArcticTableDropPartition.scala b/mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/AlterArcticTableDropPartition.scala similarity index 100% rename from spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/AlterArcticTableDropPartition.scala rename to mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/AlterArcticTableDropPartition.scala diff --git a/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/ArcticRowLevelWrite.scala b/mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/ArcticRowLevelWrite.scala similarity index 100% rename from spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/ArcticRowLevelWrite.scala rename to mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/ArcticRowLevelWrite.scala diff --git a/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/MergeIntoArcticTable.scala b/mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/MergeIntoArcticTable.scala similarity index 100% rename from spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/MergeIntoArcticTable.scala rename to mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/MergeIntoArcticTable.scala diff --git a/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/MergeRows.scala b/mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/MergeRows.scala similarity index 100% rename from spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/MergeRows.scala rename to mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/MergeRows.scala diff --git a/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/MigrateToArcticStatement.scala b/mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/MigrateToArcticStatement.scala similarity index 100% rename from spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/MigrateToArcticStatement.scala rename to mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/MigrateToArcticStatement.scala diff --git a/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/QueryWithConstraintCheckPlan.scala b/mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/QueryWithConstraintCheckPlan.scala similarity index 100% rename from spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/QueryWithConstraintCheckPlan.scala rename to mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/QueryWithConstraintCheckPlan.scala diff --git a/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/TruncateArcticTable.scala b/mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/TruncateArcticTable.scala similarity index 100% rename from spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/TruncateArcticTable.scala rename to mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/TruncateArcticTable.scala diff --git a/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/logicals.scala b/mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/logicals.scala similarity index 100% rename from spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/logicals.scala rename to mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/logicals.scala diff --git a/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/execution/AlterArcticTableDropPartitionExec.scala b/mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/execution/AlterArcticTableDropPartitionExec.scala similarity index 100% rename from spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/execution/AlterArcticTableDropPartitionExec.scala rename to mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/execution/AlterArcticTableDropPartitionExec.scala diff --git a/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ArcticCommandExec.scala b/mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ArcticCommandExec.scala similarity index 100% rename from spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ArcticCommandExec.scala rename to mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ArcticCommandExec.scala diff --git a/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ArcticRowLevelWriteExec.scala b/mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ArcticRowLevelWriteExec.scala similarity index 100% rename from spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ArcticRowLevelWriteExec.scala rename to mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ArcticRowLevelWriteExec.scala diff --git a/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/execution/DescribeKeyedTableExec.scala b/mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/execution/DescribeKeyedTableExec.scala similarity index 100% rename from spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/execution/DescribeKeyedTableExec.scala rename to mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/execution/DescribeKeyedTableExec.scala diff --git a/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ExtendedArcticStrategy.scala b/mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ExtendedArcticStrategy.scala similarity index 100% rename from spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ExtendedArcticStrategy.scala rename to mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ExtendedArcticStrategy.scala diff --git a/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ExtendedIcebergStrategy.scala b/mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ExtendedIcebergStrategy.scala similarity index 100% rename from spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ExtendedIcebergStrategy.scala rename to mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ExtendedIcebergStrategy.scala diff --git a/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/execution/MergeRowsExec.scala b/mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/execution/MergeRowsExec.scala similarity index 100% rename from spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/execution/MergeRowsExec.scala rename to mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/execution/MergeRowsExec.scala diff --git a/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/execution/QueryWithConstraintCheckExec.scala b/mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/execution/QueryWithConstraintCheckExec.scala similarity index 100% rename from spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/execution/QueryWithConstraintCheckExec.scala rename to mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/execution/QueryWithConstraintCheckExec.scala diff --git a/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/execution/TruncateArcticTableExec.scala b/mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/execution/TruncateArcticTableExec.scala similarity index 100% rename from spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/execution/TruncateArcticTableExec.scala rename to mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/execution/TruncateArcticTableExec.scala diff --git a/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/utils/ArcticRewriteHelper.scala b/mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/utils/ArcticRewriteHelper.scala similarity index 100% rename from spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/utils/ArcticRewriteHelper.scala rename to mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/utils/ArcticRewriteHelper.scala diff --git a/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/utils/ProjectingInternalRow.scala b/mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/utils/ProjectingInternalRow.scala similarity index 100% rename from spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/utils/ProjectingInternalRow.scala rename to mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/utils/ProjectingInternalRow.scala diff --git a/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/utils/RowDeltaUtils.scala b/mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/utils/RowDeltaUtils.scala similarity index 100% rename from spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/utils/RowDeltaUtils.scala rename to mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/utils/RowDeltaUtils.scala diff --git a/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/utils/WriteQueryProjections.scala b/mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/utils/WriteQueryProjections.scala similarity index 100% rename from spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/utils/WriteQueryProjections.scala rename to mixed/spark/v3.1/spark/src/main/scala/com/netease/arctic/spark/sql/utils/WriteQueryProjections.scala diff --git a/spark/v3.1/spark/src/main/scala/org/apache/spark/sql/arctic/catalyst/ArcticSpark31CatalystHelper.scala b/mixed/spark/v3.1/spark/src/main/scala/org/apache/spark/sql/arctic/catalyst/ArcticSpark31CatalystHelper.scala similarity index 100% rename from spark/v3.1/spark/src/main/scala/org/apache/spark/sql/arctic/catalyst/ArcticSpark31CatalystHelper.scala rename to mixed/spark/v3.1/spark/src/main/scala/org/apache/spark/sql/arctic/catalyst/ArcticSpark31CatalystHelper.scala diff --git a/spark/v3.1/spark/src/main/scala/org/apache/spark/sql/arctic/catalyst/ExpressionHelper.scala b/mixed/spark/v3.1/spark/src/main/scala/org/apache/spark/sql/arctic/catalyst/ExpressionHelper.scala similarity index 100% rename from spark/v3.1/spark/src/main/scala/org/apache/spark/sql/arctic/catalyst/ExpressionHelper.scala rename to mixed/spark/v3.1/spark/src/main/scala/org/apache/spark/sql/arctic/catalyst/ExpressionHelper.scala diff --git a/spark/v3.1/spark/src/main/scala/org/apache/spark/sql/arctic/execution/ExtendedV2ExistingTableWriteExec.scala b/mixed/spark/v3.1/spark/src/main/scala/org/apache/spark/sql/arctic/execution/ExtendedV2ExistingTableWriteExec.scala similarity index 100% rename from spark/v3.1/spark/src/main/scala/org/apache/spark/sql/arctic/execution/ExtendedV2ExistingTableWriteExec.scala rename to mixed/spark/v3.1/spark/src/main/scala/org/apache/spark/sql/arctic/execution/ExtendedV2ExistingTableWriteExec.scala diff --git a/spark/v3.1/spark/src/main/scala/org/apache/spark/sql/arctic/execution/WritingSparkTask.scala b/mixed/spark/v3.1/spark/src/main/scala/org/apache/spark/sql/arctic/execution/WritingSparkTask.scala similarity index 100% rename from spark/v3.1/spark/src/main/scala/org/apache/spark/sql/arctic/execution/WritingSparkTask.scala rename to mixed/spark/v3.1/spark/src/main/scala/org/apache/spark/sql/arctic/execution/WritingSparkTask.scala diff --git a/spark/v3.1/spark/src/main/scala/org/apache/spark/sql/arctic/parser/ExtendAstBuilder.scala b/mixed/spark/v3.1/spark/src/main/scala/org/apache/spark/sql/arctic/parser/ExtendAstBuilder.scala similarity index 100% rename from spark/v3.1/spark/src/main/scala/org/apache/spark/sql/arctic/parser/ExtendAstBuilder.scala rename to mixed/spark/v3.1/spark/src/main/scala/org/apache/spark/sql/arctic/parser/ExtendAstBuilder.scala diff --git a/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/TestImpalaParquet.java b/mixed/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/TestImpalaParquet.java similarity index 100% rename from spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/TestImpalaParquet.java rename to mixed/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/TestImpalaParquet.java diff --git a/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/api/TestKeyedTableDataFrameAPI.java b/mixed/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/api/TestKeyedTableDataFrameAPI.java similarity index 100% rename from spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/api/TestKeyedTableDataFrameAPI.java rename to mixed/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/api/TestKeyedTableDataFrameAPI.java diff --git a/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/api/TestUnKeyedTableDataFrameAPI.java b/mixed/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/api/TestUnKeyedTableDataFrameAPI.java similarity index 100% rename from spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/api/TestUnKeyedTableDataFrameAPI.java rename to mixed/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/api/TestUnKeyedTableDataFrameAPI.java diff --git a/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/catalog/TestSessionCatalog.java b/mixed/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/catalog/TestSessionCatalog.java similarity index 100% rename from spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/catalog/TestSessionCatalog.java rename to mixed/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/catalog/TestSessionCatalog.java diff --git a/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/catalog/TestSparkCatalog.java b/mixed/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/catalog/TestSparkCatalog.java similarity index 100% rename from spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/catalog/TestSparkCatalog.java rename to mixed/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/catalog/TestSparkCatalog.java diff --git a/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestAlterTableColumnSQL.java b/mixed/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestAlterTableColumnSQL.java similarity index 100% rename from spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestAlterTableColumnSQL.java rename to mixed/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestAlterTableColumnSQL.java diff --git a/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestArcticCommandSQL.java b/mixed/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestArcticCommandSQL.java similarity index 100% rename from spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestArcticCommandSQL.java rename to mixed/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestArcticCommandSQL.java diff --git a/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestArcticSessionCatalog.java b/mixed/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestArcticSessionCatalog.java similarity index 100% rename from spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestArcticSessionCatalog.java rename to mixed/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestArcticSessionCatalog.java diff --git a/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestCreateTableAsSelect.java b/mixed/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestCreateTableAsSelect.java similarity index 100% rename from spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestCreateTableAsSelect.java rename to mixed/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestCreateTableAsSelect.java diff --git a/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestCreateTableLikeSQL.java b/mixed/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestCreateTableLikeSQL.java similarity index 100% rename from spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestCreateTableLikeSQL.java rename to mixed/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestCreateTableLikeSQL.java diff --git a/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestCreateTableSQL.java b/mixed/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestCreateTableSQL.java similarity index 100% rename from spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestCreateTableSQL.java rename to mixed/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestCreateTableSQL.java diff --git a/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestDeleteFromSQL.java b/mixed/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestDeleteFromSQL.java similarity index 100% rename from spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestDeleteFromSQL.java rename to mixed/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestDeleteFromSQL.java diff --git a/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestDescSQL.java b/mixed/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestDescSQL.java similarity index 100% rename from spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestDescSQL.java rename to mixed/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestDescSQL.java diff --git a/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestDropPartitionSQL.java b/mixed/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestDropPartitionSQL.java similarity index 100% rename from spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestDropPartitionSQL.java rename to mixed/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestDropPartitionSQL.java diff --git a/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestInsertIntoSQL.java b/mixed/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestInsertIntoSQL.java similarity index 100% rename from spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestInsertIntoSQL.java rename to mixed/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestInsertIntoSQL.java diff --git a/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestInsertOverwriteSQL.java b/mixed/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestInsertOverwriteSQL.java similarity index 100% rename from spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestInsertOverwriteSQL.java rename to mixed/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestInsertOverwriteSQL.java diff --git a/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestMergeIntoSQL.java b/mixed/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestMergeIntoSQL.java similarity index 100% rename from spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestMergeIntoSQL.java rename to mixed/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestMergeIntoSQL.java diff --git a/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestMultiDelegateSessionCatalog.java b/mixed/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestMultiDelegateSessionCatalog.java similarity index 100% rename from spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestMultiDelegateSessionCatalog.java rename to mixed/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestMultiDelegateSessionCatalog.java diff --git a/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestSelectSQL.java b/mixed/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestSelectSQL.java similarity index 100% rename from spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestSelectSQL.java rename to mixed/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestSelectSQL.java diff --git a/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestTruncateSQL.java b/mixed/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestTruncateSQL.java similarity index 100% rename from spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestTruncateSQL.java rename to mixed/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestTruncateSQL.java diff --git a/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestUpdateSQL.java b/mixed/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestUpdateSQL.java similarity index 100% rename from spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestUpdateSQL.java rename to mixed/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestUpdateSQL.java diff --git a/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/ut/sql/parser/TestSqlExtendParser.java b/mixed/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/ut/sql/parser/TestSqlExtendParser.java similarity index 100% rename from spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/ut/sql/parser/TestSqlExtendParser.java rename to mixed/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/test/suites/ut/sql/parser/TestSqlExtendParser.java diff --git a/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/writer/TestSparkWriter.java b/mixed/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/writer/TestSparkWriter.java similarity index 100% rename from spark/v3.1/spark/src/test/java/com/netease/arctic/spark/writer/TestSparkWriter.java rename to mixed/spark/v3.1/spark/src/test/java/com/netease/arctic/spark/writer/TestSparkWriter.java diff --git a/spark/v3.1/spark/src/test/resources/log4j.properties b/mixed/spark/v3.1/spark/src/test/resources/log4j.properties similarity index 100% rename from spark/v3.1/spark/src/test/resources/log4j.properties rename to mixed/spark/v3.1/spark/src/test/resources/log4j.properties diff --git a/spark/v3.2/spark-runtime/pom.xml b/mixed/spark/v3.2/spark-runtime/pom.xml similarity index 98% rename from spark/v3.2/spark-runtime/pom.xml rename to mixed/spark/v3.2/spark-runtime/pom.xml index f199f535d8..8912eb2b2d 100644 --- a/spark/v3.2/spark-runtime/pom.xml +++ b/mixed/spark/v3.2/spark-runtime/pom.xml @@ -21,22 +21,22 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - amoro-spark + amoro-mixed-spark com.netease.amoro 0.7.0-SNAPSHOT ../../pom.xml 4.0.0 - amoro-spark-3.2-runtime + amoro-mixed-spark-3.2-runtime jar - Amoro Project Spark 3.2 Runtime + Amoro Project Mixed Format Spark 3.2 Runtime https://amoro.netease.com com.netease.amoro - amoro-spark-3.2 + amoro-mixed-spark-3.2 ${project.parent.version} @@ -53,18 +53,16 @@ shade - true - true false false - com.netease.amoro:amoro-spark-3-common - com.netease.amoro:amoro-spark-3.2 + com.netease.amoro:amoro-mixed-spark-3-common + com.netease.amoro:amoro-mixed-spark-3.2 com.netease.amoro:amoro-core com.netease.amoro:amoro-ams-api - com.netease.amoro:amoro-hive + com.netease.amoro:amoro-mixed-hive com.alibaba:fastjson org.apache.curator:curator-framework org.apache.curator:curator-client diff --git a/spark/v3.2/spark/pom.xml b/mixed/spark/v3.2/spark/pom.xml similarity index 97% rename from spark/v3.2/spark/pom.xml rename to mixed/spark/v3.2/spark/pom.xml index 740750e40f..c347c3cd2d 100644 --- a/spark/v3.2/spark/pom.xml +++ b/mixed/spark/v3.2/spark/pom.xml @@ -21,16 +21,16 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - amoro-spark + amoro-mixed-spark com.netease.amoro 0.7.0-SNAPSHOT ../../pom.xml 4.0.0 - amoro-spark-3.2 + amoro-mixed-spark-3.2 jar - Amoro Project Spark 3.2 + Amoro Project Mixed Format Spark 3.2 https://amoro.netease.com @@ -214,7 +214,7 @@ com.netease.amoro - amoro-hive + amoro-mixed-hive ${project.version} @@ -230,7 +230,7 @@ com.netease.amoro - amoro-spark-3-common + amoro-mixed-spark-3-common ${project.version} @@ -339,7 +339,7 @@ com.netease.amoro - amoro-hive + amoro-mixed-hive ${project.version} test-jar test @@ -353,7 +353,7 @@ com.netease.amoro - amoro-spark-3-common + amoro-mixed-spark-3-common ${project.version} test-jar test diff --git a/spark/v3.2/spark/src/main/antlr4/com/netease/arctic/spark/sql/parser/ArcticSqlCommand.g4 b/mixed/spark/v3.2/spark/src/main/antlr4/com/netease/arctic/spark/sql/parser/ArcticSqlCommand.g4 similarity index 100% rename from spark/v3.2/spark/src/main/antlr4/com/netease/arctic/spark/sql/parser/ArcticSqlCommand.g4 rename to mixed/spark/v3.2/spark/src/main/antlr4/com/netease/arctic/spark/sql/parser/ArcticSqlCommand.g4 diff --git a/spark/v3.2/spark/src/main/antlr4/com/netease/arctic/spark/sql/parser/ArcticSqlExtend.g4 b/mixed/spark/v3.2/spark/src/main/antlr4/com/netease/arctic/spark/sql/parser/ArcticSqlExtend.g4 similarity index 100% rename from spark/v3.2/spark/src/main/antlr4/com/netease/arctic/spark/sql/parser/ArcticSqlExtend.g4 rename to mixed/spark/v3.2/spark/src/main/antlr4/com/netease/arctic/spark/sql/parser/ArcticSqlExtend.g4 diff --git a/spark/v3.2/spark/src/main/gen-antlr/.gitignore b/mixed/spark/v3.2/spark/src/main/gen-antlr/.gitignore similarity index 100% rename from spark/v3.2/spark/src/main/gen-antlr/.gitignore rename to mixed/spark/v3.2/spark/src/main/gen-antlr/.gitignore diff --git a/spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandBaseListener.java b/mixed/spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandBaseListener.java similarity index 100% rename from spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandBaseListener.java rename to mixed/spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandBaseListener.java diff --git a/spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandBaseVisitor.java b/mixed/spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandBaseVisitor.java similarity index 100% rename from spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandBaseVisitor.java rename to mixed/spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandBaseVisitor.java diff --git a/spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandLexer.java b/mixed/spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandLexer.java similarity index 100% rename from spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandLexer.java rename to mixed/spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandLexer.java diff --git a/spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandListener.java b/mixed/spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandListener.java similarity index 100% rename from spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandListener.java rename to mixed/spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandListener.java diff --git a/spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandParser.java b/mixed/spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandParser.java similarity index 100% rename from spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandParser.java rename to mixed/spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandParser.java diff --git a/spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandVisitor.java b/mixed/spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandVisitor.java similarity index 100% rename from spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandVisitor.java rename to mixed/spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandVisitor.java diff --git a/spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendBaseListener.java b/mixed/spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendBaseListener.java similarity index 100% rename from spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendBaseListener.java rename to mixed/spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendBaseListener.java diff --git a/spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendBaseVisitor.java b/mixed/spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendBaseVisitor.java similarity index 100% rename from spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendBaseVisitor.java rename to mixed/spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendBaseVisitor.java diff --git a/spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendLexer.java b/mixed/spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendLexer.java similarity index 100% rename from spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendLexer.java rename to mixed/spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendLexer.java diff --git a/spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendListener.java b/mixed/spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendListener.java similarity index 100% rename from spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendListener.java rename to mixed/spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendListener.java diff --git a/spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendParser.java b/mixed/spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendParser.java similarity index 100% rename from spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendParser.java rename to mixed/spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendParser.java diff --git a/spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendVisitor.java b/mixed/spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendVisitor.java similarity index 100% rename from spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendVisitor.java rename to mixed/spark/v3.2/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendVisitor.java diff --git a/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/ArcticSparkCatalog.java b/mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/ArcticSparkCatalog.java similarity index 100% rename from spark/v3.2/spark/src/main/java/com/netease/arctic/spark/ArcticSparkCatalog.java rename to mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/ArcticSparkCatalog.java diff --git a/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/ArcticSparkSessionCatalog.java b/mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/ArcticSparkSessionCatalog.java similarity index 100% rename from spark/v3.2/spark/src/main/java/com/netease/arctic/spark/ArcticSparkSessionCatalog.java rename to mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/ArcticSparkSessionCatalog.java diff --git a/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/MultiDelegateSessionCatalog.java b/mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/MultiDelegateSessionCatalog.java similarity index 100% rename from spark/v3.2/spark/src/main/java/com/netease/arctic/spark/MultiDelegateSessionCatalog.java rename to mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/MultiDelegateSessionCatalog.java diff --git a/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/Spark32Adapter.java b/mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/Spark32Adapter.java similarity index 100% rename from spark/v3.2/spark/src/main/java/com/netease/arctic/spark/Spark32Adapter.java rename to mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/Spark32Adapter.java diff --git a/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/SparkAdapter.java b/mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/SparkAdapter.java similarity index 100% rename from spark/v3.2/spark/src/main/java/com/netease/arctic/spark/SparkAdapter.java rename to mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/SparkAdapter.java diff --git a/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/SparkAdapterLoader.java b/mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/SparkAdapterLoader.java similarity index 100% rename from spark/v3.2/spark/src/main/java/com/netease/arctic/spark/SparkAdapterLoader.java rename to mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/SparkAdapterLoader.java diff --git a/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/SparkInternalRowCastWrapper.java b/mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/SparkInternalRowCastWrapper.java similarity index 100% rename from spark/v3.2/spark/src/main/java/com/netease/arctic/spark/SparkInternalRowCastWrapper.java rename to mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/SparkInternalRowCastWrapper.java diff --git a/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/SparkInternalRowWrapper.java b/mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/SparkInternalRowWrapper.java similarity index 100% rename from spark/v3.2/spark/src/main/java/com/netease/arctic/spark/SparkInternalRowWrapper.java rename to mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/SparkInternalRowWrapper.java diff --git a/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/command/ArcticSparkCommand.java b/mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/command/ArcticSparkCommand.java similarity index 100% rename from spark/v3.2/spark/src/main/java/com/netease/arctic/spark/command/ArcticSparkCommand.java rename to mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/command/ArcticSparkCommand.java diff --git a/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/command/MigrateToArcticCommand.java b/mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/command/MigrateToArcticCommand.java similarity index 100% rename from spark/v3.2/spark/src/main/java/com/netease/arctic/spark/command/MigrateToArcticCommand.java rename to mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/command/MigrateToArcticCommand.java diff --git a/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/io/ArcticSparkBaseTaskWriter.java b/mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/io/ArcticSparkBaseTaskWriter.java similarity index 100% rename from spark/v3.2/spark/src/main/java/com/netease/arctic/spark/io/ArcticSparkBaseTaskWriter.java rename to mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/io/ArcticSparkBaseTaskWriter.java diff --git a/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/io/ArcticSparkChangeTaskWriter.java b/mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/io/ArcticSparkChangeTaskWriter.java similarity index 100% rename from spark/v3.2/spark/src/main/java/com/netease/arctic/spark/io/ArcticSparkChangeTaskWriter.java rename to mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/io/ArcticSparkChangeTaskWriter.java diff --git a/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/io/InternalRowFileAppenderFactory.java b/mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/io/InternalRowFileAppenderFactory.java similarity index 100% rename from spark/v3.2/spark/src/main/java/com/netease/arctic/spark/io/InternalRowFileAppenderFactory.java rename to mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/io/InternalRowFileAppenderFactory.java diff --git a/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/io/TaskWriters.java b/mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/io/TaskWriters.java similarity index 100% rename from spark/v3.2/spark/src/main/java/com/netease/arctic/spark/io/TaskWriters.java rename to mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/io/TaskWriters.java diff --git a/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/io/UnkeyedUpsertSparkWriter.java b/mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/io/UnkeyedUpsertSparkWriter.java similarity index 100% rename from spark/v3.2/spark/src/main/java/com/netease/arctic/spark/io/UnkeyedUpsertSparkWriter.java rename to mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/io/UnkeyedUpsertSparkWriter.java diff --git a/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/reader/ArcticSparkKeyedDataReader.java b/mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/reader/ArcticSparkKeyedDataReader.java similarity index 100% rename from spark/v3.2/spark/src/main/java/com/netease/arctic/spark/reader/ArcticSparkKeyedDataReader.java rename to mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/reader/ArcticSparkKeyedDataReader.java diff --git a/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/reader/ArcticSparkUnkeyedDataReader.java b/mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/reader/ArcticSparkUnkeyedDataReader.java similarity index 100% rename from spark/v3.2/spark/src/main/java/com/netease/arctic/spark/reader/ArcticSparkUnkeyedDataReader.java rename to mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/reader/ArcticSparkUnkeyedDataReader.java diff --git a/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/reader/KeyedSparkBatchScan.java b/mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/reader/KeyedSparkBatchScan.java similarity index 100% rename from spark/v3.2/spark/src/main/java/com/netease/arctic/spark/reader/KeyedSparkBatchScan.java rename to mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/reader/KeyedSparkBatchScan.java diff --git a/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/reader/SparkParquetReaders.java b/mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/reader/SparkParquetReaders.java similarity index 100% rename from spark/v3.2/spark/src/main/java/com/netease/arctic/spark/reader/SparkParquetReaders.java rename to mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/reader/SparkParquetReaders.java diff --git a/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/reader/SparkScanBuilder.java b/mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/reader/SparkScanBuilder.java similarity index 100% rename from spark/v3.2/spark/src/main/java/com/netease/arctic/spark/reader/SparkScanBuilder.java rename to mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/reader/SparkScanBuilder.java diff --git a/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/reader/UnkeyedSparkBatchScan.java b/mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/reader/UnkeyedSparkBatchScan.java similarity index 100% rename from spark/v3.2/spark/src/main/java/com/netease/arctic/spark/reader/UnkeyedSparkBatchScan.java rename to mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/reader/UnkeyedSparkBatchScan.java diff --git a/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/source/ArcticSource.java b/mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/source/ArcticSource.java similarity index 100% rename from spark/v3.2/spark/src/main/java/com/netease/arctic/spark/source/ArcticSource.java rename to mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/source/ArcticSource.java diff --git a/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/sql/catalyst/parser/ArcticCommandAstParser.java b/mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/sql/catalyst/parser/ArcticCommandAstParser.java similarity index 100% rename from spark/v3.2/spark/src/main/java/com/netease/arctic/spark/sql/catalyst/parser/ArcticCommandAstParser.java rename to mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/sql/catalyst/parser/ArcticCommandAstParser.java diff --git a/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/sql/connector/expressions/FileIndexBucket.java b/mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/sql/connector/expressions/FileIndexBucket.java similarity index 100% rename from spark/v3.2/spark/src/main/java/com/netease/arctic/spark/sql/connector/expressions/FileIndexBucket.java rename to mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/sql/connector/expressions/FileIndexBucket.java diff --git a/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/table/ArcticIcebergSparkTable.java b/mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/table/ArcticIcebergSparkTable.java similarity index 100% rename from spark/v3.2/spark/src/main/java/com/netease/arctic/spark/table/ArcticIcebergSparkTable.java rename to mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/table/ArcticIcebergSparkTable.java diff --git a/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/table/ArcticSparkChangeTable.java b/mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/table/ArcticSparkChangeTable.java similarity index 100% rename from spark/v3.2/spark/src/main/java/com/netease/arctic/spark/table/ArcticSparkChangeTable.java rename to mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/table/ArcticSparkChangeTable.java diff --git a/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/table/ArcticSparkTable.java b/mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/table/ArcticSparkTable.java similarity index 100% rename from spark/v3.2/spark/src/main/java/com/netease/arctic/spark/table/ArcticSparkTable.java rename to mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/table/ArcticSparkTable.java diff --git a/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/table/SupportsExtendIdentColumns.java b/mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/table/SupportsExtendIdentColumns.java similarity index 100% rename from spark/v3.2/spark/src/main/java/com/netease/arctic/spark/table/SupportsExtendIdentColumns.java rename to mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/table/SupportsExtendIdentColumns.java diff --git a/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/table/SupportsRowLevelOperator.java b/mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/table/SupportsRowLevelOperator.java similarity index 100% rename from spark/v3.2/spark/src/main/java/com/netease/arctic/spark/table/SupportsRowLevelOperator.java rename to mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/table/SupportsRowLevelOperator.java diff --git a/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/util/ArcticSparkUtils.java b/mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/util/ArcticSparkUtils.java similarity index 100% rename from spark/v3.2/spark/src/main/java/com/netease/arctic/spark/util/ArcticSparkUtils.java rename to mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/util/ArcticSparkUtils.java diff --git a/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/util/DistributionAndOrderingUtil.java b/mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/util/DistributionAndOrderingUtil.java similarity index 100% rename from spark/v3.2/spark/src/main/java/com/netease/arctic/spark/util/DistributionAndOrderingUtil.java rename to mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/util/DistributionAndOrderingUtil.java diff --git a/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/util/ExpressionHelper.java b/mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/util/ExpressionHelper.java similarity index 100% rename from spark/v3.2/spark/src/main/java/com/netease/arctic/spark/util/ExpressionHelper.java rename to mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/util/ExpressionHelper.java diff --git a/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/util/SortOrderToSpark.java b/mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/util/SortOrderToSpark.java similarity index 100% rename from spark/v3.2/spark/src/main/java/com/netease/arctic/spark/util/SortOrderToSpark.java rename to mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/util/SortOrderToSpark.java diff --git a/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/util/Stats.java b/mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/util/Stats.java similarity index 100% rename from spark/v3.2/spark/src/main/java/com/netease/arctic/spark/util/Stats.java rename to mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/util/Stats.java diff --git a/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/writer/ArcticSparkWriteBuilder.java b/mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/writer/ArcticSparkWriteBuilder.java similarity index 100% rename from spark/v3.2/spark/src/main/java/com/netease/arctic/spark/writer/ArcticSparkWriteBuilder.java rename to mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/writer/ArcticSparkWriteBuilder.java diff --git a/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/writer/KeyedSparkBatchWrite.java b/mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/writer/KeyedSparkBatchWrite.java similarity index 100% rename from spark/v3.2/spark/src/main/java/com/netease/arctic/spark/writer/KeyedSparkBatchWrite.java rename to mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/writer/KeyedSparkBatchWrite.java diff --git a/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/writer/RowLevelWriter.java b/mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/writer/RowLevelWriter.java similarity index 100% rename from spark/v3.2/spark/src/main/java/com/netease/arctic/spark/writer/RowLevelWriter.java rename to mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/writer/RowLevelWriter.java diff --git a/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/writer/SimpleInternalRowDataWriter.java b/mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/writer/SimpleInternalRowDataWriter.java similarity index 100% rename from spark/v3.2/spark/src/main/java/com/netease/arctic/spark/writer/SimpleInternalRowDataWriter.java rename to mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/writer/SimpleInternalRowDataWriter.java diff --git a/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/writer/SimpleRowLevelDataWriter.java b/mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/writer/SimpleRowLevelDataWriter.java similarity index 100% rename from spark/v3.2/spark/src/main/java/com/netease/arctic/spark/writer/SimpleRowLevelDataWriter.java rename to mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/writer/SimpleRowLevelDataWriter.java diff --git a/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/writer/UnkeyedSparkBatchWrite.java b/mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/writer/UnkeyedSparkBatchWrite.java similarity index 100% rename from spark/v3.2/spark/src/main/java/com/netease/arctic/spark/writer/UnkeyedSparkBatchWrite.java rename to mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/writer/UnkeyedSparkBatchWrite.java diff --git a/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/writer/WriteMode.java b/mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/writer/WriteMode.java similarity index 100% rename from spark/v3.2/spark/src/main/java/com/netease/arctic/spark/writer/WriteMode.java rename to mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/writer/WriteMode.java diff --git a/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/writer/WriteTaskCommit.java b/mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/writer/WriteTaskCommit.java similarity index 100% rename from spark/v3.2/spark/src/main/java/com/netease/arctic/spark/writer/WriteTaskCommit.java rename to mixed/spark/v3.2/spark/src/main/java/com/netease/arctic/spark/writer/WriteTaskCommit.java diff --git a/spark/v3.2/spark/src/main/java/org/apache/iceberg/spark/data/AdaptHiveParquetWithSparkSchemaVisitor.java b/mixed/spark/v3.2/spark/src/main/java/org/apache/iceberg/spark/data/AdaptHiveParquetWithSparkSchemaVisitor.java similarity index 100% rename from spark/v3.2/spark/src/main/java/org/apache/iceberg/spark/data/AdaptHiveParquetWithSparkSchemaVisitor.java rename to mixed/spark/v3.2/spark/src/main/java/org/apache/iceberg/spark/data/AdaptHiveParquetWithSparkSchemaVisitor.java diff --git a/spark/v3.2/spark/src/main/java/org/apache/iceberg/spark/data/AdaptHiveSparkParquetWriters.java b/mixed/spark/v3.2/spark/src/main/java/org/apache/iceberg/spark/data/AdaptHiveSparkParquetWriters.java similarity index 100% rename from spark/v3.2/spark/src/main/java/org/apache/iceberg/spark/data/AdaptHiveSparkParquetWriters.java rename to mixed/spark/v3.2/spark/src/main/java/org/apache/iceberg/spark/data/AdaptHiveSparkParquetWriters.java diff --git a/spark/v3.2/spark/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister b/mixed/spark/v3.2/spark/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister similarity index 100% rename from spark/v3.2/spark/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister rename to mixed/spark/v3.2/spark/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister diff --git a/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/ArcticSparkExtensions.scala b/mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/ArcticSparkExtensions.scala similarity index 100% rename from spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/ArcticSparkExtensions.scala rename to mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/ArcticSparkExtensions.scala diff --git a/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/SupportSparkAdapter.scala b/mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/SupportSparkAdapter.scala similarity index 100% rename from spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/SupportSparkAdapter.scala rename to mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/SupportSparkAdapter.scala diff --git a/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/ArcticExtensionUtils.scala b/mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/ArcticExtensionUtils.scala similarity index 100% rename from spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/ArcticExtensionUtils.scala rename to mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/ArcticExtensionUtils.scala diff --git a/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/QueryWithConstraintCheck.scala b/mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/QueryWithConstraintCheck.scala similarity index 100% rename from spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/QueryWithConstraintCheck.scala rename to mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/QueryWithConstraintCheck.scala diff --git a/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/ResolveArcticCommand.scala b/mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/ResolveArcticCommand.scala similarity index 100% rename from spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/ResolveArcticCommand.scala rename to mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/ResolveArcticCommand.scala diff --git a/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/ResolveMergeIntoArcticTableReferences.scala b/mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/ResolveMergeIntoArcticTableReferences.scala similarity index 100% rename from spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/ResolveMergeIntoArcticTableReferences.scala rename to mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/ResolveMergeIntoArcticTableReferences.scala diff --git a/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/RewriteArcticCommand.scala b/mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/RewriteArcticCommand.scala similarity index 100% rename from spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/RewriteArcticCommand.scala rename to mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/RewriteArcticCommand.scala diff --git a/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/RewriteArcticMergeIntoTable.scala b/mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/RewriteArcticMergeIntoTable.scala similarity index 100% rename from spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/RewriteArcticMergeIntoTable.scala rename to mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/RewriteArcticMergeIntoTable.scala diff --git a/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/OptimizeWriteRule.scala b/mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/OptimizeWriteRule.scala similarity index 100% rename from spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/OptimizeWriteRule.scala rename to mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/OptimizeWriteRule.scala diff --git a/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/RewriteAppendArcticTable.scala b/mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/RewriteAppendArcticTable.scala similarity index 100% rename from spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/RewriteAppendArcticTable.scala rename to mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/RewriteAppendArcticTable.scala diff --git a/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/RewriteDeleteFromArcticTable.scala b/mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/RewriteDeleteFromArcticTable.scala similarity index 100% rename from spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/RewriteDeleteFromArcticTable.scala rename to mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/RewriteDeleteFromArcticTable.scala diff --git a/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/RewriteUpdateArcticTable.scala b/mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/RewriteUpdateArcticTable.scala similarity index 100% rename from spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/RewriteUpdateArcticTable.scala rename to mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/RewriteUpdateArcticTable.scala diff --git a/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/parser/ArcticParserUtils.scala b/mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/parser/ArcticParserUtils.scala similarity index 100% rename from spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/parser/ArcticParserUtils.scala rename to mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/parser/ArcticParserUtils.scala diff --git a/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/parser/ArcticSqlExtensionsParser.scala b/mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/parser/ArcticSqlExtensionsParser.scala similarity index 100% rename from spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/parser/ArcticSqlExtensionsParser.scala rename to mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/parser/ArcticSqlExtensionsParser.scala diff --git a/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/AlterArcticTableDropPartition.scala b/mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/AlterArcticTableDropPartition.scala similarity index 100% rename from spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/AlterArcticTableDropPartition.scala rename to mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/AlterArcticTableDropPartition.scala diff --git a/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/ArcticRowLevelWrite.scala b/mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/ArcticRowLevelWrite.scala similarity index 100% rename from spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/ArcticRowLevelWrite.scala rename to mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/ArcticRowLevelWrite.scala diff --git a/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/MergeIntoArcticTable.scala b/mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/MergeIntoArcticTable.scala similarity index 100% rename from spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/MergeIntoArcticTable.scala rename to mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/MergeIntoArcticTable.scala diff --git a/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/MergeRows.scala b/mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/MergeRows.scala similarity index 100% rename from spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/MergeRows.scala rename to mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/MergeRows.scala diff --git a/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/QueryWithConstraintCheckPlan.scala b/mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/QueryWithConstraintCheckPlan.scala similarity index 100% rename from spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/QueryWithConstraintCheckPlan.scala rename to mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/QueryWithConstraintCheckPlan.scala diff --git a/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/TruncateArcticTable.scala b/mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/TruncateArcticTable.scala similarity index 100% rename from spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/TruncateArcticTable.scala rename to mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/TruncateArcticTable.scala diff --git a/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/UnresolvedMergeIntoArcticTable.scala b/mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/UnresolvedMergeIntoArcticTable.scala similarity index 100% rename from spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/UnresolvedMergeIntoArcticTable.scala rename to mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/UnresolvedMergeIntoArcticTable.scala diff --git a/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/logicals.scala b/mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/logicals.scala similarity index 100% rename from spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/logicals.scala rename to mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/logicals.scala diff --git a/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/statements.scala b/mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/statements.scala similarity index 100% rename from spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/statements.scala rename to mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/statements.scala diff --git a/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/execution/AlterArcticTableDropPartitionExec.scala b/mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/execution/AlterArcticTableDropPartitionExec.scala similarity index 100% rename from spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/execution/AlterArcticTableDropPartitionExec.scala rename to mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/execution/AlterArcticTableDropPartitionExec.scala diff --git a/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ArcticCommandExec.scala b/mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ArcticCommandExec.scala similarity index 100% rename from spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ArcticCommandExec.scala rename to mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ArcticCommandExec.scala diff --git a/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ArcticRowLevelWriteExec.scala b/mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ArcticRowLevelWriteExec.scala similarity index 100% rename from spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ArcticRowLevelWriteExec.scala rename to mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ArcticRowLevelWriteExec.scala diff --git a/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/execution/DescribeKeyedTableExec.scala b/mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/execution/DescribeKeyedTableExec.scala similarity index 100% rename from spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/execution/DescribeKeyedTableExec.scala rename to mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/execution/DescribeKeyedTableExec.scala diff --git a/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ExtendedArcticStrategy.scala b/mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ExtendedArcticStrategy.scala similarity index 100% rename from spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ExtendedArcticStrategy.scala rename to mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ExtendedArcticStrategy.scala diff --git a/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/execution/MergeRowsExec.scala b/mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/execution/MergeRowsExec.scala similarity index 100% rename from spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/execution/MergeRowsExec.scala rename to mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/execution/MergeRowsExec.scala diff --git a/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/execution/QueryWithConstraintCheckExec.scala b/mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/execution/QueryWithConstraintCheckExec.scala similarity index 100% rename from spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/execution/QueryWithConstraintCheckExec.scala rename to mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/execution/QueryWithConstraintCheckExec.scala diff --git a/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/execution/TruncateArcticTableExec.scala b/mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/execution/TruncateArcticTableExec.scala similarity index 100% rename from spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/execution/TruncateArcticTableExec.scala rename to mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/execution/TruncateArcticTableExec.scala diff --git a/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/utils/ArcticRewriteHelper.scala b/mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/utils/ArcticRewriteHelper.scala similarity index 100% rename from spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/utils/ArcticRewriteHelper.scala rename to mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/utils/ArcticRewriteHelper.scala diff --git a/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/utils/ProjectingInternalRow.scala b/mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/utils/ProjectingInternalRow.scala similarity index 100% rename from spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/utils/ProjectingInternalRow.scala rename to mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/utils/ProjectingInternalRow.scala diff --git a/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/utils/RowDeltaUtils.scala b/mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/utils/RowDeltaUtils.scala similarity index 100% rename from spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/utils/RowDeltaUtils.scala rename to mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/utils/RowDeltaUtils.scala diff --git a/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/utils/WriteQueryProjections.scala b/mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/utils/WriteQueryProjections.scala similarity index 100% rename from spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/utils/WriteQueryProjections.scala rename to mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/utils/WriteQueryProjections.scala diff --git a/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/utils/expressions.scala b/mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/utils/expressions.scala similarity index 100% rename from spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/utils/expressions.scala rename to mixed/spark/v3.2/spark/src/main/scala/com/netease/arctic/spark/sql/utils/expressions.scala diff --git a/spark/v3.2/spark/src/main/scala/org/apache/spark/sql/arctic/catalyst/ArcticSpark32Helper.scala b/mixed/spark/v3.2/spark/src/main/scala/org/apache/spark/sql/arctic/catalyst/ArcticSpark32Helper.scala similarity index 100% rename from spark/v3.2/spark/src/main/scala/org/apache/spark/sql/arctic/catalyst/ArcticSpark32Helper.scala rename to mixed/spark/v3.2/spark/src/main/scala/org/apache/spark/sql/arctic/catalyst/ArcticSpark32Helper.scala diff --git a/spark/v3.2/spark/src/main/scala/org/apache/spark/sql/arctic/catalyst/ExpressionHelper.scala b/mixed/spark/v3.2/spark/src/main/scala/org/apache/spark/sql/arctic/catalyst/ExpressionHelper.scala similarity index 100% rename from spark/v3.2/spark/src/main/scala/org/apache/spark/sql/arctic/catalyst/ExpressionHelper.scala rename to mixed/spark/v3.2/spark/src/main/scala/org/apache/spark/sql/arctic/catalyst/ExpressionHelper.scala diff --git a/spark/v3.2/spark/src/main/scala/org/apache/spark/sql/arctic/parser/ArcticSqlExtendAstBuilder.scala b/mixed/spark/v3.2/spark/src/main/scala/org/apache/spark/sql/arctic/parser/ArcticSqlExtendAstBuilder.scala similarity index 100% rename from spark/v3.2/spark/src/main/scala/org/apache/spark/sql/arctic/parser/ArcticSqlExtendAstBuilder.scala rename to mixed/spark/v3.2/spark/src/main/scala/org/apache/spark/sql/arctic/parser/ArcticSqlExtendAstBuilder.scala diff --git a/spark/v3.2/spark/src/main/scala/org/apache/spark/sql/arctic/parser/QueryParsingErrors.scala b/mixed/spark/v3.2/spark/src/main/scala/org/apache/spark/sql/arctic/parser/QueryParsingErrors.scala similarity index 100% rename from spark/v3.2/spark/src/main/scala/org/apache/spark/sql/arctic/parser/QueryParsingErrors.scala rename to mixed/spark/v3.2/spark/src/main/scala/org/apache/spark/sql/arctic/parser/QueryParsingErrors.scala diff --git a/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/TestImpalaParquet.java b/mixed/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/TestImpalaParquet.java similarity index 100% rename from spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/TestImpalaParquet.java rename to mixed/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/TestImpalaParquet.java diff --git a/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/api/TestKeyedTableDataFrameAPI.java b/mixed/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/api/TestKeyedTableDataFrameAPI.java similarity index 100% rename from spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/api/TestKeyedTableDataFrameAPI.java rename to mixed/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/api/TestKeyedTableDataFrameAPI.java diff --git a/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/api/TestUnKeyedTableDataFrameAPI.java b/mixed/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/api/TestUnKeyedTableDataFrameAPI.java similarity index 100% rename from spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/api/TestUnKeyedTableDataFrameAPI.java rename to mixed/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/api/TestUnKeyedTableDataFrameAPI.java diff --git a/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/catalog/TestSessionCatalog.java b/mixed/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/catalog/TestSessionCatalog.java similarity index 100% rename from spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/catalog/TestSessionCatalog.java rename to mixed/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/catalog/TestSessionCatalog.java diff --git a/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/catalog/TestSparkCatalog.java b/mixed/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/catalog/TestSparkCatalog.java similarity index 100% rename from spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/catalog/TestSparkCatalog.java rename to mixed/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/catalog/TestSparkCatalog.java diff --git a/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestAlterTableColumnSQL.java b/mixed/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestAlterTableColumnSQL.java similarity index 100% rename from spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestAlterTableColumnSQL.java rename to mixed/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestAlterTableColumnSQL.java diff --git a/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestArcticCommandSQL.java b/mixed/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestArcticCommandSQL.java similarity index 100% rename from spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestArcticCommandSQL.java rename to mixed/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestArcticCommandSQL.java diff --git a/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestArcticSessionCatalog.java b/mixed/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestArcticSessionCatalog.java similarity index 100% rename from spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestArcticSessionCatalog.java rename to mixed/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestArcticSessionCatalog.java diff --git a/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestCreateTableAsSelect.java b/mixed/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestCreateTableAsSelect.java similarity index 100% rename from spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestCreateTableAsSelect.java rename to mixed/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestCreateTableAsSelect.java diff --git a/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestCreateTableLikeSQL.java b/mixed/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestCreateTableLikeSQL.java similarity index 100% rename from spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestCreateTableLikeSQL.java rename to mixed/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestCreateTableLikeSQL.java diff --git a/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestCreateTableSQL.java b/mixed/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestCreateTableSQL.java similarity index 100% rename from spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestCreateTableSQL.java rename to mixed/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestCreateTableSQL.java diff --git a/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestDeleteFromSQL.java b/mixed/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestDeleteFromSQL.java similarity index 100% rename from spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestDeleteFromSQL.java rename to mixed/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestDeleteFromSQL.java diff --git a/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestDescSQL.java b/mixed/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestDescSQL.java similarity index 100% rename from spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestDescSQL.java rename to mixed/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestDescSQL.java diff --git a/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestDropPartitionSQL.java b/mixed/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestDropPartitionSQL.java similarity index 100% rename from spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestDropPartitionSQL.java rename to mixed/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestDropPartitionSQL.java diff --git a/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestInsertIntoSQL.java b/mixed/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestInsertIntoSQL.java similarity index 100% rename from spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestInsertIntoSQL.java rename to mixed/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestInsertIntoSQL.java diff --git a/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestInsertOverwriteSQL.java b/mixed/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestInsertOverwriteSQL.java similarity index 100% rename from spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestInsertOverwriteSQL.java rename to mixed/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestInsertOverwriteSQL.java diff --git a/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestMergeIntoSQL.java b/mixed/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestMergeIntoSQL.java similarity index 100% rename from spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestMergeIntoSQL.java rename to mixed/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestMergeIntoSQL.java diff --git a/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestMultiDelegateSessionCatalog.java b/mixed/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestMultiDelegateSessionCatalog.java similarity index 100% rename from spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestMultiDelegateSessionCatalog.java rename to mixed/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestMultiDelegateSessionCatalog.java diff --git a/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestSelectSQL.java b/mixed/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestSelectSQL.java similarity index 100% rename from spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestSelectSQL.java rename to mixed/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestSelectSQL.java diff --git a/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestTruncateSQL.java b/mixed/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestTruncateSQL.java similarity index 100% rename from spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestTruncateSQL.java rename to mixed/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestTruncateSQL.java diff --git a/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestUpdateSQL.java b/mixed/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestUpdateSQL.java similarity index 100% rename from spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestUpdateSQL.java rename to mixed/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestUpdateSQL.java diff --git a/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/ut/sql/parser/TestSqlExtendParser.java b/mixed/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/ut/sql/parser/TestSqlExtendParser.java similarity index 100% rename from spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/ut/sql/parser/TestSqlExtendParser.java rename to mixed/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/test/suites/ut/sql/parser/TestSqlExtendParser.java diff --git a/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/writer/TestSparkWriter.java b/mixed/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/writer/TestSparkWriter.java similarity index 100% rename from spark/v3.2/spark/src/test/java/com/netease/arctic/spark/writer/TestSparkWriter.java rename to mixed/spark/v3.2/spark/src/test/java/com/netease/arctic/spark/writer/TestSparkWriter.java diff --git a/spark/v3.2/spark/src/test/resources/log4j2.properties b/mixed/spark/v3.2/spark/src/test/resources/log4j2.properties similarity index 100% rename from spark/v3.2/spark/src/test/resources/log4j2.properties rename to mixed/spark/v3.2/spark/src/test/resources/log4j2.properties diff --git a/spark/v3.3/spark-runtime/pom.xml b/mixed/spark/v3.3/spark-runtime/pom.xml similarity index 98% rename from spark/v3.3/spark-runtime/pom.xml rename to mixed/spark/v3.3/spark-runtime/pom.xml index ae8611c79d..a42f1ac471 100644 --- a/spark/v3.3/spark-runtime/pom.xml +++ b/mixed/spark/v3.3/spark-runtime/pom.xml @@ -21,22 +21,22 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - amoro-spark + amoro-mixed-spark com.netease.amoro 0.7.0-SNAPSHOT ../../pom.xml 4.0.0 - amoro-spark-3.3-runtime + amoro-mixed-spark-3.3-runtime jar - Amoro Project Spark 3.3 Runtime + Amoro Project Mixed Format Spark 3.3 Runtime https://amoro.netease.com com.netease.amoro - amoro-spark-3.3 + amoro-mixed-spark-3.3 ${project.parent.version} @@ -53,18 +53,16 @@ shade - true - true false false - com.netease.amoro:amoro-spark-3-common - com.netease.amoro:amoro-spark-3.3 + com.netease.amoro:amoro-mixed-spark-3-common + com.netease.amoro:amoro-mixed-spark-3.3 com.netease.amoro:amoro-core com.netease.amoro:amoro-ams-api - com.netease.amoro:amoro-hive + com.netease.amoro:amoro-mixed-hive com.alibaba:fastjson org.apache.curator:curator-framework org.apache.curator:curator-client diff --git a/spark/v3.3/spark/pom.xml b/mixed/spark/v3.3/spark/pom.xml similarity index 97% rename from spark/v3.3/spark/pom.xml rename to mixed/spark/v3.3/spark/pom.xml index 204bead0e5..ed4f30cf8e 100644 --- a/spark/v3.3/spark/pom.xml +++ b/mixed/spark/v3.3/spark/pom.xml @@ -21,16 +21,16 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - amoro-spark + amoro-mixed-spark com.netease.amoro 0.7.0-SNAPSHOT ../../pom.xml 4.0.0 - amoro-spark-3.3 + amoro-mixed-spark-3.3 jar - Amoro Project Spark 3.3 + Amoro Project Mixed Format Spark 3.3 https://amoro.netease.com @@ -210,7 +210,7 @@ com.netease.amoro - amoro-hive + amoro-mixed-hive ${project.version} @@ -226,7 +226,7 @@ com.netease.amoro - amoro-spark-3-common + amoro-mixed-spark-3-common ${project.version} @@ -345,7 +345,7 @@ com.netease.amoro - amoro-hive + amoro-mixed-hive ${project.version} test-jar test @@ -358,7 +358,7 @@ com.netease.amoro - amoro-spark-3-common + amoro-mixed-spark-3-common ${project.version} test-jar test diff --git a/spark/v3.3/spark/src/main/antlr4/com/netease/arctic/spark/sql/parser/ArcticSqlCommand.g4 b/mixed/spark/v3.3/spark/src/main/antlr4/com/netease/arctic/spark/sql/parser/ArcticSqlCommand.g4 similarity index 100% rename from spark/v3.3/spark/src/main/antlr4/com/netease/arctic/spark/sql/parser/ArcticSqlCommand.g4 rename to mixed/spark/v3.3/spark/src/main/antlr4/com/netease/arctic/spark/sql/parser/ArcticSqlCommand.g4 diff --git a/spark/v3.3/spark/src/main/antlr4/com/netease/arctic/spark/sql/parser/ArcticSqlExtend.g4 b/mixed/spark/v3.3/spark/src/main/antlr4/com/netease/arctic/spark/sql/parser/ArcticSqlExtend.g4 similarity index 100% rename from spark/v3.3/spark/src/main/antlr4/com/netease/arctic/spark/sql/parser/ArcticSqlExtend.g4 rename to mixed/spark/v3.3/spark/src/main/antlr4/com/netease/arctic/spark/sql/parser/ArcticSqlExtend.g4 diff --git a/spark/v3.3/spark/src/main/gen-antlr/.gitignore b/mixed/spark/v3.3/spark/src/main/gen-antlr/.gitignore similarity index 100% rename from spark/v3.3/spark/src/main/gen-antlr/.gitignore rename to mixed/spark/v3.3/spark/src/main/gen-antlr/.gitignore diff --git a/spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandBaseListener.java b/mixed/spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandBaseListener.java similarity index 100% rename from spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandBaseListener.java rename to mixed/spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandBaseListener.java diff --git a/spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandBaseVisitor.java b/mixed/spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandBaseVisitor.java similarity index 100% rename from spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandBaseVisitor.java rename to mixed/spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandBaseVisitor.java diff --git a/spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandLexer.java b/mixed/spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandLexer.java similarity index 100% rename from spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandLexer.java rename to mixed/spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandLexer.java diff --git a/spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandListener.java b/mixed/spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandListener.java similarity index 100% rename from spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandListener.java rename to mixed/spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandListener.java diff --git a/spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandParser.java b/mixed/spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandParser.java similarity index 100% rename from spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandParser.java rename to mixed/spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandParser.java diff --git a/spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandVisitor.java b/mixed/spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandVisitor.java similarity index 100% rename from spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandVisitor.java rename to mixed/spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlCommandVisitor.java diff --git a/spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendBaseListener.java b/mixed/spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendBaseListener.java similarity index 100% rename from spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendBaseListener.java rename to mixed/spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendBaseListener.java diff --git a/spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendBaseVisitor.java b/mixed/spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendBaseVisitor.java similarity index 100% rename from spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendBaseVisitor.java rename to mixed/spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendBaseVisitor.java diff --git a/spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendLexer.java b/mixed/spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendLexer.java similarity index 100% rename from spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendLexer.java rename to mixed/spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendLexer.java diff --git a/spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendListener.java b/mixed/spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendListener.java similarity index 100% rename from spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendListener.java rename to mixed/spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendListener.java diff --git a/spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendParser.java b/mixed/spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendParser.java similarity index 100% rename from spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendParser.java rename to mixed/spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendParser.java diff --git a/spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendVisitor.java b/mixed/spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendVisitor.java similarity index 100% rename from spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendVisitor.java rename to mixed/spark/v3.3/spark/src/main/gen-antlr/com/netease/arctic/spark/sql/parser/ArcticSqlExtendVisitor.java diff --git a/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/ArcticSparkCatalog.java b/mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/ArcticSparkCatalog.java similarity index 100% rename from spark/v3.3/spark/src/main/java/com/netease/arctic/spark/ArcticSparkCatalog.java rename to mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/ArcticSparkCatalog.java diff --git a/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/ArcticSparkSessionCatalog.java b/mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/ArcticSparkSessionCatalog.java similarity index 100% rename from spark/v3.3/spark/src/main/java/com/netease/arctic/spark/ArcticSparkSessionCatalog.java rename to mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/ArcticSparkSessionCatalog.java diff --git a/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/MultiDelegateSessionCatalog.java b/mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/MultiDelegateSessionCatalog.java similarity index 100% rename from spark/v3.3/spark/src/main/java/com/netease/arctic/spark/MultiDelegateSessionCatalog.java rename to mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/MultiDelegateSessionCatalog.java diff --git a/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/Spark33Adapter.java b/mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/Spark33Adapter.java similarity index 100% rename from spark/v3.3/spark/src/main/java/com/netease/arctic/spark/Spark33Adapter.java rename to mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/Spark33Adapter.java diff --git a/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/SparkAdapter.java b/mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/SparkAdapter.java similarity index 100% rename from spark/v3.3/spark/src/main/java/com/netease/arctic/spark/SparkAdapter.java rename to mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/SparkAdapter.java diff --git a/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/SparkAdapterLoader.java b/mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/SparkAdapterLoader.java similarity index 100% rename from spark/v3.3/spark/src/main/java/com/netease/arctic/spark/SparkAdapterLoader.java rename to mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/SparkAdapterLoader.java diff --git a/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/SparkInternalRowCastWrapper.java b/mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/SparkInternalRowCastWrapper.java similarity index 100% rename from spark/v3.3/spark/src/main/java/com/netease/arctic/spark/SparkInternalRowCastWrapper.java rename to mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/SparkInternalRowCastWrapper.java diff --git a/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/SparkInternalRowWrapper.java b/mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/SparkInternalRowWrapper.java similarity index 100% rename from spark/v3.3/spark/src/main/java/com/netease/arctic/spark/SparkInternalRowWrapper.java rename to mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/SparkInternalRowWrapper.java diff --git a/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/command/ArcticSparkCommand.java b/mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/command/ArcticSparkCommand.java similarity index 100% rename from spark/v3.3/spark/src/main/java/com/netease/arctic/spark/command/ArcticSparkCommand.java rename to mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/command/ArcticSparkCommand.java diff --git a/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/command/MigrateToArcticCommand.java b/mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/command/MigrateToArcticCommand.java similarity index 100% rename from spark/v3.3/spark/src/main/java/com/netease/arctic/spark/command/MigrateToArcticCommand.java rename to mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/command/MigrateToArcticCommand.java diff --git a/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/io/ArcticSparkBaseTaskWriter.java b/mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/io/ArcticSparkBaseTaskWriter.java similarity index 100% rename from spark/v3.3/spark/src/main/java/com/netease/arctic/spark/io/ArcticSparkBaseTaskWriter.java rename to mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/io/ArcticSparkBaseTaskWriter.java diff --git a/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/io/ArcticSparkChangeTaskWriter.java b/mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/io/ArcticSparkChangeTaskWriter.java similarity index 100% rename from spark/v3.3/spark/src/main/java/com/netease/arctic/spark/io/ArcticSparkChangeTaskWriter.java rename to mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/io/ArcticSparkChangeTaskWriter.java diff --git a/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/io/InternalRowFileAppenderFactory.java b/mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/io/InternalRowFileAppenderFactory.java similarity index 100% rename from spark/v3.3/spark/src/main/java/com/netease/arctic/spark/io/InternalRowFileAppenderFactory.java rename to mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/io/InternalRowFileAppenderFactory.java diff --git a/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/io/TaskWriters.java b/mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/io/TaskWriters.java similarity index 100% rename from spark/v3.3/spark/src/main/java/com/netease/arctic/spark/io/TaskWriters.java rename to mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/io/TaskWriters.java diff --git a/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/io/UnkeyedUpsertSparkWriter.java b/mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/io/UnkeyedUpsertSparkWriter.java similarity index 100% rename from spark/v3.3/spark/src/main/java/com/netease/arctic/spark/io/UnkeyedUpsertSparkWriter.java rename to mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/io/UnkeyedUpsertSparkWriter.java diff --git a/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/reader/ArcticSparkKeyedDataReader.java b/mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/reader/ArcticSparkKeyedDataReader.java similarity index 100% rename from spark/v3.3/spark/src/main/java/com/netease/arctic/spark/reader/ArcticSparkKeyedDataReader.java rename to mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/reader/ArcticSparkKeyedDataReader.java diff --git a/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/reader/ArcticSparkUnkeyedDataReader.java b/mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/reader/ArcticSparkUnkeyedDataReader.java similarity index 100% rename from spark/v3.3/spark/src/main/java/com/netease/arctic/spark/reader/ArcticSparkUnkeyedDataReader.java rename to mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/reader/ArcticSparkUnkeyedDataReader.java diff --git a/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/reader/KeyedSparkBatchScan.java b/mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/reader/KeyedSparkBatchScan.java similarity index 100% rename from spark/v3.3/spark/src/main/java/com/netease/arctic/spark/reader/KeyedSparkBatchScan.java rename to mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/reader/KeyedSparkBatchScan.java diff --git a/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/reader/SparkParquetReaders.java b/mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/reader/SparkParquetReaders.java similarity index 100% rename from spark/v3.3/spark/src/main/java/com/netease/arctic/spark/reader/SparkParquetReaders.java rename to mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/reader/SparkParquetReaders.java diff --git a/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/reader/SparkScanBuilder.java b/mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/reader/SparkScanBuilder.java similarity index 100% rename from spark/v3.3/spark/src/main/java/com/netease/arctic/spark/reader/SparkScanBuilder.java rename to mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/reader/SparkScanBuilder.java diff --git a/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/reader/UnkeyedSparkBatchScan.java b/mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/reader/UnkeyedSparkBatchScan.java similarity index 100% rename from spark/v3.3/spark/src/main/java/com/netease/arctic/spark/reader/UnkeyedSparkBatchScan.java rename to mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/reader/UnkeyedSparkBatchScan.java diff --git a/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/source/ArcticSource.java b/mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/source/ArcticSource.java similarity index 100% rename from spark/v3.3/spark/src/main/java/com/netease/arctic/spark/source/ArcticSource.java rename to mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/source/ArcticSource.java diff --git a/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/sql/catalyst/parser/ArcticCommandAstParser.java b/mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/sql/catalyst/parser/ArcticCommandAstParser.java similarity index 100% rename from spark/v3.3/spark/src/main/java/com/netease/arctic/spark/sql/catalyst/parser/ArcticCommandAstParser.java rename to mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/sql/catalyst/parser/ArcticCommandAstParser.java diff --git a/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/sql/connector/expressions/FileIndexBucket.java b/mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/sql/connector/expressions/FileIndexBucket.java similarity index 100% rename from spark/v3.3/spark/src/main/java/com/netease/arctic/spark/sql/connector/expressions/FileIndexBucket.java rename to mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/sql/connector/expressions/FileIndexBucket.java diff --git a/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/table/ArcticIcebergSparkTable.java b/mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/table/ArcticIcebergSparkTable.java similarity index 100% rename from spark/v3.3/spark/src/main/java/com/netease/arctic/spark/table/ArcticIcebergSparkTable.java rename to mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/table/ArcticIcebergSparkTable.java diff --git a/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/table/ArcticSparkChangeTable.java b/mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/table/ArcticSparkChangeTable.java similarity index 100% rename from spark/v3.3/spark/src/main/java/com/netease/arctic/spark/table/ArcticSparkChangeTable.java rename to mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/table/ArcticSparkChangeTable.java diff --git a/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/table/ArcticSparkTable.java b/mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/table/ArcticSparkTable.java similarity index 100% rename from spark/v3.3/spark/src/main/java/com/netease/arctic/spark/table/ArcticSparkTable.java rename to mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/table/ArcticSparkTable.java diff --git a/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/table/SupportsExtendIdentColumns.java b/mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/table/SupportsExtendIdentColumns.java similarity index 100% rename from spark/v3.3/spark/src/main/java/com/netease/arctic/spark/table/SupportsExtendIdentColumns.java rename to mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/table/SupportsExtendIdentColumns.java diff --git a/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/table/SupportsRowLevelOperator.java b/mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/table/SupportsRowLevelOperator.java similarity index 100% rename from spark/v3.3/spark/src/main/java/com/netease/arctic/spark/table/SupportsRowLevelOperator.java rename to mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/table/SupportsRowLevelOperator.java diff --git a/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/util/ArcticSparkUtils.java b/mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/util/ArcticSparkUtils.java similarity index 100% rename from spark/v3.3/spark/src/main/java/com/netease/arctic/spark/util/ArcticSparkUtils.java rename to mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/util/ArcticSparkUtils.java diff --git a/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/util/DistributionAndOrderingUtil.java b/mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/util/DistributionAndOrderingUtil.java similarity index 100% rename from spark/v3.3/spark/src/main/java/com/netease/arctic/spark/util/DistributionAndOrderingUtil.java rename to mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/util/DistributionAndOrderingUtil.java diff --git a/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/util/ExpressionHelper.java b/mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/util/ExpressionHelper.java similarity index 100% rename from spark/v3.3/spark/src/main/java/com/netease/arctic/spark/util/ExpressionHelper.java rename to mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/util/ExpressionHelper.java diff --git a/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/util/SortOrderToSpark.java b/mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/util/SortOrderToSpark.java similarity index 100% rename from spark/v3.3/spark/src/main/java/com/netease/arctic/spark/util/SortOrderToSpark.java rename to mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/util/SortOrderToSpark.java diff --git a/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/util/Stats.java b/mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/util/Stats.java similarity index 100% rename from spark/v3.3/spark/src/main/java/com/netease/arctic/spark/util/Stats.java rename to mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/util/Stats.java diff --git a/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/writer/ArcticSparkWriteBuilder.java b/mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/writer/ArcticSparkWriteBuilder.java similarity index 100% rename from spark/v3.3/spark/src/main/java/com/netease/arctic/spark/writer/ArcticSparkWriteBuilder.java rename to mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/writer/ArcticSparkWriteBuilder.java diff --git a/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/writer/KeyedSparkBatchWrite.java b/mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/writer/KeyedSparkBatchWrite.java similarity index 100% rename from spark/v3.3/spark/src/main/java/com/netease/arctic/spark/writer/KeyedSparkBatchWrite.java rename to mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/writer/KeyedSparkBatchWrite.java diff --git a/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/writer/RowLevelWriter.java b/mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/writer/RowLevelWriter.java similarity index 100% rename from spark/v3.3/spark/src/main/java/com/netease/arctic/spark/writer/RowLevelWriter.java rename to mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/writer/RowLevelWriter.java diff --git a/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/writer/SimpleInternalRowDataWriter.java b/mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/writer/SimpleInternalRowDataWriter.java similarity index 100% rename from spark/v3.3/spark/src/main/java/com/netease/arctic/spark/writer/SimpleInternalRowDataWriter.java rename to mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/writer/SimpleInternalRowDataWriter.java diff --git a/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/writer/SimpleRowLevelDataWriter.java b/mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/writer/SimpleRowLevelDataWriter.java similarity index 100% rename from spark/v3.3/spark/src/main/java/com/netease/arctic/spark/writer/SimpleRowLevelDataWriter.java rename to mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/writer/SimpleRowLevelDataWriter.java diff --git a/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/writer/UnkeyedSparkBatchWrite.java b/mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/writer/UnkeyedSparkBatchWrite.java similarity index 100% rename from spark/v3.3/spark/src/main/java/com/netease/arctic/spark/writer/UnkeyedSparkBatchWrite.java rename to mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/writer/UnkeyedSparkBatchWrite.java diff --git a/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/writer/WriteMode.java b/mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/writer/WriteMode.java similarity index 100% rename from spark/v3.3/spark/src/main/java/com/netease/arctic/spark/writer/WriteMode.java rename to mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/writer/WriteMode.java diff --git a/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/writer/WriteTaskCommit.java b/mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/writer/WriteTaskCommit.java similarity index 100% rename from spark/v3.3/spark/src/main/java/com/netease/arctic/spark/writer/WriteTaskCommit.java rename to mixed/spark/v3.3/spark/src/main/java/com/netease/arctic/spark/writer/WriteTaskCommit.java diff --git a/spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/data/AdaptHiveParquetWithSparkSchemaVisitor.java b/mixed/spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/data/AdaptHiveParquetWithSparkSchemaVisitor.java similarity index 100% rename from spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/data/AdaptHiveParquetWithSparkSchemaVisitor.java rename to mixed/spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/data/AdaptHiveParquetWithSparkSchemaVisitor.java diff --git a/spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/data/AdaptHiveSparkParquetWriters.java b/mixed/spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/data/AdaptHiveSparkParquetWriters.java similarity index 100% rename from spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/data/AdaptHiveSparkParquetWriters.java rename to mixed/spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/data/AdaptHiveSparkParquetWriters.java diff --git a/spark/v3.3/spark/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister b/mixed/spark/v3.3/spark/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister similarity index 100% rename from spark/v3.3/spark/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister rename to mixed/spark/v3.3/spark/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister diff --git a/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/ArcticSparkExtensions.scala b/mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/ArcticSparkExtensions.scala similarity index 100% rename from spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/ArcticSparkExtensions.scala rename to mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/ArcticSparkExtensions.scala diff --git a/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/SupportSparkAdapter.scala b/mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/SupportSparkAdapter.scala similarity index 100% rename from spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/SupportSparkAdapter.scala rename to mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/SupportSparkAdapter.scala diff --git a/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/ArcticExtensionUtils.scala b/mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/ArcticExtensionUtils.scala similarity index 100% rename from spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/ArcticExtensionUtils.scala rename to mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/ArcticExtensionUtils.scala diff --git a/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/QueryWithConstraintCheck.scala b/mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/QueryWithConstraintCheck.scala similarity index 100% rename from spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/QueryWithConstraintCheck.scala rename to mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/QueryWithConstraintCheck.scala diff --git a/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/ResolveArcticCommand.scala b/mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/ResolveArcticCommand.scala similarity index 100% rename from spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/ResolveArcticCommand.scala rename to mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/ResolveArcticCommand.scala diff --git a/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/ResolveMergeIntoArcticTableReferences.scala b/mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/ResolveMergeIntoArcticTableReferences.scala similarity index 100% rename from spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/ResolveMergeIntoArcticTableReferences.scala rename to mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/ResolveMergeIntoArcticTableReferences.scala diff --git a/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/RewriteArcticCommand.scala b/mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/RewriteArcticCommand.scala similarity index 100% rename from spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/RewriteArcticCommand.scala rename to mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/RewriteArcticCommand.scala diff --git a/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/RewriteArcticMergeIntoTable.scala b/mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/RewriteArcticMergeIntoTable.scala similarity index 100% rename from spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/RewriteArcticMergeIntoTable.scala rename to mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/analysis/RewriteArcticMergeIntoTable.scala diff --git a/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/OptimizeWriteRule.scala b/mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/OptimizeWriteRule.scala similarity index 100% rename from spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/OptimizeWriteRule.scala rename to mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/OptimizeWriteRule.scala diff --git a/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/RewriteAppendArcticTable.scala b/mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/RewriteAppendArcticTable.scala similarity index 100% rename from spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/RewriteAppendArcticTable.scala rename to mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/RewriteAppendArcticTable.scala diff --git a/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/RewriteDeleteFromArcticTable.scala b/mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/RewriteDeleteFromArcticTable.scala similarity index 100% rename from spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/RewriteDeleteFromArcticTable.scala rename to mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/RewriteDeleteFromArcticTable.scala diff --git a/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/RewriteUpdateArcticTable.scala b/mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/RewriteUpdateArcticTable.scala similarity index 100% rename from spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/RewriteUpdateArcticTable.scala rename to mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/optimize/RewriteUpdateArcticTable.scala diff --git a/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/parser/ArcticParserUtils.scala b/mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/parser/ArcticParserUtils.scala similarity index 100% rename from spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/parser/ArcticParserUtils.scala rename to mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/parser/ArcticParserUtils.scala diff --git a/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/parser/ArcticSqlExtensionsParser.scala b/mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/parser/ArcticSqlExtensionsParser.scala similarity index 100% rename from spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/parser/ArcticSqlExtensionsParser.scala rename to mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/parser/ArcticSqlExtensionsParser.scala diff --git a/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/AlterArcticTableDropPartition.scala b/mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/AlterArcticTableDropPartition.scala similarity index 100% rename from spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/AlterArcticTableDropPartition.scala rename to mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/AlterArcticTableDropPartition.scala diff --git a/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/ArcticRowLevelWrite.scala b/mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/ArcticRowLevelWrite.scala similarity index 100% rename from spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/ArcticRowLevelWrite.scala rename to mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/ArcticRowLevelWrite.scala diff --git a/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/MergeIntoArcticTable.scala b/mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/MergeIntoArcticTable.scala similarity index 100% rename from spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/MergeIntoArcticTable.scala rename to mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/MergeIntoArcticTable.scala diff --git a/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/MergeRows.scala b/mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/MergeRows.scala similarity index 100% rename from spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/MergeRows.scala rename to mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/MergeRows.scala diff --git a/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/QueryWithConstraintCheckPlan.scala b/mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/QueryWithConstraintCheckPlan.scala similarity index 100% rename from spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/QueryWithConstraintCheckPlan.scala rename to mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/QueryWithConstraintCheckPlan.scala diff --git a/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/TruncateArcticTable.scala b/mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/TruncateArcticTable.scala similarity index 100% rename from spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/TruncateArcticTable.scala rename to mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/TruncateArcticTable.scala diff --git a/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/UnresolvedMergeIntoArcticTable.scala b/mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/UnresolvedMergeIntoArcticTable.scala similarity index 100% rename from spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/UnresolvedMergeIntoArcticTable.scala rename to mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/UnresolvedMergeIntoArcticTable.scala diff --git a/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/logicals.scala b/mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/logicals.scala similarity index 100% rename from spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/logicals.scala rename to mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/logicals.scala diff --git a/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/statements.scala b/mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/statements.scala similarity index 100% rename from spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/statements.scala rename to mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/catalyst/plans/statements.scala diff --git a/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/execution/AlterArcticTableDropPartitionExec.scala b/mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/execution/AlterArcticTableDropPartitionExec.scala similarity index 100% rename from spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/execution/AlterArcticTableDropPartitionExec.scala rename to mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/execution/AlterArcticTableDropPartitionExec.scala diff --git a/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ArcticCommandExec.scala b/mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ArcticCommandExec.scala similarity index 100% rename from spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ArcticCommandExec.scala rename to mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ArcticCommandExec.scala diff --git a/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ArcticRowLevelWriteExec.scala b/mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ArcticRowLevelWriteExec.scala similarity index 100% rename from spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ArcticRowLevelWriteExec.scala rename to mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ArcticRowLevelWriteExec.scala diff --git a/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/execution/DescribeKeyedTableExec.scala b/mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/execution/DescribeKeyedTableExec.scala similarity index 100% rename from spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/execution/DescribeKeyedTableExec.scala rename to mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/execution/DescribeKeyedTableExec.scala diff --git a/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ExtendedArcticStrategy.scala b/mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ExtendedArcticStrategy.scala similarity index 100% rename from spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ExtendedArcticStrategy.scala rename to mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/execution/ExtendedArcticStrategy.scala diff --git a/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/execution/MergeRowsExec.scala b/mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/execution/MergeRowsExec.scala similarity index 100% rename from spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/execution/MergeRowsExec.scala rename to mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/execution/MergeRowsExec.scala diff --git a/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/execution/QueryWithConstraintCheckExec.scala b/mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/execution/QueryWithConstraintCheckExec.scala similarity index 100% rename from spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/execution/QueryWithConstraintCheckExec.scala rename to mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/execution/QueryWithConstraintCheckExec.scala diff --git a/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/execution/TruncateArcticTableExec.scala b/mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/execution/TruncateArcticTableExec.scala similarity index 100% rename from spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/execution/TruncateArcticTableExec.scala rename to mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/execution/TruncateArcticTableExec.scala diff --git a/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/utils/ArcticRewriteHelper.scala b/mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/utils/ArcticRewriteHelper.scala similarity index 100% rename from spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/utils/ArcticRewriteHelper.scala rename to mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/utils/ArcticRewriteHelper.scala diff --git a/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/utils/ProjectingInternalRow.scala b/mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/utils/ProjectingInternalRow.scala similarity index 100% rename from spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/utils/ProjectingInternalRow.scala rename to mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/utils/ProjectingInternalRow.scala diff --git a/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/utils/RowDeltaUtils.scala b/mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/utils/RowDeltaUtils.scala similarity index 100% rename from spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/utils/RowDeltaUtils.scala rename to mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/utils/RowDeltaUtils.scala diff --git a/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/utils/WriteQueryProjections.scala b/mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/utils/WriteQueryProjections.scala similarity index 100% rename from spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/utils/WriteQueryProjections.scala rename to mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/utils/WriteQueryProjections.scala diff --git a/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/utils/expressions.scala b/mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/utils/expressions.scala similarity index 100% rename from spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/utils/expressions.scala rename to mixed/spark/v3.3/spark/src/main/scala/com/netease/arctic/spark/sql/utils/expressions.scala diff --git a/spark/v3.3/spark/src/main/scala/org/apache/spark/sql/arctic/catalyst/ArcticSpark33Helper.scala b/mixed/spark/v3.3/spark/src/main/scala/org/apache/spark/sql/arctic/catalyst/ArcticSpark33Helper.scala similarity index 100% rename from spark/v3.3/spark/src/main/scala/org/apache/spark/sql/arctic/catalyst/ArcticSpark33Helper.scala rename to mixed/spark/v3.3/spark/src/main/scala/org/apache/spark/sql/arctic/catalyst/ArcticSpark33Helper.scala diff --git a/spark/v3.3/spark/src/main/scala/org/apache/spark/sql/arctic/catalyst/AssignmentHelper.scala b/mixed/spark/v3.3/spark/src/main/scala/org/apache/spark/sql/arctic/catalyst/AssignmentHelper.scala similarity index 100% rename from spark/v3.3/spark/src/main/scala/org/apache/spark/sql/arctic/catalyst/AssignmentHelper.scala rename to mixed/spark/v3.3/spark/src/main/scala/org/apache/spark/sql/arctic/catalyst/AssignmentHelper.scala diff --git a/spark/v3.3/spark/src/main/scala/org/apache/spark/sql/arctic/catalyst/ExpressionHelper.scala b/mixed/spark/v3.3/spark/src/main/scala/org/apache/spark/sql/arctic/catalyst/ExpressionHelper.scala similarity index 100% rename from spark/v3.3/spark/src/main/scala/org/apache/spark/sql/arctic/catalyst/ExpressionHelper.scala rename to mixed/spark/v3.3/spark/src/main/scala/org/apache/spark/sql/arctic/catalyst/ExpressionHelper.scala diff --git a/spark/v3.3/spark/src/main/scala/org/apache/spark/sql/arctic/parser/ArcticSqlExtendAstBuilder.scala b/mixed/spark/v3.3/spark/src/main/scala/org/apache/spark/sql/arctic/parser/ArcticSqlExtendAstBuilder.scala similarity index 100% rename from spark/v3.3/spark/src/main/scala/org/apache/spark/sql/arctic/parser/ArcticSqlExtendAstBuilder.scala rename to mixed/spark/v3.3/spark/src/main/scala/org/apache/spark/sql/arctic/parser/ArcticSqlExtendAstBuilder.scala diff --git a/spark/v3.3/spark/src/main/scala/org/apache/spark/sql/arctic/parser/QueryParsingErrors.scala b/mixed/spark/v3.3/spark/src/main/scala/org/apache/spark/sql/arctic/parser/QueryParsingErrors.scala similarity index 100% rename from spark/v3.3/spark/src/main/scala/org/apache/spark/sql/arctic/parser/QueryParsingErrors.scala rename to mixed/spark/v3.3/spark/src/main/scala/org/apache/spark/sql/arctic/parser/QueryParsingErrors.scala diff --git a/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/TestImpalaParquet.java b/mixed/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/TestImpalaParquet.java similarity index 100% rename from spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/TestImpalaParquet.java rename to mixed/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/TestImpalaParquet.java diff --git a/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/api/TestKeyedTableDataFrameAPI.java b/mixed/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/api/TestKeyedTableDataFrameAPI.java similarity index 100% rename from spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/api/TestKeyedTableDataFrameAPI.java rename to mixed/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/api/TestKeyedTableDataFrameAPI.java diff --git a/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/api/TestUnKeyedTableDataFrameAPI.java b/mixed/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/api/TestUnKeyedTableDataFrameAPI.java similarity index 100% rename from spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/api/TestUnKeyedTableDataFrameAPI.java rename to mixed/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/api/TestUnKeyedTableDataFrameAPI.java diff --git a/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/catalog/TestSessionCatalog.java b/mixed/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/catalog/TestSessionCatalog.java similarity index 100% rename from spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/catalog/TestSessionCatalog.java rename to mixed/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/catalog/TestSessionCatalog.java diff --git a/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/catalog/TestSparkCatalog.java b/mixed/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/catalog/TestSparkCatalog.java similarity index 100% rename from spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/catalog/TestSparkCatalog.java rename to mixed/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/catalog/TestSparkCatalog.java diff --git a/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestAlterTableColumnSQL.java b/mixed/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestAlterTableColumnSQL.java similarity index 100% rename from spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestAlterTableColumnSQL.java rename to mixed/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestAlterTableColumnSQL.java diff --git a/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestArcticCommandSQL.java b/mixed/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestArcticCommandSQL.java similarity index 100% rename from spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestArcticCommandSQL.java rename to mixed/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestArcticCommandSQL.java diff --git a/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestArcticSessionCatalog.java b/mixed/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestArcticSessionCatalog.java similarity index 100% rename from spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestArcticSessionCatalog.java rename to mixed/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestArcticSessionCatalog.java diff --git a/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestCreateTableAsSelect.java b/mixed/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestCreateTableAsSelect.java similarity index 100% rename from spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestCreateTableAsSelect.java rename to mixed/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestCreateTableAsSelect.java diff --git a/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestCreateTableLikeSQL.java b/mixed/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestCreateTableLikeSQL.java similarity index 100% rename from spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestCreateTableLikeSQL.java rename to mixed/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestCreateTableLikeSQL.java diff --git a/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestCreateTableSQL.java b/mixed/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestCreateTableSQL.java similarity index 100% rename from spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestCreateTableSQL.java rename to mixed/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestCreateTableSQL.java diff --git a/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestDeleteFromSQL.java b/mixed/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestDeleteFromSQL.java similarity index 100% rename from spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestDeleteFromSQL.java rename to mixed/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestDeleteFromSQL.java diff --git a/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestDescSQL.java b/mixed/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestDescSQL.java similarity index 100% rename from spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestDescSQL.java rename to mixed/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestDescSQL.java diff --git a/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestDropPartitionSQL.java b/mixed/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestDropPartitionSQL.java similarity index 100% rename from spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestDropPartitionSQL.java rename to mixed/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestDropPartitionSQL.java diff --git a/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestInsertIntoSQL.java b/mixed/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestInsertIntoSQL.java similarity index 100% rename from spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestInsertIntoSQL.java rename to mixed/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestInsertIntoSQL.java diff --git a/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestInsertOverwriteSQL.java b/mixed/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestInsertOverwriteSQL.java similarity index 100% rename from spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestInsertOverwriteSQL.java rename to mixed/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestInsertOverwriteSQL.java diff --git a/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestMergeIntoSQL.java b/mixed/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestMergeIntoSQL.java similarity index 100% rename from spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestMergeIntoSQL.java rename to mixed/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestMergeIntoSQL.java diff --git a/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestMultiDelegateSessionCatalog.java b/mixed/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestMultiDelegateSessionCatalog.java similarity index 100% rename from spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestMultiDelegateSessionCatalog.java rename to mixed/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestMultiDelegateSessionCatalog.java diff --git a/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestSelectSQL.java b/mixed/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestSelectSQL.java similarity index 100% rename from spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestSelectSQL.java rename to mixed/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestSelectSQL.java diff --git a/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestTruncateSQL.java b/mixed/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestTruncateSQL.java similarity index 100% rename from spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestTruncateSQL.java rename to mixed/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestTruncateSQL.java diff --git a/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestUpdateSQL.java b/mixed/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestUpdateSQL.java similarity index 100% rename from spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestUpdateSQL.java rename to mixed/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/sql/TestUpdateSQL.java diff --git a/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/ut/sql/parser/TestSqlExtendParser.java b/mixed/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/ut/sql/parser/TestSqlExtendParser.java similarity index 100% rename from spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/ut/sql/parser/TestSqlExtendParser.java rename to mixed/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/test/suites/ut/sql/parser/TestSqlExtendParser.java diff --git a/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/writer/TestSparkWriter.java b/mixed/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/writer/TestSparkWriter.java similarity index 100% rename from spark/v3.3/spark/src/test/java/com/netease/arctic/spark/writer/TestSparkWriter.java rename to mixed/spark/v3.3/spark/src/test/java/com/netease/arctic/spark/writer/TestSparkWriter.java diff --git a/spark/v3.3/spark/src/test/resources/log4j2.properties b/mixed/spark/v3.3/spark/src/test/resources/log4j2.properties similarity index 100% rename from spark/v3.3/spark/src/test/resources/log4j2.properties rename to mixed/spark/v3.3/spark/src/test/resources/log4j2.properties diff --git a/trino/assembly.xml b/mixed/trino/assembly.xml similarity index 100% rename from trino/assembly.xml rename to mixed/trino/assembly.xml diff --git a/trino/pom.xml b/mixed/trino/pom.xml similarity index 98% rename from trino/pom.xml rename to mixed/trino/pom.xml index 88ec7ffcef..e5666367f9 100644 --- a/trino/pom.xml +++ b/mixed/trino/pom.xml @@ -22,12 +22,12 @@ 4.0.0 com.netease.amoro - amoro-parent + amoro-mixed 0.7.0-SNAPSHOT - amoro-trino - Amoro Project Trino + amoro-mixed-trino + Amoro Project Mixed Format Trino https://amoro.netease.com @@ -427,7 +427,7 @@ com.netease.amoro - amoro-hive + amoro-mixed-hive ${project.version} @@ -475,7 +475,7 @@ com.netease.amoro - amoro-hive + amoro-mixed-hive ${project.version} test-jar test @@ -566,7 +566,7 @@ package false - trino-amoro-${project.version} + amoro-mixed-trino-${project.version} assembly.xml diff --git a/trino/src/main/java/com/netease/arctic/ArcticErrorCode.java b/mixed/trino/src/main/java/com/netease/arctic/ArcticErrorCode.java similarity index 100% rename from trino/src/main/java/com/netease/arctic/ArcticErrorCode.java rename to mixed/trino/src/main/java/com/netease/arctic/ArcticErrorCode.java diff --git a/trino/src/main/java/com/netease/arctic/trino/ArcticCatalogFactory.java b/mixed/trino/src/main/java/com/netease/arctic/trino/ArcticCatalogFactory.java similarity index 100% rename from trino/src/main/java/com/netease/arctic/trino/ArcticCatalogFactory.java rename to mixed/trino/src/main/java/com/netease/arctic/trino/ArcticCatalogFactory.java diff --git a/trino/src/main/java/com/netease/arctic/trino/ArcticCatalogSupportTableSuffix.java b/mixed/trino/src/main/java/com/netease/arctic/trino/ArcticCatalogSupportTableSuffix.java similarity index 100% rename from trino/src/main/java/com/netease/arctic/trino/ArcticCatalogSupportTableSuffix.java rename to mixed/trino/src/main/java/com/netease/arctic/trino/ArcticCatalogSupportTableSuffix.java diff --git a/trino/src/main/java/com/netease/arctic/trino/ArcticConfig.java b/mixed/trino/src/main/java/com/netease/arctic/trino/ArcticConfig.java similarity index 100% rename from trino/src/main/java/com/netease/arctic/trino/ArcticConfig.java rename to mixed/trino/src/main/java/com/netease/arctic/trino/ArcticConfig.java diff --git a/trino/src/main/java/com/netease/arctic/trino/ArcticConnector.java b/mixed/trino/src/main/java/com/netease/arctic/trino/ArcticConnector.java similarity index 100% rename from trino/src/main/java/com/netease/arctic/trino/ArcticConnector.java rename to mixed/trino/src/main/java/com/netease/arctic/trino/ArcticConnector.java diff --git a/trino/src/main/java/com/netease/arctic/trino/ArcticConnectorFactory.java b/mixed/trino/src/main/java/com/netease/arctic/trino/ArcticConnectorFactory.java similarity index 100% rename from trino/src/main/java/com/netease/arctic/trino/ArcticConnectorFactory.java rename to mixed/trino/src/main/java/com/netease/arctic/trino/ArcticConnectorFactory.java diff --git a/trino/src/main/java/com/netease/arctic/trino/ArcticConnectorMetadata.java b/mixed/trino/src/main/java/com/netease/arctic/trino/ArcticConnectorMetadata.java similarity index 100% rename from trino/src/main/java/com/netease/arctic/trino/ArcticConnectorMetadata.java rename to mixed/trino/src/main/java/com/netease/arctic/trino/ArcticConnectorMetadata.java diff --git a/trino/src/main/java/com/netease/arctic/trino/ArcticConnectorSplitManager.java b/mixed/trino/src/main/java/com/netease/arctic/trino/ArcticConnectorSplitManager.java similarity index 100% rename from trino/src/main/java/com/netease/arctic/trino/ArcticConnectorSplitManager.java rename to mixed/trino/src/main/java/com/netease/arctic/trino/ArcticConnectorSplitManager.java diff --git a/trino/src/main/java/com/netease/arctic/trino/ArcticHadoopAuthentication.java b/mixed/trino/src/main/java/com/netease/arctic/trino/ArcticHadoopAuthentication.java similarity index 100% rename from trino/src/main/java/com/netease/arctic/trino/ArcticHadoopAuthentication.java rename to mixed/trino/src/main/java/com/netease/arctic/trino/ArcticHadoopAuthentication.java diff --git a/trino/src/main/java/com/netease/arctic/trino/ArcticHdfsAuthentication.java b/mixed/trino/src/main/java/com/netease/arctic/trino/ArcticHdfsAuthentication.java similarity index 100% rename from trino/src/main/java/com/netease/arctic/trino/ArcticHdfsAuthentication.java rename to mixed/trino/src/main/java/com/netease/arctic/trino/ArcticHdfsAuthentication.java diff --git a/trino/src/main/java/com/netease/arctic/trino/ArcticHdfsConfiguration.java b/mixed/trino/src/main/java/com/netease/arctic/trino/ArcticHdfsConfiguration.java similarity index 100% rename from trino/src/main/java/com/netease/arctic/trino/ArcticHdfsConfiguration.java rename to mixed/trino/src/main/java/com/netease/arctic/trino/ArcticHdfsConfiguration.java diff --git a/trino/src/main/java/com/netease/arctic/trino/ArcticMetadataFactory.java b/mixed/trino/src/main/java/com/netease/arctic/trino/ArcticMetadataFactory.java similarity index 100% rename from trino/src/main/java/com/netease/arctic/trino/ArcticMetadataFactory.java rename to mixed/trino/src/main/java/com/netease/arctic/trino/ArcticMetadataFactory.java diff --git a/trino/src/main/java/com/netease/arctic/trino/ArcticModule.java b/mixed/trino/src/main/java/com/netease/arctic/trino/ArcticModule.java similarity index 100% rename from trino/src/main/java/com/netease/arctic/trino/ArcticModule.java rename to mixed/trino/src/main/java/com/netease/arctic/trino/ArcticModule.java diff --git a/trino/src/main/java/com/netease/arctic/trino/ArcticPageSourceProvider.java b/mixed/trino/src/main/java/com/netease/arctic/trino/ArcticPageSourceProvider.java similarity index 100% rename from trino/src/main/java/com/netease/arctic/trino/ArcticPageSourceProvider.java rename to mixed/trino/src/main/java/com/netease/arctic/trino/ArcticPageSourceProvider.java diff --git a/trino/src/main/java/com/netease/arctic/trino/ArcticPlugin.java b/mixed/trino/src/main/java/com/netease/arctic/trino/ArcticPlugin.java similarity index 100% rename from trino/src/main/java/com/netease/arctic/trino/ArcticPlugin.java rename to mixed/trino/src/main/java/com/netease/arctic/trino/ArcticPlugin.java diff --git a/trino/src/main/java/com/netease/arctic/trino/ArcticSessionProperties.java b/mixed/trino/src/main/java/com/netease/arctic/trino/ArcticSessionProperties.java similarity index 100% rename from trino/src/main/java/com/netease/arctic/trino/ArcticSessionProperties.java rename to mixed/trino/src/main/java/com/netease/arctic/trino/ArcticSessionProperties.java diff --git a/trino/src/main/java/com/netease/arctic/trino/ArcticTransactionManager.java b/mixed/trino/src/main/java/com/netease/arctic/trino/ArcticTransactionManager.java similarity index 100% rename from trino/src/main/java/com/netease/arctic/trino/ArcticTransactionManager.java rename to mixed/trino/src/main/java/com/netease/arctic/trino/ArcticTransactionManager.java diff --git a/trino/src/main/java/com/netease/arctic/trino/DefaultArcticCatalogFactory.java b/mixed/trino/src/main/java/com/netease/arctic/trino/DefaultArcticCatalogFactory.java similarity index 100% rename from trino/src/main/java/com/netease/arctic/trino/DefaultArcticCatalogFactory.java rename to mixed/trino/src/main/java/com/netease/arctic/trino/DefaultArcticCatalogFactory.java diff --git a/trino/src/main/java/com/netease/arctic/trino/TableNameResolve.java b/mixed/trino/src/main/java/com/netease/arctic/trino/TableNameResolve.java similarity index 100% rename from trino/src/main/java/com/netease/arctic/trino/TableNameResolve.java rename to mixed/trino/src/main/java/com/netease/arctic/trino/TableNameResolve.java diff --git a/trino/src/main/java/com/netease/arctic/trino/delete/DummyFileScanTask.java b/mixed/trino/src/main/java/com/netease/arctic/trino/delete/DummyFileScanTask.java similarity index 100% rename from trino/src/main/java/com/netease/arctic/trino/delete/DummyFileScanTask.java rename to mixed/trino/src/main/java/com/netease/arctic/trino/delete/DummyFileScanTask.java diff --git a/trino/src/main/java/com/netease/arctic/trino/delete/TrinoDeleteFile.java b/mixed/trino/src/main/java/com/netease/arctic/trino/delete/TrinoDeleteFile.java similarity index 100% rename from trino/src/main/java/com/netease/arctic/trino/delete/TrinoDeleteFile.java rename to mixed/trino/src/main/java/com/netease/arctic/trino/delete/TrinoDeleteFile.java diff --git a/trino/src/main/java/com/netease/arctic/trino/delete/TrinoRow.java b/mixed/trino/src/main/java/com/netease/arctic/trino/delete/TrinoRow.java similarity index 100% rename from trino/src/main/java/com/netease/arctic/trino/delete/TrinoRow.java rename to mixed/trino/src/main/java/com/netease/arctic/trino/delete/TrinoRow.java diff --git a/trino/src/main/java/com/netease/arctic/trino/keyed/KeyedConnectorMetadata.java b/mixed/trino/src/main/java/com/netease/arctic/trino/keyed/KeyedConnectorMetadata.java similarity index 100% rename from trino/src/main/java/com/netease/arctic/trino/keyed/KeyedConnectorMetadata.java rename to mixed/trino/src/main/java/com/netease/arctic/trino/keyed/KeyedConnectorMetadata.java diff --git a/trino/src/main/java/com/netease/arctic/trino/keyed/KeyedConnectorPageSource.java b/mixed/trino/src/main/java/com/netease/arctic/trino/keyed/KeyedConnectorPageSource.java similarity index 100% rename from trino/src/main/java/com/netease/arctic/trino/keyed/KeyedConnectorPageSource.java rename to mixed/trino/src/main/java/com/netease/arctic/trino/keyed/KeyedConnectorPageSource.java diff --git a/trino/src/main/java/com/netease/arctic/trino/keyed/KeyedConnectorSplit.java b/mixed/trino/src/main/java/com/netease/arctic/trino/keyed/KeyedConnectorSplit.java similarity index 100% rename from trino/src/main/java/com/netease/arctic/trino/keyed/KeyedConnectorSplit.java rename to mixed/trino/src/main/java/com/netease/arctic/trino/keyed/KeyedConnectorSplit.java diff --git a/trino/src/main/java/com/netease/arctic/trino/keyed/KeyedConnectorSplitManager.java b/mixed/trino/src/main/java/com/netease/arctic/trino/keyed/KeyedConnectorSplitManager.java similarity index 100% rename from trino/src/main/java/com/netease/arctic/trino/keyed/KeyedConnectorSplitManager.java rename to mixed/trino/src/main/java/com/netease/arctic/trino/keyed/KeyedConnectorSplitManager.java diff --git a/trino/src/main/java/com/netease/arctic/trino/keyed/KeyedDeleteFilter.java b/mixed/trino/src/main/java/com/netease/arctic/trino/keyed/KeyedDeleteFilter.java similarity index 100% rename from trino/src/main/java/com/netease/arctic/trino/keyed/KeyedDeleteFilter.java rename to mixed/trino/src/main/java/com/netease/arctic/trino/keyed/KeyedDeleteFilter.java diff --git a/trino/src/main/java/com/netease/arctic/trino/keyed/KeyedPageSourceProvider.java b/mixed/trino/src/main/java/com/netease/arctic/trino/keyed/KeyedPageSourceProvider.java similarity index 100% rename from trino/src/main/java/com/netease/arctic/trino/keyed/KeyedPageSourceProvider.java rename to mixed/trino/src/main/java/com/netease/arctic/trino/keyed/KeyedPageSourceProvider.java diff --git a/trino/src/main/java/com/netease/arctic/trino/keyed/KeyedTableHandle.java b/mixed/trino/src/main/java/com/netease/arctic/trino/keyed/KeyedTableHandle.java similarity index 100% rename from trino/src/main/java/com/netease/arctic/trino/keyed/KeyedTableHandle.java rename to mixed/trino/src/main/java/com/netease/arctic/trino/keyed/KeyedTableHandle.java diff --git a/trino/src/main/java/com/netease/arctic/trino/unkeyed/AdaptHiveIcebergTableHandle.java b/mixed/trino/src/main/java/com/netease/arctic/trino/unkeyed/AdaptHiveIcebergTableHandle.java similarity index 100% rename from trino/src/main/java/com/netease/arctic/trino/unkeyed/AdaptHiveIcebergTableHandle.java rename to mixed/trino/src/main/java/com/netease/arctic/trino/unkeyed/AdaptHiveIcebergTableHandle.java diff --git a/trino/src/main/java/com/netease/arctic/trino/unkeyed/ArcticTrinoCatalog.java b/mixed/trino/src/main/java/com/netease/arctic/trino/unkeyed/ArcticTrinoCatalog.java similarity index 100% rename from trino/src/main/java/com/netease/arctic/trino/unkeyed/ArcticTrinoCatalog.java rename to mixed/trino/src/main/java/com/netease/arctic/trino/unkeyed/ArcticTrinoCatalog.java diff --git a/trino/src/main/java/com/netease/arctic/trino/unkeyed/ArcticTrinoCatalogFactory.java b/mixed/trino/src/main/java/com/netease/arctic/trino/unkeyed/ArcticTrinoCatalogFactory.java similarity index 100% rename from trino/src/main/java/com/netease/arctic/trino/unkeyed/ArcticTrinoCatalogFactory.java rename to mixed/trino/src/main/java/com/netease/arctic/trino/unkeyed/ArcticTrinoCatalogFactory.java diff --git a/trino/src/main/java/com/netease/arctic/trino/unkeyed/IcebergMetadata.java b/mixed/trino/src/main/java/com/netease/arctic/trino/unkeyed/IcebergMetadata.java similarity index 100% rename from trino/src/main/java/com/netease/arctic/trino/unkeyed/IcebergMetadata.java rename to mixed/trino/src/main/java/com/netease/arctic/trino/unkeyed/IcebergMetadata.java diff --git a/trino/src/main/java/com/netease/arctic/trino/unkeyed/IcebergPageSource.java b/mixed/trino/src/main/java/com/netease/arctic/trino/unkeyed/IcebergPageSource.java similarity index 100% rename from trino/src/main/java/com/netease/arctic/trino/unkeyed/IcebergPageSource.java rename to mixed/trino/src/main/java/com/netease/arctic/trino/unkeyed/IcebergPageSource.java diff --git a/trino/src/main/java/com/netease/arctic/trino/unkeyed/IcebergPageSourceProvider.java b/mixed/trino/src/main/java/com/netease/arctic/trino/unkeyed/IcebergPageSourceProvider.java similarity index 100% rename from trino/src/main/java/com/netease/arctic/trino/unkeyed/IcebergPageSourceProvider.java rename to mixed/trino/src/main/java/com/netease/arctic/trino/unkeyed/IcebergPageSourceProvider.java diff --git a/trino/src/main/java/com/netease/arctic/trino/unkeyed/IcebergSplit.java b/mixed/trino/src/main/java/com/netease/arctic/trino/unkeyed/IcebergSplit.java similarity index 100% rename from trino/src/main/java/com/netease/arctic/trino/unkeyed/IcebergSplit.java rename to mixed/trino/src/main/java/com/netease/arctic/trino/unkeyed/IcebergSplit.java diff --git a/trino/src/main/java/com/netease/arctic/trino/unkeyed/IcebergSplitManager.java b/mixed/trino/src/main/java/com/netease/arctic/trino/unkeyed/IcebergSplitManager.java similarity index 100% rename from trino/src/main/java/com/netease/arctic/trino/unkeyed/IcebergSplitManager.java rename to mixed/trino/src/main/java/com/netease/arctic/trino/unkeyed/IcebergSplitManager.java diff --git a/trino/src/main/java/com/netease/arctic/trino/unkeyed/IcebergSplitSource.java b/mixed/trino/src/main/java/com/netease/arctic/trino/unkeyed/IcebergSplitSource.java similarity index 100% rename from trino/src/main/java/com/netease/arctic/trino/unkeyed/IcebergSplitSource.java rename to mixed/trino/src/main/java/com/netease/arctic/trino/unkeyed/IcebergSplitSource.java diff --git a/trino/src/main/java/com/netease/arctic/trino/unkeyed/TrinoDeleteFilter.java b/mixed/trino/src/main/java/com/netease/arctic/trino/unkeyed/TrinoDeleteFilter.java similarity index 100% rename from trino/src/main/java/com/netease/arctic/trino/unkeyed/TrinoDeleteFilter.java rename to mixed/trino/src/main/java/com/netease/arctic/trino/unkeyed/TrinoDeleteFilter.java diff --git a/trino/src/main/java/com/netease/arctic/trino/util/MetricUtil.java b/mixed/trino/src/main/java/com/netease/arctic/trino/util/MetricUtil.java similarity index 100% rename from trino/src/main/java/com/netease/arctic/trino/util/MetricUtil.java rename to mixed/trino/src/main/java/com/netease/arctic/trino/util/MetricUtil.java diff --git a/trino/src/main/java/com/netease/arctic/trino/util/ObjectSerializerUtil.java b/mixed/trino/src/main/java/com/netease/arctic/trino/util/ObjectSerializerUtil.java similarity index 100% rename from trino/src/main/java/com/netease/arctic/trino/util/ObjectSerializerUtil.java rename to mixed/trino/src/main/java/com/netease/arctic/trino/util/ObjectSerializerUtil.java diff --git a/trino/src/main/java/io/trino/parquet/reader/ColumnReaderFactory.java b/mixed/trino/src/main/java/io/trino/parquet/reader/ColumnReaderFactory.java similarity index 100% rename from trino/src/main/java/io/trino/parquet/reader/ColumnReaderFactory.java rename to mixed/trino/src/main/java/io/trino/parquet/reader/ColumnReaderFactory.java diff --git a/trino/src/main/java/io/trino/parquet/reader/TimestampColumnReader.java b/mixed/trino/src/main/java/io/trino/parquet/reader/TimestampColumnReader.java similarity index 100% rename from trino/src/main/java/io/trino/parquet/reader/TimestampColumnReader.java rename to mixed/trino/src/main/java/io/trino/parquet/reader/TimestampColumnReader.java diff --git a/trino/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java b/mixed/trino/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java similarity index 100% rename from trino/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java rename to mixed/trino/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java diff --git a/trino/src/main/java/org/apache/hadoop/util/VersionInfo.java b/mixed/trino/src/main/java/org/apache/hadoop/util/VersionInfo.java similarity index 100% rename from trino/src/main/java/org/apache/hadoop/util/VersionInfo.java rename to mixed/trino/src/main/java/org/apache/hadoop/util/VersionInfo.java diff --git a/trino/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverterUtil.java b/mixed/trino/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverterUtil.java similarity index 100% rename from trino/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverterUtil.java rename to mixed/trino/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverterUtil.java diff --git a/trino/src/main/java/org/apache/parquet/io/ColumnIOUtil.java b/mixed/trino/src/main/java/org/apache/parquet/io/ColumnIOUtil.java similarity index 100% rename from trino/src/main/java/org/apache/parquet/io/ColumnIOUtil.java rename to mixed/trino/src/main/java/org/apache/parquet/io/ColumnIOUtil.java diff --git a/trino/src/main/resources/META-INF/services/io.trino.spi.Plugin b/mixed/trino/src/main/resources/META-INF/services/io.trino.spi.Plugin similarity index 100% rename from trino/src/main/resources/META-INF/services/io.trino.spi.Plugin rename to mixed/trino/src/main/resources/META-INF/services/io.trino.spi.Plugin diff --git a/trino/src/test/java/com/netease/arctic/trino/arctic/ArcticQueryRunner.java b/mixed/trino/src/test/java/com/netease/arctic/trino/arctic/ArcticQueryRunner.java similarity index 100% rename from trino/src/test/java/com/netease/arctic/trino/arctic/ArcticQueryRunner.java rename to mixed/trino/src/test/java/com/netease/arctic/trino/arctic/ArcticQueryRunner.java diff --git a/trino/src/test/java/com/netease/arctic/trino/arctic/HiveTestRecords.java b/mixed/trino/src/test/java/com/netease/arctic/trino/arctic/HiveTestRecords.java similarity index 100% rename from trino/src/test/java/com/netease/arctic/trino/arctic/HiveTestRecords.java rename to mixed/trino/src/test/java/com/netease/arctic/trino/arctic/HiveTestRecords.java diff --git a/trino/src/test/java/com/netease/arctic/trino/arctic/TableTestBaseForTrino.java b/mixed/trino/src/test/java/com/netease/arctic/trino/arctic/TableTestBaseForTrino.java similarity index 100% rename from trino/src/test/java/com/netease/arctic/trino/arctic/TableTestBaseForTrino.java rename to mixed/trino/src/test/java/com/netease/arctic/trino/arctic/TableTestBaseForTrino.java diff --git a/trino/src/test/java/com/netease/arctic/trino/arctic/TableTestBaseWithInitDataForTrino.java b/mixed/trino/src/test/java/com/netease/arctic/trino/arctic/TableTestBaseWithInitDataForTrino.java similarity index 100% rename from trino/src/test/java/com/netease/arctic/trino/arctic/TableTestBaseWithInitDataForTrino.java rename to mixed/trino/src/test/java/com/netease/arctic/trino/arctic/TableTestBaseWithInitDataForTrino.java diff --git a/trino/src/test/java/com/netease/arctic/trino/arctic/TestBaseArcticPrimaryTable.java b/mixed/trino/src/test/java/com/netease/arctic/trino/arctic/TestBaseArcticPrimaryTable.java similarity index 100% rename from trino/src/test/java/com/netease/arctic/trino/arctic/TestBaseArcticPrimaryTable.java rename to mixed/trino/src/test/java/com/netease/arctic/trino/arctic/TestBaseArcticPrimaryTable.java diff --git a/trino/src/test/java/com/netease/arctic/trino/arctic/TestHiveTable.java b/mixed/trino/src/test/java/com/netease/arctic/trino/arctic/TestHiveTable.java similarity index 100% rename from trino/src/test/java/com/netease/arctic/trino/arctic/TestHiveTable.java rename to mixed/trino/src/test/java/com/netease/arctic/trino/arctic/TestHiveTable.java diff --git a/trino/src/test/java/com/netease/arctic/trino/arctic/TestHiveTableBaseForTrino.java b/mixed/trino/src/test/java/com/netease/arctic/trino/arctic/TestHiveTableBaseForTrino.java similarity index 100% rename from trino/src/test/java/com/netease/arctic/trino/arctic/TestHiveTableBaseForTrino.java rename to mixed/trino/src/test/java/com/netease/arctic/trino/arctic/TestHiveTableBaseForTrino.java diff --git a/trino/src/test/java/com/netease/arctic/trino/iceberg/ArcticQueryRunner.java b/mixed/trino/src/test/java/com/netease/arctic/trino/iceberg/ArcticQueryRunner.java similarity index 100% rename from trino/src/test/java/com/netease/arctic/trino/iceberg/ArcticQueryRunner.java rename to mixed/trino/src/test/java/com/netease/arctic/trino/iceberg/ArcticQueryRunner.java diff --git a/trino/src/test/java/com/netease/arctic/trino/iceberg/ArcticQueryRunnerForClient.java b/mixed/trino/src/test/java/com/netease/arctic/trino/iceberg/ArcticQueryRunnerForClient.java similarity index 100% rename from trino/src/test/java/com/netease/arctic/trino/iceberg/ArcticQueryRunnerForClient.java rename to mixed/trino/src/test/java/com/netease/arctic/trino/iceberg/ArcticQueryRunnerForClient.java diff --git a/trino/src/test/java/com/netease/arctic/trino/iceberg/BaseConnectorTest.java b/mixed/trino/src/test/java/com/netease/arctic/trino/iceberg/BaseConnectorTest.java similarity index 100% rename from trino/src/test/java/com/netease/arctic/trino/iceberg/BaseConnectorTest.java rename to mixed/trino/src/test/java/com/netease/arctic/trino/iceberg/BaseConnectorTest.java diff --git a/trino/src/test/java/com/netease/arctic/trino/iceberg/SchemaInitializer.java b/mixed/trino/src/test/java/com/netease/arctic/trino/iceberg/SchemaInitializer.java similarity index 100% rename from trino/src/test/java/com/netease/arctic/trino/iceberg/SchemaInitializer.java rename to mixed/trino/src/test/java/com/netease/arctic/trino/iceberg/SchemaInitializer.java diff --git a/trino/src/test/java/com/netease/arctic/trino/iceberg/TestArcticCatalogFactory.java b/mixed/trino/src/test/java/com/netease/arctic/trino/iceberg/TestArcticCatalogFactory.java similarity index 100% rename from trino/src/test/java/com/netease/arctic/trino/iceberg/TestArcticCatalogFactory.java rename to mixed/trino/src/test/java/com/netease/arctic/trino/iceberg/TestArcticCatalogFactory.java diff --git a/trino/src/test/java/com/netease/arctic/trino/iceberg/TestArcticConnectorFactory.java b/mixed/trino/src/test/java/com/netease/arctic/trino/iceberg/TestArcticConnectorFactory.java similarity index 100% rename from trino/src/test/java/com/netease/arctic/trino/iceberg/TestArcticConnectorFactory.java rename to mixed/trino/src/test/java/com/netease/arctic/trino/iceberg/TestArcticConnectorFactory.java diff --git a/trino/src/test/java/com/netease/arctic/trino/iceberg/TestArcticPlugin.java b/mixed/trino/src/test/java/com/netease/arctic/trino/iceberg/TestArcticPlugin.java similarity index 100% rename from trino/src/test/java/com/netease/arctic/trino/iceberg/TestArcticPlugin.java rename to mixed/trino/src/test/java/com/netease/arctic/trino/iceberg/TestArcticPlugin.java diff --git a/trino/src/test/java/com/netease/arctic/trino/iceberg/TestArcticTable.java b/mixed/trino/src/test/java/com/netease/arctic/trino/iceberg/TestArcticTable.java similarity index 100% rename from trino/src/test/java/com/netease/arctic/trino/iceberg/TestArcticTable.java rename to mixed/trino/src/test/java/com/netease/arctic/trino/iceberg/TestArcticTable.java diff --git a/trino/src/test/java/com/netease/arctic/trino/iceberg/TestBaseArcticConnectorTest.java b/mixed/trino/src/test/java/com/netease/arctic/trino/iceberg/TestBaseArcticConnectorTest.java similarity index 100% rename from trino/src/test/java/com/netease/arctic/trino/iceberg/TestBaseArcticConnectorTest.java rename to mixed/trino/src/test/java/com/netease/arctic/trino/iceberg/TestBaseArcticConnectorTest.java diff --git a/trino/src/test/java/com/netease/arctic/trino/iceberg/TestBasicArcticCatalog.java b/mixed/trino/src/test/java/com/netease/arctic/trino/iceberg/TestBasicArcticCatalog.java similarity index 100% rename from trino/src/test/java/com/netease/arctic/trino/iceberg/TestBasicArcticCatalog.java rename to mixed/trino/src/test/java/com/netease/arctic/trino/iceberg/TestBasicArcticCatalog.java diff --git a/trino/src/test/java/com/netease/arctic/trino/iceberg/TestOnServerArcticConnectorTest.java b/mixed/trino/src/test/java/com/netease/arctic/trino/iceberg/TestOnServerArcticConnectorTest.java similarity index 100% rename from trino/src/test/java/com/netease/arctic/trino/iceberg/TestOnServerArcticConnectorTest.java rename to mixed/trino/src/test/java/com/netease/arctic/trino/iceberg/TestOnServerArcticConnectorTest.java diff --git a/trino/src/test/java/com/netease/arctic/trino/iceberg/TestUnionModule.java b/mixed/trino/src/test/java/com/netease/arctic/trino/iceberg/TestUnionModule.java similarity index 100% rename from trino/src/test/java/com/netease/arctic/trino/iceberg/TestUnionModule.java rename to mixed/trino/src/test/java/com/netease/arctic/trino/iceberg/TestUnionModule.java diff --git a/pom.xml b/pom.xml index 083f18855b..fafa477490 100644 --- a/pom.xml +++ b/pom.xml @@ -40,12 +40,8 @@ core - hive - flink - spark - trino ams - dist + mixed @@ -148,7 +144,7 @@ com.netease.amoro - amoro-hive + amoro-mixed-hive ${project.version}