diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1cc90da3aeae0..66f092dd3b4f9 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -27,8 +27,8 @@ parameters: default: - 'hudi-common' - 'hudi-flink-datasource/hudi-flink' - - 'hudi-flink-datasource/hudi-flink1.13.x' - - 'hudi-flink-datasource/hudi-flink1.14.x' + - 'hudi-flink-datasource/hudi-flink1.13' + - 'hudi-flink-datasource/hudi-flink1.14' - name: job2Modules type: object default: @@ -62,8 +62,8 @@ parameters: - '!hudi-examples/hudi-examples-spark' - '!hudi-flink-datasource' - '!hudi-flink-datasource/hudi-flink' - - '!hudi-flink-datasource/hudi-flink1.13.x' - - '!hudi-flink-datasource/hudi-flink1.14.x' + - '!hudi-flink-datasource/hudi-flink1.13' + - '!hudi-flink-datasource/hudi-flink1.14' - '!hudi-sync' - '!hudi-sync/hudi-adb-sync' - '!hudi-sync/hudi-datahub-sync' diff --git a/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/transaction/TransactionManager.java b/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/transaction/TransactionManager.java index aef1fee5e0794..e9329fece69f3 100644 --- a/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/transaction/TransactionManager.java +++ b/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/transaction/TransactionManager.java @@ -85,6 +85,10 @@ public void close() { } } + public LockManager getLockManager() { + return lockManager; + } + public Option getLastCompletedTransactionOwner() { return lastCompletedTxnOwnerInstant; } diff --git a/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/config/HoodieLockConfig.java b/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/config/HoodieLockConfig.java index 7fcc96810be2c..3623a04232be2 100644 --- a/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/config/HoodieLockConfig.java +++ b/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/config/HoodieLockConfig.java @@ -311,6 +311,16 @@ public HoodieLockConfig.Builder withConflictResolutionStrategy(ConflictResolutio return this; } + public HoodieLockConfig.Builder withFileSystemLockPath(String path) { + lockConfig.setValue(FILESYSTEM_LOCK_PATH, path); + return this; + } + + public HoodieLockConfig.Builder withFileSystemLockExpire(Integer expireTime) { + lockConfig.setValue(FILESYSTEM_LOCK_EXPIRE, String.valueOf(expireTime)); + return this; + } + public HoodieLockConfig build() { lockConfig.setDefaults(HoodieLockConfig.class.getName()); return lockConfig; diff --git a/hudi-client/hudi-flink-client/src/main/java/org/apache/hudi/client/HoodieFlinkWriteClient.java b/hudi-client/hudi-flink-client/src/main/java/org/apache/hudi/client/HoodieFlinkWriteClient.java index 0276b389e9152..0cbb192ab9072 100644 --- a/hudi-client/hudi-flink-client/src/main/java/org/apache/hudi/client/HoodieFlinkWriteClient.java +++ b/hudi-client/hudi-flink-client/src/main/java/org/apache/hudi/client/HoodieFlinkWriteClient.java @@ -267,14 +267,21 @@ protected void writeTableMetadata(HoodieTable table, String instantTime, String if (this.metadataWriter == null) { initMetadataWriter(); } - // refresh the timeline - - // Note: the data meta client is not refreshed currently, some code path - // relies on the meta client for resolving the latest data schema, - // the schema expects to be immutable for SQL jobs but may be not for non-SQL - // jobs. - this.metadataWriter.initTableMetadata(); - this.metadataWriter.update(metadata, instantTime, getHoodieTable().isTableServiceAction(actionType)); + try { + // guard the metadata writer with concurrent lock + this.txnManager.getLockManager().lock(); + + // refresh the timeline + + // Note: the data meta client is not refreshed currently, some code path + // relies on the meta client for resolving the latest data schema, + // the schema expects to be immutable for SQL jobs but may be not for non-SQL + // jobs. + this.metadataWriter.initTableMetadata(); + this.metadataWriter.update(metadata, instantTime, getHoodieTable().isTableServiceAction(actionType)); + } finally { + this.txnManager.getLockManager().unlock(); + } } /** diff --git a/hudi-client/hudi-spark-client/src/main/scala/org/apache/spark/sql/hudi/SparkAdapter.scala b/hudi-client/hudi-spark-client/src/main/scala/org/apache/spark/sql/hudi/SparkAdapter.scala index 818cff843b45c..d78216a48e8b4 100644 --- a/hudi-client/hudi-spark-client/src/main/scala/org/apache/spark/sql/hudi/SparkAdapter.scala +++ b/hudi-client/hudi-spark-client/src/main/scala/org/apache/spark/sql/hudi/SparkAdapter.scala @@ -162,7 +162,7 @@ trait SparkAdapter extends Serializable { * Extract condition in [[DeleteFromTable]] * SPARK-38626 condition is no longer Option in Spark 3.3 */ - def extractCondition(deleteFromTable: Command): Expression + def extractDeleteCondition(deleteFromTable: Command): Expression /** * Get parseQuery from ExtendedSqlParser, only for Spark 3.3+ diff --git a/hudi-common/src/main/java/org/apache/hudi/common/model/AWSDmsAvroPayload.java b/hudi-common/src/main/java/org/apache/hudi/common/model/AWSDmsAvroPayload.java index c515338ee64b4..20a20fb62999b 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/model/AWSDmsAvroPayload.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/model/AWSDmsAvroPayload.java @@ -18,11 +18,10 @@ package org.apache.hudi.common.model; -import org.apache.hudi.common.util.Option; - import org.apache.avro.Schema; import org.apache.avro.generic.GenericRecord; import org.apache.avro.generic.IndexedRecord; +import org.apache.hudi.common.util.Option; import java.io.IOException; import java.util.Properties; diff --git a/hudi-spark-datasource/hudi-spark/src/test/java/org/apache/hudi/payload/TestAWSDmsAvroPayload.java b/hudi-common/src/test/java/org/apache/hudi/common/model/TestAWSDmsAvroPayload.java similarity index 96% rename from hudi-spark-datasource/hudi-spark/src/test/java/org/apache/hudi/payload/TestAWSDmsAvroPayload.java rename to hudi-common/src/test/java/org/apache/hudi/common/model/TestAWSDmsAvroPayload.java index 7373553dfdb50..5ba537269ea19 100644 --- a/hudi-spark-datasource/hudi-spark/src/test/java/org/apache/hudi/payload/TestAWSDmsAvroPayload.java +++ b/hudi-common/src/test/java/org/apache/hudi/common/model/TestAWSDmsAvroPayload.java @@ -16,16 +16,13 @@ * limitations under the License. */ -package org.apache.hudi.payload; - -import org.apache.hudi.common.model.AWSDmsAvroPayload; -import org.apache.hudi.common.model.OverwriteWithLatestAvroPayload; -import org.apache.hudi.common.util.Option; +package org.apache.hudi.common.model; import org.apache.avro.Schema; import org.apache.avro.generic.GenericData; import org.apache.avro.generic.GenericRecord; import org.apache.avro.generic.IndexedRecord; +import org.apache.hudi.common.util.Option; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/hudi-flink-datasource/hudi-flink/src/main/java/org/apache/hudi/sink/StreamWriteOperatorCoordinator.java b/hudi-flink-datasource/hudi-flink/src/main/java/org/apache/hudi/sink/StreamWriteOperatorCoordinator.java index d636bcde3cf8f..7d20789bff981 100644 --- a/hudi-flink-datasource/hudi-flink/src/main/java/org/apache/hudi/sink/StreamWriteOperatorCoordinator.java +++ b/hudi-flink-datasource/hudi-flink/src/main/java/org/apache/hudi/sink/StreamWriteOperatorCoordinator.java @@ -152,11 +152,6 @@ public class StreamWriteOperatorCoordinator */ private CkpMetadata ckpMetadata; - /** - * Current checkpoint. - */ - private long checkpointId = -1; - /** * Constructs a StreamingSinkOperatorCoordinator. * @@ -219,7 +214,6 @@ public void close() throws Exception { @Override public void checkpointCoordinator(long checkpointId, CompletableFuture result) { - this.checkpointId = checkpointId; executor.execute( () -> { try { diff --git a/hudi-flink-datasource/hudi-flink/src/main/java/org/apache/hudi/util/StreamerUtil.java b/hudi-flink-datasource/hudi-flink/src/main/java/org/apache/hudi/util/StreamerUtil.java index 5a34f2a178b11..b3c054b32d3f3 100644 --- a/hudi-flink-datasource/hudi-flink/src/main/java/org/apache/hudi/util/StreamerUtil.java +++ b/hudi-flink-datasource/hudi-flink/src/main/java/org/apache/hudi/util/StreamerUtil.java @@ -21,6 +21,7 @@ import org.apache.hudi.client.FlinkTaskContextSupplier; import org.apache.hudi.client.HoodieFlinkWriteClient; import org.apache.hudi.client.common.HoodieFlinkEngineContext; +import org.apache.hudi.client.transaction.lock.FileSystemBasedLockProvider; import org.apache.hudi.common.config.DFSPropertiesConfiguration; import org.apache.hudi.common.config.HoodieMetadataConfig; import org.apache.hudi.common.config.SerializableConfiguration; @@ -43,6 +44,7 @@ import org.apache.hudi.config.HoodieCleanConfig; import org.apache.hudi.config.HoodieClusteringConfig; import org.apache.hudi.config.HoodieCompactionConfig; +import org.apache.hudi.config.HoodieLockConfig; import org.apache.hudi.config.HoodieWriteConfig; import org.apache.hudi.config.HoodieMemoryConfig; import org.apache.hudi.config.HoodieStorageConfig; @@ -88,6 +90,7 @@ import static org.apache.hudi.common.model.HoodieFileFormat.ORC; import static org.apache.hudi.common.model.HoodieFileFormat.PARQUET; import static org.apache.hudi.common.table.HoodieTableConfig.ARCHIVELOG_FOLDER; +import static org.apache.hudi.common.table.HoodieTableMetaClient.AUXILIARYFOLDER_NAME; /** * Utilities for Flink stream read and write. @@ -170,7 +173,7 @@ public static HoodieWriteConfig getHoodieClientConfig( .withMergeAllowDuplicateOnInserts(OptionsResolver.insertClustering(conf)) .withClusteringConfig( HoodieClusteringConfig.newBuilder() - .withAsyncClustering(conf.getBoolean(FlinkOptions.CLUSTERING_SCHEDULE_ENABLED)) + .withAsyncClustering(conf.getBoolean(FlinkOptions.CLUSTERING_ASYNC_ENABLED)) .withClusteringPlanStrategyClass(conf.getString(FlinkOptions.CLUSTERING_PLAN_STRATEGY_CLASS)) .withClusteringPlanPartitionFilterMode( ClusteringPlanPartitionFilterMode.valueOf(conf.getString(FlinkOptions.CLUSTERING_PLAN_PARTITION_FILTER_MODE_NAME))) @@ -218,6 +221,12 @@ public static HoodieWriteConfig getHoodieClientConfig( .enable(conf.getBoolean(FlinkOptions.METADATA_ENABLED)) .withMaxNumDeltaCommitsBeforeCompaction(conf.getInteger(FlinkOptions.METADATA_COMPACTION_DELTA_COMMITS)) .build()) + .withLockConfig(HoodieLockConfig.newBuilder() + .withLockProvider(FileSystemBasedLockProvider.class) + .withLockWaitTimeInMillis(2000L) // 2s + .withFileSystemLockExpire(1) // 1 minute + .withFileSystemLockPath(StreamerUtil.getAuxiliaryPath(conf)) + .build()) .withPayloadConfig(HoodiePayloadConfig.newBuilder() .withPayloadClass(conf.getString(FlinkOptions.PAYLOAD_CLASS_NAME)) .withPayloadOrderingField(conf.getString(FlinkOptions.PRECOMBINE_FIELD)) @@ -231,6 +240,7 @@ public static HoodieWriteConfig getHoodieClientConfig( .withProps(flinkConf2TypedProperties(conf)) .withSchema(getSourceSchema(conf).toString()); + // do not configure cleaning strategy as LAZY until multi-writers is supported. HoodieWriteConfig writeConfig = builder.build(); if (loadFsViewStorageConfig) { // do not use the builder to give a change for recovering the original fs view storage config @@ -548,4 +558,11 @@ public static boolean fileExists(FileSystem fs, Path path) { throw new HoodieException("Exception while checking file " + path + " existence", e); } } + + /** + * Returns the auxiliary path. + */ + public static String getAuxiliaryPath(Configuration conf) { + return conf.getString(FlinkOptions.PATH) + Path.SEPARATOR + AUXILIARYFOLDER_NAME; + } } diff --git a/hudi-flink-datasource/hudi-flink/src/test/java/org/apache/hudi/sink/ITTestDataStreamWrite.java b/hudi-flink-datasource/hudi-flink/src/test/java/org/apache/hudi/sink/ITTestDataStreamWrite.java index 1589cf31e7405..680c4d02e238b 100644 --- a/hudi-flink-datasource/hudi-flink/src/test/java/org/apache/hudi/sink/ITTestDataStreamWrite.java +++ b/hudi-flink-datasource/hudi-flink/src/test/java/org/apache/hudi/sink/ITTestDataStreamWrite.java @@ -382,13 +382,9 @@ public void testHoodiePipelineBuilderSink() throws Exception { execEnv.enableCheckpointing(4000, CheckpointingMode.EXACTLY_ONCE); execEnv.getCheckpointConfig().setMaxConcurrentCheckpoints(1); - options.put(FlinkOptions.INDEX_TYPE.key(), "FLINK_STATE"); options.put(FlinkOptions.PATH.key(), tempFile.getAbsolutePath()); - options.put(FlinkOptions.BUCKET_INDEX_NUM_BUCKETS.key(), "4"); - options.put("table.type", HoodieTableType.MERGE_ON_READ.name()); - options.put(FlinkOptions.INDEX_KEY_FIELD.key(), "id"); - options.put(FlinkOptions.COMPACTION_DELTA_COMMITS.key(), "1"); options.put(FlinkOptions.TABLE_TYPE.key(), HoodieTableType.MERGE_ON_READ.name()); + options.put(FlinkOptions.COMPACTION_DELTA_COMMITS.key(), "1"); options.put(FlinkOptions.SOURCE_AVRO_SCHEMA_PATH.key(), Objects.requireNonNull(Thread.currentThread().getContextClassLoader().getResource("test_read_schema.avsc")).toString()); Configuration conf = Configuration.fromMap(options); // Read from file source diff --git a/hudi-flink-datasource/hudi-flink/src/test/java/org/apache/hudi/sink/compact/ITTestHoodieFlinkCompactor.java b/hudi-flink-datasource/hudi-flink/src/test/java/org/apache/hudi/sink/compact/ITTestHoodieFlinkCompactor.java index 814763e1f6f38..d8ffd6b1b111d 100644 --- a/hudi-flink-datasource/hudi-flink/src/test/java/org/apache/hudi/sink/compact/ITTestHoodieFlinkCompactor.java +++ b/hudi-flink-datasource/hudi-flink/src/test/java/org/apache/hudi/sink/compact/ITTestHoodieFlinkCompactor.java @@ -42,7 +42,6 @@ import org.apache.flink.table.api.TableEnvironment; import org.apache.flink.table.api.config.ExecutionConfigOptions; import org.apache.flink.table.api.internal.TableEnvironmentImpl; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.io.TempDir; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; @@ -166,7 +165,6 @@ public void testHoodieFlinkCompactor(boolean enableChangelog) throws Exception { TestData.checkWrittenDataCOW(tempFile, EXPECTED1); } - @Disabled @ParameterizedTest @ValueSource(booleans = {true, false}) public void testHoodieFlinkCompactorService(boolean enableChangelog) throws Exception { @@ -201,14 +199,13 @@ public void testHoodieFlinkCompactorService(boolean enableChangelog) throws Exce asyncCompactionService.start(null); // wait for the asynchronous commit to finish - TimeUnit.SECONDS.sleep(5); + TimeUnit.SECONDS.sleep(10); asyncCompactionService.shutDown(); TestData.checkWrittenDataCOW(tempFile, EXPECTED2); } - @Disabled @ParameterizedTest @ValueSource(booleans = {true, false}) public void testHoodieFlinkCompactorWithPlanSelectStrategy(boolean enableChangelog) throws Exception { @@ -218,7 +215,6 @@ public void testHoodieFlinkCompactorWithPlanSelectStrategy(boolean enableChangel tableEnv.getConfig().getConfiguration() .setInteger(ExecutionConfigOptions.TABLE_EXEC_RESOURCE_DEFAULT_PARALLELISM, 1); Map options = new HashMap<>(); - options.put(FlinkOptions.COMPACTION_SCHEDULE_ENABLED.key(), "false"); options.put(FlinkOptions.COMPACTION_ASYNC_ENABLED.key(), "false"); options.put(FlinkOptions.PATH.key(), tempFile.getAbsolutePath()); options.put(FlinkOptions.TABLE_TYPE.key(), "MERGE_ON_READ"); @@ -227,9 +223,6 @@ public void testHoodieFlinkCompactorWithPlanSelectStrategy(boolean enableChangel tableEnv.executeSql(hoodieTableDDL); tableEnv.executeSql(TestSQL.INSERT_T1).await(); - // wait for the asynchronous commit to finish - TimeUnit.SECONDS.sleep(3); - StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment(); FlinkCompactionConfig cfg = new FlinkCompactionConfig(); cfg.path = tempFile.getAbsolutePath(); @@ -253,9 +246,13 @@ public void testHoodieFlinkCompactorWithPlanSelectStrategy(boolean enableChangel + "('id13','Jenny',72,TIMESTAMP '1970-01-01 00:00:10','par5')"; tableEnv.executeSql(insertT1ForNewPartition).await(); - // wait for the asynchronous commit to finish - TimeUnit.SECONDS.sleep(3); + writeClient.close(); + // re-create the write client/fs view server + // or there is low probability that connection refused occurs then + // the reader metadata view is not complete + writeClient = StreamerUtil.createWriteClient(conf); + metaClient.reloadActiveTimeline(); compactionInstantTimeList.add(scheduleCompactionPlan(metaClient, writeClient)); HoodieFlinkTable table = writeClient.getHoodieTable(); diff --git a/hudi-flink-datasource/hudi-flink/src/test/java/org/apache/hudi/table/ITTestHoodieDataSource.java b/hudi-flink-datasource/hudi-flink/src/test/java/org/apache/hudi/table/ITTestHoodieDataSource.java index fb9f55986d150..c40831639b67f 100644 --- a/hudi-flink-datasource/hudi-flink/src/test/java/org/apache/hudi/table/ITTestHoodieDataSource.java +++ b/hudi-flink-datasource/hudi-flink/src/test/java/org/apache/hudi/table/ITTestHoodieDataSource.java @@ -222,7 +222,7 @@ void testStreamWriteBatchRead() { } @Test - void testStreamWriteBatchReadOptimized() { + void testStreamWriteBatchReadOptimized() throws Exception { // create filesystem table named source String createSource = TestConfigurations.getFileSourceDDL("source"); streamTableEnv.executeSql(createSource); @@ -236,11 +236,16 @@ void testStreamWriteBatchReadOptimized() { .option(FlinkOptions.QUERY_TYPE, FlinkOptions.QUERY_TYPE_READ_OPTIMIZED) .option(FlinkOptions.COMPACTION_DELTA_COMMITS, 1) .option(FlinkOptions.COMPACTION_TASKS, 1) + // disable the metadata table because + // the lock conflicts resolution takes time + .option(FlinkOptions.METADATA_ENABLED, false) .end(); streamTableEnv.executeSql(hoodieTableDDL); String insertInto = "insert into t1 select * from source"; execInsertSql(streamTableEnv, insertInto); + // give some buffer time for finishing the async compaction tasks + TimeUnit.SECONDS.sleep(5); List rows = CollectionUtil.iterableToList( () -> streamTableEnv.sqlQuery("select * from t1").execute().collect()); diff --git a/hudi-flink-datasource/hudi-flink1.13.x/pom.xml b/hudi-flink-datasource/hudi-flink1.13/pom.xml similarity index 99% rename from hudi-flink-datasource/hudi-flink1.13.x/pom.xml rename to hudi-flink-datasource/hudi-flink1.13/pom.xml index 35024b1f18652..fe997cefb417f 100644 --- a/hudi-flink-datasource/hudi-flink1.13.x/pom.xml +++ b/hudi-flink-datasource/hudi-flink1.13/pom.xml @@ -24,7 +24,7 @@ 4.0.0 - hudi-flink1.13.x + hudi-flink1.13 0.12.0-SNAPSHOT jar diff --git a/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/flink/table/data/ColumnarArrayData.java b/hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/flink/table/data/ColumnarArrayData.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/flink/table/data/ColumnarArrayData.java rename to hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/flink/table/data/ColumnarArrayData.java diff --git a/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/flink/table/data/ColumnarMapData.java b/hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/flink/table/data/ColumnarMapData.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/flink/table/data/ColumnarMapData.java rename to hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/flink/table/data/ColumnarMapData.java diff --git a/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/flink/table/data/ColumnarRowData.java b/hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/flink/table/data/ColumnarRowData.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/flink/table/data/ColumnarRowData.java rename to hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/flink/table/data/ColumnarRowData.java diff --git a/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/flink/table/data/vector/MapColumnVector.java b/hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/flink/table/data/vector/MapColumnVector.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/flink/table/data/vector/MapColumnVector.java rename to hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/flink/table/data/vector/MapColumnVector.java diff --git a/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/flink/table/data/vector/RowColumnVector.java b/hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/flink/table/data/vector/RowColumnVector.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/flink/table/data/vector/RowColumnVector.java rename to hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/flink/table/data/vector/RowColumnVector.java diff --git a/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/flink/table/data/vector/VectorizedColumnBatch.java b/hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/flink/table/data/vector/VectorizedColumnBatch.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/flink/table/data/vector/VectorizedColumnBatch.java rename to hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/flink/table/data/vector/VectorizedColumnBatch.java diff --git a/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/adapter/AbstractStreamOperatorAdapter.java b/hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/hudi/adapter/AbstractStreamOperatorAdapter.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/adapter/AbstractStreamOperatorAdapter.java rename to hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/hudi/adapter/AbstractStreamOperatorAdapter.java diff --git a/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/adapter/AbstractStreamOperatorFactoryAdapter.java b/hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/hudi/adapter/AbstractStreamOperatorFactoryAdapter.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/adapter/AbstractStreamOperatorFactoryAdapter.java rename to hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/hudi/adapter/AbstractStreamOperatorFactoryAdapter.java diff --git a/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/adapter/DataStreamScanProviderAdapter.java b/hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/hudi/adapter/DataStreamScanProviderAdapter.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/adapter/DataStreamScanProviderAdapter.java rename to hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/hudi/adapter/DataStreamScanProviderAdapter.java diff --git a/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/adapter/DataStreamSinkProviderAdapter.java b/hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/hudi/adapter/DataStreamSinkProviderAdapter.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/adapter/DataStreamSinkProviderAdapter.java rename to hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/hudi/adapter/DataStreamSinkProviderAdapter.java diff --git a/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/adapter/MailboxExecutorAdapter.java b/hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/hudi/adapter/MailboxExecutorAdapter.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/adapter/MailboxExecutorAdapter.java rename to hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/hudi/adapter/MailboxExecutorAdapter.java diff --git a/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/adapter/RateLimiterAdapter.java b/hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/hudi/adapter/RateLimiterAdapter.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/adapter/RateLimiterAdapter.java rename to hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/hudi/adapter/RateLimiterAdapter.java diff --git a/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/adapter/Utils.java b/hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/hudi/adapter/Utils.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/adapter/Utils.java rename to hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/hudi/adapter/Utils.java diff --git a/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/ParquetSplitReaderUtil.java b/hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/hudi/table/format/cow/ParquetSplitReaderUtil.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/ParquetSplitReaderUtil.java rename to hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/hudi/table/format/cow/ParquetSplitReaderUtil.java diff --git a/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/HeapArrayVector.java b/hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/hudi/table/format/cow/vector/HeapArrayVector.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/HeapArrayVector.java rename to hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/hudi/table/format/cow/vector/HeapArrayVector.java diff --git a/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/HeapMapColumnVector.java b/hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/hudi/table/format/cow/vector/HeapMapColumnVector.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/HeapMapColumnVector.java rename to hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/hudi/table/format/cow/vector/HeapMapColumnVector.java diff --git a/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/HeapRowColumnVector.java b/hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/hudi/table/format/cow/vector/HeapRowColumnVector.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/HeapRowColumnVector.java rename to hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/hudi/table/format/cow/vector/HeapRowColumnVector.java diff --git a/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/ParquetDecimalVector.java b/hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/hudi/table/format/cow/vector/ParquetDecimalVector.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/ParquetDecimalVector.java rename to hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/hudi/table/format/cow/vector/ParquetDecimalVector.java diff --git a/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/AbstractColumnReader.java b/hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/hudi/table/format/cow/vector/reader/AbstractColumnReader.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/AbstractColumnReader.java rename to hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/hudi/table/format/cow/vector/reader/AbstractColumnReader.java diff --git a/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ArrayColumnReader.java b/hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ArrayColumnReader.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ArrayColumnReader.java rename to hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ArrayColumnReader.java diff --git a/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/BaseVectorizedColumnReader.java b/hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/hudi/table/format/cow/vector/reader/BaseVectorizedColumnReader.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/BaseVectorizedColumnReader.java rename to hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/hudi/table/format/cow/vector/reader/BaseVectorizedColumnReader.java diff --git a/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/FixedLenBytesColumnReader.java b/hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/hudi/table/format/cow/vector/reader/FixedLenBytesColumnReader.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/FixedLenBytesColumnReader.java rename to hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/hudi/table/format/cow/vector/reader/FixedLenBytesColumnReader.java diff --git a/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/Int64TimestampColumnReader.java b/hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/hudi/table/format/cow/vector/reader/Int64TimestampColumnReader.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/Int64TimestampColumnReader.java rename to hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/hudi/table/format/cow/vector/reader/Int64TimestampColumnReader.java diff --git a/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/MapColumnReader.java b/hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/hudi/table/format/cow/vector/reader/MapColumnReader.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/MapColumnReader.java rename to hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/hudi/table/format/cow/vector/reader/MapColumnReader.java diff --git a/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ParquetColumnarRowSplitReader.java b/hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ParquetColumnarRowSplitReader.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ParquetColumnarRowSplitReader.java rename to hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ParquetColumnarRowSplitReader.java diff --git a/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ParquetDataColumnReader.java b/hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ParquetDataColumnReader.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ParquetDataColumnReader.java rename to hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ParquetDataColumnReader.java diff --git a/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ParquetDataColumnReaderFactory.java b/hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ParquetDataColumnReaderFactory.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ParquetDataColumnReaderFactory.java rename to hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ParquetDataColumnReaderFactory.java diff --git a/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/RowColumnReader.java b/hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/hudi/table/format/cow/vector/reader/RowColumnReader.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/RowColumnReader.java rename to hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/hudi/table/format/cow/vector/reader/RowColumnReader.java diff --git a/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/RunLengthDecoder.java b/hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/hudi/table/format/cow/vector/reader/RunLengthDecoder.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/RunLengthDecoder.java rename to hudi-flink-datasource/hudi-flink1.13/src/main/java/org/apache/hudi/table/format/cow/vector/reader/RunLengthDecoder.java diff --git a/hudi-flink-datasource/hudi-flink1.13.x/src/test/java/org/apache/hudi/adapter/OutputAdapter.java b/hudi-flink-datasource/hudi-flink1.13/src/test/java/org/apache/hudi/adapter/OutputAdapter.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.13.x/src/test/java/org/apache/hudi/adapter/OutputAdapter.java rename to hudi-flink-datasource/hudi-flink1.13/src/test/java/org/apache/hudi/adapter/OutputAdapter.java diff --git a/hudi-flink-datasource/hudi-flink1.13.x/src/test/java/org/apache/hudi/adapter/StateInitializationContextAdapter.java b/hudi-flink-datasource/hudi-flink1.13/src/test/java/org/apache/hudi/adapter/StateInitializationContextAdapter.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.13.x/src/test/java/org/apache/hudi/adapter/StateInitializationContextAdapter.java rename to hudi-flink-datasource/hudi-flink1.13/src/test/java/org/apache/hudi/adapter/StateInitializationContextAdapter.java diff --git a/hudi-flink-datasource/hudi-flink1.13.x/src/test/java/org/apache/hudi/adapter/StreamingRuntimeContextAdapter.java b/hudi-flink-datasource/hudi-flink1.13/src/test/java/org/apache/hudi/adapter/StreamingRuntimeContextAdapter.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.13.x/src/test/java/org/apache/hudi/adapter/StreamingRuntimeContextAdapter.java rename to hudi-flink-datasource/hudi-flink1.13/src/test/java/org/apache/hudi/adapter/StreamingRuntimeContextAdapter.java diff --git a/hudi-flink-datasource/hudi-flink1.13.x/src/test/java/org/apache/hudi/adapter/TestTableEnvs.java b/hudi-flink-datasource/hudi-flink1.13/src/test/java/org/apache/hudi/adapter/TestTableEnvs.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.13.x/src/test/java/org/apache/hudi/adapter/TestTableEnvs.java rename to hudi-flink-datasource/hudi-flink1.13/src/test/java/org/apache/hudi/adapter/TestTableEnvs.java diff --git a/hudi-flink-datasource/hudi-flink1.14.x/pom.xml b/hudi-flink-datasource/hudi-flink1.14/pom.xml similarity index 99% rename from hudi-flink-datasource/hudi-flink1.14.x/pom.xml rename to hudi-flink-datasource/hudi-flink1.14/pom.xml index 990321b15b863..86502025272ec 100644 --- a/hudi-flink-datasource/hudi-flink1.14.x/pom.xml +++ b/hudi-flink-datasource/hudi-flink1.14/pom.xml @@ -24,7 +24,7 @@ 4.0.0 - hudi-flink1.14.x + hudi-flink1.14 0.12.0-SNAPSHOT jar diff --git a/hudi-flink-datasource/hudi-flink1.14.x/src/main/java/org/apache/hudi/adapter/AbstractStreamOperatorAdapter.java b/hudi-flink-datasource/hudi-flink1.14/src/main/java/org/apache/hudi/adapter/AbstractStreamOperatorAdapter.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.14.x/src/main/java/org/apache/hudi/adapter/AbstractStreamOperatorAdapter.java rename to hudi-flink-datasource/hudi-flink1.14/src/main/java/org/apache/hudi/adapter/AbstractStreamOperatorAdapter.java diff --git a/hudi-flink-datasource/hudi-flink1.14.x/src/main/java/org/apache/hudi/adapter/AbstractStreamOperatorFactoryAdapter.java b/hudi-flink-datasource/hudi-flink1.14/src/main/java/org/apache/hudi/adapter/AbstractStreamOperatorFactoryAdapter.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.14.x/src/main/java/org/apache/hudi/adapter/AbstractStreamOperatorFactoryAdapter.java rename to hudi-flink-datasource/hudi-flink1.14/src/main/java/org/apache/hudi/adapter/AbstractStreamOperatorFactoryAdapter.java diff --git a/hudi-flink-datasource/hudi-flink1.14.x/src/main/java/org/apache/hudi/adapter/DataStreamScanProviderAdapter.java b/hudi-flink-datasource/hudi-flink1.14/src/main/java/org/apache/hudi/adapter/DataStreamScanProviderAdapter.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.14.x/src/main/java/org/apache/hudi/adapter/DataStreamScanProviderAdapter.java rename to hudi-flink-datasource/hudi-flink1.14/src/main/java/org/apache/hudi/adapter/DataStreamScanProviderAdapter.java diff --git a/hudi-flink-datasource/hudi-flink1.14.x/src/main/java/org/apache/hudi/adapter/DataStreamSinkProviderAdapter.java b/hudi-flink-datasource/hudi-flink1.14/src/main/java/org/apache/hudi/adapter/DataStreamSinkProviderAdapter.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.14.x/src/main/java/org/apache/hudi/adapter/DataStreamSinkProviderAdapter.java rename to hudi-flink-datasource/hudi-flink1.14/src/main/java/org/apache/hudi/adapter/DataStreamSinkProviderAdapter.java diff --git a/hudi-flink-datasource/hudi-flink1.14.x/src/main/java/org/apache/hudi/adapter/MailboxExecutorAdapter.java b/hudi-flink-datasource/hudi-flink1.14/src/main/java/org/apache/hudi/adapter/MailboxExecutorAdapter.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.14.x/src/main/java/org/apache/hudi/adapter/MailboxExecutorAdapter.java rename to hudi-flink-datasource/hudi-flink1.14/src/main/java/org/apache/hudi/adapter/MailboxExecutorAdapter.java diff --git a/hudi-flink-datasource/hudi-flink1.14.x/src/main/java/org/apache/hudi/adapter/RateLimiterAdapter.java b/hudi-flink-datasource/hudi-flink1.14/src/main/java/org/apache/hudi/adapter/RateLimiterAdapter.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.14.x/src/main/java/org/apache/hudi/adapter/RateLimiterAdapter.java rename to hudi-flink-datasource/hudi-flink1.14/src/main/java/org/apache/hudi/adapter/RateLimiterAdapter.java diff --git a/hudi-flink-datasource/hudi-flink1.14.x/src/main/java/org/apache/hudi/adapter/Utils.java b/hudi-flink-datasource/hudi-flink1.14/src/main/java/org/apache/hudi/adapter/Utils.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.14.x/src/main/java/org/apache/hudi/adapter/Utils.java rename to hudi-flink-datasource/hudi-flink1.14/src/main/java/org/apache/hudi/adapter/Utils.java diff --git a/hudi-flink-datasource/hudi-flink1.14.x/src/main/java/org/apache/hudi/table/format/cow/ParquetSplitReaderUtil.java b/hudi-flink-datasource/hudi-flink1.14/src/main/java/org/apache/hudi/table/format/cow/ParquetSplitReaderUtil.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.14.x/src/main/java/org/apache/hudi/table/format/cow/ParquetSplitReaderUtil.java rename to hudi-flink-datasource/hudi-flink1.14/src/main/java/org/apache/hudi/table/format/cow/ParquetSplitReaderUtil.java diff --git a/hudi-flink-datasource/hudi-flink1.14.x/src/main/java/org/apache/hudi/table/format/cow/vector/HeapArrayVector.java b/hudi-flink-datasource/hudi-flink1.14/src/main/java/org/apache/hudi/table/format/cow/vector/HeapArrayVector.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.14.x/src/main/java/org/apache/hudi/table/format/cow/vector/HeapArrayVector.java rename to hudi-flink-datasource/hudi-flink1.14/src/main/java/org/apache/hudi/table/format/cow/vector/HeapArrayVector.java diff --git a/hudi-flink-datasource/hudi-flink1.14.x/src/main/java/org/apache/hudi/table/format/cow/vector/HeapMapColumnVector.java b/hudi-flink-datasource/hudi-flink1.14/src/main/java/org/apache/hudi/table/format/cow/vector/HeapMapColumnVector.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.14.x/src/main/java/org/apache/hudi/table/format/cow/vector/HeapMapColumnVector.java rename to hudi-flink-datasource/hudi-flink1.14/src/main/java/org/apache/hudi/table/format/cow/vector/HeapMapColumnVector.java diff --git a/hudi-flink-datasource/hudi-flink1.14.x/src/main/java/org/apache/hudi/table/format/cow/vector/HeapRowColumnVector.java b/hudi-flink-datasource/hudi-flink1.14/src/main/java/org/apache/hudi/table/format/cow/vector/HeapRowColumnVector.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.14.x/src/main/java/org/apache/hudi/table/format/cow/vector/HeapRowColumnVector.java rename to hudi-flink-datasource/hudi-flink1.14/src/main/java/org/apache/hudi/table/format/cow/vector/HeapRowColumnVector.java diff --git a/hudi-flink-datasource/hudi-flink1.14.x/src/main/java/org/apache/hudi/table/format/cow/vector/ParquetDecimalVector.java b/hudi-flink-datasource/hudi-flink1.14/src/main/java/org/apache/hudi/table/format/cow/vector/ParquetDecimalVector.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.14.x/src/main/java/org/apache/hudi/table/format/cow/vector/ParquetDecimalVector.java rename to hudi-flink-datasource/hudi-flink1.14/src/main/java/org/apache/hudi/table/format/cow/vector/ParquetDecimalVector.java diff --git a/hudi-flink-datasource/hudi-flink1.14.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/AbstractColumnReader.java b/hudi-flink-datasource/hudi-flink1.14/src/main/java/org/apache/hudi/table/format/cow/vector/reader/AbstractColumnReader.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.14.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/AbstractColumnReader.java rename to hudi-flink-datasource/hudi-flink1.14/src/main/java/org/apache/hudi/table/format/cow/vector/reader/AbstractColumnReader.java diff --git a/hudi-flink-datasource/hudi-flink1.14.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ArrayColumnReader.java b/hudi-flink-datasource/hudi-flink1.14/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ArrayColumnReader.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.14.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ArrayColumnReader.java rename to hudi-flink-datasource/hudi-flink1.14/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ArrayColumnReader.java diff --git a/hudi-flink-datasource/hudi-flink1.14.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/BaseVectorizedColumnReader.java b/hudi-flink-datasource/hudi-flink1.14/src/main/java/org/apache/hudi/table/format/cow/vector/reader/BaseVectorizedColumnReader.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.14.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/BaseVectorizedColumnReader.java rename to hudi-flink-datasource/hudi-flink1.14/src/main/java/org/apache/hudi/table/format/cow/vector/reader/BaseVectorizedColumnReader.java diff --git a/hudi-flink-datasource/hudi-flink1.14.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/FixedLenBytesColumnReader.java b/hudi-flink-datasource/hudi-flink1.14/src/main/java/org/apache/hudi/table/format/cow/vector/reader/FixedLenBytesColumnReader.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.14.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/FixedLenBytesColumnReader.java rename to hudi-flink-datasource/hudi-flink1.14/src/main/java/org/apache/hudi/table/format/cow/vector/reader/FixedLenBytesColumnReader.java diff --git a/hudi-flink-datasource/hudi-flink1.14.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/Int64TimestampColumnReader.java b/hudi-flink-datasource/hudi-flink1.14/src/main/java/org/apache/hudi/table/format/cow/vector/reader/Int64TimestampColumnReader.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.14.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/Int64TimestampColumnReader.java rename to hudi-flink-datasource/hudi-flink1.14/src/main/java/org/apache/hudi/table/format/cow/vector/reader/Int64TimestampColumnReader.java diff --git a/hudi-flink-datasource/hudi-flink1.14.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/MapColumnReader.java b/hudi-flink-datasource/hudi-flink1.14/src/main/java/org/apache/hudi/table/format/cow/vector/reader/MapColumnReader.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.14.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/MapColumnReader.java rename to hudi-flink-datasource/hudi-flink1.14/src/main/java/org/apache/hudi/table/format/cow/vector/reader/MapColumnReader.java diff --git a/hudi-flink-datasource/hudi-flink1.14.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ParquetColumnarRowSplitReader.java b/hudi-flink-datasource/hudi-flink1.14/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ParquetColumnarRowSplitReader.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.14.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ParquetColumnarRowSplitReader.java rename to hudi-flink-datasource/hudi-flink1.14/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ParquetColumnarRowSplitReader.java diff --git a/hudi-flink-datasource/hudi-flink1.14.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ParquetDataColumnReader.java b/hudi-flink-datasource/hudi-flink1.14/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ParquetDataColumnReader.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.14.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ParquetDataColumnReader.java rename to hudi-flink-datasource/hudi-flink1.14/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ParquetDataColumnReader.java diff --git a/hudi-flink-datasource/hudi-flink1.14.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ParquetDataColumnReaderFactory.java b/hudi-flink-datasource/hudi-flink1.14/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ParquetDataColumnReaderFactory.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.14.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ParquetDataColumnReaderFactory.java rename to hudi-flink-datasource/hudi-flink1.14/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ParquetDataColumnReaderFactory.java diff --git a/hudi-flink-datasource/hudi-flink1.14.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/RowColumnReader.java b/hudi-flink-datasource/hudi-flink1.14/src/main/java/org/apache/hudi/table/format/cow/vector/reader/RowColumnReader.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.14.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/RowColumnReader.java rename to hudi-flink-datasource/hudi-flink1.14/src/main/java/org/apache/hudi/table/format/cow/vector/reader/RowColumnReader.java diff --git a/hudi-flink-datasource/hudi-flink1.14.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/RunLengthDecoder.java b/hudi-flink-datasource/hudi-flink1.14/src/main/java/org/apache/hudi/table/format/cow/vector/reader/RunLengthDecoder.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.14.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/RunLengthDecoder.java rename to hudi-flink-datasource/hudi-flink1.14/src/main/java/org/apache/hudi/table/format/cow/vector/reader/RunLengthDecoder.java diff --git a/hudi-flink-datasource/hudi-flink1.14.x/src/test/java/org/apache/hudi/adapter/OutputAdapter.java b/hudi-flink-datasource/hudi-flink1.14/src/test/java/org/apache/hudi/adapter/OutputAdapter.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.14.x/src/test/java/org/apache/hudi/adapter/OutputAdapter.java rename to hudi-flink-datasource/hudi-flink1.14/src/test/java/org/apache/hudi/adapter/OutputAdapter.java diff --git a/hudi-flink-datasource/hudi-flink1.14.x/src/test/java/org/apache/hudi/adapter/StateInitializationContextAdapter.java b/hudi-flink-datasource/hudi-flink1.14/src/test/java/org/apache/hudi/adapter/StateInitializationContextAdapter.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.14.x/src/test/java/org/apache/hudi/adapter/StateInitializationContextAdapter.java rename to hudi-flink-datasource/hudi-flink1.14/src/test/java/org/apache/hudi/adapter/StateInitializationContextAdapter.java diff --git a/hudi-flink-datasource/hudi-flink1.14.x/src/test/java/org/apache/hudi/adapter/StreamingRuntimeContextAdapter.java b/hudi-flink-datasource/hudi-flink1.14/src/test/java/org/apache/hudi/adapter/StreamingRuntimeContextAdapter.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.14.x/src/test/java/org/apache/hudi/adapter/StreamingRuntimeContextAdapter.java rename to hudi-flink-datasource/hudi-flink1.14/src/test/java/org/apache/hudi/adapter/StreamingRuntimeContextAdapter.java diff --git a/hudi-flink-datasource/hudi-flink1.14.x/src/test/java/org/apache/hudi/adapter/TestTableEnvs.java b/hudi-flink-datasource/hudi-flink1.14/src/test/java/org/apache/hudi/adapter/TestTableEnvs.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.14.x/src/test/java/org/apache/hudi/adapter/TestTableEnvs.java rename to hudi-flink-datasource/hudi-flink1.14/src/test/java/org/apache/hudi/adapter/TestTableEnvs.java diff --git a/hudi-flink-datasource/hudi-flink1.15.x/pom.xml b/hudi-flink-datasource/hudi-flink1.15/pom.xml similarity index 99% rename from hudi-flink-datasource/hudi-flink1.15.x/pom.xml rename to hudi-flink-datasource/hudi-flink1.15/pom.xml index b55ee77768f5c..a40071ee86cb0 100644 --- a/hudi-flink-datasource/hudi-flink1.15.x/pom.xml +++ b/hudi-flink-datasource/hudi-flink1.15/pom.xml @@ -24,7 +24,7 @@ 4.0.0 - hudi-flink1.15.x + hudi-flink1.15 0.12.0-SNAPSHOT jar diff --git a/hudi-flink-datasource/hudi-flink1.15.x/src/main/java/org/apache/hudi/adapter/AbstractStreamOperatorAdapter.java b/hudi-flink-datasource/hudi-flink1.15/src/main/java/org/apache/hudi/adapter/AbstractStreamOperatorAdapter.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.15.x/src/main/java/org/apache/hudi/adapter/AbstractStreamOperatorAdapter.java rename to hudi-flink-datasource/hudi-flink1.15/src/main/java/org/apache/hudi/adapter/AbstractStreamOperatorAdapter.java diff --git a/hudi-flink-datasource/hudi-flink1.15.x/src/main/java/org/apache/hudi/adapter/AbstractStreamOperatorFactoryAdapter.java b/hudi-flink-datasource/hudi-flink1.15/src/main/java/org/apache/hudi/adapter/AbstractStreamOperatorFactoryAdapter.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.15.x/src/main/java/org/apache/hudi/adapter/AbstractStreamOperatorFactoryAdapter.java rename to hudi-flink-datasource/hudi-flink1.15/src/main/java/org/apache/hudi/adapter/AbstractStreamOperatorFactoryAdapter.java diff --git a/hudi-flink-datasource/hudi-flink1.15.x/src/main/java/org/apache/hudi/adapter/DataStreamScanProviderAdapter.java b/hudi-flink-datasource/hudi-flink1.15/src/main/java/org/apache/hudi/adapter/DataStreamScanProviderAdapter.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.15.x/src/main/java/org/apache/hudi/adapter/DataStreamScanProviderAdapter.java rename to hudi-flink-datasource/hudi-flink1.15/src/main/java/org/apache/hudi/adapter/DataStreamScanProviderAdapter.java diff --git a/hudi-flink-datasource/hudi-flink1.15.x/src/main/java/org/apache/hudi/adapter/DataStreamSinkProviderAdapter.java b/hudi-flink-datasource/hudi-flink1.15/src/main/java/org/apache/hudi/adapter/DataStreamSinkProviderAdapter.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.15.x/src/main/java/org/apache/hudi/adapter/DataStreamSinkProviderAdapter.java rename to hudi-flink-datasource/hudi-flink1.15/src/main/java/org/apache/hudi/adapter/DataStreamSinkProviderAdapter.java diff --git a/hudi-flink-datasource/hudi-flink1.15.x/src/main/java/org/apache/hudi/adapter/MailboxExecutorAdapter.java b/hudi-flink-datasource/hudi-flink1.15/src/main/java/org/apache/hudi/adapter/MailboxExecutorAdapter.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.15.x/src/main/java/org/apache/hudi/adapter/MailboxExecutorAdapter.java rename to hudi-flink-datasource/hudi-flink1.15/src/main/java/org/apache/hudi/adapter/MailboxExecutorAdapter.java diff --git a/hudi-flink-datasource/hudi-flink1.15.x/src/main/java/org/apache/hudi/adapter/RateLimiterAdapter.java b/hudi-flink-datasource/hudi-flink1.15/src/main/java/org/apache/hudi/adapter/RateLimiterAdapter.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.15.x/src/main/java/org/apache/hudi/adapter/RateLimiterAdapter.java rename to hudi-flink-datasource/hudi-flink1.15/src/main/java/org/apache/hudi/adapter/RateLimiterAdapter.java diff --git a/hudi-flink-datasource/hudi-flink1.15.x/src/main/java/org/apache/hudi/adapter/Utils.java b/hudi-flink-datasource/hudi-flink1.15/src/main/java/org/apache/hudi/adapter/Utils.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.15.x/src/main/java/org/apache/hudi/adapter/Utils.java rename to hudi-flink-datasource/hudi-flink1.15/src/main/java/org/apache/hudi/adapter/Utils.java diff --git a/hudi-flink-datasource/hudi-flink1.15.x/src/main/java/org/apache/hudi/table/format/cow/ParquetSplitReaderUtil.java b/hudi-flink-datasource/hudi-flink1.15/src/main/java/org/apache/hudi/table/format/cow/ParquetSplitReaderUtil.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.15.x/src/main/java/org/apache/hudi/table/format/cow/ParquetSplitReaderUtil.java rename to hudi-flink-datasource/hudi-flink1.15/src/main/java/org/apache/hudi/table/format/cow/ParquetSplitReaderUtil.java diff --git a/hudi-flink-datasource/hudi-flink1.15.x/src/main/java/org/apache/hudi/table/format/cow/vector/HeapArrayVector.java b/hudi-flink-datasource/hudi-flink1.15/src/main/java/org/apache/hudi/table/format/cow/vector/HeapArrayVector.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.15.x/src/main/java/org/apache/hudi/table/format/cow/vector/HeapArrayVector.java rename to hudi-flink-datasource/hudi-flink1.15/src/main/java/org/apache/hudi/table/format/cow/vector/HeapArrayVector.java diff --git a/hudi-flink-datasource/hudi-flink1.15.x/src/main/java/org/apache/hudi/table/format/cow/vector/HeapMapColumnVector.java b/hudi-flink-datasource/hudi-flink1.15/src/main/java/org/apache/hudi/table/format/cow/vector/HeapMapColumnVector.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.15.x/src/main/java/org/apache/hudi/table/format/cow/vector/HeapMapColumnVector.java rename to hudi-flink-datasource/hudi-flink1.15/src/main/java/org/apache/hudi/table/format/cow/vector/HeapMapColumnVector.java diff --git a/hudi-flink-datasource/hudi-flink1.15.x/src/main/java/org/apache/hudi/table/format/cow/vector/HeapRowColumnVector.java b/hudi-flink-datasource/hudi-flink1.15/src/main/java/org/apache/hudi/table/format/cow/vector/HeapRowColumnVector.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.15.x/src/main/java/org/apache/hudi/table/format/cow/vector/HeapRowColumnVector.java rename to hudi-flink-datasource/hudi-flink1.15/src/main/java/org/apache/hudi/table/format/cow/vector/HeapRowColumnVector.java diff --git a/hudi-flink-datasource/hudi-flink1.15.x/src/main/java/org/apache/hudi/table/format/cow/vector/ParquetDecimalVector.java b/hudi-flink-datasource/hudi-flink1.15/src/main/java/org/apache/hudi/table/format/cow/vector/ParquetDecimalVector.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.15.x/src/main/java/org/apache/hudi/table/format/cow/vector/ParquetDecimalVector.java rename to hudi-flink-datasource/hudi-flink1.15/src/main/java/org/apache/hudi/table/format/cow/vector/ParquetDecimalVector.java diff --git a/hudi-flink-datasource/hudi-flink1.15.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/AbstractColumnReader.java b/hudi-flink-datasource/hudi-flink1.15/src/main/java/org/apache/hudi/table/format/cow/vector/reader/AbstractColumnReader.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.15.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/AbstractColumnReader.java rename to hudi-flink-datasource/hudi-flink1.15/src/main/java/org/apache/hudi/table/format/cow/vector/reader/AbstractColumnReader.java diff --git a/hudi-flink-datasource/hudi-flink1.15.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ArrayColumnReader.java b/hudi-flink-datasource/hudi-flink1.15/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ArrayColumnReader.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.15.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ArrayColumnReader.java rename to hudi-flink-datasource/hudi-flink1.15/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ArrayColumnReader.java diff --git a/hudi-flink-datasource/hudi-flink1.15.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/BaseVectorizedColumnReader.java b/hudi-flink-datasource/hudi-flink1.15/src/main/java/org/apache/hudi/table/format/cow/vector/reader/BaseVectorizedColumnReader.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.15.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/BaseVectorizedColumnReader.java rename to hudi-flink-datasource/hudi-flink1.15/src/main/java/org/apache/hudi/table/format/cow/vector/reader/BaseVectorizedColumnReader.java diff --git a/hudi-flink-datasource/hudi-flink1.15.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/FixedLenBytesColumnReader.java b/hudi-flink-datasource/hudi-flink1.15/src/main/java/org/apache/hudi/table/format/cow/vector/reader/FixedLenBytesColumnReader.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.15.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/FixedLenBytesColumnReader.java rename to hudi-flink-datasource/hudi-flink1.15/src/main/java/org/apache/hudi/table/format/cow/vector/reader/FixedLenBytesColumnReader.java diff --git a/hudi-flink-datasource/hudi-flink1.15.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/Int64TimestampColumnReader.java b/hudi-flink-datasource/hudi-flink1.15/src/main/java/org/apache/hudi/table/format/cow/vector/reader/Int64TimestampColumnReader.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.15.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/Int64TimestampColumnReader.java rename to hudi-flink-datasource/hudi-flink1.15/src/main/java/org/apache/hudi/table/format/cow/vector/reader/Int64TimestampColumnReader.java diff --git a/hudi-flink-datasource/hudi-flink1.15.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/MapColumnReader.java b/hudi-flink-datasource/hudi-flink1.15/src/main/java/org/apache/hudi/table/format/cow/vector/reader/MapColumnReader.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.15.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/MapColumnReader.java rename to hudi-flink-datasource/hudi-flink1.15/src/main/java/org/apache/hudi/table/format/cow/vector/reader/MapColumnReader.java diff --git a/hudi-flink-datasource/hudi-flink1.15.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ParquetColumnarRowSplitReader.java b/hudi-flink-datasource/hudi-flink1.15/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ParquetColumnarRowSplitReader.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.15.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ParquetColumnarRowSplitReader.java rename to hudi-flink-datasource/hudi-flink1.15/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ParquetColumnarRowSplitReader.java diff --git a/hudi-flink-datasource/hudi-flink1.15.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ParquetDataColumnReader.java b/hudi-flink-datasource/hudi-flink1.15/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ParquetDataColumnReader.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.15.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ParquetDataColumnReader.java rename to hudi-flink-datasource/hudi-flink1.15/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ParquetDataColumnReader.java diff --git a/hudi-flink-datasource/hudi-flink1.15.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ParquetDataColumnReaderFactory.java b/hudi-flink-datasource/hudi-flink1.15/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ParquetDataColumnReaderFactory.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.15.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ParquetDataColumnReaderFactory.java rename to hudi-flink-datasource/hudi-flink1.15/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ParquetDataColumnReaderFactory.java diff --git a/hudi-flink-datasource/hudi-flink1.15.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/RowColumnReader.java b/hudi-flink-datasource/hudi-flink1.15/src/main/java/org/apache/hudi/table/format/cow/vector/reader/RowColumnReader.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.15.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/RowColumnReader.java rename to hudi-flink-datasource/hudi-flink1.15/src/main/java/org/apache/hudi/table/format/cow/vector/reader/RowColumnReader.java diff --git a/hudi-flink-datasource/hudi-flink1.15.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/RunLengthDecoder.java b/hudi-flink-datasource/hudi-flink1.15/src/main/java/org/apache/hudi/table/format/cow/vector/reader/RunLengthDecoder.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.15.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/RunLengthDecoder.java rename to hudi-flink-datasource/hudi-flink1.15/src/main/java/org/apache/hudi/table/format/cow/vector/reader/RunLengthDecoder.java diff --git a/hudi-flink-datasource/hudi-flink1.15.x/src/test/java/org/apache/hudi/adapter/OutputAdapter.java b/hudi-flink-datasource/hudi-flink1.15/src/test/java/org/apache/hudi/adapter/OutputAdapter.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.15.x/src/test/java/org/apache/hudi/adapter/OutputAdapter.java rename to hudi-flink-datasource/hudi-flink1.15/src/test/java/org/apache/hudi/adapter/OutputAdapter.java diff --git a/hudi-flink-datasource/hudi-flink1.15.x/src/test/java/org/apache/hudi/adapter/StateInitializationContextAdapter.java b/hudi-flink-datasource/hudi-flink1.15/src/test/java/org/apache/hudi/adapter/StateInitializationContextAdapter.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.15.x/src/test/java/org/apache/hudi/adapter/StateInitializationContextAdapter.java rename to hudi-flink-datasource/hudi-flink1.15/src/test/java/org/apache/hudi/adapter/StateInitializationContextAdapter.java diff --git a/hudi-flink-datasource/hudi-flink1.15.x/src/test/java/org/apache/hudi/adapter/StreamingRuntimeContextAdapter.java b/hudi-flink-datasource/hudi-flink1.15/src/test/java/org/apache/hudi/adapter/StreamingRuntimeContextAdapter.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.15.x/src/test/java/org/apache/hudi/adapter/StreamingRuntimeContextAdapter.java rename to hudi-flink-datasource/hudi-flink1.15/src/test/java/org/apache/hudi/adapter/StreamingRuntimeContextAdapter.java diff --git a/hudi-flink-datasource/hudi-flink1.15.x/src/test/java/org/apache/hudi/adapter/TestTableEnvs.java b/hudi-flink-datasource/hudi-flink1.15/src/test/java/org/apache/hudi/adapter/TestTableEnvs.java similarity index 100% rename from hudi-flink-datasource/hudi-flink1.15.x/src/test/java/org/apache/hudi/adapter/TestTableEnvs.java rename to hudi-flink-datasource/hudi-flink1.15/src/test/java/org/apache/hudi/adapter/TestTableEnvs.java diff --git a/hudi-flink-datasource/pom.xml b/hudi-flink-datasource/pom.xml index ee991497a4326..83e74998efc3c 100644 --- a/hudi-flink-datasource/pom.xml +++ b/hudi-flink-datasource/pom.xml @@ -33,9 +33,9 @@ - hudi-flink1.13.x - hudi-flink1.14.x - hudi-flink1.15.x + hudi-flink1.13 + hudi-flink1.14 + hudi-flink1.15 hudi-flink diff --git a/hudi-spark-datasource/README.md b/hudi-spark-datasource/README.md index dd1796991c873..edc1d020382e2 100644 --- a/hudi-spark-datasource/README.md +++ b/hudi-spark-datasource/README.md @@ -21,9 +21,9 @@ This repo contains the code that integrate Hudi with Spark. The repo is split in `hudi-spark` `hudi-spark2` -`hudi-spark3.1.x` -`hudi-spark3.2.x` -`hudi-spark3.3.x` +`hudi-spark3.1` +`hudi-spark3.2` +`hudi-spark3.3` `hudi-spark2-common` `hudi-spark3-common` `hudi-spark-common` @@ -31,9 +31,9 @@ This repo contains the code that integrate Hudi with Spark. The repo is split in * hudi-spark is the module that contains the code that both spark2 & spark3 version would share, also contains the antlr4 file that supports spark sql on spark 2.x version. * hudi-spark2 is the module that contains the code that compatible with spark 2.x versions. -* hudi-spark3.1.x is the module that contains the code that compatible with spark3.1.x and spark3.0.x version. -* hudi-spark3.2.x is the module that contains the code that compatible with spark 3.2.x versions. -* hudi-spark3.3.x is the module that contains the code that compatible with spark 3.3.x+ versions. +* hudi-spark3.1 is the module that contains the code that compatible with spark3.1.x and spark3.0.x version. +* hudi-spark3.2 is the module that contains the code that compatible with spark 3.2.x versions. +* hudi-spark3.3 is the module that contains the code that compatible with spark 3.3.x+ versions. * hudi-spark2-common is the module that contains the code that would be reused between spark2.x versions, right now the module has no class since hudi only supports spark 2.4.4 version, and it acts as the placeholder when packaging hudi-spark-bundle module. * hudi-spark3-common is the module that contains the code that would be reused between spark3.x versions. @@ -55,7 +55,7 @@ has no class since hudi only supports spark 2.4.4 version, and it acts as the pl ### To improve: Spark3.3 support time travel syntax link [SPARK-37219](https://issues.apache.org/jira/browse/SPARK-37219). Once Spark 3.3 released. The files in the following list will be removed: -* hudi-spark3.3.x's `HoodieSpark3_3ExtendedSqlAstBuilder.scala`, `HoodieSpark3_3ExtendedSqlParser.scala`, `TimeTravelRelation.scala`, `SqlBase.g4`, `HoodieSqlBase.g4` +* hudi-spark3.3's `HoodieSpark3_3ExtendedSqlAstBuilder.scala`, `HoodieSpark3_3ExtendedSqlParser.scala`, `TimeTravelRelation.scala`, `SqlBase.g4`, `HoodieSqlBase.g4` Tracking Jira: [HUDI-4468](https://issues.apache.org/jira/browse/HUDI-4468) Some other improvements undergoing: diff --git a/hudi-spark-datasource/hudi-spark/src/main/java/org/apache/hudi/payload/AWSDmsAvroPayload.java b/hudi-spark-datasource/hudi-spark/src/main/java/org/apache/hudi/payload/AWSDmsAvroPayload.java new file mode 100644 index 0000000000000..1411d4f4796c0 --- /dev/null +++ b/hudi-spark-datasource/hudi-spark/src/main/java/org/apache/hudi/payload/AWSDmsAvroPayload.java @@ -0,0 +1,48 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hudi.payload; + +import org.apache.avro.generic.GenericRecord; +import org.apache.hudi.common.util.Option; + +/** + * Provides support for seamlessly applying changes captured via Amazon Database Migration Service onto S3. + * + * Typically, we get the following pattern of full change records corresponding to DML against the + * source database + * + * - Full load records with no `Op` field + * - For inserts against the source table, records contain full after image with `Op=I` + * - For updates against the source table, records contain full after image with `Op=U` + * - For deletes against the source table, records contain full before image with `Op=D` + * + * This payload implementation will issue matching insert, delete, updates against the hudi table + * + */ +@Deprecated +public class AWSDmsAvroPayload extends org.apache.hudi.common.model.AWSDmsAvroPayload { + + public AWSDmsAvroPayload(GenericRecord record, Comparable orderingVal) { + super(record, orderingVal); + } + + public AWSDmsAvroPayload(Option record) { + super(record); + } +} diff --git a/hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/analysis/HoodieAnalysis.scala b/hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/analysis/HoodieAnalysis.scala index 9d5f380661541..6afa8681339ac 100644 --- a/hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/analysis/HoodieAnalysis.scala +++ b/hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/analysis/HoodieAnalysis.scala @@ -435,7 +435,7 @@ case class HoodieResolveReferences(sparkSession: SparkSession) extends Rule[Logi // Resolve Delete Table case dft @ DeleteFromTable(table, condition) if sparkAdapter.isHoodieTable(table, sparkSession) && table.resolved => - val resolveExpression = resolveExpressionFrom(table, None)_ + val resolveExpression = resolveExpressionFrom(table, None)(_) sparkAdapter.resolveDeleteFromTable(dft, resolveExpression) // Append the meta field to the insert query to walk through the validate for the diff --git a/hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/DeleteHoodieTableCommand.scala b/hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/DeleteHoodieTableCommand.scala index 82f2ae29fa776..e1dc8daa4ca97 100644 --- a/hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/DeleteHoodieTableCommand.scala +++ b/hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/DeleteHoodieTableCommand.scala @@ -37,8 +37,7 @@ case class DeleteHoodieTableCommand(deleteTable: DeleteFromTable) extends Hoodie // Remove meta fields from the data frame var df = removeMetaFields(Dataset.ofRows(sparkSession, table)) - // SPARK-38626 DeleteFromTable.condition is changed from Option[Expression] to Expression in Spark 3.3 - val condition = sparkAdapter.extractCondition(deleteTable) + val condition = sparkAdapter.extractDeleteCondition(deleteTable) if (condition != null) df = df.filter(Column(condition)) val hoodieCatalogTable = HoodieCatalogTable(sparkSession, tableId) diff --git a/hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/InsertIntoHoodieTableCommand.scala b/hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/InsertIntoHoodieTableCommand.scala index 2fc7fb017ad5e..be1ad8e9b8a5d 100644 --- a/hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/InsertIntoHoodieTableCommand.scala +++ b/hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/InsertIntoHoodieTableCommand.scala @@ -154,12 +154,15 @@ object InsertIntoHoodieTableCommand extends Logging with ProvidesHoodieConfig { schemaWithoutMetaFields: Seq[StructField], conf: SQLConf): Seq[Alias] = { queryOutputWithoutMetaFields.zip(schemaWithoutMetaFields).map { case (dataAttr, dataField) => - val targetFieldOption = if (dataAttr.name.startsWith("col")) None else - schemaWithoutMetaFields.find(_.name.equals(dataAttr.name)) - val targetField = if (targetFieldOption.isDefined) targetFieldOption.get else dataField - val castAttr = castIfNeeded(dataAttr.withNullability(targetField.nullable), - targetField.dataType, conf) - Alias(castAttr, targetField.name)() + val targetAttrOption = if (dataAttr.name.startsWith("col")) { + None + } else { + queryOutputWithoutMetaFields.find(_.name.equals(dataField.name)) + } + val targetAttr = targetAttrOption.getOrElse(dataAttr) + val castAttr = castIfNeeded(targetAttr.withNullability(dataField.nullable), + dataField.dataType, conf) + Alias(castAttr, dataField.name)() } } } diff --git a/hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/spark/sql/hudi/TestInsertTable.scala b/hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/spark/sql/hudi/TestInsertTable.scala index 9aa3c509c3dab..8d21fe32eadba 100644 --- a/hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/spark/sql/hudi/TestInsertTable.scala +++ b/hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/spark/sql/hudi/TestInsertTable.scala @@ -93,6 +93,14 @@ class TestInsertTable extends HoodieSparkSqlTestBase { | insert into $tableName partition(dt = '2021-01-06') | select 20 as price, 2000 as ts, 2 as id, 'a2' as name """.stripMargin) + // should not mess with the original order after write the out-of-order data. + val metaClient = HoodieTableMetaClient.builder() + .setBasePath(tmp.getCanonicalPath) + .setConf(spark.sessionState.newHadoopConf()) + .build() + val schema = HoodieSqlCommonUtils.getTableSqlSchema(metaClient).get + assert(schema.getFieldIndex("id").contains(0)) + assert(schema.getFieldIndex("price").contains(2)) // Note: Do not write the field alias, the partition field must be placed last. spark.sql( @@ -133,6 +141,14 @@ class TestInsertTable extends HoodieSparkSqlTestBase { | insert into $tableName partition(dt) | select 1 as id, '2021-01-05' as dt, 'a1' as name, 10 as price, 1000 as ts """.stripMargin) + // should not mess with the original order after write the out-of-order data. + val metaClient = HoodieTableMetaClient.builder() + .setBasePath(tmp.getCanonicalPath) + .setConf(spark.sessionState.newHadoopConf()) + .build() + val schema = HoodieSqlCommonUtils.getTableSqlSchema(metaClient).get + assert(schema.getFieldIndex("id").contains(0)) + assert(schema.getFieldIndex("price").contains(2)) spark.sql( s""" diff --git a/hudi-spark-datasource/hudi-spark2/src/main/scala/org/apache/spark/sql/adapter/Spark2Adapter.scala b/hudi-spark-datasource/hudi-spark2/src/main/scala/org/apache/spark/sql/adapter/Spark2Adapter.scala index d1ba1e36bbcfb..eabdd337ee5d8 100644 --- a/hudi-spark-datasource/hudi-spark2/src/main/scala/org/apache/spark/sql/adapter/Spark2Adapter.scala +++ b/hudi-spark-datasource/hudi-spark2/src/main/scala/org/apache/spark/sql/adapter/Spark2Adapter.scala @@ -138,7 +138,7 @@ class Spark2Adapter extends SparkAdapter { DeleteFromTable(deleteFromTableCommand.table, resolvedCondition) } - override def extractCondition(deleteFromTable: Command): Expression = { + override def extractDeleteCondition(deleteFromTable: Command): Expression = { deleteFromTable.asInstanceOf[DeleteFromTable].condition.getOrElse(null) } diff --git a/hudi-spark-datasource/hudi-spark3.1.x/pom.xml b/hudi-spark-datasource/hudi-spark3.1/pom.xml similarity index 99% rename from hudi-spark-datasource/hudi-spark3.1.x/pom.xml rename to hudi-spark-datasource/hudi-spark3.1/pom.xml index bd46caaa87a5a..59910d90f839a 100644 --- a/hudi-spark-datasource/hudi-spark3.1.x/pom.xml +++ b/hudi-spark-datasource/hudi-spark3.1/pom.xml @@ -21,10 +21,10 @@ 4.0.0 - hudi-spark3.1.x_2.12 + hudi-spark3.1_2.12 0.12.0-SNAPSHOT - hudi-spark3.1.x_2.12 + hudi-spark3.1_2.12 jar diff --git a/hudi-spark-datasource/hudi-spark3.1.x/src/main/java/org/apache/spark/sql/execution/datasources/parquet/Spark312HoodieVectorizedParquetRecordReader.java b/hudi-spark-datasource/hudi-spark3.1/src/main/java/org/apache/spark/sql/execution/datasources/parquet/Spark312HoodieVectorizedParquetRecordReader.java similarity index 100% rename from hudi-spark-datasource/hudi-spark3.1.x/src/main/java/org/apache/spark/sql/execution/datasources/parquet/Spark312HoodieVectorizedParquetRecordReader.java rename to hudi-spark-datasource/hudi-spark3.1/src/main/java/org/apache/spark/sql/execution/datasources/parquet/Spark312HoodieVectorizedParquetRecordReader.java diff --git a/hudi-spark-datasource/hudi-spark3.1.x/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister b/hudi-spark-datasource/hudi-spark3.1/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister similarity index 100% rename from hudi-spark-datasource/hudi-spark3.1.x/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister rename to hudi-spark-datasource/hudi-spark3.1/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister diff --git a/hudi-spark-datasource/hudi-spark3.1.x/src/main/scala/org/apache/hudi/Spark31HoodieFileScanRDD.scala b/hudi-spark-datasource/hudi-spark3.1/src/main/scala/org/apache/hudi/Spark31HoodieFileScanRDD.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.1.x/src/main/scala/org/apache/hudi/Spark31HoodieFileScanRDD.scala rename to hudi-spark-datasource/hudi-spark3.1/src/main/scala/org/apache/hudi/Spark31HoodieFileScanRDD.scala diff --git a/hudi-spark-datasource/hudi-spark3.1.x/src/main/scala/org/apache/hudi/Spark3xDefaultSource.scala b/hudi-spark-datasource/hudi-spark3.1/src/main/scala/org/apache/hudi/Spark3xDefaultSource.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.1.x/src/main/scala/org/apache/hudi/Spark3xDefaultSource.scala rename to hudi-spark-datasource/hudi-spark3.1/src/main/scala/org/apache/hudi/Spark3xDefaultSource.scala diff --git a/hudi-spark-datasource/hudi-spark3.1.x/src/main/scala/org/apache/spark/sql/HoodieSpark31CatalystExpressionUtils.scala b/hudi-spark-datasource/hudi-spark3.1/src/main/scala/org/apache/spark/sql/HoodieSpark31CatalystExpressionUtils.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.1.x/src/main/scala/org/apache/spark/sql/HoodieSpark31CatalystExpressionUtils.scala rename to hudi-spark-datasource/hudi-spark3.1/src/main/scala/org/apache/spark/sql/HoodieSpark31CatalystExpressionUtils.scala diff --git a/hudi-spark-datasource/hudi-spark3.1.x/src/main/scala/org/apache/spark/sql/HoodieSpark31CatalystPlanUtils.scala b/hudi-spark-datasource/hudi-spark3.1/src/main/scala/org/apache/spark/sql/HoodieSpark31CatalystPlanUtils.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.1.x/src/main/scala/org/apache/spark/sql/HoodieSpark31CatalystPlanUtils.scala rename to hudi-spark-datasource/hudi-spark3.1/src/main/scala/org/apache/spark/sql/HoodieSpark31CatalystPlanUtils.scala diff --git a/hudi-spark-datasource/hudi-spark3.1.x/src/main/scala/org/apache/spark/sql/adapter/Spark3_1Adapter.scala b/hudi-spark-datasource/hudi-spark3.1/src/main/scala/org/apache/spark/sql/adapter/Spark3_1Adapter.scala similarity index 98% rename from hudi-spark-datasource/hudi-spark3.1.x/src/main/scala/org/apache/spark/sql/adapter/Spark3_1Adapter.scala rename to hudi-spark-datasource/hudi-spark3.1/src/main/scala/org/apache/spark/sql/adapter/Spark3_1Adapter.scala index 7ccf51cbb40b0..2697c6658ab18 100644 --- a/hudi-spark-datasource/hudi-spark3.1.x/src/main/scala/org/apache/spark/sql/adapter/Spark3_1Adapter.scala +++ b/hudi-spark-datasource/hudi-spark3.1/src/main/scala/org/apache/spark/sql/adapter/Spark3_1Adapter.scala @@ -73,7 +73,7 @@ class Spark3_1Adapter extends BaseSpark3Adapter { DeleteFromTable(deleteFromTableCommand.table, resolvedCondition) } - override def extractCondition(deleteFromTable: Command): Expression = { + override def extractDeleteCondition(deleteFromTable: Command): Expression = { deleteFromTable.asInstanceOf[DeleteFromTable].condition.getOrElse(null) } } diff --git a/hudi-spark-datasource/hudi-spark3.1.x/src/main/scala/org/apache/spark/sql/avro/AvroDeserializer.scala b/hudi-spark-datasource/hudi-spark3.1/src/main/scala/org/apache/spark/sql/avro/AvroDeserializer.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.1.x/src/main/scala/org/apache/spark/sql/avro/AvroDeserializer.scala rename to hudi-spark-datasource/hudi-spark3.1/src/main/scala/org/apache/spark/sql/avro/AvroDeserializer.scala diff --git a/hudi-spark-datasource/hudi-spark3.1.x/src/main/scala/org/apache/spark/sql/avro/AvroSerializer.scala b/hudi-spark-datasource/hudi-spark3.1/src/main/scala/org/apache/spark/sql/avro/AvroSerializer.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.1.x/src/main/scala/org/apache/spark/sql/avro/AvroSerializer.scala rename to hudi-spark-datasource/hudi-spark3.1/src/main/scala/org/apache/spark/sql/avro/AvroSerializer.scala diff --git a/hudi-spark-datasource/hudi-spark3.1.x/src/main/scala/org/apache/spark/sql/avro/AvroUtils.scala b/hudi-spark-datasource/hudi-spark3.1/src/main/scala/org/apache/spark/sql/avro/AvroUtils.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.1.x/src/main/scala/org/apache/spark/sql/avro/AvroUtils.scala rename to hudi-spark-datasource/hudi-spark3.1/src/main/scala/org/apache/spark/sql/avro/AvroUtils.scala diff --git a/hudi-spark-datasource/hudi-spark3.1.x/src/main/scala/org/apache/spark/sql/avro/HoodieSpark3_1AvroDeserializer.scala b/hudi-spark-datasource/hudi-spark3.1/src/main/scala/org/apache/spark/sql/avro/HoodieSpark3_1AvroDeserializer.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.1.x/src/main/scala/org/apache/spark/sql/avro/HoodieSpark3_1AvroDeserializer.scala rename to hudi-spark-datasource/hudi-spark3.1/src/main/scala/org/apache/spark/sql/avro/HoodieSpark3_1AvroDeserializer.scala diff --git a/hudi-spark-datasource/hudi-spark3.1.x/src/main/scala/org/apache/spark/sql/avro/HoodieSpark3_1AvroSerializer.scala b/hudi-spark-datasource/hudi-spark3.1/src/main/scala/org/apache/spark/sql/avro/HoodieSpark3_1AvroSerializer.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.1.x/src/main/scala/org/apache/spark/sql/avro/HoodieSpark3_1AvroSerializer.scala rename to hudi-spark-datasource/hudi-spark3.1/src/main/scala/org/apache/spark/sql/avro/HoodieSpark3_1AvroSerializer.scala diff --git a/hudi-spark-datasource/hudi-spark3.1.x/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/HStatments.scala b/hudi-spark-datasource/hudi-spark3.1/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/HStatments.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.1.x/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/HStatments.scala rename to hudi-spark-datasource/hudi-spark3.1/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/HStatments.scala diff --git a/hudi-spark-datasource/hudi-spark3.1.x/src/main/scala/org/apache/spark/sql/execution/datasources/Spark31NestedSchemaPruning.scala b/hudi-spark-datasource/hudi-spark3.1/src/main/scala/org/apache/spark/sql/execution/datasources/Spark31NestedSchemaPruning.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.1.x/src/main/scala/org/apache/spark/sql/execution/datasources/Spark31NestedSchemaPruning.scala rename to hudi-spark-datasource/hudi-spark3.1/src/main/scala/org/apache/spark/sql/execution/datasources/Spark31NestedSchemaPruning.scala diff --git a/hudi-spark-datasource/hudi-spark3.1.x/src/main/scala/org/apache/spark/sql/execution/datasources/parquet/Spark31HoodieParquetFileFormat.scala b/hudi-spark-datasource/hudi-spark3.1/src/main/scala/org/apache/spark/sql/execution/datasources/parquet/Spark31HoodieParquetFileFormat.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.1.x/src/main/scala/org/apache/spark/sql/execution/datasources/parquet/Spark31HoodieParquetFileFormat.scala rename to hudi-spark-datasource/hudi-spark3.1/src/main/scala/org/apache/spark/sql/execution/datasources/parquet/Spark31HoodieParquetFileFormat.scala diff --git a/hudi-spark-datasource/hudi-spark3.1.x/src/main/scala/org/apache/spark/sql/hudi/Spark312ResolveHudiAlterTableCommand.scala b/hudi-spark-datasource/hudi-spark3.1/src/main/scala/org/apache/spark/sql/hudi/Spark312ResolveHudiAlterTableCommand.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.1.x/src/main/scala/org/apache/spark/sql/hudi/Spark312ResolveHudiAlterTableCommand.scala rename to hudi-spark-datasource/hudi-spark3.1/src/main/scala/org/apache/spark/sql/hudi/Spark312ResolveHudiAlterTableCommand.scala diff --git a/hudi-spark-datasource/hudi-spark3.1.x/src/main/scala/org/apache/spark/sql/hudi/command/AlterTableCommand312.scala b/hudi-spark-datasource/hudi-spark3.1/src/main/scala/org/apache/spark/sql/hudi/command/AlterTableCommand312.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.1.x/src/main/scala/org/apache/spark/sql/hudi/command/AlterTableCommand312.scala rename to hudi-spark-datasource/hudi-spark3.1/src/main/scala/org/apache/spark/sql/hudi/command/AlterTableCommand312.scala diff --git a/hudi-spark-datasource/hudi-spark3.1.x/src/main/scala/org/apache/spark/sql/parser/HoodieSpark312SqlAstBuilder.scala b/hudi-spark-datasource/hudi-spark3.1/src/main/scala/org/apache/spark/sql/parser/HoodieSpark312SqlAstBuilder.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.1.x/src/main/scala/org/apache/spark/sql/parser/HoodieSpark312SqlAstBuilder.scala rename to hudi-spark-datasource/hudi-spark3.1/src/main/scala/org/apache/spark/sql/parser/HoodieSpark312SqlAstBuilder.scala diff --git a/hudi-spark-datasource/hudi-spark3.1.x/src/main/scala/org/apache/spark/sql/parser/HoodieSpark3_1ExtendedSqlParser.scala b/hudi-spark-datasource/hudi-spark3.1/src/main/scala/org/apache/spark/sql/parser/HoodieSpark3_1ExtendedSqlParser.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.1.x/src/main/scala/org/apache/spark/sql/parser/HoodieSpark3_1ExtendedSqlParser.scala rename to hudi-spark-datasource/hudi-spark3.1/src/main/scala/org/apache/spark/sql/parser/HoodieSpark3_1ExtendedSqlParser.scala diff --git a/hudi-spark-datasource/hudi-spark3.2.x/pom.xml b/hudi-spark-datasource/hudi-spark3.2/pom.xml similarity index 97% rename from hudi-spark-datasource/hudi-spark3.2.x/pom.xml rename to hudi-spark-datasource/hudi-spark3.2/pom.xml index 5e8a58329cfc8..a69687b2c1567 100644 --- a/hudi-spark-datasource/hudi-spark3.2.x/pom.xml +++ b/hudi-spark-datasource/hudi-spark3.2/pom.xml @@ -21,10 +21,10 @@ 4.0.0 - hudi-spark3.2.x_2.12 + hudi-spark3.2_2.12 0.12.0-SNAPSHOT - hudi-spark3.2.x_2.12 + hudi-spark3.2_2.12 jar @@ -164,8 +164,8 @@ true true - ../hudi-spark3.2.x/src/main/antlr4 - ../hudi-spark3.2.x/src/main/antlr4/imports + ../hudi-spark3.2/src/main/antlr4 + ../hudi-spark3.2/src/main/antlr4/imports diff --git a/hudi-spark-datasource/hudi-spark3.2.x/src/main/antlr4/imports/SqlBase.g4 b/hudi-spark-datasource/hudi-spark3.2/src/main/antlr4/imports/SqlBase.g4 similarity index 100% rename from hudi-spark-datasource/hudi-spark3.2.x/src/main/antlr4/imports/SqlBase.g4 rename to hudi-spark-datasource/hudi-spark3.2/src/main/antlr4/imports/SqlBase.g4 diff --git a/hudi-spark-datasource/hudi-spark3.2.x/src/main/antlr4/org/apache/hudi/spark/sql/parser/HoodieSqlBase.g4 b/hudi-spark-datasource/hudi-spark3.2/src/main/antlr4/org/apache/hudi/spark/sql/parser/HoodieSqlBase.g4 similarity index 100% rename from hudi-spark-datasource/hudi-spark3.2.x/src/main/antlr4/org/apache/hudi/spark/sql/parser/HoodieSqlBase.g4 rename to hudi-spark-datasource/hudi-spark3.2/src/main/antlr4/org/apache/hudi/spark/sql/parser/HoodieSqlBase.g4 diff --git a/hudi-spark-datasource/hudi-spark3.2.x/src/main/java/org/apache/spark/sql/execution/datasources/parquet/Spark32HoodieVectorizedParquetRecordReader.java b/hudi-spark-datasource/hudi-spark3.2/src/main/java/org/apache/spark/sql/execution/datasources/parquet/Spark32HoodieVectorizedParquetRecordReader.java similarity index 100% rename from hudi-spark-datasource/hudi-spark3.2.x/src/main/java/org/apache/spark/sql/execution/datasources/parquet/Spark32HoodieVectorizedParquetRecordReader.java rename to hudi-spark-datasource/hudi-spark3.2/src/main/java/org/apache/spark/sql/execution/datasources/parquet/Spark32HoodieVectorizedParquetRecordReader.java diff --git a/hudi-spark-datasource/hudi-spark3.2.x/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister b/hudi-spark-datasource/hudi-spark3.2/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister similarity index 100% rename from hudi-spark-datasource/hudi-spark3.2.x/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister rename to hudi-spark-datasource/hudi-spark3.2/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister diff --git a/hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/hudi/Spark32HoodieFileScanRDD.scala b/hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/hudi/Spark32HoodieFileScanRDD.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/hudi/Spark32HoodieFileScanRDD.scala rename to hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/hudi/Spark32HoodieFileScanRDD.scala diff --git a/hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/hudi/Spark3DefaultSource.scala b/hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/hudi/Spark3DefaultSource.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/hudi/Spark3DefaultSource.scala rename to hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/hudi/Spark3DefaultSource.scala diff --git a/hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/HoodieSpark32CatalystExpressionUtils.scala b/hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/HoodieSpark32CatalystExpressionUtils.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/HoodieSpark32CatalystExpressionUtils.scala rename to hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/HoodieSpark32CatalystExpressionUtils.scala diff --git a/hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/HoodieSpark32CatalystPlanUtils.scala b/hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/HoodieSpark32CatalystPlanUtils.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/HoodieSpark32CatalystPlanUtils.scala rename to hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/HoodieSpark32CatalystPlanUtils.scala diff --git a/hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/adapter/Spark3_2Adapter.scala b/hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/adapter/Spark3_2Adapter.scala similarity index 97% rename from hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/adapter/Spark3_2Adapter.scala rename to hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/adapter/Spark3_2Adapter.scala index ce39123171158..bd2d6e4f7bffc 100644 --- a/hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/adapter/Spark3_2Adapter.scala +++ b/hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/adapter/Spark3_2Adapter.scala @@ -70,7 +70,7 @@ class Spark3_2Adapter extends BaseSpark3Adapter { DeleteFromTable(deleteFromTableCommand.table, resolvedCondition) } - override def extractCondition(deleteFromTable: Command): Expression = { + override def extractDeleteCondition(deleteFromTable: Command): Expression = { deleteFromTable.asInstanceOf[DeleteFromTable].condition.getOrElse(null) } } diff --git a/hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/avro/AvroDeserializer.scala b/hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/avro/AvroDeserializer.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/avro/AvroDeserializer.scala rename to hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/avro/AvroDeserializer.scala diff --git a/hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/avro/AvroSerializer.scala b/hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/avro/AvroSerializer.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/avro/AvroSerializer.scala rename to hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/avro/AvroSerializer.scala diff --git a/hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/avro/AvroUtils.scala b/hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/avro/AvroUtils.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/avro/AvroUtils.scala rename to hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/avro/AvroUtils.scala diff --git a/hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/avro/HoodieSpark3_2AvroDeserializer.scala b/hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/avro/HoodieSpark3_2AvroDeserializer.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/avro/HoodieSpark3_2AvroDeserializer.scala rename to hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/avro/HoodieSpark3_2AvroDeserializer.scala diff --git a/hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/avro/HoodieSpark3_2AvroSerializer.scala b/hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/avro/HoodieSpark3_2AvroSerializer.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/avro/HoodieSpark3_2AvroSerializer.scala rename to hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/avro/HoodieSpark3_2AvroSerializer.scala diff --git a/hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/TimeTravelRelation.scala b/hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/TimeTravelRelation.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/TimeTravelRelation.scala rename to hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/TimeTravelRelation.scala diff --git a/hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/connector/catalog/HoodieIdentifier.scala b/hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/connector/catalog/HoodieIdentifier.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/connector/catalog/HoodieIdentifier.scala rename to hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/connector/catalog/HoodieIdentifier.scala diff --git a/hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/execution/datasources/Spark32NestedSchemaPruning.scala b/hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/execution/datasources/Spark32NestedSchemaPruning.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/execution/datasources/Spark32NestedSchemaPruning.scala rename to hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/execution/datasources/Spark32NestedSchemaPruning.scala diff --git a/hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/execution/datasources/parquet/Spark32DataSourceUtils.scala b/hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/execution/datasources/parquet/Spark32DataSourceUtils.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/execution/datasources/parquet/Spark32DataSourceUtils.scala rename to hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/execution/datasources/parquet/Spark32DataSourceUtils.scala diff --git a/hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/execution/datasources/parquet/Spark32HoodieParquetFileFormat.scala b/hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/execution/datasources/parquet/Spark32HoodieParquetFileFormat.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/execution/datasources/parquet/Spark32HoodieParquetFileFormat.scala rename to hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/execution/datasources/parquet/Spark32HoodieParquetFileFormat.scala diff --git a/hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/hudi/Spark32ResolveHudiAlterTableCommand.scala b/hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/hudi/Spark32ResolveHudiAlterTableCommand.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/hudi/Spark32ResolveHudiAlterTableCommand.scala rename to hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/hudi/Spark32ResolveHudiAlterTableCommand.scala diff --git a/hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/hudi/analysis/HoodieSpark3Analysis.scala b/hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/hudi/analysis/HoodieSpark3Analysis.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/hudi/analysis/HoodieSpark3Analysis.scala rename to hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/hudi/analysis/HoodieSpark3Analysis.scala diff --git a/hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/hudi/catalog/BasicStagedTable.scala b/hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/hudi/catalog/BasicStagedTable.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/hudi/catalog/BasicStagedTable.scala rename to hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/hudi/catalog/BasicStagedTable.scala diff --git a/hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/hudi/catalog/HoodieCatalog.scala b/hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/hudi/catalog/HoodieCatalog.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/hudi/catalog/HoodieCatalog.scala rename to hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/hudi/catalog/HoodieCatalog.scala diff --git a/hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/hudi/catalog/HoodieInternalV2Table.scala b/hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/hudi/catalog/HoodieInternalV2Table.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/hudi/catalog/HoodieInternalV2Table.scala rename to hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/hudi/catalog/HoodieInternalV2Table.scala diff --git a/hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/hudi/catalog/HoodieStagedTable.scala b/hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/hudi/catalog/HoodieStagedTable.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/hudi/catalog/HoodieStagedTable.scala rename to hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/hudi/catalog/HoodieStagedTable.scala diff --git a/hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/hudi/catalog/TableCreationMode.java b/hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/hudi/catalog/TableCreationMode.java similarity index 100% rename from hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/hudi/catalog/TableCreationMode.java rename to hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/hudi/catalog/TableCreationMode.java diff --git a/hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/hudi/command/AlterTableCommand.scala b/hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/hudi/command/AlterTableCommand.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/hudi/command/AlterTableCommand.scala rename to hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/hudi/command/AlterTableCommand.scala diff --git a/hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/parser/HoodieSpark3_2ExtendedSqlAstBuilder.scala b/hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/parser/HoodieSpark3_2ExtendedSqlAstBuilder.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/parser/HoodieSpark3_2ExtendedSqlAstBuilder.scala rename to hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/parser/HoodieSpark3_2ExtendedSqlAstBuilder.scala diff --git a/hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/parser/HoodieSpark3_2ExtendedSqlParser.scala b/hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/parser/HoodieSpark3_2ExtendedSqlParser.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.2.x/src/main/scala/org/apache/spark/sql/parser/HoodieSpark3_2ExtendedSqlParser.scala rename to hudi-spark-datasource/hudi-spark3.2/src/main/scala/org/apache/spark/sql/parser/HoodieSpark3_2ExtendedSqlParser.scala diff --git a/hudi-spark-datasource/hudi-spark3.2.x/src/test/java/org/apache/hudi/spark3/internal/TestHoodieBulkInsertDataInternalWriter.java b/hudi-spark-datasource/hudi-spark3.2/src/test/java/org/apache/hudi/spark3/internal/TestHoodieBulkInsertDataInternalWriter.java similarity index 100% rename from hudi-spark-datasource/hudi-spark3.2.x/src/test/java/org/apache/hudi/spark3/internal/TestHoodieBulkInsertDataInternalWriter.java rename to hudi-spark-datasource/hudi-spark3.2/src/test/java/org/apache/hudi/spark3/internal/TestHoodieBulkInsertDataInternalWriter.java diff --git a/hudi-spark-datasource/hudi-spark3.2.x/src/test/java/org/apache/hudi/spark3/internal/TestHoodieDataSourceInternalBatchWrite.java b/hudi-spark-datasource/hudi-spark3.2/src/test/java/org/apache/hudi/spark3/internal/TestHoodieDataSourceInternalBatchWrite.java similarity index 100% rename from hudi-spark-datasource/hudi-spark3.2.x/src/test/java/org/apache/hudi/spark3/internal/TestHoodieDataSourceInternalBatchWrite.java rename to hudi-spark-datasource/hudi-spark3.2/src/test/java/org/apache/hudi/spark3/internal/TestHoodieDataSourceInternalBatchWrite.java diff --git a/hudi-spark-datasource/hudi-spark3.2.x/src/test/java/org/apache/hudi/spark3/internal/TestReflectUtil.java b/hudi-spark-datasource/hudi-spark3.2/src/test/java/org/apache/hudi/spark3/internal/TestReflectUtil.java similarity index 100% rename from hudi-spark-datasource/hudi-spark3.2.x/src/test/java/org/apache/hudi/spark3/internal/TestReflectUtil.java rename to hudi-spark-datasource/hudi-spark3.2/src/test/java/org/apache/hudi/spark3/internal/TestReflectUtil.java diff --git a/hudi-spark-datasource/hudi-spark3.2.x/src/test/resources/log4j-surefire-quiet.properties b/hudi-spark-datasource/hudi-spark3.2/src/test/resources/log4j-surefire-quiet.properties similarity index 100% rename from hudi-spark-datasource/hudi-spark3.2.x/src/test/resources/log4j-surefire-quiet.properties rename to hudi-spark-datasource/hudi-spark3.2/src/test/resources/log4j-surefire-quiet.properties diff --git a/hudi-spark-datasource/hudi-spark3.2.x/src/test/resources/log4j-surefire.properties b/hudi-spark-datasource/hudi-spark3.2/src/test/resources/log4j-surefire.properties similarity index 100% rename from hudi-spark-datasource/hudi-spark3.2.x/src/test/resources/log4j-surefire.properties rename to hudi-spark-datasource/hudi-spark3.2/src/test/resources/log4j-surefire.properties diff --git a/hudi-spark-datasource/hudi-spark3.3.x/pom.xml b/hudi-spark-datasource/hudi-spark3.3/pom.xml similarity index 97% rename from hudi-spark-datasource/hudi-spark3.3.x/pom.xml rename to hudi-spark-datasource/hudi-spark3.3/pom.xml index ab72c8571b100..4d891ee755fe2 100644 --- a/hudi-spark-datasource/hudi-spark3.3.x/pom.xml +++ b/hudi-spark-datasource/hudi-spark3.3/pom.xml @@ -21,10 +21,10 @@ 4.0.0 - hudi-spark3.3.x_2.12 + hudi-spark3.3_2.12 0.12.0-SNAPSHOT - hudi-spark3.3.x_2.12 + hudi-spark3.3_2.12 jar @@ -164,8 +164,8 @@ true true - ../hudi-spark3.3.x/src/main/antlr4 - ../hudi-spark3.3.x/src/main/antlr4/imports + ../hudi-spark3.3/src/main/antlr4 + ../hudi-spark3.3/src/main/antlr4/imports diff --git a/hudi-spark-datasource/hudi-spark3.3.x/src/main/antlr4/imports/SqlBase.g4 b/hudi-spark-datasource/hudi-spark3.3/src/main/antlr4/imports/SqlBase.g4 similarity index 100% rename from hudi-spark-datasource/hudi-spark3.3.x/src/main/antlr4/imports/SqlBase.g4 rename to hudi-spark-datasource/hudi-spark3.3/src/main/antlr4/imports/SqlBase.g4 diff --git a/hudi-spark-datasource/hudi-spark3.3.x/src/main/antlr4/org/apache/hudi/spark/sql/parser/HoodieSqlBase.g4 b/hudi-spark-datasource/hudi-spark3.3/src/main/antlr4/org/apache/hudi/spark/sql/parser/HoodieSqlBase.g4 similarity index 100% rename from hudi-spark-datasource/hudi-spark3.3.x/src/main/antlr4/org/apache/hudi/spark/sql/parser/HoodieSqlBase.g4 rename to hudi-spark-datasource/hudi-spark3.3/src/main/antlr4/org/apache/hudi/spark/sql/parser/HoodieSqlBase.g4 diff --git a/hudi-spark-datasource/hudi-spark3.3.x/src/main/java/org/apache/spark/sql/execution/datasources/parquet/Spark33HoodieVectorizedParquetRecordReader.java b/hudi-spark-datasource/hudi-spark3.3/src/main/java/org/apache/spark/sql/execution/datasources/parquet/Spark33HoodieVectorizedParquetRecordReader.java similarity index 100% rename from hudi-spark-datasource/hudi-spark3.3.x/src/main/java/org/apache/spark/sql/execution/datasources/parquet/Spark33HoodieVectorizedParquetRecordReader.java rename to hudi-spark-datasource/hudi-spark3.3/src/main/java/org/apache/spark/sql/execution/datasources/parquet/Spark33HoodieVectorizedParquetRecordReader.java diff --git a/hudi-spark-datasource/hudi-spark3.3.x/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister b/hudi-spark-datasource/hudi-spark3.3/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister similarity index 100% rename from hudi-spark-datasource/hudi-spark3.3.x/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister rename to hudi-spark-datasource/hudi-spark3.3/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister diff --git a/hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/hudi/Spark33HoodieFileScanRDD.scala b/hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/hudi/Spark33HoodieFileScanRDD.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/hudi/Spark33HoodieFileScanRDD.scala rename to hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/hudi/Spark33HoodieFileScanRDD.scala diff --git a/hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/hudi/Spark3DefaultSource.scala b/hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/hudi/Spark3DefaultSource.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/hudi/Spark3DefaultSource.scala rename to hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/hudi/Spark3DefaultSource.scala diff --git a/hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/HoodieSpark33CatalystExpressionUtils.scala b/hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/HoodieSpark33CatalystExpressionUtils.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/HoodieSpark33CatalystExpressionUtils.scala rename to hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/HoodieSpark33CatalystExpressionUtils.scala diff --git a/hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/HoodieSpark33CatalystPlanUtils.scala b/hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/HoodieSpark33CatalystPlanUtils.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/HoodieSpark33CatalystPlanUtils.scala rename to hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/HoodieSpark33CatalystPlanUtils.scala diff --git a/hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/adapter/Spark3_3Adapter.scala b/hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/adapter/Spark3_3Adapter.scala similarity index 98% rename from hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/adapter/Spark3_3Adapter.scala rename to hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/adapter/Spark3_3Adapter.scala index e1a97a4646b19..1cbd6be31f01e 100644 --- a/hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/adapter/Spark3_3Adapter.scala +++ b/hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/adapter/Spark3_3Adapter.scala @@ -69,7 +69,7 @@ class Spark3_3Adapter extends BaseSpark3Adapter { DeleteFromTable(deleteFromTableCommand.table, resolveExpression(deleteFromTableCommand.condition)) } - override def extractCondition(deleteFromTable: Command): Expression = { + override def extractDeleteCondition(deleteFromTable: Command): Expression = { deleteFromTable.asInstanceOf[DeleteFromTable].condition } diff --git a/hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/avro/AvroDeserializer.scala b/hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/avro/AvroDeserializer.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/avro/AvroDeserializer.scala rename to hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/avro/AvroDeserializer.scala diff --git a/hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/avro/AvroSerializer.scala b/hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/avro/AvroSerializer.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/avro/AvroSerializer.scala rename to hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/avro/AvroSerializer.scala diff --git a/hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/avro/AvroUtils.scala b/hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/avro/AvroUtils.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/avro/AvroUtils.scala rename to hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/avro/AvroUtils.scala diff --git a/hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/avro/HoodieSpark3_3AvroDeserializer.scala b/hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/avro/HoodieSpark3_3AvroDeserializer.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/avro/HoodieSpark3_3AvroDeserializer.scala rename to hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/avro/HoodieSpark3_3AvroDeserializer.scala diff --git a/hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/avro/HoodieSpark3_3AvroSerializer.scala b/hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/avro/HoodieSpark3_3AvroSerializer.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/avro/HoodieSpark3_3AvroSerializer.scala rename to hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/avro/HoodieSpark3_3AvroSerializer.scala diff --git a/hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/TimeTravelRelation.scala b/hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/TimeTravelRelation.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/TimeTravelRelation.scala rename to hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/TimeTravelRelation.scala diff --git a/hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/connector/catalog/HoodieIdentifier.scala b/hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/connector/catalog/HoodieIdentifier.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/connector/catalog/HoodieIdentifier.scala rename to hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/connector/catalog/HoodieIdentifier.scala diff --git a/hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/execution/datasources/Spark33NestedSchemaPruning.scala b/hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/execution/datasources/Spark33NestedSchemaPruning.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/execution/datasources/Spark33NestedSchemaPruning.scala rename to hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/execution/datasources/Spark33NestedSchemaPruning.scala diff --git a/hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/execution/datasources/parquet/Spark33DataSourceUtils.scala b/hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/execution/datasources/parquet/Spark33DataSourceUtils.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/execution/datasources/parquet/Spark33DataSourceUtils.scala rename to hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/execution/datasources/parquet/Spark33DataSourceUtils.scala diff --git a/hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/execution/datasources/parquet/Spark33HoodieParquetFileFormat.scala b/hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/execution/datasources/parquet/Spark33HoodieParquetFileFormat.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/execution/datasources/parquet/Spark33HoodieParquetFileFormat.scala rename to hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/execution/datasources/parquet/Spark33HoodieParquetFileFormat.scala diff --git a/hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/hudi/Spark33ResolveHudiAlterTableCommand.scala b/hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/hudi/Spark33ResolveHudiAlterTableCommand.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/hudi/Spark33ResolveHudiAlterTableCommand.scala rename to hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/hudi/Spark33ResolveHudiAlterTableCommand.scala diff --git a/hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/hudi/analysis/HoodieSpark3Analysis.scala b/hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/hudi/analysis/HoodieSpark3Analysis.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/hudi/analysis/HoodieSpark3Analysis.scala rename to hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/hudi/analysis/HoodieSpark3Analysis.scala diff --git a/hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/hudi/catalog/BasicStagedTable.scala b/hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/hudi/catalog/BasicStagedTable.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/hudi/catalog/BasicStagedTable.scala rename to hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/hudi/catalog/BasicStagedTable.scala diff --git a/hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/hudi/catalog/HoodieCatalog.scala b/hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/hudi/catalog/HoodieCatalog.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/hudi/catalog/HoodieCatalog.scala rename to hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/hudi/catalog/HoodieCatalog.scala diff --git a/hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/hudi/catalog/HoodieInternalV2Table.scala b/hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/hudi/catalog/HoodieInternalV2Table.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/hudi/catalog/HoodieInternalV2Table.scala rename to hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/hudi/catalog/HoodieInternalV2Table.scala diff --git a/hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/hudi/catalog/HoodieStagedTable.scala b/hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/hudi/catalog/HoodieStagedTable.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/hudi/catalog/HoodieStagedTable.scala rename to hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/hudi/catalog/HoodieStagedTable.scala diff --git a/hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/hudi/catalog/TableCreationMode.java b/hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/hudi/catalog/TableCreationMode.java similarity index 100% rename from hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/hudi/catalog/TableCreationMode.java rename to hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/hudi/catalog/TableCreationMode.java diff --git a/hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/hudi/command/AlterTableCommand.scala b/hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/hudi/command/AlterTableCommand.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/hudi/command/AlterTableCommand.scala rename to hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/hudi/command/AlterTableCommand.scala diff --git a/hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/parser/HoodieSpark3_3ExtendedSqlAstBuilder.scala b/hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/parser/HoodieSpark3_3ExtendedSqlAstBuilder.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/parser/HoodieSpark3_3ExtendedSqlAstBuilder.scala rename to hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/parser/HoodieSpark3_3ExtendedSqlAstBuilder.scala diff --git a/hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/parser/HoodieSpark3_3ExtendedSqlParser.scala b/hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/parser/HoodieSpark3_3ExtendedSqlParser.scala similarity index 100% rename from hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/parser/HoodieSpark3_3ExtendedSqlParser.scala rename to hudi-spark-datasource/hudi-spark3.3/src/main/scala/org/apache/spark/sql/parser/HoodieSpark3_3ExtendedSqlParser.scala diff --git a/hudi-spark-datasource/hudi-spark3.3.x/src/test/java/org/apache/hudi/spark3/internal/TestHoodieBulkInsertDataInternalWriter.java b/hudi-spark-datasource/hudi-spark3.3/src/test/java/org/apache/hudi/spark3/internal/TestHoodieBulkInsertDataInternalWriter.java similarity index 100% rename from hudi-spark-datasource/hudi-spark3.3.x/src/test/java/org/apache/hudi/spark3/internal/TestHoodieBulkInsertDataInternalWriter.java rename to hudi-spark-datasource/hudi-spark3.3/src/test/java/org/apache/hudi/spark3/internal/TestHoodieBulkInsertDataInternalWriter.java diff --git a/hudi-spark-datasource/hudi-spark3.3.x/src/test/java/org/apache/hudi/spark3/internal/TestHoodieDataSourceInternalBatchWrite.java b/hudi-spark-datasource/hudi-spark3.3/src/test/java/org/apache/hudi/spark3/internal/TestHoodieDataSourceInternalBatchWrite.java similarity index 100% rename from hudi-spark-datasource/hudi-spark3.3.x/src/test/java/org/apache/hudi/spark3/internal/TestHoodieDataSourceInternalBatchWrite.java rename to hudi-spark-datasource/hudi-spark3.3/src/test/java/org/apache/hudi/spark3/internal/TestHoodieDataSourceInternalBatchWrite.java diff --git a/hudi-spark-datasource/hudi-spark3.3.x/src/test/java/org/apache/hudi/spark3/internal/TestReflectUtil.java b/hudi-spark-datasource/hudi-spark3.3/src/test/java/org/apache/hudi/spark3/internal/TestReflectUtil.java similarity index 100% rename from hudi-spark-datasource/hudi-spark3.3.x/src/test/java/org/apache/hudi/spark3/internal/TestReflectUtil.java rename to hudi-spark-datasource/hudi-spark3.3/src/test/java/org/apache/hudi/spark3/internal/TestReflectUtil.java diff --git a/hudi-spark-datasource/hudi-spark3.3.x/src/test/resources/log4j-surefire-quiet.properties b/hudi-spark-datasource/hudi-spark3.3/src/test/resources/log4j-surefire-quiet.properties similarity index 100% rename from hudi-spark-datasource/hudi-spark3.3.x/src/test/resources/log4j-surefire-quiet.properties rename to hudi-spark-datasource/hudi-spark3.3/src/test/resources/log4j-surefire-quiet.properties diff --git a/hudi-spark-datasource/hudi-spark3.3.x/src/test/resources/log4j-surefire.properties b/hudi-spark-datasource/hudi-spark3.3/src/test/resources/log4j-surefire.properties similarity index 100% rename from hudi-spark-datasource/hudi-spark3.3.x/src/test/resources/log4j-surefire.properties rename to hudi-spark-datasource/hudi-spark3.3/src/test/resources/log4j-surefire.properties diff --git a/pom.xml b/pom.xml index 3c9fad9068a92..a31d823c03597 100644 --- a/pom.xml +++ b/pom.xml @@ -127,7 +127,7 @@ 1.14.5 1.13.6 ${flink1.13.version} - hudi-flink1.13.x + hudi-flink1.13 1.13 1.12.2 flink-runtime @@ -1674,7 +1674,7 @@ 3.3 ${scala12.version} 2.12 - hudi-spark3.3.x + hudi-spark3.3 hudi-spark3-common ${scalatest.spark3.version} ${kafka.spark3.version} @@ -1692,7 +1692,7 @@ true - hudi-spark-datasource/hudi-spark3.3.x + hudi-spark-datasource/hudi-spark3.3 hudi-spark-datasource/hudi-spark3-common @@ -1710,7 +1710,7 @@ 3.1 ${scala12.version} 2.12 - hudi-spark3.1.x + hudi-spark3.1 hudi-spark3-common ${scalatest.spark3.version} ${kafka.spark3.version} @@ -1724,7 +1724,7 @@ true - hudi-spark-datasource/hudi-spark3.1.x + hudi-spark-datasource/hudi-spark3.1 hudi-spark-datasource/hudi-spark3-common @@ -1742,7 +1742,7 @@ 3.2 ${scala12.version} 2.12 - hudi-spark3.2.x + hudi-spark3.2 hudi-spark3-common ${scalatest.spark3.version} ${kafka.spark3.version} @@ -1759,7 +1759,7 @@ true - hudi-spark-datasource/hudi-spark3.2.x + hudi-spark-datasource/hudi-spark3.2 hudi-spark-datasource/hudi-spark3-common @@ -1777,7 +1777,7 @@ 3.3 ${scala12.version} 2.12 - hudi-spark3.3.x + hudi-spark3.3 hudi-spark3-common ${scalatest.spark3.version} ${kafka.spark3.version} @@ -1795,7 +1795,7 @@ true - hudi-spark-datasource/hudi-spark3.3.x + hudi-spark-datasource/hudi-spark3.3 hudi-spark-datasource/hudi-spark3-common @@ -1818,7 +1818,7 @@ flink-connector-kafka flink-hadoop-compatibility_2.12 - hudi-flink1.15.x + hudi-flink1.15 1.15 @@ -1839,7 +1839,7 @@ flink-clients_${scala.binary.version} flink-connector-kafka_${scala.binary.version} flink-hadoop-compatibility_${scala.binary.version} - hudi-flink1.14.x + hudi-flink1.14 1.14 @@ -1866,7 +1866,7 @@ flink-clients_${scala.binary.version} flink-connector-kafka_${scala.binary.version} flink-hadoop-compatibility_${scala.binary.version} - hudi-flink1.13.x + hudi-flink1.13 1.13 true