more

viirya · Sep 12, 2024 · 74e28fb · 74e28fb
1 parent 73194f7
commit 74e28fb
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/spark/src/main/scala/org/apache/comet/CometSparkSessionExtensions.scala b/spark/src/main/scala/org/apache/comet/CometSparkSessionExtensions.scala
@@ -825,10 +825,6 @@ class CometSparkSessionExtensions
           withInfo(s, Seq(msg1, msg2, msg3).flatten.mkString(","))
           s
 
-        case op: RowToColumnarExec
-            if op.output.forall(a => QueryPlanSerde.rowColumnarSupportedDataType(a.dataType)) =>
-          CometRowToColumnarExec(op.output, op.child)
-
         case op =>
           op match {
             case _: CometExec | _: AQEShuffleReadExec | _: BroadcastExchangeExec |
@@ -994,6 +990,9 @@ class CometSparkSessionExtensions
       val eliminatedPlan = plan transformUp {
         case ColumnarToRowExec(sparkToColumnar: CometSparkToColumnarExec) => sparkToColumnar.child
         case CometSparkToColumnarExec(child: CometSparkToColumnarExec) => child
+        case op: RowToColumnarExec
+            if op.output.forall(a => QueryPlanSerde.rowColumnarSupportedDataType(a.dataType)) =>
+          CometRowToColumnarExec(op.output, op.child)
       }
 
       eliminatedPlan match {

diff --git a/spark/src/main/scala/org/apache/spark/sql/comet/CometRowToColumnarExec.scala b/spark/src/main/scala/org/apache/spark/sql/comet/CometRowToColumnarExec.scala
@@ -41,7 +41,7 @@ case class CometRowToColumnarExec(override val output: Seq[Attribute], child: Sp
     extends CometPlan
     with RowToColumnarTransition {
 
-  override def nodeName: String = "CometRowToColumnarExec"
+  override def nodeName: String = "CometRowToColumnar"
 
   override def outputOrdering: Seq[SortOrder] = child.outputOrdering
 

diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q98/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q98/explain.txt
@@ -3,7 +3,7 @@
 +- CometProject (25)
    +- CometSort (24)
       +- CometColumnarExchange (23)
-         +- RowToColumnar (22)
+         +- CometRowToColumnar (22)
             +- * Project (21)
                +- Window (20)
                   +- * ColumnarToRow (19)
@@ -124,8 +124,9 @@ Arguments: [sum(_w0#15) windowspecdefinition(i_class#9, specifiedwindowframe(Row
 Output [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, ((_w0#15 * 100) / _we0#16) AS revenueratio#17, i_item_id#6]
 Input [8]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15, i_item_id#6, _we0#16]
 
-(22) RowToColumnar
+(22) CometRowToColumnar
 Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, revenueratio#17, i_item_id#6]
+Arguments: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, revenueratio#17, i_item_id#6]
 
 (23) CometColumnarExchange
 Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, revenueratio#17, i_item_id#6]

diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q98/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q98/simplified.txt
@@ -4,7 +4,7 @@ WholeStageCodegen (3)
       CometProject [i_item_desc,i_category,i_class,i_current_price,itemrevenue,revenueratio]
         CometSort [i_item_desc,i_category,i_class,i_current_price,itemrevenue,revenueratio,i_item_id]
           CometColumnarExchange [i_category,i_class,i_item_id,i_item_desc,revenueratio] #1
-            RowToColumnar
+            CometRowToColumnar [i_item_desc,i_category,i_class,i_current_price,itemrevenue,revenueratio,i_item_id]
               WholeStageCodegen (2)
                 Project [i_item_desc,i_category,i_class,i_current_price,itemrevenue,_w0,_we0,i_item_id]
                   InputAdapter