update

Author: YannByron

.github/workflows/ci-template.yaml

@@ -36,7 +36,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        module: [ core, flink, spark, lake ]
+        module: [ core, flink, spark3, lake ]
     name: "${{ matrix.module }}"
     steps:
       - name: Checkout code

.github/workflows/stage.sh

@@ -19,7 +19,7 @@
 
 STAGE_CORE="core"
 STAGE_FLINK="flink"
-STAGE_SPARK="spark"
+STAGE_SPARK="spark3"
 STAGE_LAKE="lake"
 
 MODULES_FLINK="\
@@ -29,7 +29,7 @@ fluss-flink/fluss-flink-2.1,\
 fluss-flink/fluss-flink-1.20,\
 "
 
-MODULES_SPARK="\
+MODULES_SPARK3="\
 fluss-spark,\
 fluss-spark/fluss-spark-common,\
 fluss-spark/fluss-spark-ut,\
@@ -51,10 +51,10 @@ function get_test_modules_for_stage() {
     local stage=$1
 
     local modules_flink=$MODULES_FLINK
-    local modules_spark=$MODULES_SPARK
+    local modules_spark3=$MODULES_SPARK3
     local modules_lake=$MODULES_LAKE
     local negated_flink=\!${MODULES_FLINK//,/,\!}
-    local negated_spark=\!${MODULES_SPARK//,/,\!}
+    local negated_spark=\!${MODULES_SPARK3//,/,\!}
     local negated_lake=\!${MODULES_LAKE//,/,\!}
     local modules_core="$negated_flink,$negated_spark,$negated_lake"
 
@@ -66,7 +66,7 @@ function get_test_modules_for_stage() {
             echo "-pl fluss-test-coverage,$modules_flink"
         ;;
         (${STAGE_SPARK})
-            echo "-pl fluss-test-coverage,$modules_spark"
+            echo "-Pspark3 -pl fluss-test-coverage,$modules_spark3"
         ;;
         (${STAGE_LAKE})
             echo "-pl fluss-test-coverage,$modules_lake"

fluss-test-coverage/pom.xml

@@ -180,7 +180,7 @@
         </profile>
 
         <profile>
-            <id>test-spark</id>
+            <id>test-spark3</id>
             <build>
                 <plugins>
                     <!-- required by jacoco for the goal: check to work -->
@@ -326,6 +326,8 @@
                                         </limit>
                                     </limits>
                                     <excludes>
+                                        <exclude>org.apache.fluss.spark.*</exclude>
+                                        <exclude>org.apache.spark.sql.*</exclude>
                                         <exclude>org.apache.fluss.protogen.*</exclude>
                                         <exclude>org.apache.fluss.memory.*</exclude>
                                         <exclude>org.apache.fluss.utils.*</exclude>