(incubator-gluten) branch main updated: [MINOR] Replace match plan with startsWith by case match (#11084)

[be...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

beliefer 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 cd307676e2 [MINOR] Replace match plan with startsWith by case match (#11084)
cd307676e2 is described below

commit cd307676e2386ffbd924509e81acb03d98174e14
Author: Jiaan Geng <be...@163.com>
AuthorDate: Mon Nov 17 10:33:35 2025 +0800

    [MINOR] Replace match plan with startsWith by case match (#11084)
---
 .../test/scala/org/apache/spark/sql/GlutenQueryTest.scala   | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/gluten-substrait/src/test/scala/org/apache/spark/sql/GlutenQueryTest.scala b/gluten-substrait/src/test/scala/org/apache/spark/sql/GlutenQueryTest.scala
index fae13c8493..4d93e3d7ae 100644
--- a/gluten-substrait/src/test/scala/org/apache/spark/sql/GlutenQueryTest.scala
+++ b/gluten-substrait/src/test/scala/org/apache/spark/sql/GlutenQueryTest.scala
@@ -21,8 +21,7 @@ package org.apache.spark.sql
  *   1. We need to modify the way org.apache.spark.sql.CHQueryTest#compare compares double
  */
 import org.apache.gluten.backendsapi.BackendsApiManager
-import org.apache.gluten.execution.GlutenPlan
-import org.apache.gluten.execution.TransformSupport
+import org.apache.gluten.execution.{GlutenPlan, TransformSupport, WholeStageTransformer}
 import org.apache.gluten.sql.shims.SparkShimLoader
 
 import org.apache.spark.{SPARK_VERSION_SHORT, SparkConf}
@@ -31,7 +30,7 @@ import org.apache.spark.sql.catalyst.plans._
 import org.apache.spark.sql.catalyst.plans.logical._
 import org.apache.spark.sql.catalyst.util._
 import org.apache.spark.sql.classic.ClassicConversions._
-import org.apache.spark.sql.execution.{CommandResultExec, SparkPlan, SQLExecution, UnaryExecNode}
+import org.apache.spark.sql.execution.{CommandResultExec, SparkPlan, SQLExecution, UnaryExecNode, WholeStageCodegenExec}
 import org.apache.spark.sql.execution.adaptive.{AdaptiveSparkPlanExec, ShuffleQueryStageExec}
 import org.apache.spark.sql.execution.adaptive.AdaptiveSparkPlanHelper
 import org.apache.spark.sql.execution.columnar.InMemoryRelation
@@ -374,10 +373,10 @@ abstract class GlutenQueryTest extends PlanTest with AdaptiveSparkPlanHelper {
         plan.children.flatMap(getExecutedPlan)
     }
 
-    if (plan.nodeName.startsWith("WholeStageCodegen")) {
-      subTree
-    } else {
-      subTree :+ plan
+    plan match {
+      case WholeStageCodegenExec(_) => subTree
+      case WholeStageTransformer(_, _) => subTree
+      case _ => subTree :+ plan
     }
   }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For additional commands, e-mail: commits-help@gluten.apache.org