change spark 3 it case dependency module with spark version variable …

…and add workflow
apache · Dec 31, 2024 · 8c4dd46 · 8c4dd46
1 parent f3663c2
commit 8c4dd46
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/.github/workflows/run-itcase-12.yml b/.github/workflows/run-itcase-12.yml
@@ -42,6 +42,10 @@ jobs:
       run: |
         cd spark-doris-connector && mvn clean test -Pspark-2-it,spark-2.4_2.11 -pl spark-doris-connector-it -am -DfailIfNoTests=false -Dtest="*ITCase" -Dimage="adamlee489/doris:1.2.7.1_x86"
 
-    - name: Run ITCases for spark 3
+    - name: Run ITCases for spark 3.1
       run: |
         cd spark-doris-connector && mvn clean test -Pspark-3-it,spark-3.1 -pl spark-doris-connector-it -am -DfailIfNoTests=false -Dtest="*ITCase" -Dimage="adamlee489/doris:1.2.7.1_x86"
+
+    - name: Run ITCases for spark 3.3
+      run: |
+        cd spark-doris-connector && mvn clean test -Pspark-3-it,spark-3.3 -pl spark-doris-connector-it -am -DfailIfNoTests=false -Dtest="*ITCase" -Dimage="adamlee489/doris:1.2.7.1_x86"
diff --git a/.github/workflows/run-itcase-20.yml b/.github/workflows/run-itcase-20.yml
@@ -42,7 +42,11 @@ jobs:
       run: |
         cd spark-doris-connector && mvn clean test -Pspark-2-it,spark-2.4_2.11 -pl spark-doris-connector-it -am -DfailIfNoTests=false -Dtest="*ITCase" -Dimage="adamlee489/doris:2.0.3"
 
-    - name: Run ITCases for spark 3
+    - name: Run ITCases for spark 3.1
       run: |
         cd spark-doris-connector && mvn clean test -Pspark-3-it,spark-3.1 -pl spark-doris-connector-it -am -DfailIfNoTests=false -Dtest="*ITCase" -Dimage="adamlee489/doris:2.0.3"
+
+    - name: Run ITCases for spark 3.3
+      run: |
+        cd spark-doris-connector && mvn clean test -Pspark-3-it,spark-3.3 -pl spark-doris-connector-it -am -DfailIfNoTests=false -Dtest="*ITCase" -Dimage="adamlee489/doris:2.0.3"
     
diff --git a/spark-doris-connector/spark-doris-connector-it/pom.xml b/spark-doris-connector/spark-doris-connector-it/pom.xml
@@ -97,7 +97,7 @@
             <dependencies>
                 <dependency>
                     <groupId>org.apache.doris</groupId>
-                    <artifactId>spark-doris-connector-spark-3.3</artifactId>
+                    <artifactId>spark-doris-connector-spark-${spark.major.version}</artifactId>
                     <version>${project.version}</version>
                     <scope>test</scope>
                 </dependency>

diff --git a/spark-load/spark-load-core/src/main/java/org/apache/doris/common/DorisScanV2.scala b/spark-load/spark-load-core/src/main/java/org/apache/doris/common/DorisScanV2.scala
diff --git a/...park-load-core/src/main/java/org/apache/doris/common/expression/V2ExpressionBuilder.scala b/...park-load-core/src/main/java/org/apache/doris/common/expression/V2ExpressionBuilder.scala