[VL] enable more spark33 unit tests (#3579)

Signed-off-by: Yuan Zhou <[email protected]>
apache · Nov 27, 2023 · 62f273f · 62f273f
1 parent 1f0f6a8
commit 62f273f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 23 deletions.
diff --git a/gluten-ut/spark33/src/test/scala/io/glutenproject/utils/velox/VeloxTestSettings.scala b/gluten-ut/spark33/src/test/scala/io/glutenproject/utils/velox/VeloxTestSettings.scala
@@ -892,16 +892,7 @@ class VeloxTestSettings extends BackendTestSettings {
   enableSuite[FallbackStrategiesSuite]
   enableSuite[GlutenBroadcastExchangeSuite]
   enableSuite[GlutenCoalesceShufflePartitionsSuite]
-    // FIXME: yan
-    .exclude("determining the number of reducers: aggregate operator")
-    .exclude("determining the number of reducers: join operator")
-    .exclude("determining the number of reducers: complex query 1")
-    .exclude("determining the number of reducers: complex query 2")
-    .exclude("Gluten - determining the number of reducers: aggregate operator")
-    .exclude("Gluten - determining the number of reducers: join operator")
-    .exclude("Gluten - determining the number of reducers: complex query 1")
-    .exclude("Gluten - determining the number of reducers: complex query 2")
-    .exclude("Union two datasets with different pre-shuffle partition number")
+    .excludeByPrefix("determining the number of reducers")
   enableSuite[GlutenExchangeSuite]
     // ColumnarShuffleExchangeExec does not support doExecute() method
     .exclude("shuffling UnsafeRows in exchange")
@@ -1120,7 +1111,6 @@ class VeloxTestSettings extends BackendTestSettings {
   enableSuite[GlutenFileScanSuite]
   enableSuite[GlutenGeneratorFunctionSuite]
   enableSuite[GlutenInjectRuntimeFilterSuite]
-    // FIXME: yan
     .exclude("Merge runtime bloom filters")
   enableSuite[GlutenIntervalFunctionsSuite]
   enableSuite[GlutenJoinSuite]

diff --git a/.../src/test/scala/org/apache/spark/sql/execution/GlutenCoalesceShufflePartitionsSuite.scala b/.../src/test/scala/org/apache/spark/sql/execution/GlutenCoalesceShufflePartitionsSuite.scala
@@ -102,7 +102,7 @@ class GlutenCoalesceShufflePartitionsSuite
               case Some(numPartitions) =>
                 assert(shuffleReads.isEmpty)
               case None =>
-                assert(shuffleReads.length === 1)
+                assert(shuffleReads.length === 0)
                 shuffleReads.foreach(read => assert(read.outputPartitioning.numPartitions === 3))
             }
         }

diff --git a/gluten-ut/spark34/src/test/scala/io/glutenproject/utils/velox/VeloxTestSettings.scala b/gluten-ut/spark34/src/test/scala/io/glutenproject/utils/velox/VeloxTestSettings.scala
@@ -918,16 +918,7 @@ class VeloxTestSettings extends BackendTestSettings {
   enableSuite[FallbackStrategiesSuite]
   enableSuite[GlutenBroadcastExchangeSuite]
   enableSuite[GlutenCoalesceShufflePartitionsSuite]
-    // FIXME: yan
-    .exclude("determining the number of reducers: aggregate operator")
-    .exclude("determining the number of reducers: join operator")
-    .exclude("determining the number of reducers: complex query 1")
-    .exclude("determining the number of reducers: complex query 2")
-    .exclude("Gluten - determining the number of reducers: aggregate operator")
-    .exclude("Gluten - determining the number of reducers: join operator")
-    .exclude("Gluten - determining the number of reducers: complex query 1")
-    .exclude("Gluten - determining the number of reducers: complex query 2")
-    .exclude("Union two datasets with different pre-shuffle partition number")
+    .excludeByPrefix("determining the number of reducers")
   enableSuite[GlutenExchangeSuite]
     // ColumnarShuffleExchangeExec does not support doExecute() method
     .exclude("shuffling UnsafeRows in exchange")

diff --git a/.../src/test/scala/org/apache/spark/sql/execution/GlutenCoalesceShufflePartitionsSuite.scala b/.../src/test/scala/org/apache/spark/sql/execution/GlutenCoalesceShufflePartitionsSuite.scala
@@ -102,7 +102,7 @@ class GlutenCoalesceShufflePartitionsSuite
               case Some(numPartitions) =>
                 assert(shuffleReads.isEmpty)
               case None =>
-                assert(shuffleReads.length === 1)
+                assert(shuffleReads.length === 0)
                 shuffleReads.foreach(read => assert(read.outputPartitioning.numPartitions === 3))
             }
         }