fixup

apache · Mar 6, 2024 · d59fb4f · d59fb4f
1 parent ff56f9f
commit d59fb4f
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 3 deletions.
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/22.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/22.txt
@@ -319,4 +319,25 @@ Results [1]: [avg(c_acctbal#X)#X AS avg(c_acctbal)#X]
 
 (57) AdaptiveSparkPlan
 Output [1]: [avg(c_acctbal)#X]
-Arguments: isFinalPlan=true
+Arguments: isFinalPlan=true
+
+Subquery:2 Hosting operator id = 1 Hosting Expression = Subquery subquery#X, [id=#X]
+AdaptiveSparkPlan (57)
++- == Final Plan ==
+   VeloxColumnarToRowExec (50)
+   +- ^ RegularHashAggregateExecTransformer (48)
+      +- ^ InputIteratorTransformer (47)
+         +- ^ InputAdapter (46)
+            +- ^ ShuffleQueryStage (45), Statistics(X)
+               +- ColumnarExchange (44)
+                  +- ^ FlushableHashAggregateExecTransformer (42)
+                     +- ^ ProjectExecTransformer (41)
+                        +- ^ FilterExecTransformer (40)
+                           +- ^ Scan parquet (39)
++- == Initial Plan ==
+   HashAggregate (56)
+   +- Exchange (55)
+      +- HashAggregate (54)
+         +- Project (53)
+            +- Filter (52)
+               +- Scan parquet (51)
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/22.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/22.txt
@@ -356,4 +356,25 @@ Results [1]: [avg(c_acctbal#X)#X AS avg(c_acctbal)#X]
 
 (65) AdaptiveSparkPlan
 Output [1]: [avg(c_acctbal)#X]
-Arguments: isFinalPlan=true
+Arguments: isFinalPlan=true
+
+Subquery:2 Hosting operator id = 1 Hosting Expression = Subquery subquery#X, [id=#X]
+AdaptiveSparkPlan (65)
++- == Final Plan ==
+   VeloxColumnarToRowExec (58)
+   +- ^ RegularHashAggregateExecTransformer (56)
+      +- ^ InputIteratorTransformer (55)
+         +- ^ InputAdapter (54)
+            +- ^ ShuffleQueryStage (53), Statistics(X)
+               +- ColumnarExchange (52)
+                  +- ^ FlushableHashAggregateExecTransformer (50)
+                     +- ^ ProjectExecTransformer (49)
+                        +- ^ FilterExecTransformer (48)
+                           +- ^ Scan parquet (47)
++- == Initial Plan ==
+   HashAggregate (64)
+   +- Exchange (63)
+      +- HashAggregate (62)
+         +- Project (61)
+            +- Filter (60)
+               +- Scan parquet (59)
diff --git a/gluten-core/src/main/scala/io/glutenproject/extension/ColumnarOverrides.scala b/gluten-core/src/main/scala/io/glutenproject/extension/ColumnarOverrides.scala
@@ -232,9 +232,9 @@ case class ColumnarOverrideRules(session: SparkSession)
         (spark: SparkSession) => MergeTwoPhasesHashBaseAggregate(spark),
         (_: SparkSession) => rewriteSparkPlanRule(),
         (_: SparkSession) => AddTransformHintRule(),
-        (_: SparkSession) => InsertTransitions(outputsColumnar),
         (_: SparkSession) => FallbackBloomFilterAggIfNeeded(),
         (_: SparkSession) => TransformPreOverrides(),
+        (_: SparkSession) => InsertTransitions(outputsColumnar),
         (_: SparkSession) => RemoveNativeWriteFilesSortAndProject(),
         (spark: SparkSession) => RewriteTransformer(spark),
         (_: SparkSession) => EnsureLocalSortRequirements,

diff --git a/gluten-delta/src/main/scala/io/glutenproject/extension/DeltaRewriteTransformerRules.scala b/gluten-delta/src/main/scala/io/glutenproject/extension/DeltaRewriteTransformerRules.scala
@@ -18,6 +18,7 @@ package io.glutenproject.extension
 
 import io.glutenproject.execution.{DeltaScanTransformer, ProjectExecTransformer}
 import io.glutenproject.extension.DeltaRewriteTransformerRules.columnMappingRule
+import io.glutenproject.extension.columnar.RewriteTransformerRules
 
 import org.apache.spark.sql.SparkSession
 import org.apache.spark.sql.catalyst.expressions.{Alias, Attribute, AttributeReference}