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 0defe5ab839e..553a06288a18 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 @@ -863,8 +863,6 @@ class VeloxTestSettings extends BackendTestSettings { enableSuite[GlutenVectorizedParquetReadSchemaSuite] enableSuite[GlutenMergedParquetReadSchemaSuite] enableSuite[GlutenEnsureRequirementsSuite] - // FIXME: yan - .exclude("reorder should handle PartitioningCollection") // Rewrite to change the shuffle partitions for optimizing repartition .excludeByPrefix("SPARK-35675") diff --git a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/exchange/GlutenEnsureRequirementsSuite.scala b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/exchange/GlutenEnsureRequirementsSuite.scala index 24c66b51a536..7581f0e9d371 100644 --- a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/exchange/GlutenEnsureRequirementsSuite.scala +++ b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/exchange/GlutenEnsureRequirementsSuite.scala @@ -16,11 +16,17 @@ */ package org.apache.spark.sql.execution.exchange +import org.apache.spark.SparkConf import org.apache.spark.sql.GlutenSQLTestsBaseTrait import org.apache.spark.sql.GlutenTestConstants.GLUTEN_TEST import org.apache.spark.sql.internal.SQLConf class GlutenEnsureRequirementsSuite extends EnsureRequirementsSuite with GlutenSQLTestsBaseTrait { + override def sparkConf: SparkConf = { + // Native SQL configs + super.sparkConf + .set("spark.sql.shuffle.partitions", "5") + } test( GLUTEN_TEST + 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 6f97cd02d225..8378659b2afe 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 @@ -888,8 +888,6 @@ class VeloxTestSettings extends BackendTestSettings { enableSuite[GlutenVectorizedParquetReadSchemaSuite] enableSuite[GlutenMergedParquetReadSchemaSuite] enableSuite[GlutenEnsureRequirementsSuite] - // FIXME: yan - .exclude("reorder should handle PartitioningCollection") // Rewrite to change the shuffle partitions for optimizing repartition .excludeByPrefix("SPARK-35675") .exclude("SPARK-41986: Introduce shuffle on SinglePartition") diff --git a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/exchange/GlutenEnsureRequirementsSuite.scala b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/exchange/GlutenEnsureRequirementsSuite.scala index 24c66b51a536..7581f0e9d371 100644 --- a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/exchange/GlutenEnsureRequirementsSuite.scala +++ b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/exchange/GlutenEnsureRequirementsSuite.scala @@ -16,11 +16,17 @@ */ package org.apache.spark.sql.execution.exchange +import org.apache.spark.SparkConf import org.apache.spark.sql.GlutenSQLTestsBaseTrait import org.apache.spark.sql.GlutenTestConstants.GLUTEN_TEST import org.apache.spark.sql.internal.SQLConf class GlutenEnsureRequirementsSuite extends EnsureRequirementsSuite with GlutenSQLTestsBaseTrait { + override def sparkConf: SparkConf = { + // Native SQL configs + super.sparkConf + .set("spark.sql.shuffle.partitions", "5") + } test( GLUTEN_TEST +