fix

Author: JingsongLi

.github/workflows/utitcase-spark-4.x.yml

@@ -25,28 +25,24 @@ on:
       - 'docs/**'
       - '**/*.md'
 
-env:
-  JDK_VERSION: 8
-
 concurrency:
   group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.number || github.run_id }}
   cancel-in-progress: true
 
 jobs:
-  build:
+  Spark 3.x:
     runs-on: ubuntu-latest
-
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-      - name: Set up JDK ${{ env.JDK_VERSION }}
+      - name: Set up JDK 8
         uses: actions/setup-java@v4
         with:
-          java-version: ${{ env.JDK_VERSION }}
+          java-version: 8
           distribution: 'temurin'
-      - name: Build Spark
+      - name: Build Spark 3.x
         run:  mvn -T 2C -B clean install -DskipTests
-      - name: Test Spark
+      - name: Test Spark 3.x
         timeout-minutes: 60
         run: |
           # run tests with random timezone to find out timezone related bugs
@@ -60,4 +56,32 @@ jobs:
           test_modules="${test_modules%,}"
           mvn -T 2C -B test -pl "${test_modules}" -Duser.timezone=$jvm_timezone
         env:
-          MAVEN_OPTS: -Xmx4096m
+          MAVEN_OPTS: -Xmx4096m
+  Spark 4.x:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: 17
+          distribution: 'temurin'
+      - name: Build Spark 4.x
+        run:  mvn -T 2C -B clean install -DskipTests -Pspark4
+      - name: Test Spark 4.x
+        timeout-minutes: 60
+        run: |
+          # run tests with random timezone to find out timezone related bugs
+          . .github/workflows/utils.sh
+          jvm_timezone=$(random_timezone)
+          echo "JVM timezone is set to $jvm_timezone"
+          test_modules=""
+          for suffix in ut 4.0; do
+          test_modules+="org.apache.paimon:paimon-spark-${suffix},"
+          done
+          test_modules="${test_modules%,}"
+          mvn -T 2C -B test -pl "${test_modules}" -Duser.timezone=$jvm_timezone -Pspark4
+        env:
+          MAVEN_OPTS: -Xmx4096m

.github/workflows/utitcase-spark-3.x.yml .github/workflows/utitcase-spark.yml.github/workflows/utitcase-spark-3.x.yml renamed to .github/workflows/utitcase-spark.yml

@@ -64,15 +64,13 @@ class PaimonHiveTestBase extends PaimonSparkTestBase {
     super.beforeAll()
     spark.sql(s"USE $sparkCatalogName")
     spark.sql(s"CREATE DATABASE IF NOT EXISTS $hiveDbName")
-    println(s"CREATE DATABASE IF NOT EXISTS $hiveDbName")
   }
 
   override protected def afterAll(): Unit = {
     try {
       spark.sql(s"USE $sparkCatalogName")
       spark.sql("USE default")
       spark.sql(s"DROP DATABASE $hiveDbName CASCADE")
-      println(s"DROP DATABASE $hiveDbName CASCADE")
     } finally {
       super.afterAll()
       testHiveMetastore.stop()