diff --git a/.github/workflows/run-itcase-12.yml b/.github/workflows/run-itcase-12.yml index fddcda73..fd283577 100644 --- 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 index d16d810e..b0f31c09 100644 --- 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" \ No newline at end of file diff --git a/spark-doris-connector/spark-doris-connector-it/pom.xml b/spark-doris-connector/spark-doris-connector-it/pom.xml index 1fcae06d..9797fb60 100644 --- a/spark-doris-connector/spark-doris-connector-it/pom.xml +++ b/spark-doris-connector/spark-doris-connector-it/pom.xml @@ -97,7 +97,7 @@ org.apache.doris - spark-doris-connector-spark-3.3 + spark-doris-connector-spark-${spark.major.version} ${project.version} test 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 deleted file mode 100644 index e69de29b..00000000 diff --git a/spark-load/spark-load-core/src/main/java/org/apache/doris/common/expression/V2ExpressionBuilder.scala b/spark-load/spark-load-core/src/main/java/org/apache/doris/common/expression/V2ExpressionBuilder.scala deleted file mode 100644 index e69de29b..00000000