This is an automated email from the ASF dual-hosted git repository.
mingliang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new f0084dded0 [GLUTEN-11088] Fix
GlutenCollapseProjectExecTransformerSuite in Spark-4.0 (#11206)
f0084dded0 is described below
commit f0084dded020231613c9f8659a84d1609b4b57a2
Author: Mingliang Zhu <[email protected]>
AuthorDate: Fri Nov 28 09:03:45 2025 +0800
[GLUTEN-11088] Fix GlutenCollapseProjectExecTransformerSuite in Spark-4.0
(#11206)
---
.../test/scala/org/apache/spark/sql/GlutenSQLTestsBaseTrait.scala | 4 ++--
.../test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala | 5 ++---
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git
a/gluten-ut/common/src/test/scala/org/apache/spark/sql/GlutenSQLTestsBaseTrait.scala
b/gluten-ut/common/src/test/scala/org/apache/spark/sql/GlutenSQLTestsBaseTrait.scala
index 51b6adce96..a87e2f5431 100644
---
a/gluten-ut/common/src/test/scala/org/apache/spark/sql/GlutenSQLTestsBaseTrait.scala
+++
b/gluten-ut/common/src/test/scala/org/apache/spark/sql/GlutenSQLTestsBaseTrait.scala
@@ -21,7 +21,7 @@ import org.apache.gluten.utils.BackendTestUtils
import org.apache.spark.SparkConf
import org.apache.spark.sql.execution.SparkPlan
-import org.apache.spark.sql.execution.adaptive.{AdaptiveSparkPlanExec,
ShuffleQueryStageExec}
+import org.apache.spark.sql.execution.adaptive.{AdaptiveSparkPlanExec,
QueryStageExec}
import org.apache.spark.sql.test.SharedSparkSession
/** Basic trait for Gluten SQL test cases. */
@@ -44,7 +44,7 @@ trait GlutenSQLTestsBaseTrait extends SharedSparkSession with
GlutenTestsBaseTra
}
val inputPlans: Seq[SparkPlan] = plans.map {
- case stage: ShuffleQueryStageExec => stage.plan
+ case stage: QueryStageExec => stage.plan
case plan => plan
}
diff --git
a/gluten-ut/spark40/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
b/gluten-ut/spark40/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
index 2e1984dc58..4498b7ebf3 100644
---
a/gluten-ut/spark40/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
+++
b/gluten-ut/spark40/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
@@ -36,7 +36,7 @@ import
org.apache.spark.sql.execution.datasources.v2.{GlutenDataSourceV2Strategy
import org.apache.spark.sql.execution.exchange.GlutenEnsureRequirementsSuite
import org.apache.spark.sql.execution.joins._
import org.apache.spark.sql.execution.python._
-import org.apache.spark.sql.extension.{GlutenSessionExtensionSuite,
TestFileSourceScanExecTransformer}
+import
org.apache.spark.sql.extension.{GlutenCollapseProjectExecTransformerSuite,
GlutenSessionExtensionSuite, TestFileSourceScanExecTransformer}
import org.apache.spark.sql.gluten.GlutenFallbackSuite
import org.apache.spark.sql.hive.execution.GlutenHiveSQLQuerySuite
import org.apache.spark.sql.sources._
@@ -965,8 +965,7 @@ class VeloxTestSettings extends BackendTestSettings {
enableSuite[GlutenXPathFunctionsSuite]
enableSuite[GlutenFallbackSuite]
enableSuite[GlutenHiveSQLQuerySuite]
- // TODO: fix in Spark-4.0
- // enableSuite[GlutenCollapseProjectExecTransformerSuite]
+ enableSuite[GlutenCollapseProjectExecTransformerSuite]
enableSuite[GlutenSparkSessionExtensionSuite]
enableSuite[GlutenGroupBasedDeleteFromTableSuite]
enableSuite[GlutenDeltaBasedDeleteFromTableSuite]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
