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 index aa3904246913..fe3e0697ed58 100644 --- 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/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/GlutenCoalesceShufflePartitionsSuite.scala b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/GlutenCoalesceShufflePartitionsSuite.scala index bc80c1b8f3e3..38d19111eb12 100644 --- a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/GlutenCoalesceShufflePartitionsSuite.scala +++ b/gluten-ut/spark33/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 index 986be903ef82..f1ef6c1a0065 100644 --- 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/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/GlutenCoalesceShufflePartitionsSuite.scala b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/GlutenCoalesceShufflePartitionsSuite.scala index bc80c1b8f3e3..38d19111eb12 100644 --- a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/GlutenCoalesceShufflePartitionsSuite.scala +++ b/gluten-ut/spark34/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)) } }