Merge pull request #12 from apache/master

merge master
apache · Jul 8, 2022 · 424c1da · 424c1da
2 parents 25ea8db + fc8d962
commit 424c1da
Show file tree

Hide file tree

Showing 498 changed files with 25,602 additions and 5,041 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -21,12 +21,68 @@ trigger:
 pool:
   vmImage: 'ubuntu-18.04'
 
+parameters:
+  - name: job1Modules
+    type: object
+    default:
+      - 'hudi-common'
+      - 'hudi-flink-datasource/hudi-flink'
+      - 'hudi-flink-datasource/hudi-flink1.13.x'
+      - 'hudi-flink-datasource/hudi-flink1.14.x'
+  - name: job2Modules
+    type: object
+    default:
+      - 'hudi-client/hudi-spark-client'
+  - name: job3Modules
+    type: object
+    default:
+      - 'hudi-cli'
+      - 'hudi-client/hudi-client-common'
+      - 'hudi-client/hudi-flink-client'
+      - 'hudi-client/hudi-java-client'
+      - 'hudi-sync/hudi-adb-sync'
+      - 'hudi-sync/hudi-datahub-sync'
+      - 'hudi-sync/hudi-hive-sync'
+      - 'hudi-sync/hudi-sync-common'
+      - 'hudi-utilities'
+  - name: job4Modules
+    type: object
+    default:
+      - '!hudi-cli'
+      - '!hudi-client'
+      - '!hudi-client/hudi-client-common'
+      - '!hudi-client/hudi-flink-client'
+      - '!hudi-client/hudi-java-client'
+      - '!hudi-client/hudi-spark-client'
+      - '!hudi-common'
+      - '!hudi-examples'
+      - '!hudi-examples/hudi-examples-common'
+      - '!hudi-examples/hudi-examples-flink'
+      - '!hudi-examples/hudi-examples-java'
+      - '!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-sync'
+      - '!hudi-sync/hudi-adb-sync'
+      - '!hudi-sync/hudi-datahub-sync'
+      - '!hudi-sync/hudi-hive-sync'
+      - '!hudi-sync/hudi-sync-common'
+      - '!hudi-utilities'
+
 variables:
-  MAVEN_OPTS: '-Dcheckstyle.skip=true -Drat.skip=true -Djacoco.skip=true'
+  BUILD_PROFILES: '-Dscala-2.11 -Dspark2 -Dflink1.14'
+  PLUGIN_OPTS: '-Dcheckstyle.skip=true -Drat.skip=true -Djacoco.skip=true'
+  MVN_OPTS_INSTALL: '-DskipTests $(BUILD_PROFILES) $(PLUGIN_OPTS)'
+  MVN_OPTS_TEST: '-fae $(BUILD_PROFILES) $(PLUGIN_OPTS)'
   SPARK_VERSION: '2.4.4'
   HADOOP_VERSION: '2.7'
   SPARK_ARCHIVE: spark-$(SPARK_VERSION)-bin-hadoop$(HADOOP_VERSION)
-  EXCLUDE_TESTED_MODULES: '!hudi-examples/hudi-examples-common,!hudi-examples/hudi-examples-flink,!hudi-examples/hudi-examples-java,!hudi-examples/hudi-examples-spark,!hudi-common,!hudi-flink-datasource/hudi-flink,!hudi-client/hudi-spark-client,!hudi-client/hudi-client-common,!hudi-client/hudi-flink-client,!hudi-client/hudi-java-client,!hudi-cli,!hudi-utilities,!hudi-sync/hudi-hive-sync'
+  JOB1_MODULES: ${{ join(',',parameters.job1Modules) }}
+  JOB2_MODULES: ${{ join(',',parameters.job2Modules) }}
+  JOB3_MODULES: ${{ join(',',parameters.job3Modules) }}
+  JOB4_MODULES: ${{ join(',',parameters.job4Modules) }}
 
 stages:
   - stage: test
@@ -40,28 +96,27 @@ stages:
             inputs:
               mavenPomFile: 'pom.xml'
               goals: 'clean install'
-              options: -T 2.5C -DskipTests
+              options: $(MVN_OPTS_INSTALL)
               publishJUnitResults: false
               jdkVersionOption: '1.8'
-              mavenOptions: '-Xmx4g $(MAVEN_OPTS)'
           - task: Maven@3
             displayName: UT common flink client/spark-client
             inputs:
               mavenPomFile: 'pom.xml'
               goals: 'test'
-              options: -Punit-tests -pl hudi-common,hudi-flink-datasource/hudi-flink,hudi-client/hudi-spark-client
+              options: $(MVN_OPTS_TEST) -Punit-tests -pl $(JOB1_MODULES),hudi-client/hudi-spark-client
               publishJUnitResults: false
               jdkVersionOption: '1.8'
-              mavenOptions: '-Xmx4g $(MAVEN_OPTS)'
+              mavenOptions: '-Xmx4g'
           - task: Maven@3
             displayName: FT common flink
             inputs:
               mavenPomFile: 'pom.xml'
               goals: 'test'
-              options: -Pfunctional-tests -pl hudi-common,hudi-flink-datasource/hudi-flink
+              options: $(MVN_OPTS_TEST) -Pfunctional-tests -pl $(JOB1_MODULES)
               publishJUnitResults: false
               jdkVersionOption: '1.8'
-              mavenOptions: '-Xmx4g $(MAVEN_OPTS)'
+              mavenOptions: '-Xmx4g'
       - job: UT_FT_2
         displayName: FT client/spark-client
         timeoutInMinutes: '120'
@@ -71,50 +126,48 @@ stages:
             inputs:
               mavenPomFile: 'pom.xml'
               goals: 'clean install'
-              options: -T 2.5C -DskipTests
+              options: $(MVN_OPTS_INSTALL)
               publishJUnitResults: false
               jdkVersionOption: '1.8'
-              mavenOptions: '-Xmx4g $(MAVEN_OPTS)'
           - task: Maven@3
             displayName: FT client/spark-client
             inputs:
               mavenPomFile: 'pom.xml'
               goals: 'test'
-              options: -Pfunctional-tests -pl hudi-client/hudi-spark-client
+              options: $(MVN_OPTS_TEST) -Pfunctional-tests -pl $(JOB2_MODULES)
               publishJUnitResults: false
               jdkVersionOption: '1.8'
-              mavenOptions: '-Xmx4g $(MAVEN_OPTS)'
+              mavenOptions: '-Xmx4g'
       - job: UT_FT_3
-        displayName: UT FT clients & cli & utilities & sync/hive-sync
+        displayName: UT FT clients & cli & utilities & sync
         timeoutInMinutes: '120'
         steps:
           - task: Maven@3
             displayName: maven install
             inputs:
               mavenPomFile: 'pom.xml'
               goals: 'clean install'
-              options: -T 2.5C -DskipTests
+              options: $(MVN_OPTS_INSTALL)
               publishJUnitResults: false
               jdkVersionOption: '1.8'
-              mavenOptions: '-Xmx4g $(MAVEN_OPTS)'
           - task: Maven@3
-            displayName: UT clients & cli & utilities & sync/hive-sync
+            displayName: UT clients & cli & utilities & sync
             inputs:
               mavenPomFile: 'pom.xml'
               goals: 'test'
-              options: -Punit-tests -pl hudi-client/hudi-client-common,hudi-client/hudi-flink-client,hudi-client/hudi-java-client,hudi-cli,hudi-utilities,hudi-sync/hudi-hive-sync
+              options: $(MVN_OPTS_TEST) -Punit-tests -pl $(JOB3_MODULES)
               publishJUnitResults: false
               jdkVersionOption: '1.8'
-              mavenOptions: '-Xmx4g $(MAVEN_OPTS)'
+              mavenOptions: '-Xmx4g'
           - task: Maven@3
-            displayName: FT clients & cli & utilities & sync/hive-sync
+            displayName: FT clients & cli & utilities & sync
             inputs:
               mavenPomFile: 'pom.xml'
               goals: 'test'
-              options: -Pfunctional-tests -pl hudi-client/hudi-client-common,hudi-client/hudi-flink-client,hudi-client/hudi-java-client,hudi-cli,hudi-utilities,hudi-sync/hudi-hive-sync
+              options: $(MVN_OPTS_TEST) -Pfunctional-tests -pl $(JOB3_MODULES)
               publishJUnitResults: false
               jdkVersionOption: '1.8'
-              mavenOptions: '-Xmx4g $(MAVEN_OPTS)'
+              mavenOptions: '-Xmx4g'
       - job: UT_FT_4
         displayName: UT FT other modules
         timeoutInMinutes: '120'
@@ -124,28 +177,27 @@ stages:
             inputs:
               mavenPomFile: 'pom.xml'
               goals: 'clean install'
-              options: -T 2.5C -DskipTests
+              options: $(MVN_OPTS_INSTALL)
               publishJUnitResults: false
               jdkVersionOption: '1.8'
-              mavenOptions: '-Xmx4g $(MAVEN_OPTS)'
           - task: Maven@3
             displayName: UT other modules
             inputs:
               mavenPomFile: 'pom.xml'
               goals: 'test'
-              options: -Punit-tests -pl $(EXCLUDE_TESTED_MODULES)
+              options: $(MVN_OPTS_TEST) -Punit-tests -pl $(JOB4_MODULES)
               publishJUnitResults: false
               jdkVersionOption: '1.8'
-              mavenOptions: '-Xmx4g $(MAVEN_OPTS)'
+              mavenOptions: '-Xmx4g'
           - task: Maven@3
             displayName: FT other modules
             inputs:
               mavenPomFile: 'pom.xml'
               goals: 'test'
-              options: -Pfunctional-tests -pl $(EXCLUDE_TESTED_MODULES)
+              options: $(MVN_OPTS_TEST) -Pfunctional-tests -pl $(JOB4_MODULES)
               publishJUnitResults: false
               jdkVersionOption: '1.8'
-              mavenOptions: '-Xmx4g $(MAVEN_OPTS)'
+              mavenOptions: '-Xmx4g'
       - job: IT
         displayName: IT modules
         timeoutInMinutes: '120'
@@ -155,19 +207,18 @@ stages:
             inputs:
               mavenPomFile: 'pom.xml'
               goals: 'clean install'
-              options: -T 2.5C -Pintegration-tests -DskipTests
+              options: $(MVN_OPTS_INSTALL) -Pintegration-tests
               publishJUnitResults: false
               jdkVersionOption: '1.8'
-              mavenOptions: '-Xmx4g $(MAVEN_OPTS)'
           - task: Maven@3
             displayName: UT integ-test
             inputs:
               mavenPomFile: 'pom.xml'
               goals: 'test'
-              options: -Pintegration-tests -DskipUTs=false -DskipITs=true -pl hudi-integ-test test
+              options: $(MVN_OPTS_TEST) -Pintegration-tests -DskipUTs=false -DskipITs=true -pl hudi-integ-test
               publishJUnitResults: false
               jdkVersionOption: '1.8'
-              mavenOptions: '-Xmx4g $(MAVEN_OPTS)'
+              mavenOptions: '-Xmx4g'
           - task: AzureCLI@2
             displayName: Prepare for IT
             inputs:
@@ -180,5 +231,6 @@ stages:
                 tar -xvf $(Pipeline.Workspace)/$(SPARK_ARCHIVE).tgz -C $(Pipeline.Workspace)/
                 mkdir /tmp/spark-events/
           - script: |
-              mvn $(MAVEN_OPTS) -Pintegration-tests verify
+              export SPARK_HOME=$(Pipeline.Workspace)/$(SPARK_ARCHIVE)
+              mvn $(MVN_OPTS_TEST) -Pintegration-tests verify
             displayName: IT
diff --git a/doap_HUDI.rdf b/doap_HUDI.rdf
@@ -91,6 +91,11 @@
         <created>2022-04-30</created>
         <revision>0.11.0</revision>
       </Version>
+      <Version>
+        <name>Apache Hudi 0.11.1</name>
+        <created>2022-06-18</created>
+        <revision>0.11.1</revision>
+      </Version>
     </release>
     <repository>
       <GitRepository>

diff --git a/docker/demo/sparksql-incremental.commands b/docker/demo/sparksql-incremental.commands
@@ -21,7 +21,7 @@ import org.apache.hudi.DataSourceWriteOptions;
 import org.apache.spark.sql.SaveMode;
 import org.apache.hudi.config.HoodieWriteConfig;
 import org.apache.hudi.HoodieDataSourceHelpers;
-import org.apache.hudi.hive.HiveSyncConfig;
+import org.apache.hudi.hive.HiveSyncConfigHolder;
 import org.apache.hudi.sync.common.HoodieSyncConfig;
 import org.apache.hudi.hive.MultiPartKeysValueExtractor;
 import org.apache.hadoop.fs.FileSystem;
@@ -47,10 +47,10 @@ spark.sql("select key, `_hoodie_partition_path` as datestr, symbol, ts, open, cl
     option(HoodieWriteConfig.TBL_NAME.key(), "stock_ticks_derived_mor").
     option(HoodieSyncConfig.META_SYNC_TABLE_NAME.key(), "stock_ticks_derived_mor").
     option(HoodieSyncConfig.META_SYNC_DATABASE_NAME.key(), "default").
-    option(HiveSyncConfig.HIVE_URL.key(), "jdbc:hive2://hiveserver:10000").
-    option(HiveSyncConfig.HIVE_USER.key(), "hive").
-    option(HiveSyncConfig.HIVE_PASS.key(), "hive").
-    option(HiveSyncConfig.HIVE_SYNC_ENABLED.key(), "true").
+    option(HiveSyncConfigHolder.HIVE_URL.key(), "jdbc:hive2://hiveserver:10000").
+    option(HiveSyncConfigHolder.HIVE_USER.key(), "hive").
+    option(HiveSyncConfigHolder.HIVE_PASS.key(), "hive").
+    option(HiveSyncConfigHolder.HIVE_SYNC_ENABLED.key(), "true").
     option(HoodieSyncConfig.META_SYNC_PARTITION_FIELDS.key(), "datestr").
     option(HoodieSyncConfig.META_SYNC_PARTITION_EXTRACTOR_CLASS.key(), classOf[MultiPartKeysValueExtractor].getCanonicalName).
     option(DataSourceWriteOptions.URL_ENCODE_PARTITIONING.key(), "true").
@@ -79,10 +79,10 @@ spark.sql("select key, `_hoodie_partition_path` as datestr, symbol, ts, open, cl
     option(HoodieWriteConfig.TBL_NAME.key(), "stock_ticks_derived_mor_bs").
     option(HoodieSyncConfig.META_SYNC_TABLE_NAME.key(), "stock_ticks_derived_mor_bs").
     option(HoodieSyncConfig.META_SYNC_DATABASE_NAME.key(), "default").
-    option(HiveSyncConfig.HIVE_URL.key(), "jdbc:hive2://hiveserver:10000").
-    option(HiveSyncConfig.HIVE_USER.key(), "hive").
-    option(HiveSyncConfig.HIVE_PASS.key(), "hive").
-    option(HiveSyncConfig.HIVE_SYNC_ENABLED.key(), "true").
+    option(HiveSyncConfigHolder.HIVE_URL.key(), "jdbc:hive2://hiveserver:10000").
+    option(HiveSyncConfigHolder.HIVE_USER.key(), "hive").
+    option(HiveSyncConfigHolder.HIVE_PASS.key(), "hive").
+    option(HiveSyncConfigHolder.HIVE_SYNC_ENABLED.key(), "true").
     option(HoodieSyncConfig.META_SYNC_PARTITION_FIELDS.key(), "datestr").
     option(HoodieSyncConfig.META_SYNC_PARTITION_EXTRACTOR_CLASS.key(), classOf[MultiPartKeysValueExtractor].getCanonicalName).
     option(DataSourceWriteOptions.URL_ENCODE_PARTITIONING.key(), "true").

diff --git a/hudi-aws/pom.xml b/hudi-aws/pom.xml
@@ -48,8 +48,16 @@
 
         <!-- Logging -->
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
+          <groupId>org.apache.logging.log4j</groupId>
+          <artifactId>log4j-api</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.logging.log4j</groupId>
+          <artifactId>log4j-core</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.logging.log4j</groupId>
+          <artifactId>log4j-1.2-api</artifactId>
         </dependency>
 
         <!-- Hadoop -->
@@ -144,11 +152,41 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-runner</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-suite-api</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>