apache · wangxianghu · Oct 2, 2020
diff --git a/.travis.yml b/.travis.yml
@@ -20,10 +20,10 @@ jdk:
   - openjdk8
 jobs:
   include:
-    - name: "Unit tests except hudi-spark-client"
-      env: MODE=unit MODULES='!hudi-client/hudi-spark-client' HUDI_QUIETER_LOGGING=1
-    - name: "Unit tests for hudi-spark-client"
-      env: MODE=unit MODULES=hudi-client/hudi-spark-client HUDI_QUIETER_LOGGING=1
+    - name: "Unit tests except hudi-client-spark"
+      env: MODE=unit MODULES='!hudi-client/hudi-client-spark' HUDI_QUIETER_LOGGING=1
+    - name: "Unit tests for hudi-client-spark"
+      env: MODE=unit MODULES=hudi-client/hudi-client-spark HUDI_QUIETER_LOGGING=1
     - name: "Functional tests"
       env: MODE=functional HUDI_QUIETER_LOGGING=1
     - name: "Integration tests"

diff --git a/hudi-cli/pom.xml b/hudi-cli/pom.xml
@@ -155,7 +155,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hudi</groupId>
-      <artifactId>hudi-spark-client</artifactId>
+      <artifactId>hudi-client-spark</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
       <type>test-jar</type>

diff --git a/hudi-client/hudi-spark-client/pom.xml → hudi-client/hudi-client-spark/pom.xml b/hudi-client/hudi-spark-client/pom.xml → hudi-client/hudi-client-spark/pom.xml
@@ -24,10 +24,10 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>hudi-spark-client</artifactId>
+  <artifactId>hudi-client-spark</artifactId>
   <version>${parent.version}</version>
 
-  <name>hudi-spark-client</name>
+  <name>hudi-client-spark</name>
   <packaging>jar</packaging>
 
   <dependencies>

diff --git a/.../hudi/async/SparkAsyncCompactService.java → .../hudi/async/SparkAsyncCompactService.java b/.../hudi/async/SparkAsyncCompactService.java → .../hudi/async/SparkAsyncCompactService.java
diff --git a/.../apache/hudi/client/HoodieReadClient.java → .../apache/hudi/client/HoodieReadClient.java b/.../apache/hudi/client/HoodieReadClient.java → .../apache/hudi/client/HoodieReadClient.java
diff --git a/...che/hudi/client/HoodieSparkCompactor.java → ...che/hudi/client/HoodieSparkCompactor.java b/...che/hudi/client/HoodieSparkCompactor.java → ...che/hudi/client/HoodieSparkCompactor.java
diff --git a/...apache/hudi/client/HoodieWriteResult.java → ...apache/hudi/client/HoodieWriteResult.java b/...apache/hudi/client/HoodieWriteResult.java → ...apache/hudi/client/HoodieWriteResult.java
diff --git a/...ache/hudi/client/SparkRDDWriteClient.java → ...ache/hudi/client/SparkRDDWriteClient.java b/...ache/hudi/client/SparkRDDWriteClient.java → ...ache/hudi/client/SparkRDDWriteClient.java
diff --git a/...hudi/client/SparkTaskContextSupplier.java → ...hudi/client/SparkTaskContextSupplier.java b/...hudi/client/SparkTaskContextSupplier.java → ...hudi/client/SparkTaskContextSupplier.java
diff --git a/...p/HoodieSparkBootstrapSchemaProvider.java → ...p/HoodieSparkBootstrapSchemaProvider.java b/...p/HoodieSparkBootstrapSchemaProvider.java → ...p/HoodieSparkBootstrapSchemaProvider.java
diff --git a/...ient/common/HoodieSparkEngineContext.java → ...ient/common/HoodieSparkEngineContext.java b/...ient/common/HoodieSparkEngineContext.java → ...ient/common/HoodieSparkEngineContext.java
diff --git a/.../hudi/client/model/HoodieInternalRow.java → .../hudi/client/model/HoodieInternalRow.java b/.../hudi/client/model/HoodieInternalRow.java → .../hudi/client/model/HoodieInternalRow.java
diff --git a/...e/hudi/client/utils/SparkMemoryUtils.java → ...e/hudi/client/utils/SparkMemoryUtils.java b/...e/hudi/client/utils/SparkMemoryUtils.java → ...e/hudi/client/utils/SparkMemoryUtils.java
diff --git a/...ecution/SparkBoundedInMemoryExecutor.java → ...ecution/SparkBoundedInMemoryExecutor.java b/...ecution/SparkBoundedInMemoryExecutor.java → ...ecution/SparkBoundedInMemoryExecutor.java
diff --git a/...di/execution/SparkLazyInsertIterable.java → ...di/execution/SparkLazyInsertIterable.java b/...di/execution/SparkLazyInsertIterable.java → ...di/execution/SparkLazyInsertIterable.java
diff --git a/...BulkInsertInternalPartitionerFactory.java → ...BulkInsertInternalPartitionerFactory.java b/...BulkInsertInternalPartitionerFactory.java → ...BulkInsertInternalPartitionerFactory.java
diff --git a/...ion/bulkinsert/BulkInsertMapFunction.java → ...ion/bulkinsert/BulkInsertMapFunction.java b/...ion/bulkinsert/BulkInsertMapFunction.java → ...ion/bulkinsert/BulkInsertMapFunction.java
diff --git a/...ion/bulkinsert/GlobalSortPartitioner.java → ...ion/bulkinsert/GlobalSortPartitioner.java b/...ion/bulkinsert/GlobalSortPartitioner.java → ...ion/bulkinsert/GlobalSortPartitioner.java
diff --git a/...cution/bulkinsert/NonSortPartitioner.java → ...cution/bulkinsert/NonSortPartitioner.java b/...cution/bulkinsert/NonSortPartitioner.java → ...cution/bulkinsert/NonSortPartitioner.java
diff --git a/...lkinsert/RDDPartitionSortPartitioner.java → ...lkinsert/RDDPartitionSortPartitioner.java b/...lkinsert/RDDPartitionSortPartitioner.java → ...lkinsert/RDDPartitionSortPartitioner.java
diff --git a/...g/apache/hudi/index/SparkHoodieIndex.java → ...g/apache/hudi/index/SparkHoodieIndex.java b/...g/apache/hudi/index/SparkHoodieIndex.java → ...g/apache/hudi/index/SparkHoodieIndex.java
diff --git a/...he/hudi/index/SparkInMemoryHashIndex.java → ...he/hudi/index/SparkInMemoryHashIndex.java b/...he/hudi/index/SparkInMemoryHashIndex.java → ...he/hudi/index/SparkInMemoryHashIndex.java
diff --git a/...loom/BucketizedBloomCheckPartitioner.java → ...loom/BucketizedBloomCheckPartitioner.java b/...loom/BucketizedBloomCheckPartitioner.java → ...loom/BucketizedBloomCheckPartitioner.java
diff --git a/.../bloom/HoodieBloomIndexCheckFunction.java → .../bloom/HoodieBloomIndexCheckFunction.java b/.../bloom/HoodieBloomIndexCheckFunction.java → .../bloom/HoodieBloomIndexCheckFunction.java
diff --git a/...di/index/bloom/SparkHoodieBloomIndex.java → ...di/index/bloom/SparkHoodieBloomIndex.java b/...di/index/bloom/SparkHoodieBloomIndex.java → ...di/index/bloom/SparkHoodieBloomIndex.java
diff --git a/...ex/bloom/SparkHoodieGlobalBloomIndex.java → ...ex/bloom/SparkHoodieGlobalBloomIndex.java b/...ex/bloom/SparkHoodieGlobalBloomIndex.java → ...ex/bloom/SparkHoodieGlobalBloomIndex.java
diff --git a/...di/index/hbase/SparkHoodieHBaseIndex.java → ...di/index/hbase/SparkHoodieHBaseIndex.java b/...di/index/hbase/SparkHoodieHBaseIndex.java → ...di/index/hbase/SparkHoodieHBaseIndex.java
diff --git a/.../simple/SparkHoodieGlobalSimpleIndex.java → .../simple/SparkHoodieGlobalSimpleIndex.java b/.../simple/SparkHoodieGlobalSimpleIndex.java → .../simple/SparkHoodieGlobalSimpleIndex.java
diff --git a/.../index/simple/SparkHoodieSimpleIndex.java → .../index/simple/SparkHoodieSimpleIndex.java b/.../index/simple/SparkHoodieSimpleIndex.java → .../index/simple/SparkHoodieSimpleIndex.java
diff --git a/...apache/hudi/io/HoodieRowCreateHandle.java → ...apache/hudi/io/HoodieRowCreateHandle.java b/...apache/hudi/io/HoodieRowCreateHandle.java → ...apache/hudi/io/HoodieRowCreateHandle.java
diff --git a/.../storage/HoodieInternalRowFileWriter.java → .../storage/HoodieInternalRowFileWriter.java b/.../storage/HoodieInternalRowFileWriter.java → .../storage/HoodieInternalRowFileWriter.java
diff --git a/...e/HoodieInternalRowFileWriterFactory.java → ...e/HoodieInternalRowFileWriterFactory.java b/...e/HoodieInternalRowFileWriterFactory.java → ...e/HoodieInternalRowFileWriterFactory.java
diff --git a/...orage/HoodieInternalRowParquetWriter.java → ...orage/HoodieInternalRowParquetWriter.java b/...orage/HoodieInternalRowParquetWriter.java → ...orage/HoodieInternalRowParquetWriter.java
diff --git a/...di/io/storage/HoodieRowParquetConfig.java → ...di/io/storage/HoodieRowParquetConfig.java b/...di/io/storage/HoodieRowParquetConfig.java → ...di/io/storage/HoodieRowParquetConfig.java
diff --git a/...storage/HoodieRowParquetWriteSupport.java → ...storage/HoodieRowParquetWriteSupport.java b/...storage/HoodieRowParquetWriteSupport.java → ...storage/HoodieRowParquetWriteSupport.java
diff --git a/...di/keygen/SparkKeyGeneratorInterface.java → ...di/keygen/SparkKeyGeneratorInterface.java b/...di/keygen/SparkKeyGeneratorInterface.java → ...di/keygen/SparkKeyGeneratorInterface.java
diff --git a/...di/table/HoodieSparkCopyOnWriteTable.java → ...di/table/HoodieSparkCopyOnWriteTable.java b/...di/table/HoodieSparkCopyOnWriteTable.java → ...di/table/HoodieSparkCopyOnWriteTable.java
diff --git a/...di/table/HoodieSparkMergeOnReadTable.java → ...di/table/HoodieSparkMergeOnReadTable.java b/...di/table/HoodieSparkMergeOnReadTable.java → ...di/table/HoodieSparkMergeOnReadTable.java
diff --git a/...g/apache/hudi/table/HoodieSparkTable.java → ...g/apache/hudi/table/HoodieSparkTable.java b/...g/apache/hudi/table/HoodieSparkTable.java → ...g/apache/hudi/table/HoodieSparkTable.java
diff --git a/...p/SparkBootstrapCommitActionExecutor.java → ...p/SparkBootstrapCommitActionExecutor.java b/...p/SparkBootstrapCommitActionExecutor.java → ...p/SparkBootstrapCommitActionExecutor.java
diff --git a/...rkBootstrapDeltaCommitActionExecutor.java → ...rkBootstrapDeltaCommitActionExecutor.java b/...rkBootstrapDeltaCommitActionExecutor.java → ...rkBootstrapDeltaCommitActionExecutor.java
diff --git a/...ction/clean/SparkCleanActionExecutor.java → ...ction/clean/SparkCleanActionExecutor.java b/...ction/clean/SparkCleanActionExecutor.java → ...ction/clean/SparkCleanActionExecutor.java
diff --git a/...commit/BaseSparkCommitActionExecutor.java → ...commit/BaseSparkCommitActionExecutor.java b/...commit/BaseSparkCommitActionExecutor.java → ...commit/BaseSparkCommitActionExecutor.java
diff --git a/.../SparkBulkInsertCommitActionExecutor.java → .../SparkBulkInsertCommitActionExecutor.java b/.../SparkBulkInsertCommitActionExecutor.java → .../SparkBulkInsertCommitActionExecutor.java
diff --git a/.../action/commit/SparkBulkInsertHelper.java → .../action/commit/SparkBulkInsertHelper.java b/.../action/commit/SparkBulkInsertHelper.java → .../action/commit/SparkBulkInsertHelper.java
diff --git a/...ulkInsertPreppedCommitActionExecutor.java → ...ulkInsertPreppedCommitActionExecutor.java b/...ulkInsertPreppedCommitActionExecutor.java → ...ulkInsertPreppedCommitActionExecutor.java
diff --git a/...mmit/SparkDeleteCommitActionExecutor.java → ...mmit/SparkDeleteCommitActionExecutor.java b/...mmit/SparkDeleteCommitActionExecutor.java → ...mmit/SparkDeleteCommitActionExecutor.java
diff --git a/...able/action/commit/SparkDeleteHelper.java → ...able/action/commit/SparkDeleteHelper.java b/...able/action/commit/SparkDeleteHelper.java → ...able/action/commit/SparkDeleteHelper.java
diff --git a/...mmit/SparkInsertCommitActionExecutor.java → ...mmit/SparkInsertCommitActionExecutor.java b/...mmit/SparkInsertCommitActionExecutor.java → ...mmit/SparkInsertCommitActionExecutor.java
diff --git a/...kInsertOverwriteCommitActionExecutor.java → ...kInsertOverwriteCommitActionExecutor.java b/...kInsertOverwriteCommitActionExecutor.java → ...kInsertOverwriteCommitActionExecutor.java
diff --git a/...mmit/SparkInsertOverwritePartitioner.java → ...mmit/SparkInsertOverwritePartitioner.java b/...mmit/SparkInsertOverwritePartitioner.java → ...mmit/SparkInsertOverwritePartitioner.java
diff --git a/...arkInsertPreppedCommitActionExecutor.java → ...arkInsertPreppedCommitActionExecutor.java b/...arkInsertPreppedCommitActionExecutor.java → ...arkInsertPreppedCommitActionExecutor.java
diff --git a/...table/action/commit/SparkMergeHelper.java → ...table/action/commit/SparkMergeHelper.java b/...table/action/commit/SparkMergeHelper.java → ...table/action/commit/SparkMergeHelper.java
diff --git a/...mmit/SparkUpsertCommitActionExecutor.java → ...mmit/SparkUpsertCommitActionExecutor.java b/...mmit/SparkUpsertCommitActionExecutor.java → ...mmit/SparkUpsertCommitActionExecutor.java
diff --git a/...arkUpsertPreppedCommitActionExecutor.java → ...arkUpsertPreppedCommitActionExecutor.java b/...arkUpsertPreppedCommitActionExecutor.java → ...arkUpsertPreppedCommitActionExecutor.java
diff --git a/...table/action/commit/SparkWriteHelper.java → ...table/action/commit/SparkWriteHelper.java b/...table/action/commit/SparkWriteHelper.java → ...table/action/commit/SparkWriteHelper.java
diff --git a/...able/action/commit/UpsertPartitioner.java → ...able/action/commit/UpsertPartitioner.java b/...able/action/commit/UpsertPartitioner.java → ...able/action/commit/UpsertPartitioner.java
diff --git a/...HoodieSparkMergeOnReadTableCompactor.java → ...HoodieSparkMergeOnReadTableCompactor.java b/...HoodieSparkMergeOnReadTableCompactor.java → ...HoodieSparkMergeOnReadTableCompactor.java
diff --git a/...e/action/compact/SparkCompactHelpers.java → ...e/action/compact/SparkCompactHelpers.java b/...e/action/compact/SparkCompactHelpers.java → ...e/action/compact/SparkCompactHelpers.java
diff --git a/...act/SparkRunCompactionActionExecutor.java → ...act/SparkRunCompactionActionExecutor.java b/...act/SparkRunCompactionActionExecutor.java → ...act/SparkRunCompactionActionExecutor.java
diff --git a/...parkScheduleCompactionActionExecutor.java → ...parkScheduleCompactionActionExecutor.java b/...parkScheduleCompactionActionExecutor.java → ...parkScheduleCompactionActionExecutor.java
diff --git a/...stractSparkDeltaCommitActionExecutor.java → ...stractSparkDeltaCommitActionExecutor.java b/...stractSparkDeltaCommitActionExecutor.java → ...stractSparkDeltaCommitActionExecutor.java
diff --git a/...kBulkInsertDeltaCommitActionExecutor.java → ...kBulkInsertDeltaCommitActionExecutor.java b/...kBulkInsertDeltaCommitActionExecutor.java → ...kBulkInsertDeltaCommitActionExecutor.java
diff --git a/...sertPreppedDeltaCommitActionExecutor.java → ...sertPreppedDeltaCommitActionExecutor.java b/...sertPreppedDeltaCommitActionExecutor.java → ...sertPreppedDeltaCommitActionExecutor.java
diff --git a/...SparkDeleteDeltaCommitActionExecutor.java → ...SparkDeleteDeltaCommitActionExecutor.java b/...SparkDeleteDeltaCommitActionExecutor.java → ...SparkDeleteDeltaCommitActionExecutor.java
diff --git a/...SparkInsertDeltaCommitActionExecutor.java → ...SparkInsertDeltaCommitActionExecutor.java b/...SparkInsertDeltaCommitActionExecutor.java → ...SparkInsertDeltaCommitActionExecutor.java
diff --git a/...sertPreppedDeltaCommitActionExecutor.java → ...sertPreppedDeltaCommitActionExecutor.java b/...sertPreppedDeltaCommitActionExecutor.java → ...sertPreppedDeltaCommitActionExecutor.java
diff --git a/...SparkUpsertDeltaCommitActionExecutor.java → ...SparkUpsertDeltaCommitActionExecutor.java b/...SparkUpsertDeltaCommitActionExecutor.java → ...SparkUpsertDeltaCommitActionExecutor.java
diff --git a/...it/SparkUpsertDeltaCommitPartitioner.java → ...it/SparkUpsertDeltaCommitPartitioner.java b/...it/SparkUpsertDeltaCommitPartitioner.java → ...it/SparkUpsertDeltaCommitPartitioner.java
diff --git a/...sertPreppedDeltaCommitActionExecutor.java → ...sertPreppedDeltaCommitActionExecutor.java b/...sertPreppedDeltaCommitActionExecutor.java → ...sertPreppedDeltaCommitActionExecutor.java
diff --git a/...parkCopyOnWriteRestoreActionExecutor.java → ...parkCopyOnWriteRestoreActionExecutor.java b/...parkCopyOnWriteRestoreActionExecutor.java → ...parkCopyOnWriteRestoreActionExecutor.java
diff --git a/...parkMergeOnReadRestoreActionExecutor.java → ...parkMergeOnReadRestoreActionExecutor.java b/...parkMergeOnReadRestoreActionExecutor.java → ...parkMergeOnReadRestoreActionExecutor.java
diff --git a/.../rollback/ListingBasedRollbackHelper.java → .../rollback/ListingBasedRollbackHelper.java b/.../rollback/ListingBasedRollbackHelper.java → .../rollback/ListingBasedRollbackHelper.java
diff --git a/...arkCopyOnWriteRollbackActionExecutor.java → ...arkCopyOnWriteRollbackActionExecutor.java b/...arkCopyOnWriteRollbackActionExecutor.java → ...arkCopyOnWriteRollbackActionExecutor.java
diff --git a/...ack/SparkMarkerBasedRollbackStrategy.java → ...ack/SparkMarkerBasedRollbackStrategy.java b/...ack/SparkMarkerBasedRollbackStrategy.java → ...ack/SparkMarkerBasedRollbackStrategy.java
diff --git a/...arkMergeOnReadRollbackActionExecutor.java → ...arkMergeOnReadRollbackActionExecutor.java b/...arkMergeOnReadRollbackActionExecutor.java → ...arkMergeOnReadRollbackActionExecutor.java
diff --git a/...le/upgrade/OneToZeroDowngradeHandler.java → ...le/upgrade/OneToZeroDowngradeHandler.java b/...le/upgrade/OneToZeroDowngradeHandler.java → ...le/upgrade/OneToZeroDowngradeHandler.java
diff --git a/.../table/upgrade/SparkUpgradeDowngrade.java → .../table/upgrade/SparkUpgradeDowngrade.java b/.../table/upgrade/SparkUpgradeDowngrade.java → .../table/upgrade/SparkUpgradeDowngrade.java
diff --git a/...able/upgrade/ZeroToOneUpgradeHandler.java → ...able/upgrade/ZeroToOneUpgradeHandler.java b/...able/upgrade/ZeroToOneUpgradeHandler.java → ...able/upgrade/ZeroToOneUpgradeHandler.java
diff --git a/...lient/src/main/resources/log4j.properties → ...spark/src/main/resources/log4j.properties b/...lient/src/main/resources/log4j.properties → ...spark/src/main/resources/log4j.properties
diff --git a/...pache/hudi/client/TestClientRollback.java → ...pache/hudi/client/TestClientRollback.java b/...pache/hudi/client/TestClientRollback.java → ...pache/hudi/client/TestClientRollback.java
diff --git a/...udi/client/TestCompactionAdminClient.java → ...udi/client/TestCompactionAdminClient.java b/...udi/client/TestCompactionAdminClient.java → ...udi/client/TestCompactionAdminClient.java
diff --git a/...TestHoodieClientOnCopyOnWriteStorage.java → ...TestHoodieClientOnCopyOnWriteStorage.java b/...TestHoodieClientOnCopyOnWriteStorage.java → ...TestHoodieClientOnCopyOnWriteStorage.java
diff --git a/...client/TestHoodieInternalWriteStatus.java → ...client/TestHoodieInternalWriteStatus.java b/...client/TestHoodieInternalWriteStatus.java → ...client/TestHoodieInternalWriteStatus.java
diff --git a/...che/hudi/client/TestHoodieReadClient.java → ...che/hudi/client/TestHoodieReadClient.java b/...che/hudi/client/TestHoodieReadClient.java → ...che/hudi/client/TestHoodieReadClient.java
diff --git a/...a/org/apache/hudi/client/TestMultiFS.java → ...a/org/apache/hudi/client/TestMultiFS.java b/...a/org/apache/hudi/client/TestMultiFS.java → ...a/org/apache/hudi/client/TestMultiFS.java
diff --git a/...hudi/client/TestTableSchemaEvolution.java → ...hudi/client/TestTableSchemaEvolution.java b/...hudi/client/TestTableSchemaEvolution.java → ...hudi/client/TestTableSchemaEvolution.java
diff --git a/...udi/client/TestUpdateSchemaEvolution.java → ...udi/client/TestUpdateSchemaEvolution.java b/...udi/client/TestUpdateSchemaEvolution.java → ...udi/client/TestUpdateSchemaEvolution.java
diff --git a/...g/apache/hudi/client/TestWriteStatus.java → ...g/apache/hudi/client/TestWriteStatus.java b/...g/apache/hudi/client/TestWriteStatus.java → ...g/apache/hudi/client/TestWriteStatus.java
diff --git a/...strap/TestBootstrapRegexModeSelector.java → ...strap/TestBootstrapRegexModeSelector.java b/...strap/TestBootstrapRegexModeSelector.java → ...strap/TestBootstrapRegexModeSelector.java
diff --git a/...rap/TestUniformBootstrapModeSelector.java → ...rap/TestUniformBootstrapModeSelector.java b/...rap/TestUniformBootstrapModeSelector.java → ...rap/TestUniformBootstrapModeSelector.java
diff --git a/...i/client/model/TestHoodieInternalRow.java → ...i/client/model/TestHoodieInternalRow.java b/...i/client/model/TestHoodieInternalRow.java → ...i/client/model/TestHoodieInternalRow.java
diff --git a/...i/execution/TestBoundedInMemoryQueue.java → ...i/execution/TestBoundedInMemoryQueue.java b/...i/execution/TestBoundedInMemoryQueue.java → ...i/execution/TestBoundedInMemoryQueue.java
diff --git a/...ion/TestSparkBoundedInMemoryExecutor.java → ...ion/TestSparkBoundedInMemoryExecutor.java b/...ion/TestSparkBoundedInMemoryExecutor.java → ...ion/TestSparkBoundedInMemoryExecutor.java
diff --git a/...rt/TestBulkInsertInternalPartitioner.java → ...rt/TestBulkInsertInternalPartitioner.java b/...rt/TestBulkInsertInternalPartitioner.java → ...rt/TestBulkInsertInternalPartitioner.java
diff --git a/...rg/apache/hudi/index/TestHoodieIndex.java → ...rg/apache/hudi/index/TestHoodieIndex.java b/...rg/apache/hudi/index/TestHoodieIndex.java → ...rg/apache/hudi/index/TestHoodieIndex.java
diff --git a/...he/hudi/index/TestHoodieIndexConfigs.java → ...he/hudi/index/TestHoodieIndexConfigs.java b/...he/hudi/index/TestHoodieIndexConfigs.java → ...he/hudi/index/TestHoodieIndexConfigs.java
diff --git a/.../TestBucketizedBloomCheckPartitioner.java → .../TestBucketizedBloomCheckPartitioner.java b/.../TestBucketizedBloomCheckPartitioner.java → .../TestBucketizedBloomCheckPartitioner.java
diff --git a/...udi/index/bloom/TestHoodieBloomIndex.java → ...udi/index/bloom/TestHoodieBloomIndex.java b/...udi/index/bloom/TestHoodieBloomIndex.java → ...udi/index/bloom/TestHoodieBloomIndex.java
diff --git a/...dex/bloom/TestHoodieGlobalBloomIndex.java → ...dex/bloom/TestHoodieGlobalBloomIndex.java b/...dex/bloom/TestHoodieGlobalBloomIndex.java → ...dex/bloom/TestHoodieGlobalBloomIndex.java
diff --git a/...i/index/bloom/TestKeyRangeLookupTree.java → ...i/index/bloom/TestKeyRangeLookupTree.java b/...i/index/bloom/TestKeyRangeLookupTree.java → ...i/index/bloom/TestKeyRangeLookupTree.java
diff --git a/...ache/hudi/index/hbase/TestHBaseIndex.java → ...ache/hudi/index/hbase/TestHBaseIndex.java b/...ache/hudi/index/hbase/TestHBaseIndex.java → ...ache/hudi/index/hbase/TestHBaseIndex.java
diff --git a/...hudi/index/hbase/TestHBaseIndexUsage.java → ...hudi/index/hbase/TestHBaseIndexUsage.java b/...hudi/index/hbase/TestHBaseIndexUsage.java → ...hudi/index/hbase/TestHBaseIndexUsage.java
diff --git a/...base/TestHBasePutBatchSizeCalculator.java → ...base/TestHBasePutBatchSizeCalculator.java b/...base/TestHBasePutBatchSizeCalculator.java → ...base/TestHBasePutBatchSizeCalculator.java
diff --git a/.../hbase/TestHBaseQPSResourceAllocator.java → .../hbase/TestHBaseQPSResourceAllocator.java b/.../hbase/TestHBaseQPSResourceAllocator.java → .../hbase/TestHBaseQPSResourceAllocator.java
diff --git a/.../io/TestHoodieKeyLocationFetchHandle.java → .../io/TestHoodieKeyLocationFetchHandle.java b/.../io/TestHoodieKeyLocationFetchHandle.java → .../io/TestHoodieKeyLocationFetchHandle.java
diff --git a/...apache/hudi/io/TestHoodieMergeHandle.java → ...apache/hudi/io/TestHoodieMergeHandle.java b/...apache/hudi/io/TestHoodieMergeHandle.java → ...apache/hudi/io/TestHoodieMergeHandle.java
diff --git a/...he/hudi/io/TestHoodieRowCreateHandle.java → ...he/hudi/io/TestHoodieRowCreateHandle.java b/...he/hudi/io/TestHoodieRowCreateHandle.java → ...he/hudi/io/TestHoodieRowCreateHandle.java
diff --git a/...hudi/io/TestHoodieTimelineArchiveLog.java → ...hudi/io/TestHoodieTimelineArchiveLog.java b/...hudi/io/TestHoodieTimelineArchiveLog.java → ...hudi/io/TestHoodieTimelineArchiveLog.java
diff --git a/.../org/apache/hudi/io/TestSparkIOUtils.java → .../org/apache/hudi/io/TestSparkIOUtils.java b/.../org/apache/hudi/io/TestSparkIOUtils.java → .../org/apache/hudi/io/TestSparkIOUtils.java
diff --git a/.../storage/TestHoodieFileWriterFactory.java → .../storage/TestHoodieFileWriterFactory.java b/.../storage/TestHoodieFileWriterFactory.java → .../storage/TestHoodieFileWriterFactory.java
diff --git a/...e/TestHoodieInternalRowParquetWriter.java → ...e/TestHoodieInternalRowParquetWriter.java b/...e/TestHoodieInternalRowParquetWriter.java → ...e/TestHoodieInternalRowParquetWriter.java
diff --git a/...va/org/apache/hudi/table/TestCleaner.java → ...va/org/apache/hudi/table/TestCleaner.java b/...va/org/apache/hudi/table/TestCleaner.java → ...va/org/apache/hudi/table/TestCleaner.java
diff --git a/...ache/hudi/table/TestConsistencyGuard.java → ...ache/hudi/table/TestConsistencyGuard.java b/...ache/hudi/table/TestConsistencyGuard.java → ...ache/hudi/table/TestConsistencyGuard.java
diff --git a/...udi/table/TestHoodieMergeOnReadTable.java → ...udi/table/TestHoodieMergeOnReadTable.java b/...udi/table/TestHoodieMergeOnReadTable.java → ...udi/table/TestHoodieMergeOnReadTable.java
diff --git a/...rg/apache/hudi/table/TestMarkerFiles.java → ...rg/apache/hudi/table/TestMarkerFiles.java b/...rg/apache/hudi/table/TestMarkerFiles.java → ...rg/apache/hudi/table/TestMarkerFiles.java
diff --git a/.../action/bootstrap/TestBootstrapUtils.java → .../action/bootstrap/TestBootstrapUtils.java b/.../action/bootstrap/TestBootstrapUtils.java → .../action/bootstrap/TestBootstrapUtils.java
diff --git a/...commit/TestCopyOnWriteActionExecutor.java → ...commit/TestCopyOnWriteActionExecutor.java b/...commit/TestCopyOnWriteActionExecutor.java → ...commit/TestCopyOnWriteActionExecutor.java
diff --git a/...table/action/commit/TestDeleteHelper.java → ...table/action/commit/TestDeleteHelper.java b/...table/action/commit/TestDeleteHelper.java → ...table/action/commit/TestDeleteHelper.java
diff --git a/.../action/commit/TestUpsertPartitioner.java → .../action/commit/TestUpsertPartitioner.java b/.../action/commit/TestUpsertPartitioner.java → .../action/commit/TestUpsertPartitioner.java
diff --git a/...le/action/compact/CompactionTestBase.java → ...le/action/compact/CompactionTestBase.java b/...le/action/compact/CompactionTestBase.java → ...le/action/compact/CompactionTestBase.java
diff --git a/...e/action/compact/TestAsyncCompaction.java → ...e/action/compact/TestAsyncCompaction.java b/...e/action/compact/TestAsyncCompaction.java → ...e/action/compact/TestAsyncCompaction.java
diff --git a/...e/action/compact/TestHoodieCompactor.java → ...e/action/compact/TestHoodieCompactor.java b/...e/action/compact/TestHoodieCompactor.java → ...e/action/compact/TestHoodieCompactor.java
diff --git a/.../action/compact/TestInlineCompaction.java → .../action/compact/TestInlineCompaction.java b/.../action/compact/TestInlineCompaction.java → .../action/compact/TestInlineCompaction.java
diff --git a/...trategy/TestHoodieCompactionStrategy.java → ...trategy/TestHoodieCompactionStrategy.java b/...trategy/TestHoodieCompactionStrategy.java → ...trategy/TestHoodieCompactionStrategy.java
diff --git a/...ollback/HoodieClientRollbackTestBase.java → ...ollback/HoodieClientRollbackTestBase.java b/...ollback/HoodieClientRollbackTestBase.java → ...ollback/HoodieClientRollbackTestBase.java
diff --git a/...estCopyOnWriteRollbackActionExecutor.java → ...estCopyOnWriteRollbackActionExecutor.java b/...estCopyOnWriteRollbackActionExecutor.java → ...estCopyOnWriteRollbackActionExecutor.java
diff --git a/...back/TestMarkerBasedRollbackStrategy.java → ...back/TestMarkerBasedRollbackStrategy.java b/...back/TestMarkerBasedRollbackStrategy.java → ...back/TestMarkerBasedRollbackStrategy.java
diff --git a/...estMergeOnReadRollbackActionExecutor.java → ...estMergeOnReadRollbackActionExecutor.java b/...estMergeOnReadRollbackActionExecutor.java → ...estMergeOnReadRollbackActionExecutor.java
diff --git a/...le/action/rollback/TestRollbackUtils.java → ...le/action/rollback/TestRollbackUtils.java b/...le/action/rollback/TestRollbackUtils.java → ...le/action/rollback/TestRollbackUtils.java
diff --git a/...i/table/upgrade/TestUpgradeDowngrade.java → ...i/table/upgrade/TestUpgradeDowngrade.java b/...i/table/upgrade/TestUpgradeDowngrade.java → ...i/table/upgrade/TestUpgradeDowngrade.java
diff --git a/...org/apache/hudi/testutils/Assertions.java → ...org/apache/hudi/testutils/Assertions.java b/...org/apache/hudi/testutils/Assertions.java → ...org/apache/hudi/testutils/Assertions.java
diff --git a/...hudi/testutils/FunctionalTestHarness.java → ...hudi/testutils/FunctionalTestHarness.java b/...hudi/testutils/FunctionalTestHarness.java → ...hudi/testutils/FunctionalTestHarness.java
diff --git a/.../hudi/testutils/HoodieClientTestBase.java → .../hudi/testutils/HoodieClientTestBase.java b/.../hudi/testutils/HoodieClientTestBase.java → .../hudi/testutils/HoodieClientTestBase.java
diff --git a/...di/testutils/HoodieClientTestHarness.java → ...di/testutils/HoodieClientTestHarness.java b/...di/testutils/HoodieClientTestHarness.java → ...di/testutils/HoodieClientTestHarness.java
diff --git a/...hudi/testutils/HoodieClientTestUtils.java → ...hudi/testutils/HoodieClientTestUtils.java b/...hudi/testutils/HoodieClientTestUtils.java → ...hudi/testutils/HoodieClientTestUtils.java
diff --git a/...testutils/HoodieMergeOnReadTestUtils.java → ...testutils/HoodieMergeOnReadTestUtils.java b/...testutils/HoodieMergeOnReadTestUtils.java → ...testutils/HoodieMergeOnReadTestUtils.java
diff --git a/...i/testutils/HoodieWriteableTestTable.java → ...i/testutils/HoodieWriteableTestTable.java b/...i/testutils/HoodieWriteableTestTable.java → ...i/testutils/HoodieWriteableTestTable.java
diff --git a/...i/testutils/MetadataMergeWriteStatus.java → ...i/testutils/MetadataMergeWriteStatus.java b/...i/testutils/MetadataMergeWriteStatus.java → ...i/testutils/MetadataMergeWriteStatus.java
diff --git a/...hudi/testutils/SparkDatasetTestUtils.java → ...hudi/testutils/SparkDatasetTestUtils.java b/...hudi/testutils/SparkDatasetTestUtils.java → ...hudi/testutils/SparkDatasetTestUtils.java
diff --git a/...di/testutils/providers/SparkProvider.java → ...di/testutils/providers/SparkProvider.java b/...di/testutils/providers/SparkProvider.java → ...di/testutils/providers/SparkProvider.java
diff --git a/...resources/log4j-surefire-quiet.properties → ...resources/log4j-surefire-quiet.properties b/...resources/log4j-surefire-quiet.properties → ...resources/log4j-surefire-quiet.properties
diff --git a/.../test/resources/log4j-surefire.properties → .../test/resources/log4j-surefire.properties b/.../test/resources/log4j-surefire.properties → .../test/resources/log4j-surefire.properties
diff --git a/...est/resources/testDataGeneratorSchema.txt → ...est/resources/testDataGeneratorSchema.txt b/...est/resources/testDataGeneratorSchema.txt → ...est/resources/testDataGeneratorSchema.txt
diff --git a/hudi-client/pom.xml b/hudi-client/pom.xml
@@ -32,6 +32,6 @@
 
   <modules>
     <module>hudi-client-common</module>
-    <module>hudi-spark-client</module>
+    <module>hudi-client-spark</module>
   </modules>
 </project>
diff --git a/hudi-examples/pom.xml b/hudi-examples/pom.xml
@@ -135,7 +135,7 @@
 
     <dependency>
       <groupId>org.apache.hudi</groupId>
-      <artifactId>hudi-spark-client</artifactId>
+      <artifactId>hudi-client-spark</artifactId>
       <version>${project.version}</version>
     </dependency>
 

diff --git a/hudi-integ-test/pom.xml b/hudi-integ-test/pom.xml
@@ -197,7 +197,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hudi</groupId>
-      <artifactId>hudi-spark-client</artifactId>
+      <artifactId>hudi-client-spark</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
     </dependency>

diff --git a/hudi-spark/pom.xml b/hudi-spark/pom.xml
@@ -173,7 +173,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hudi</groupId>
-      <artifactId>hudi-spark-client</artifactId>
+      <artifactId>hudi-client-spark</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
@@ -353,7 +353,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hudi</groupId>
-      <artifactId>hudi-spark-client</artifactId>
+      <artifactId>hudi-client-spark</artifactId>
       <version>${project.version}</version>
       <classifier>tests</classifier>
       <type>test-jar</type>

diff --git a/hudi-utilities/pom.xml b/hudi-utilities/pom.xml
@@ -99,7 +99,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hudi</groupId>
-      <artifactId>hudi-spark-client</artifactId>
+      <artifactId>hudi-client-spark</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
@@ -360,7 +360,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hudi</groupId>
-      <artifactId>hudi-spark-client</artifactId>
+      <artifactId>hudi-client-spark</artifactId>
       <version>${project.version}</version>
       <classifier>tests</classifier>
       <type>test-jar</type>

diff --git a/packaging/hudi-integ-test-bundle/pom.xml b/packaging/hudi-integ-test-bundle/pom.xml
@@ -70,7 +70,7 @@
 
                   <include>org.apache.hudi:hudi-common</include>
                   <include>org.apache.hudi:hudi-client-common</include>
-                  <include>org.apache.hudi:hudi-spark-client</include>
+                  <include>org.apache.hudi:hudi-client-spark</include>
                   <include>org.apache.hudi:hudi-utilities_${scala.binary.version}</include>
                   <include>org.apache.hudi:hudi-spark_${scala.binary.version}</include>
                   <include>org.apache.hudi:hudi-hive-sync</include>
@@ -437,7 +437,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hudi</groupId>
-      <artifactId>hudi-spark-client</artifactId>
+      <artifactId>hudi-client-spark</artifactId>
       <version>${project.version}</version>
     </dependency>
 
@@ -464,7 +464,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hudi</groupId>
-      <artifactId>hudi-spark-client</artifactId>
+      <artifactId>hudi-client-spark</artifactId>
       <version>${project.version}</version>
       <classifier>tests</classifier>
       <type>test-jar</type>

diff --git a/packaging/hudi-spark-bundle/pom.xml b/packaging/hudi-spark-bundle/pom.xml
@@ -66,7 +66,7 @@
                   <include>com.yammer.metrics:metrics-core</include>
                   <include>org.apache.hudi:hudi-common</include>
                   <include>org.apache.hudi:hudi-client-common</include>
-                  <include>org.apache.hudi:hudi-spark-client</include>
+                  <include>org.apache.hudi:hudi-client-spark</include>
                   <include>org.apache.hudi:hudi-spark_${scala.binary.version}</include>
                   <include>org.apache.hudi:hudi-hive-sync</include>
                   <include>org.apache.hudi:hudi-sync-common</include>
@@ -215,7 +215,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hudi</groupId>
-      <artifactId>hudi-spark-client</artifactId>
+      <artifactId>hudi-client-spark</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>

diff --git a/packaging/hudi-utilities-bundle/pom.xml b/packaging/hudi-utilities-bundle/pom.xml
@@ -67,7 +67,7 @@
                 <includes>
                   <include>org.apache.hudi:hudi-common</include>
                   <include>org.apache.hudi:hudi-client-common</include>
-                  <include>org.apache.hudi:hudi-spark-client</include>
+                  <include>org.apache.hudi:hudi-client-spark</include>
                   <include>org.apache.hudi:hudi-utilities_${scala.binary.version}</include>
                   <include>org.apache.hudi:hudi-spark_${scala.binary.version}</include>
                   <include>org.apache.hudi:hudi-hive-sync</include>
@@ -217,7 +217,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hudi</groupId>
-      <artifactId>hudi-spark-client</artifactId>
+      <artifactId>hudi-client-spark</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>