more fixes

apache · Mar 6, 2024 · 0c9ed63 · 0c9ed63
1 parent 17d638f
commit 0c9ed63
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/.github/actions/setup-spark-builder/action.yaml b/.github/actions/setup-spark-builder/action.yaml
@@ -54,9 +54,9 @@ runs:
         path: |
           ~/.m2/repository
           /root/.m2/repository
-        key: ${{ runner.os }}-java-maven-${{ hashFiles('**/pom.xml', '!apache-spark/**/pom.xml') }}
+        key: ${{ runner.os }}-spark-sql-${{ hashFiles('spark/**/pom.xml', 'common/**/pom.xml') }}
         restore-keys: |
-          ${{ runner.os }}-java-maven-
+          ${{ runner.os }}-spark-sql-
 
     - name: Build Comet
       shell: bash

diff --git a/.github/workflows/spark_sql_test.yml b/.github/workflows/spark_sql_test.yml
@@ -65,7 +65,7 @@ jobs:
       - name: Run Spark sql/catalyst tests
         run: |
           cd apache-spark
-          ENABLE_COMET=false build/sbt catalyst/test
+          ENABLE_COMET=true build/sbt catalyst/test
 
   spark-sql-core-1:
     strategy:
@@ -94,7 +94,7 @@ jobs:
       - name: Run Spark sql/core-1 tests
         run: |
           cd apache-spark
-          ENABLE_COMET=false build/sbt sql/test -Dtest.exclude.tags=org.apache.spark.tags.ExtendedSQLTest,org.apache.spark.tags.SlowSQLTest
+          ENABLE_COMET=true build/sbt sql/test -Dtest.exclude.tags=org.apache.spark.tags.ExtendedSQLTest,org.apache.spark.tags.SlowSQLTest
 
   spark-sql-core-2:
     strategy:
@@ -123,7 +123,7 @@ jobs:
       - name: Run Spark sql/core-2 tests
         run: |
           cd apache-spark
-          ENABLE_COMET=false build/sbt "sql/testOnly *.SQLQueryTestSuite *.ExpressionsSchemaSuite *.ParquetV1FilterSuite *.ParquetV2FilterSuite *.ParquetV1SchemaPruningSuite *.ParquetV2SchemaPruningSuite org.apache.spark.sql.TPCDSQuery*"
+          ENABLE_COMET=true build/sbt "sql/testOnly *.SQLQueryTestSuite *.ExpressionsSchemaSuite *.ParquetV1FilterSuite *.ParquetV2FilterSuite *.ParquetV1SchemaPruningSuite *.ParquetV2SchemaPruningSuite org.apache.spark.sql.TPCDSQuery*"
 
   spark-sql-core-3:
     strategy:
@@ -152,7 +152,7 @@ jobs:
       - name: Run Spark sql/core-3 tests
         run: |
           cd apache-spark
-          ENABLE_COMET=false build/sbt "sql/testOnly * -- -n org.apache.spark.tags.SlowSQLTest"
+          ENABLE_COMET=true build/sbt "sql/testOnly * -- -n org.apache.spark.tags.SlowSQLTest"
 
   spark-sql-hive-1:
     strategy:
@@ -180,9 +180,10 @@ jobs:
           comet-version: '0.1.0-SNAPSHOT' # TODO: get this from pom.xml
       - name: Run Spark sql/hive-1 tests
         run: |
-          localedef -c -f UTF-8 -i en_US en_US.UTF-8
           cd apache-spark
-          ENABLE_COMET=false build/sbt hive/test -Dtest.exclude.tags=org.apache.spark.tags.ExtendedHiveTest
+          ENABLE_COMET=true build/sbt hive/test -Dtest.exclude.tags=org.apache.spark.tags.ExtendedHiveTest
+        env:
+          LC_ALL: "C.UTF-8"
 
   spark-sql-hive-2:
     strategy:
@@ -210,7 +211,7 @@ jobs:
           comet-version: '0.1.0-SNAPSHOT' # TODO: get this from pom.xml
       - name: Run Spark sql/hive-2 tests
         run: |
-          localedef -c -f UTF-8 -i en_US en_US.UTF-8
           cd apache-spark
-          ENABLE_COMET=false build/sbt "hive/testOnly *.HiveSparkSubmitSuite *.VersionsSuite *.HiveDDLSuite *.HiveCatalogedDDLSuite *.HiveSerDeSuite *.HiveQuerySuite *.SQLQuerySuite"
-
+          ENABLE_COMET=true build/sbt "hive/testOnly *.HiveSparkSubmitSuite *.VersionsSuite *.HiveDDLSuite *.HiveCatalogedDDLSuite *.HiveSerDeSuite *.HiveQuerySuite *.SQLQuerySuite"
+        env:
+          LC_ALL: "C.UTF-8"