Skip to content

Commit 87f9a2b

Browse files
committed
[4.1.0] Add spark.sql.unionOutputPartitioning=false to Maven test args in workflows
see apache/spark#51623
1 parent 63d0c79 commit 87f9a2b

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

.github/workflows/velox_backend_x86.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1537,7 +1537,7 @@ jobs:
15371537
export PATH=$JAVA_HOME/bin:$PATH
15381538
java -version
15391539
$MVN_CMD clean test -Pspark-4.1 -Pscala-2.13 -Pjava-17 -Pbackends-velox \
1540-
-Pspark-ut -DargLine="-Dspark.test.home=/opt/shims/spark41/spark_home/" \
1540+
-Pspark-ut -DargLine="-Dspark.test.home=/opt/shims/spark41/spark_home/ -Dspark.sql.unionOutputPartitioning=false" \
15411541
-DtagsToExclude=org.apache.spark.tags.ExtendedSQLTest,org.apache.gluten.tags.UDFTest,org.apache.gluten.tags.EnhancedFeaturesTest,org.apache.gluten.tags.SkipTest
15421542
- name: Upload test report
15431543
if: always()
@@ -1586,7 +1586,7 @@ jobs:
15861586
export PATH=$JAVA_HOME/bin:$PATH
15871587
java -version
15881588
$MVN_CMD clean test -Pspark-4.1 -Pscala-2.13 -Pjava-17 -Pbackends-velox -Pspark-ut \
1589-
-DargLine="-Dspark.test.home=/opt/shims/spark41/spark_home/" \
1589+
-DargLine="-Dspark.test.home=/opt/shims/spark41/spark_home/ -Dspark.sql.unionOutputPartitioning=false" \
15901590
-DtagsToInclude=org.apache.spark.tags.ExtendedSQLTest
15911591
- name: Upload test report
15921592
if: always()

gluten-ut/spark41/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -601,6 +601,8 @@ class VeloxTestSettings extends BackendTestSettings {
601601
enableSuite[GlutenOuterJoinSuiteForceShjOff]
602602
enableSuite[GlutenFallbackStrategiesSuite]
603603
enableSuite[GlutenBroadcastExchangeSuite]
604+
// TODO: fix on Spark-4.1 introduced by see https://github.com/apache/spark/pull/51623
605+
.exclude("SPARK-52962: broadcast exchange should not reset metrics")
604606
enableSuite[GlutenLocalBroadcastExchangeSuite]
605607
enableSuite[GlutenCoalesceShufflePartitionsSuite]
606608
// Rewrite for Gluten. Change details are in the inline comments in individual tests.
@@ -741,6 +743,8 @@ class VeloxTestSettings extends BackendTestSettings {
741743
// Result depends on the implementation for nondeterministic expression rand.
742744
// Not really an issue.
743745
.exclude("SPARK-10740: handle nondeterministic expressions correctly for set operations")
746+
// TODO: fix on Spark-4.1
747+
.excludeByPrefix("SPARK-52921") // see https://github.com/apache/spark/pull/51623
744748
enableSuite[GlutenDataFrameStatSuite]
745749
enableSuite[GlutenDataFrameSuite]
746750
// Rewrite these tests because it checks Spark's physical operators.

tools/gluten-it/common/src/main/scala/org/apache/gluten/integration/Suite.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ abstract class Suite(
6969
sessionSwitcher.addDefaultConf("spark.sql.broadcastTimeout", "1800")
7070
sessionSwitcher.addDefaultConf("spark.network.io.preferDirectBufs", "false")
7171
sessionSwitcher.addDefaultConf("spark.unsafe.exceptionOnMemoryLeak", s"$errorOnMemLeak")
72+
sessionSwitcher.addDefaultConf("spark.sql.unionOutputPartitioning", "false")
7273

7374
if (dataSource() == "delta") {
7475
sessionSwitcher.addDefaultConf(

0 commit comments

Comments
 (0)