You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datafusion.apache.org by ag...@apache.org on 2026/07/30 20:56:42 UTC
(datafusion-comet) branch branch-1.0 updated: feat: disable native columnar-to-row conversion by default (#5114) (#5151)
This is an automated email from the ASF dual-hosted git repository.
andygrove pushed a commit to branch branch-1.0
in repository https://gitbox.apache.org/repos/asf/datafusion-comet.git
The following commit(s) were added to refs/heads/branch-1.0 by this push:
new 8bb692b9c4 feat: disable native columnar-to-row conversion by default (#5114) (#5151)
8bb692b9c4 is described below
commit 8bb692b9c4e72c13cde9ab32d5f3413872dce49b
Author: Andy Grove <ag...@apache.org>
AuthorDate: Thu Jul 30 14:56:37 2026 -0600
feat: disable native columnar-to-row conversion by default (#5114) (#5151)
* feat: disable native columnar-to-row conversion by default
Change the default of spark.comet.exec.columnarToRow.native.enabled
from true to false. Isolated benchmarking in #5112 shows the native
converter is 3.7x slower per row than the JVM implementation at the
default batch size and up to 15.7x slower for small batches due to a
fixed JNI and FFI cost of roughly 10us per batch, while end-to-end
benchmarks and TPC-DS runs show no benefit over the JVM operator.
Also update the operator scaladoc, which claimed zero-copy strings and
reduced GC pressure: rows have been deep-copied to the JVM heap since
the fix for #3308, and #4440 found no measurable GC benefit.
Part of #5112
* fix: strip CometColumnarToRowExec in DPP subquery broadcast rewrite
The non-AQE DPP rewrite in CometExecRule only recognized
CometNativeColumnarToRowExec under the SubqueryBroadcastExec's
BroadcastExchangeExec. With the native conversion disabled by default,
the JVM CometColumnarToRowExec is used instead, and because it is
CodegenSupport the prepared subquery plan wraps it as
WholeStageCodegenExec(CometColumnarToRowExec(InputAdapter(cometPlan))).
The rewrite did not match this shape, so SubqueryBroadcastExec was
never converted to CometSubqueryBroadcastExec and DPP broadcast
exchange reuse stopped working. Unwrap the codegen and InputAdapter
layers so both columnar-to-row variants are handled.
* test: regenerate plan stability golden files for JVM columnar-to-row default
Regenerated with dev/regenerate-golden-files.sh for all Spark versions.
The only change is the operator rename from CometNativeColumnarToRow to
CometColumnarToRow at plan stage roots; CometSubqueryBroadcast and
exchange reuse are unchanged thanks to the DPP rewrite fix.
* test: accept CometColumnarToRowExec in SubquerySuite partition pruning test
* test: refresh golden files and plan docs for JVM columnar-to-row default
* test: accept codegen-wrapped CometColumnarToRow in CachedBatchSerializerNoUnwrapSuite
The Comet patch for `CachedBatchSerializerNoUnwrapSuite` accepted either the
Spark shape (`WholeStageCodegenExec(ColumnarToRowExec)`) or a cached plan whose
top node is in `org.apache.spark.sql.comet`. The latter only held for
`CometNativeColumnarToRowExec`, which does not support codegen. Now that the
JVM `CometColumnarToRowExec` is the default, the cached plan is
`WholeStageCodegenExec(CometColumnarToRow(...))`, so both checks failed:
isSparkShape was false, and isCometShape was false unexpected cached plan:
*(1) CometColumnarToRow
+- CometNativeScan parquet [count#822213] ...
Look through a `WholeStageCodegenExec` before classifying the transition node so
both Comet operators are accepted.
* fix: do not report decimal avg overflow when there is nothing to average
Closes #5148.
In ANSI mode, `avg` on a decimal column raised
`[ARITHMETIC_OVERFLOW] Overflow in sum of decimals` for an ungrouped aggregate
whose input was empty or entirely null, where Spark returns NULL.
`AvgDecimalAccumulator::merge_batch` derives `is_empty` from the nullness of the
merged counts, but a global partial aggregate over zero rows still emits one row
with `sum = NULL, count = 0` and that count is not null, so `is_empty` becomes
false. `evaluate` then treated the missing sum as an overflow. Guard that check
with `count > 0`, matching the neighbouring `is_not_null` check and the
`GroupsAccumulator` path (which is why only aggregates without GROUP BY were
affected).
This is what makes `LogicalPlanTagInSparkPlanSuite` q24a/q24b/q24-v2.7 fail in
the Spark 4.1 SQL lane once the JVM columnar-to-row operator is the default:
`CometColumnarToRowExec` supports codegen, so `checkGeneratedCode` calls
`WholeStageCodegenExec.doCodeGen`, which prepares the plan and eagerly executes
q24's `SELECT 0.05 * avg(netpaid) FROM ssales` scalar subquery against the
row-less TPC-DS tables that suite creates.
(cherry picked from commit 4c3f04805acdbf87d4d6cecc62da29266ebfa83b)
---
dev/diffs/3.4.3.diff | 20 ++++++++---
dev/diffs/3.5.8.diff | 20 ++++++++---
dev/diffs/4.0.2.diff | 22 +++++++++---
dev/diffs/4.1.2.diff | 41 +++++++++++++++-------
docs/source/user-guide/latest/installation.md | 2 +-
.../user-guide/latest/understanding-comet-plans.md | 16 ++++-----
native/spark-expr/src/agg_funcs/avg_decimal.rs | 9 ++++-
.../main/scala/org/apache/comet/CometConf.scala | 6 ++--
.../org/apache/comet/rules/CometExecRule.scala | 12 ++++++-
.../sql/comet/CometNativeColumnarToRowExec.scala | 11 +++---
.../approved-plans-v1_4-spark3_5/q44/extended.txt | 14 ++++----
.../approved-plans-v1_4-spark3_5/q58/extended.txt | 10 +++---
.../approved-plans-v1_4-spark3_5/q67/extended.txt | 4 +--
.../approved-plans-v1_4-spark3_5/q70/extended.txt | 8 ++---
.../approved-plans-v1_4-spark3_5/q83/extended.txt | 2 +-
.../approved-plans-v1_4-spark4_0/q14b/extended.txt | 12 +++----
.../approved-plans-v1_4-spark4_0/q44/extended.txt | 12 +++----
.../approved-plans-v1_4-spark4_0/q54/extended.txt | 10 +++---
.../approved-plans-v1_4-spark4_0/q58/extended.txt | 10 +++---
.../approved-plans-v1_4-spark4_0/q6/extended.txt | 6 ++--
.../q83.ansi/extended.txt | 2 +-
.../approved-plans-v1_4-spark4_1/q33/extended.txt | 2 +-
.../approved-plans-v1_4-spark4_1/q49/extended.txt | 2 +-
.../approved-plans-v1_4-spark4_1/q56/extended.txt | 2 +-
.../approved-plans-v1_4-spark4_1/q60/extended.txt | 2 +-
.../approved-plans-v1_4-spark4_1/q66/extended.txt | 2 +-
.../approved-plans-v1_4/q1/extended.txt | 2 +-
.../approved-plans-v1_4/q10/extended.txt | 10 +++---
.../approved-plans-v1_4/q11/extended.txt | 2 +-
.../approved-plans-v1_4/q12/extended.txt | 2 +-
.../approved-plans-v1_4/q13/extended.txt | 2 +-
.../approved-plans-v1_4/q14a/extended.txt | 4 +--
.../approved-plans-v1_4/q14b/extended.txt | 12 +++----
.../approved-plans-v1_4/q15/extended.txt | 2 +-
.../approved-plans-v1_4/q16/extended.txt | 2 +-
.../approved-plans-v1_4/q17/extended.txt | 2 +-
.../approved-plans-v1_4/q18/extended.txt | 2 +-
.../approved-plans-v1_4/q19/extended.txt | 2 +-
.../approved-plans-v1_4/q2/extended.txt | 2 +-
.../approved-plans-v1_4/q20/extended.txt | 2 +-
.../approved-plans-v1_4/q21/extended.txt | 2 +-
.../approved-plans-v1_4/q22/extended.txt | 2 +-
.../approved-plans-v1_4/q23a/extended.txt | 4 +--
.../approved-plans-v1_4/q23b/extended.txt | 4 +--
.../approved-plans-v1_4/q24a/extended.txt | 4 +--
.../approved-plans-v1_4/q24b/extended.txt | 4 +--
.../approved-plans-v1_4/q25/extended.txt | 2 +-
.../approved-plans-v1_4/q26/extended.txt | 2 +-
.../approved-plans-v1_4/q27/extended.txt | 2 +-
.../approved-plans-v1_4/q28/extended.txt | 2 +-
.../approved-plans-v1_4/q29/extended.txt | 2 +-
.../approved-plans-v1_4/q3/extended.txt | 2 +-
.../approved-plans-v1_4/q30/extended.txt | 2 +-
.../approved-plans-v1_4/q31/extended.txt | 2 +-
.../approved-plans-v1_4/q32/extended.txt | 2 +-
.../approved-plans-v1_4/q33/extended.txt | 2 +-
.../approved-plans-v1_4/q34/extended.txt | 2 +-
.../approved-plans-v1_4/q35/extended.txt | 10 +++---
.../approved-plans-v1_4/q36/extended.txt | 2 +-
.../approved-plans-v1_4/q37/extended.txt | 2 +-
.../approved-plans-v1_4/q38/extended.txt | 2 +-
.../approved-plans-v1_4/q39a/extended.txt | 2 +-
.../approved-plans-v1_4/q39b/extended.txt | 2 +-
.../approved-plans-v1_4/q4/extended.txt | 2 +-
.../approved-plans-v1_4/q40/extended.txt | 2 +-
.../approved-plans-v1_4/q41/extended.txt | 2 +-
.../approved-plans-v1_4/q42/extended.txt | 2 +-
.../approved-plans-v1_4/q43/extended.txt | 2 +-
.../approved-plans-v1_4/q44/extended.txt | 6 ++--
.../approved-plans-v1_4/q45/extended.txt | 6 ++--
.../approved-plans-v1_4/q46/extended.txt | 2 +-
.../approved-plans-v1_4/q47/extended.txt | 2 +-
.../approved-plans-v1_4/q48/extended.txt | 2 +-
.../approved-plans-v1_4/q49/extended.txt | 2 +-
.../approved-plans-v1_4/q5/extended.txt | 2 +-
.../approved-plans-v1_4/q50/extended.txt | 2 +-
.../approved-plans-v1_4/q51/extended.txt | 2 +-
.../approved-plans-v1_4/q52/extended.txt | 2 +-
.../approved-plans-v1_4/q53/extended.txt | 2 +-
.../approved-plans-v1_4/q54/extended.txt | 10 +++---
.../approved-plans-v1_4/q55/extended.txt | 2 +-
.../approved-plans-v1_4/q56/extended.txt | 2 +-
.../approved-plans-v1_4/q57/extended.txt | 2 +-
.../approved-plans-v1_4/q58/extended.txt | 6 ++--
.../approved-plans-v1_4/q59/extended.txt | 2 +-
.../approved-plans-v1_4/q6/extended.txt | 6 ++--
.../approved-plans-v1_4/q60/extended.txt | 2 +-
.../approved-plans-v1_4/q61/extended.txt | 2 +-
.../approved-plans-v1_4/q62/extended.txt | 2 +-
.../approved-plans-v1_4/q63/extended.txt | 2 +-
.../approved-plans-v1_4/q64/extended.txt | 2 +-
.../approved-plans-v1_4/q65/extended.txt | 2 +-
.../approved-plans-v1_4/q66/extended.txt | 2 +-
.../approved-plans-v1_4/q67/extended.txt | 2 +-
.../approved-plans-v1_4/q68/extended.txt | 2 +-
.../approved-plans-v1_4/q69/extended.txt | 2 +-
.../approved-plans-v1_4/q7/extended.txt | 2 +-
.../approved-plans-v1_4/q70/extended.txt | 2 +-
.../approved-plans-v1_4/q71/extended.txt | 2 +-
.../approved-plans-v1_4/q72/extended.txt | 2 +-
.../approved-plans-v1_4/q73/extended.txt | 2 +-
.../approved-plans-v1_4/q74/extended.txt | 2 +-
.../approved-plans-v1_4/q75/extended.txt | 2 +-
.../approved-plans-v1_4/q76/extended.txt | 2 +-
.../approved-plans-v1_4/q77/extended.txt | 2 +-
.../approved-plans-v1_4/q78/extended.txt | 2 +-
.../approved-plans-v1_4/q79/extended.txt | 2 +-
.../approved-plans-v1_4/q8/extended.txt | 2 +-
.../approved-plans-v1_4/q80/extended.txt | 2 +-
.../approved-plans-v1_4/q81/extended.txt | 2 +-
.../approved-plans-v1_4/q82/extended.txt | 2 +-
.../approved-plans-v1_4/q83/extended.txt | 2 +-
.../approved-plans-v1_4/q84/extended.txt | 2 +-
.../approved-plans-v1_4/q85/extended.txt | 2 +-
.../approved-plans-v1_4/q86/extended.txt | 2 +-
.../approved-plans-v1_4/q87/extended.txt | 2 +-
.../approved-plans-v1_4/q88/extended.txt | 2 +-
.../approved-plans-v1_4/q89/extended.txt | 2 +-
.../approved-plans-v1_4/q9/extended.txt | 12 +++----
.../approved-plans-v1_4/q90/extended.txt | 2 +-
.../approved-plans-v1_4/q91/extended.txt | 2 +-
.../approved-plans-v1_4/q92/extended.txt | 2 +-
.../approved-plans-v1_4/q93/extended.txt | 2 +-
.../approved-plans-v1_4/q94/extended.txt | 2 +-
.../approved-plans-v1_4/q95/extended.txt | 2 +-
.../approved-plans-v1_4/q96/extended.txt | 2 +-
.../approved-plans-v1_4/q97/extended.txt | 2 +-
.../approved-plans-v1_4/q98/extended.txt | 2 +-
.../approved-plans-v1_4/q99/extended.txt | 2 +-
.../approved-plans-v2_7-spark3_5/q67a/extended.txt | 4 +--
.../approved-plans-v2_7-spark3_5/q70a/extended.txt | 20 +++++------
.../approved-plans-v2_7-spark4_0/q14/extended.txt | 12 +++----
.../approved-plans-v2_7-spark4_0/q6/extended.txt | 6 ++--
.../approved-plans-v2_7-spark4_1/q14a/extended.txt | 4 +--
.../approved-plans-v2_7-spark4_1/q49/extended.txt | 2 +-
.../approved-plans-v2_7-spark4_2/q77a/extended.txt | 26 +++++++-------
.../approved-plans-v2_7/q10a/extended.txt | 2 +-
.../approved-plans-v2_7/q11/extended.txt | 2 +-
.../approved-plans-v2_7/q12/extended.txt | 2 +-
.../approved-plans-v2_7/q14/extended.txt | 12 +++----
.../approved-plans-v2_7/q14a/extended.txt | 12 +++----
.../approved-plans-v2_7/q18a/extended.txt | 2 +-
.../approved-plans-v2_7/q20/extended.txt | 2 +-
.../approved-plans-v2_7/q22/extended.txt | 2 +-
.../approved-plans-v2_7/q22a/extended.txt | 2 +-
.../approved-plans-v2_7/q24/extended.txt | 4 +--
.../approved-plans-v2_7/q27a/extended.txt | 2 +-
.../approved-plans-v2_7/q34/extended.txt | 2 +-
.../approved-plans-v2_7/q35/extended.txt | 10 +++---
.../approved-plans-v2_7/q35a/extended.txt | 2 +-
.../approved-plans-v2_7/q36a/extended.txt | 2 +-
.../approved-plans-v2_7/q47/extended.txt | 2 +-
.../approved-plans-v2_7/q49/extended.txt | 2 +-
.../approved-plans-v2_7/q51a/extended.txt | 2 +-
.../approved-plans-v2_7/q57/extended.txt | 2 +-
.../approved-plans-v2_7/q5a/extended.txt | 2 +-
.../approved-plans-v2_7/q6/extended.txt | 6 ++--
.../approved-plans-v2_7/q64/extended.txt | 2 +-
.../approved-plans-v2_7/q67a/extended.txt | 2 +-
.../approved-plans-v2_7/q70a/extended.txt | 2 +-
.../approved-plans-v2_7/q72/extended.txt | 2 +-
.../approved-plans-v2_7/q74/extended.txt | 2 +-
.../approved-plans-v2_7/q75/extended.txt | 2 +-
.../approved-plans-v2_7/q77a/extended.txt | 2 +-
.../approved-plans-v2_7/q78/extended.txt | 2 +-
.../approved-plans-v2_7/q80a/extended.txt | 2 +-
.../approved-plans-v2_7/q86a/extended.txt | 2 +-
.../approved-plans-v2_7/q98/extended.txt | 2 +-
.../apache/comet/exec/CometAggregateSuite.scala | 24 +++++++++++++
169 files changed, 411 insertions(+), 320 deletions(-)
diff --git a/dev/diffs/3.4.3.diff b/dev/diffs/3.4.3.diff
index 6948b9259d..70305645f2 100644
--- a/dev/diffs/3.4.3.diff
+++ b/dev/diffs/3.4.3.diff
@@ -1124,14 +1124,14 @@ index 18123a4d6ec..0fe185baa33 100644
test("non-matching optional group") {
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/SubquerySuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/SubquerySuite.scala
-index 75eabcb96f2..f8141c28f60 100644
+index 75eabcb96f2..c68f4827bf1 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/SubquerySuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/SubquerySuite.scala
@@ -21,10 +21,11 @@ import scala.collection.mutable.ArrayBuffer
import org.apache.spark.sql.catalyst.expressions.SubqueryExpression
import org.apache.spark.sql.catalyst.plans.logical.{Aggregate, Join, LogicalPlan, Project, Sort, Union}
-+import org.apache.spark.sql.comet.{CometNativeColumnarToRowExec, CometNativeScanExec, CometScanExec}
++import org.apache.spark.sql.comet.{CometColumnarToRowExec, CometNativeColumnarToRowExec, CometNativeScanExec, CometScanExec}
import org.apache.spark.sql.execution._
import org.apache.spark.sql.execution.adaptive.{AdaptiveSparkPlanHelper, DisableAdaptiveExecution}
import org.apache.spark.sql.execution.datasources.FileScanRDD
@@ -1140,7 +1140,7 @@ index 75eabcb96f2..f8141c28f60 100644
import org.apache.spark.sql.execution.joins.{BaseJoinExec, BroadcastHashJoinExec, BroadcastNestedLoopJoinExec}
import org.apache.spark.sql.internal.SQLConf
import org.apache.spark.sql.test.SharedSparkSession
-@@ -1543,6 +1544,17 @@ class SubquerySuite extends QueryTest
+@@ -1543,6 +1544,29 @@ class SubquerySuite extends QueryTest
fs.inputRDDs().forall(
_.asInstanceOf[FileScanRDD].filePartitions.forall(
_.files.forall(_.urlEncodedPath.contains("p=0"))))
@@ -1150,6 +1150,18 @@ index 75eabcb96f2..f8141c28f60 100644
+ fs.inputRDDs().forall(
+ _.asInstanceOf[FileScanRDD].filePartitions.forall(
+ _.files.forall(_.urlEncodedPath.contains("p=0"))))
++ case WholeStageCodegenExec(CometColumnarToRowExec(InputAdapter(
++ fs @ CometScanExec(_, _, _, partitionFilters, _, _, _, _, _, _)))) =>
++ partitionFilters.exists(ExecSubqueryExpression.hasSubquery) &&
++ fs.inputRDDs().forall(
++ _.asInstanceOf[FileScanRDD].filePartitions.forall(
++ _.files.forall(_.urlEncodedPath.contains("p=0"))))
++ case WholeStageCodegenExec(CometColumnarToRowExec(InputAdapter(
++ fs: CometNativeScanExec))) =>
++ fs.partitionFilters.exists(ExecSubqueryExpression.hasSubquery) &&
++ fs.inputRDDs().forall(
++ _.asInstanceOf[FileScanRDD].filePartitions.forall(
++ _.files.forall(_.urlEncodedPath.contains("p=0"))))
+ case CometNativeColumnarToRowExec(fs: CometNativeScanExec) =>
+ fs.partitionFilters.exists(ExecSubqueryExpression.hasSubquery) &&
+ fs.inputRDDs().forall(
@@ -1158,7 +1170,7 @@ index 75eabcb96f2..f8141c28f60 100644
case _ => false
})
}
-@@ -2108,7 +2120,7 @@ class SubquerySuite extends QueryTest
+@@ -2108,7 +2132,7 @@ class SubquerySuite extends QueryTest
df.collect()
val exchanges = collect(df.queryExecution.executedPlan) {
diff --git a/dev/diffs/3.5.8.diff b/dev/diffs/3.5.8.diff
index 963fe19bae..7df506c2dc 100644
--- a/dev/diffs/3.5.8.diff
+++ b/dev/diffs/3.5.8.diff
@@ -1065,14 +1065,14 @@ index 71af1fd69c3..81a04c93c9c 100644
}
}
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/SubquerySuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/SubquerySuite.scala
-index 04702201f82..c5ab5443ff7 100644
+index 04702201f82..4d38d8d6e51 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/SubquerySuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/SubquerySuite.scala
@@ -22,10 +22,11 @@ import scala.collection.mutable.ArrayBuffer
import org.apache.spark.sql.catalyst.expressions.SubqueryExpression
import org.apache.spark.sql.catalyst.plans.{LeftAnti, LeftSemi}
import org.apache.spark.sql.catalyst.plans.logical.{Aggregate, Join, LogicalPlan, Project, Sort, Union}
-+import org.apache.spark.sql.comet.{CometNativeColumnarToRowExec, CometNativeScanExec, CometScanExec}
++import org.apache.spark.sql.comet.{CometColumnarToRowExec, CometNativeColumnarToRowExec, CometNativeScanExec, CometScanExec}
import org.apache.spark.sql.execution._
import org.apache.spark.sql.execution.adaptive.{AdaptiveSparkPlanHelper, DisableAdaptiveExecution}
import org.apache.spark.sql.execution.datasources.FileScanRDD
@@ -1081,7 +1081,7 @@ index 04702201f82..c5ab5443ff7 100644
import org.apache.spark.sql.execution.joins.{BaseJoinExec, BroadcastHashJoinExec, BroadcastNestedLoopJoinExec}
import org.apache.spark.sql.internal.SQLConf
import org.apache.spark.sql.test.SharedSparkSession
-@@ -1599,6 +1600,17 @@ class SubquerySuite extends QueryTest
+@@ -1599,6 +1600,29 @@ class SubquerySuite extends QueryTest
fs.inputRDDs().forall(
_.asInstanceOf[FileScanRDD].filePartitions.forall(
_.files.forall(_.urlEncodedPath.contains("p=0"))))
@@ -1091,6 +1091,18 @@ index 04702201f82..c5ab5443ff7 100644
+ fs.inputRDDs().forall(
+ _.asInstanceOf[FileScanRDD].filePartitions.forall(
+ _.files.forall(_.urlEncodedPath.contains("p=0"))))
++ case WholeStageCodegenExec(CometColumnarToRowExec(InputAdapter(
++ fs @ CometScanExec(_, _, _, partitionFilters, _, _, _, _, _, _)))) =>
++ partitionFilters.exists(ExecSubqueryExpression.hasSubquery) &&
++ fs.inputRDDs().forall(
++ _.asInstanceOf[FileScanRDD].filePartitions.forall(
++ _.files.forall(_.urlEncodedPath.contains("p=0"))))
++ case WholeStageCodegenExec(CometColumnarToRowExec(InputAdapter(
++ fs: CometNativeScanExec))) =>
++ fs.partitionFilters.exists(ExecSubqueryExpression.hasSubquery) &&
++ fs.inputRDDs().forall(
++ _.asInstanceOf[FileScanRDD].filePartitions.forall(
++ _.files.forall(_.urlEncodedPath.contains("p=0"))))
+ case CometNativeColumnarToRowExec(fs: CometNativeScanExec) =>
+ fs.partitionFilters.exists(ExecSubqueryExpression.hasSubquery) &&
+ fs.inputRDDs().forall(
@@ -1099,7 +1111,7 @@ index 04702201f82..c5ab5443ff7 100644
case _ => false
})
}
-@@ -2164,7 +2176,7 @@ class SubquerySuite extends QueryTest
+@@ -2164,7 +2188,7 @@ class SubquerySuite extends QueryTest
df.collect()
val exchanges = collect(df.queryExecution.executedPlan) {
diff --git a/dev/diffs/4.0.2.diff b/dev/diffs/4.0.2.diff
index 570764c52e..815ad45ed0 100644
--- a/dev/diffs/4.0.2.diff
+++ b/dev/diffs/4.0.2.diff
@@ -1298,14 +1298,14 @@ index 0df7f806272..9cdfe8b8f46 100644
df.collect()
}
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/SubquerySuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/SubquerySuite.scala
-index 2e33f6505ab..be967565303 100644
+index 2e33f6505ab..f0e64fd58ca 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/SubquerySuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/SubquerySuite.scala
@@ -23,10 +23,11 @@ import org.apache.spark.SparkRuntimeException
import org.apache.spark.sql.catalyst.expressions.SubqueryExpression
import org.apache.spark.sql.catalyst.plans.{LeftAnti, LeftSemi}
import org.apache.spark.sql.catalyst.plans.logical.{Aggregate, Filter, Join, LogicalPlan, Project, Sort, Union}
-+import org.apache.spark.sql.comet.{CometNativeColumnarToRowExec, CometNativeScanExec, CometScanExec}
++import org.apache.spark.sql.comet.{CometColumnarToRowExec, CometNativeColumnarToRowExec, CometNativeScanExec, CometScanExec}
import org.apache.spark.sql.execution._
import org.apache.spark.sql.execution.adaptive.{AdaptiveSparkPlanHelper, DisableAdaptiveExecution}
import org.apache.spark.sql.execution.datasources.FileScanRDD
@@ -1314,7 +1314,7 @@ index 2e33f6505ab..be967565303 100644
import org.apache.spark.sql.execution.joins.{BaseJoinExec, BroadcastHashJoinExec, BroadcastNestedLoopJoinExec}
import org.apache.spark.sql.internal.SQLConf
import org.apache.spark.sql.test.SharedSparkSession
-@@ -1529,6 +1530,18 @@ class SubquerySuite extends QueryTest
+@@ -1529,6 +1530,30 @@ class SubquerySuite extends QueryTest
fs.inputRDDs().forall(
_.asInstanceOf[FileScanRDD].filePartitions.forall(
_.files.forall(_.urlEncodedPath.contains("p=0"))))
@@ -1324,6 +1324,18 @@ index 2e33f6505ab..be967565303 100644
+ fs.inputRDDs().forall(
+ _.asInstanceOf[FileScanRDD].filePartitions.forall(
+ _.files.forall(_.urlEncodedPath.contains("p=0"))))
++ case WholeStageCodegenExec(CometColumnarToRowExec(InputAdapter(
++ fs @ CometScanExec(_, _, _, partitionFilters, _, _, _, _, _, _)))) =>
++ partitionFilters.exists(ExecSubqueryExpression.hasSubquery) &&
++ fs.inputRDDs().forall(
++ _.asInstanceOf[FileScanRDD].filePartitions.forall(
++ _.files.forall(_.urlEncodedPath.contains("p=0"))))
++ case WholeStageCodegenExec(CometColumnarToRowExec(InputAdapter(
++ fs: CometNativeScanExec))) =>
++ fs.partitionFilters.exists(ExecSubqueryExpression.hasSubquery) &&
++ fs.inputRDDs().forall(
++ _.asInstanceOf[FileScanRDD].filePartitions.forall(
++ _.files.forall(_.urlEncodedPath.contains("p=0"))))
+ case CometNativeColumnarToRowExec(
+ fs: CometNativeScanExec) =>
+ fs.partitionFilters.exists(ExecSubqueryExpression.hasSubquery) &&
@@ -1333,7 +1345,7 @@ index 2e33f6505ab..be967565303 100644
case _ => false
})
}
-@@ -2094,7 +2107,7 @@ class SubquerySuite extends QueryTest
+@@ -2094,7 +2119,7 @@ class SubquerySuite extends QueryTest
df.collect()
val exchanges = collect(df.queryExecution.executedPlan) {
@@ -1342,7 +1354,7 @@ index 2e33f6505ab..be967565303 100644
}
assert(exchanges.size === 1)
}
-@@ -2678,18 +2691,29 @@ class SubquerySuite extends QueryTest
+@@ -2678,18 +2703,29 @@ class SubquerySuite extends QueryTest
def checkFileSourceScan(query: String, answer: Seq[Row]): Unit = {
val df = sql(query)
checkAnswer(df, answer)
diff --git a/dev/diffs/4.1.2.diff b/dev/diffs/4.1.2.diff
index 00c9bd726d..11cc5d2d55 100644
--- a/dev/diffs/4.1.2.diff
+++ b/dev/diffs/4.1.2.diff
@@ -1397,14 +1397,14 @@ index 7bfc8cf4fa6..4bd387801db 100644
df.collect()
}
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/SubquerySuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/SubquerySuite.scala
-index 3ba48da0e32..0313aaa9ec6 100644
+index 3ba48da0e32..a7f9513b9c8 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/SubquerySuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/SubquerySuite.scala
@@ -23,10 +23,11 @@ import org.apache.spark.SparkRuntimeException
import org.apache.spark.sql.catalyst.expressions.{EqualTo, NamedExpression, OuterReference, SubqueryExpression}
import org.apache.spark.sql.catalyst.plans.{LeftAnti, LeftSemi}
import org.apache.spark.sql.catalyst.plans.logical.{Aggregate, Filter, Join, LogicalPlan, Project, Sort, Union}
-+import org.apache.spark.sql.comet.{CometNativeColumnarToRowExec, CometNativeScanExec, CometScanExec}
++import org.apache.spark.sql.comet.{CometColumnarToRowExec, CometNativeColumnarToRowExec, CometNativeScanExec, CometScanExec}
import org.apache.spark.sql.execution._
import org.apache.spark.sql.execution.adaptive.{AdaptiveSparkPlanHelper, DisableAdaptiveExecution}
import org.apache.spark.sql.execution.datasources.FileScanRDD
@@ -1413,7 +1413,7 @@ index 3ba48da0e32..0313aaa9ec6 100644
import org.apache.spark.sql.execution.joins.{BaseJoinExec, BroadcastHashJoinExec, BroadcastNestedLoopJoinExec}
import org.apache.spark.sql.internal.SQLConf
import org.apache.spark.sql.test.SharedSparkSession
-@@ -1529,6 +1530,18 @@ class SubquerySuite extends QueryTest
+@@ -1529,6 +1530,30 @@ class SubquerySuite extends QueryTest
fs.inputRDDs().forall(
_.asInstanceOf[FileScanRDD].filePartitions.forall(
_.files.forall(_.urlEncodedPath.contains("p=0"))))
@@ -1423,6 +1423,18 @@ index 3ba48da0e32..0313aaa9ec6 100644
+ fs.inputRDDs().forall(
+ _.asInstanceOf[FileScanRDD].filePartitions.forall(
+ _.files.forall(_.urlEncodedPath.contains("p=0"))))
++ case WholeStageCodegenExec(CometColumnarToRowExec(InputAdapter(
++ fs @ CometScanExec(_, _, _, partitionFilters, _, _, _, _, _, _)))) =>
++ partitionFilters.exists(ExecSubqueryExpression.hasSubquery) &&
++ fs.inputRDDs().forall(
++ _.asInstanceOf[FileScanRDD].filePartitions.forall(
++ _.files.forall(_.urlEncodedPath.contains("p=0"))))
++ case WholeStageCodegenExec(CometColumnarToRowExec(InputAdapter(
++ fs: CometNativeScanExec))) =>
++ fs.partitionFilters.exists(ExecSubqueryExpression.hasSubquery) &&
++ fs.inputRDDs().forall(
++ _.asInstanceOf[FileScanRDD].filePartitions.forall(
++ _.files.forall(_.urlEncodedPath.contains("p=0"))))
+ case CometNativeColumnarToRowExec(
+ fs: CometNativeScanExec) =>
+ fs.partitionFilters.exists(ExecSubqueryExpression.hasSubquery) &&
@@ -1432,7 +1444,7 @@ index 3ba48da0e32..0313aaa9ec6 100644
case _ => false
})
}
-@@ -2094,7 +2107,7 @@ class SubquerySuite extends QueryTest
+@@ -2094,7 +2119,7 @@ class SubquerySuite extends QueryTest
df.collect()
val exchanges = collect(df.queryExecution.executedPlan) {
@@ -1441,7 +1453,7 @@ index 3ba48da0e32..0313aaa9ec6 100644
}
assert(exchanges.size === 1)
}
-@@ -2678,18 +2691,29 @@ class SubquerySuite extends QueryTest
+@@ -2678,18 +2703,29 @@ class SubquerySuite extends QueryTest
def checkFileSourceScan(query: String, answer: Seq[Row]): Unit = {
val df = sql(query)
checkAnswer(df, answer)
@@ -2724,10 +2736,10 @@ index 3e7d26f74bd..79232dc3664 100644
assert(o1.semanticEquals(o2), "Different output column order after AQE optimization")
}
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/execution/columnar/CachedBatchSerializerSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/execution/columnar/CachedBatchSerializerSuite.scala
-index 47b935a2880..3e9b87f5c32 100644
+index 47b935a2880..3fdeab3113c 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/execution/columnar/CachedBatchSerializerSuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/execution/columnar/CachedBatchSerializerSuite.scala
-@@ -230,9 +230,16 @@ class CachedBatchSerializerNoUnwrapSuite extends QueryTest
+@@ -230,9 +230,21 @@ class CachedBatchSerializerNoUnwrapSuite extends QueryTest
assert(cachedPlans.length == 2)
cachedPlans.foreach {
cachedPlan =>
@@ -2738,11 +2750,16 @@ index 47b935a2880..3e9b87f5c32 100644
+ // (CometNativeColumnarToRow / CometColumnarToRow). Accept either the
+ // Spark shape or the equivalent Comet shape, since the important property
+ // under this serializer is that the row conversion is not unwrapped.
-+ val isSparkShape =
-+ cachedPlan.isInstanceOf[WholeStageCodegenExec] &&
-+ cachedPlan.asInstanceOf[WholeStageCodegenExec]
-+ .child.isInstanceOf[ColumnarToRowExec]
-+ val isCometShape = cachedPlan.getClass.getName.startsWith("org.apache.spark.sql.comet.")
++ // CometColumnarToRowExec supports codegen, so it appears as the child of a
++ // WholeStageCodegenExec, while CometNativeColumnarToRowExec does not and is
++ // the cached plan itself.
++ val transition = cachedPlan match {
++ case w: WholeStageCodegenExec => w.child
++ case other => other
++ }
++ val isSparkShape = cachedPlan.isInstanceOf[WholeStageCodegenExec] &&
++ transition.isInstanceOf[ColumnarToRowExec]
++ val isCometShape = transition.getClass.getName.startsWith("org.apache.spark.sql.comet.")
+ assert(isSparkShape || isCometShape, s"unexpected cached plan:\n$cachedPlan")
}
}
diff --git a/docs/source/user-guide/latest/installation.md b/docs/source/user-guide/latest/installation.md
index 2beed42625..3977c04328 100644
--- a/docs/source/user-guide/latest/installation.md
+++ b/docs/source/user-guide/latest/installation.md
@@ -161,7 +161,7 @@ Comet will log output similar to:
```shell
== Physical Plan ==
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometFilter [a#6], (isnotnull(a#6) AND (a#6 > 5))
+- CometNativeScan parquet [a#6] Batched: true, DataFilters: [isnotnull(a#6), (a#6 > 5)], Format: CometParquet, Location: InMemoryFileIndex(1 paths)[file:/tmp/test], PartitionFilters: [], PushedFilters: [IsNotNull(a), GreaterThan(a,5)], ReadSchema: struct<a:int>
```
diff --git a/docs/source/user-guide/latest/understanding-comet-plans.md b/docs/source/user-guide/latest/understanding-comet-plans.md
index af603569a0..130762d560 100644
--- a/docs/source/user-guide/latest/understanding-comet-plans.md
+++ b/docs/source/user-guide/latest/understanding-comet-plans.md
@@ -140,7 +140,7 @@ println(new org.apache.comet.ExtendedExplainInfo()
Output:
```
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometProject [COMET-INFO: JVM codegen dispatcher: hypot, levenshtein]
+- CometNativeScan parquet spark_catalog.default.t
@@ -221,7 +221,7 @@ Output
```
Project [COMET: from_unixtime(eventTime#5L, yyyy-MM-dd HH:mm:ss, Some(GMT)) is not fully compatible with Spark. To enable it anyway, set spark.comet.expression.FromUnixTime.allowIncompatible=true. For more information, refer to the Comet Compatibility Guide (https://datafusion.apache.org/comet/user-guide/compatibility.html).]
-+- CometNativeColumnarToRow
++- CometColumnarToRow
+- CometNativeScan parquet
Comet accelerated 1 out of 2 eligible operators (50%). Final plan contains 1 transitions between Spark and Comet.
@@ -309,12 +309,12 @@ Comet inserts these nodes wherever data has to cross the columnar/row boundary.
Multiple implementations exist because the optimal strategy depends on what
produced the columnar data.
-| Node | Direction | Notes |
-| ------------------------------ | ------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `CometColumnarToRow` | columnar → row | JVM-based row conversion. A fork of Spark's `ColumnarToRowExec` that includes the SPARK-50235 fix. |
-| `CometNativeColumnarToRow` | columnar → row | Rust-based row conversion that decodes broadcast Arrow batches via `NativeColumnarToRowConverter`. Used downstream of `CometBroadcastExchange`. Zero-copy for variable-length types and avoids an extra JVM materialization step. |
-| `CometSparkColumnarToColumnar` | columnar → columnar | Converts a Spark columnar input (a non-Comet `ColumnarBatch`) into Comet's Arrow batches. |
-| `CometSparkRowToColumnar` | row → columnar | Converts a Spark row input into Comet's Arrow batches. |
+| Node | Direction | Notes |
+| ------------------------------ | ------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `CometColumnarToRow` | columnar → row | JVM-based row conversion. A fork of Spark's `ColumnarToRowExec` that includes the SPARK-50235 fix. This is the default. |
+| `CometNativeColumnarToRow` | columnar → row | Rust-based row conversion via `NativeColumnarToRowConverter`. Disabled by default; enable with `spark.comet.exec.columnarToRow.native.enabled=true`. It carries a fixed JNI cost per batch and is slower than the JVM conversion for small batches. |
+| `CometSparkColumnarToColumnar` | columnar → columnar | Converts a Spark columnar input (a non-Comet `ColumnarBatch`) into Comet's Arrow batches. |
+| `CometSparkRowToColumnar` | row → columnar | Converts a Spark row input into Comet's Arrow batches. |
The two `CometSpark*` names come from a single `CometSparkToColumnarExec`
operator that picks the node name based on whether its child supports
diff --git a/native/spark-expr/src/agg_funcs/avg_decimal.rs b/native/spark-expr/src/agg_funcs/avg_decimal.rs
index a71bbe44ea..186e027244 100644
--- a/native/spark-expr/src/agg_funcs/avg_decimal.rs
+++ b/native/spark-expr/src/agg_funcs/avg_decimal.rs
@@ -361,7 +361,14 @@ impl Accumulator for AvgDecimalAccumulator {
fn evaluate(&mut self) -> Result<ScalarValue> {
// Check for overflow during sum accumulation in ANSI mode.
// This matches Spark's DecimalDivideWithOverflowCheck behavior.
- if self.sum.is_none() && !self.is_empty && self.eval_mode == EvalMode::Ansi {
+ // `count` guards against reporting an overflow when there was nothing to sum: an
+ // empty or all-null input also leaves `sum` as None, and `is_empty` cannot
+ // distinguish those cases because the counts merged in `merge_batch` are never null.
+ if self.sum.is_none()
+ && !self.is_empty
+ && self.count > 0
+ && self.eval_mode == EvalMode::Ansi
+ {
let error = decimal_sum_overflow_error("avg");
return Err(self.wrap_error_with_context(error));
}
diff --git a/spark/src/main/scala/org/apache/comet/CometConf.scala b/spark/src/main/scala/org/apache/comet/CometConf.scala
index 6a8920c4b4..bf4cced486 100644
--- a/spark/src/main/scala/org/apache/comet/CometConf.scala
+++ b/spark/src/main/scala/org/apache/comet/CometConf.scala
@@ -242,10 +242,10 @@ object CometConf extends ShimCometConf {
.doc(
"Whether to enable native columnar to row conversion. When enabled, Comet will use " +
"native Rust code to convert Arrow columnar data to Spark UnsafeRow format instead " +
- "of the JVM implementation. This can improve performance for queries that need to " +
- "convert between columnar and row formats.")
+ "of the JVM implementation. The native conversion carries a fixed JNI cost per batch " +
+ "and is slower than the JVM implementation for small batches.")
.booleanConf
- .createWithDefault(true)
+ .createWithDefault(false)
val COMET_EXEC_SORT_MERGE_JOIN_WITH_JOIN_FILTER_ENABLED: ConfigEntry[Boolean] =
conf("spark.comet.exec.sortMergeJoinWithJoinFilter.enabled")
diff --git a/spark/src/main/scala/org/apache/comet/rules/CometExecRule.scala b/spark/src/main/scala/org/apache/comet/rules/CometExecRule.scala
index db7ba7996a..f7913e3a4f 100644
--- a/spark/src/main/scala/org/apache/comet/rules/CometExecRule.scala
+++ b/spark/src/main/scala/org/apache/comet/rules/CometExecRule.scala
@@ -441,10 +441,20 @@ case class CometExecRule(session: SparkSession)
case sub: SubqueryBroadcastExec =>
sub.child match {
case b: BroadcastExchangeExec =>
- // The BroadcastExchangeExec child is CometNativeColumnarToRowExec wrapping
+ // The BroadcastExchangeExec child is a Comet columnar-to-row transition wrapping
// a Comet plan. Strip the row transition to get the columnar Comet plan.
+ // CometColumnarToRowExec is CodegenSupport, so by the time this rule sees the
+ // subquery plan it is compiled into WholeStageCodegenExec(CometColumnarToRowExec(
+ // InputAdapter(cometPlan))); CometNativeColumnarToRowExec is not CodegenSupport and
+ // sits directly under the exchange.
val cometChild = b.child match {
case c2r: CometNativeColumnarToRowExec => c2r.child
+ case c2r: CometColumnarToRowExec => c2r.child
+ case WholeStageCodegenExec(c2r: CometColumnarToRowExec) =>
+ c2r.child match {
+ case InputAdapter(child) => child
+ case other => other
+ }
case other => other
}
if (cometChild.isInstanceOf[CometNativeExec]) {
diff --git a/spark/src/main/scala/org/apache/spark/sql/comet/CometNativeColumnarToRowExec.scala b/spark/src/main/scala/org/apache/spark/sql/comet/CometNativeColumnarToRowExec.scala
index 6fa220b728..ce800ddf09 100644
--- a/spark/src/main/scala/org/apache/spark/sql/comet/CometNativeColumnarToRowExec.scala
+++ b/spark/src/main/scala/org/apache/spark/sql/comet/CometNativeColumnarToRowExec.scala
@@ -45,13 +45,10 @@ import org.apache.comet.{CometConf, NativeColumnarToRowConverter}
* Native implementation of ColumnarToRowExec that converts Arrow columnar data to Spark UnsafeRow
* format using Rust.
*
- * This feature is enabled by default and can be disabled by setting
- * `spark.comet.exec.columnarToRow.native.enabled=false`.
- *
- * Benefits over the JVM implementation:
- * - Zero-copy for variable-length types (strings, binary)
- * - Better CPU cache utilization through vectorized processing
- * - Reduced GC pressure
+ * This feature is disabled by default and can be enabled by setting
+ * `spark.comet.exec.columnarToRow.native.enabled=true`. The native conversion carries a fixed JNI
+ * cost per batch and is slower than the JVM implementation for small batches (see issue #5112 for
+ * measurements).
*
* @param child
* The child plan that produces columnar batches
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark3_5/q44/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark3_5/q44/extended.txt
index 3ee645114d..236d51688a 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark3_5/q44/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark3_5/q44/extended.txt
@@ -10,15 +10,15 @@ TakeOrderedAndProject
: : : +- Filter
: : : +- Window
: : : +- WindowGroupLimit [COMET: WindowGroupLimit is not supported]
- : : : +- CometNativeColumnarToRow
+ : : : +- CometColumnarToRow
: : : +- CometSort
: : : +- CometColumnarExchange
: : : +- WindowGroupLimit [COMET: WindowGroupLimit is not supported]
- : : : +- CometNativeColumnarToRow
+ : : : +- CometColumnarToRow
: : : +- CometSort
: : : +- CometFilter
: : : : +- Subquery
- : : : : +- CometNativeColumnarToRow
+ : : : : +- CometColumnarToRow
: : : : +- CometHashAggregate
: : : : +- CometExchange
: : : : +- CometHashAggregate
@@ -36,11 +36,11 @@ TakeOrderedAndProject
: : +- Filter
: : +- Window
: : +- WindowGroupLimit [COMET: WindowGroupLimit is not supported]
- : : +- CometNativeColumnarToRow
+ : : +- CometColumnarToRow
: : +- CometSort
: : +- CometColumnarExchange
: : +- WindowGroupLimit [COMET: WindowGroupLimit is not supported]
- : : +- CometNativeColumnarToRow
+ : : +- CometColumnarToRow
: : +- CometSort
: : +- CometFilter
: : : +- ReusedSubquery
@@ -51,12 +51,12 @@ TakeOrderedAndProject
: : +- CometFilter
: : +- CometNativeScan parquet spark_catalog.default.store_sales
: +- BroadcastExchange
- : +- CometNativeColumnarToRow
+ : +- CometColumnarToRow
: +- CometProject
: +- CometFilter
: +- CometNativeScan parquet spark_catalog.default.item
+- BroadcastExchange
- +- CometNativeColumnarToRow
+ +- CometColumnarToRow
+- CometProject
+- CometFilter
+- CometNativeScan parquet spark_catalog.default.item
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark3_5/q58/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark3_5/q58/extended.txt
index 7f1bcd05ac..ab807c6af4 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark3_5/q58/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark3_5/q58/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometProject
+- CometBroadcastHashJoin
@@ -24,7 +24,7 @@ CometNativeColumnarToRow
: : : : +- CometProject
: : : : +- CometFilter
: : : : : +- Subquery
- : : : : : +- CometNativeColumnarToRow
+ : : : : : +- CometColumnarToRow
: : : : : +- CometProject
: : : : : +- CometFilter
: : : : : +- CometNativeScan parquet spark_catalog.default.date_dim
@@ -42,7 +42,7 @@ CometNativeColumnarToRow
: : +- CometProject
: : +- CometFilter
: : : +- Subquery
- : : : +- CometNativeColumnarToRow
+ : : : +- CometColumnarToRow
: : : +- CometProject
: : : +- CometFilter
: : : +- CometNativeScan parquet spark_catalog.default.date_dim
@@ -72,7 +72,7 @@ CometNativeColumnarToRow
: +- CometProject
: +- CometFilter
: : +- Subquery
- : : +- CometNativeColumnarToRow
+ : : +- CometColumnarToRow
: : +- CometProject
: : +- CometFilter
: : +- CometNativeScan parquet spark_catalog.default.date_dim
@@ -102,7 +102,7 @@ CometNativeColumnarToRow
+- CometProject
+- CometFilter
: +- Subquery
- : +- CometNativeColumnarToRow
+ : +- CometColumnarToRow
: +- CometProject
: +- CometFilter
: +- CometNativeScan parquet spark_catalog.default.date_dim
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark3_5/q67/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark3_5/q67/extended.txt
index 3c1bc08e97..451edaaf5f 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark3_5/q67/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark3_5/q67/extended.txt
@@ -2,11 +2,11 @@ TakeOrderedAndProject
+- Filter
+- Window
+- WindowGroupLimit [COMET: WindowGroupLimit is not supported]
- +- CometNativeColumnarToRow
+ +- CometColumnarToRow
+- CometSort
+- CometColumnarExchange
+- WindowGroupLimit [COMET: WindowGroupLimit is not supported]
- +- CometNativeColumnarToRow
+ +- CometColumnarToRow
+- CometSort
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark3_5/q70/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark3_5/q70/extended.txt
index f9fb64d9e4..2858fc2453 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark3_5/q70/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark3_5/q70/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometProject
+- CometWindowExec
@@ -10,7 +10,7 @@ CometNativeColumnarToRow
+- Expand
+- Project
+- BroadcastHashJoin
- :- CometNativeColumnarToRow
+ :- CometColumnarToRow
: +- CometProject
: +- CometBroadcastHashJoin
: :- CometFilter
@@ -27,7 +27,7 @@ CometNativeColumnarToRow
+- BroadcastExchange
+- Project
+- BroadcastHashJoin
- :- CometNativeColumnarToRow
+ :- CometColumnarToRow
: +- CometFilter
: +- CometNativeScan parquet spark_catalog.default.store
+- BroadcastExchange
@@ -35,7 +35,7 @@ CometNativeColumnarToRow
+- Filter
+- Window
+- WindowGroupLimit [COMET: WindowGroupLimit is not supported]
- +- CometNativeColumnarToRow
+ +- CometColumnarToRow
+- CometSort
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark3_5/q83/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark3_5/q83/extended.txt
index 32adaba671..31471bd185 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark3_5/q83/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark3_5/q83/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometProject
+- CometBroadcastHashJoin
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_0/q14b/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_0/q14b/extended.txt
index 85cda8b553..9a56bcf3fe 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_0/q14b/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_0/q14b/extended.txt
@@ -1,9 +1,9 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometBroadcastHashJoin
:- CometFilter
: : +- Subquery
- : : +- CometNativeColumnarToRow
+ : : +- CometColumnarToRow
: : +- CometHashAggregate
: : +- CometExchange
: : +- CometHashAggregate
@@ -49,7 +49,7 @@ CometNativeColumnarToRow
: : : : : +- ReusedSubquery
: : : : +- CometNativeScan parquet spark_catalog.default.date_dim
: : : : +- Subquery
- : : : : +- CometNativeColumnarToRow
+ : : : : +- CometColumnarToRow
: : : : +- CometProject
: : : : +- CometFilter
: : : : +- CometNativeScan parquet spark_catalog.default.date_dim
@@ -181,7 +181,7 @@ CometNativeColumnarToRow
: : +- ReusedSubquery
: +- CometNativeScan parquet spark_catalog.default.date_dim
: +- Subquery
- : +- CometNativeColumnarToRow
+ : +- CometColumnarToRow
: +- CometProject
: +- CometFilter
: +- CometNativeScan parquet spark_catalog.default.date_dim
@@ -205,7 +205,7 @@ CometNativeColumnarToRow
: : : : +- ReusedSubquery
: : : +- CometNativeScan parquet spark_catalog.default.date_dim
: : : +- Subquery
- : : : +- CometNativeColumnarToRow
+ : : : +- CometColumnarToRow
: : : +- CometProject
: : : +- CometFilter
: : : +- CometNativeScan parquet spark_catalog.default.date_dim
@@ -337,7 +337,7 @@ CometNativeColumnarToRow
: +- ReusedSubquery
+- CometNativeScan parquet spark_catalog.default.date_dim
+- Subquery
- +- CometNativeColumnarToRow
+ +- CometColumnarToRow
+- CometProject
+- CometFilter
+- CometNativeScan parquet spark_catalog.default.date_dim
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_0/q44/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_0/q44/extended.txt
index c1b85fc86e..6595583fa5 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_0/q44/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_0/q44/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometProject
+- CometBroadcastHashJoin
@@ -12,15 +12,15 @@ CometNativeColumnarToRow
: : : +- Filter
: : : +- Window
: : : +- WindowGroupLimit [COMET: WindowGroupLimit is not supported]
- : : : +- CometNativeColumnarToRow
+ : : : +- CometColumnarToRow
: : : +- CometSort
: : : +- CometColumnarExchange
: : : +- WindowGroupLimit [COMET: WindowGroupLimit is not supported]
- : : : +- CometNativeColumnarToRow
+ : : : +- CometColumnarToRow
: : : +- CometSort
: : : +- CometFilter
: : : : +- Subquery
- : : : : +- CometNativeColumnarToRow
+ : : : : +- CometColumnarToRow
: : : : +- CometHashAggregate
: : : : +- CometExchange
: : : : +- CometHashAggregate
@@ -39,11 +39,11 @@ CometNativeColumnarToRow
: : +- Filter
: : +- Window
: : +- WindowGroupLimit [COMET: WindowGroupLimit is not supported]
- : : +- CometNativeColumnarToRow
+ : : +- CometColumnarToRow
: : +- CometSort
: : +- CometColumnarExchange
: : +- WindowGroupLimit [COMET: WindowGroupLimit is not supported]
- : : +- CometNativeColumnarToRow
+ : : +- CometColumnarToRow
: : +- CometSort
: : +- CometFilter
: : : +- ReusedSubquery
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_0/q54/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_0/q54/extended.txt
index d262c6d56f..39ae056b46 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_0/q54/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_0/q54/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
@@ -58,7 +58,7 @@ CometNativeColumnarToRow
: : : : +- ReusedSubquery
: : : +- CometNativeScan parquet spark_catalog.default.date_dim
: : : :- Subquery
- : : : : +- CometNativeColumnarToRow
+ : : : : +- CometColumnarToRow
: : : : +- CometHashAggregate
: : : : +- CometExchange
: : : : +- CometHashAggregate
@@ -66,7 +66,7 @@ CometNativeColumnarToRow
: : : : +- CometFilter
: : : : +- CometNativeScan parquet spark_catalog.default.date_dim
: : : +- Subquery
- : : : +- CometNativeColumnarToRow
+ : : : +- CometColumnarToRow
: : : +- CometHashAggregate
: : : +- CometExchange
: : : +- CometHashAggregate
@@ -88,7 +88,7 @@ CometNativeColumnarToRow
: +- ReusedSubquery
+- CometNativeScan parquet spark_catalog.default.date_dim
:- Subquery
- : +- CometNativeColumnarToRow
+ : +- CometColumnarToRow
: +- CometHashAggregate
: +- CometExchange
: +- CometHashAggregate
@@ -96,7 +96,7 @@ CometNativeColumnarToRow
: +- CometFilter
: +- CometNativeScan parquet spark_catalog.default.date_dim
+- Subquery
- +- CometNativeColumnarToRow
+ +- CometColumnarToRow
+- CometHashAggregate
+- CometExchange
+- CometHashAggregate
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_0/q58/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_0/q58/extended.txt
index 6597775c11..48aaad7415 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_0/q58/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_0/q58/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometProject
+- CometBroadcastHashJoin
@@ -26,7 +26,7 @@ CometNativeColumnarToRow
: : : : : +- ReusedSubquery
: : : : +- CometNativeScan parquet spark_catalog.default.date_dim
: : : : +- Subquery
- : : : : +- CometNativeColumnarToRow
+ : : : : +- CometColumnarToRow
: : : : +- CometProject
: : : : +- CometFilter
: : : : +- CometNativeScan parquet spark_catalog.default.date_dim
@@ -45,7 +45,7 @@ CometNativeColumnarToRow
: : : +- ReusedSubquery
: : +- CometNativeScan parquet spark_catalog.default.date_dim
: : +- Subquery
- : : +- CometNativeColumnarToRow
+ : : +- CometColumnarToRow
: : +- CometProject
: : +- CometFilter
: : +- CometNativeScan parquet spark_catalog.default.date_dim
@@ -76,7 +76,7 @@ CometNativeColumnarToRow
: : +- ReusedSubquery
: +- CometNativeScan parquet spark_catalog.default.date_dim
: +- Subquery
- : +- CometNativeColumnarToRow
+ : +- CometColumnarToRow
: +- CometProject
: +- CometFilter
: +- CometNativeScan parquet spark_catalog.default.date_dim
@@ -107,7 +107,7 @@ CometNativeColumnarToRow
: +- ReusedSubquery
+- CometNativeScan parquet spark_catalog.default.date_dim
+- Subquery
- +- CometNativeColumnarToRow
+ +- CometColumnarToRow
+- CometProject
+- CometFilter
+- CometNativeScan parquet spark_catalog.default.date_dim
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_0/q6/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_0/q6/extended.txt
index dd68f2476e..d452f76572 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_0/q6/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_0/q6/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometFilter
+- CometHashAggregate
@@ -28,7 +28,7 @@ CometNativeColumnarToRow
: : : +- ReusedSubquery
: : +- CometNativeScan parquet spark_catalog.default.date_dim
: : +- Subquery
- : : +- CometNativeColumnarToRow
+ : : +- CometColumnarToRow
: : +- CometHashAggregate
: : +- CometExchange
: : +- CometHashAggregate
@@ -41,7 +41,7 @@ CometNativeColumnarToRow
: : +- ReusedSubquery
: +- CometNativeScan parquet spark_catalog.default.date_dim
: +- Subquery
- : +- CometNativeColumnarToRow
+ : +- CometColumnarToRow
: +- CometHashAggregate
: +- CometExchange
: +- CometHashAggregate
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_0/q83.ansi/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_0/q83.ansi/extended.txt
index 32adaba671..31471bd185 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_0/q83.ansi/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_0/q83.ansi/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometProject
+- CometBroadcastHashJoin
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_1/q33/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_1/q33/extended.txt
index 7d65fff0b9..ac79ace1da 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_1/q33/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_1/q33/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometHashAggregate
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_1/q49/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_1/q49/extended.txt
index 0cec7e115e..403a2b2590 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_1/q49/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_1/q49/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometHashAggregate
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_1/q56/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_1/q56/extended.txt
index bf043f9d60..301f3aa292 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_1/q56/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_1/q56/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometHashAggregate
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_1/q60/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_1/q60/extended.txt
index bf043f9d60..301f3aa292 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_1/q60/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_1/q60/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometHashAggregate
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_1/q66/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_1/q66/extended.txt
index a259d59a1b..b111e93333 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_1/q66/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4-spark4_1/q66/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometHashAggregate
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q1/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q1/extended.txt
index f49109dafb..55b0d16456 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q1/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q1/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometProject
+- CometBroadcastHashJoin
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q10/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q10/extended.txt
index 0354bdd3b2..3c3e9e8487 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q10/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q10/extended.txt
@@ -10,7 +10,7 @@ TakeOrderedAndProject
: : +- Filter
: : +- BroadcastHashJoin
: : :- BroadcastHashJoin [COMET: Unsupported join type ExistenceJoin(exists#1)]
- : : : :- CometNativeColumnarToRow
+ : : : :- CometColumnarToRow
: : : : +- CometBroadcastHashJoin
: : : : :- CometFilter
: : : : : +- CometNativeScan parquet spark_catalog.default.customer
@@ -28,7 +28,7 @@ TakeOrderedAndProject
: : : : +- CometFilter
: : : : +- CometNativeScan parquet spark_catalog.default.date_dim
: : : +- BroadcastExchange
- : : : +- CometNativeColumnarToRow
+ : : : +- CometColumnarToRow
: : : +- CometProject
: : : +- CometBroadcastHashJoin
: : : :- CometNativeScan parquet spark_catalog.default.web_sales
@@ -38,7 +38,7 @@ TakeOrderedAndProject
: : : +- CometFilter
: : : +- CometNativeScan parquet spark_catalog.default.date_dim
: : +- BroadcastExchange
- : : +- CometNativeColumnarToRow
+ : : +- CometColumnarToRow
: : +- CometProject
: : +- CometBroadcastHashJoin
: : :- CometNativeScan parquet spark_catalog.default.catalog_sales
@@ -48,12 +48,12 @@ TakeOrderedAndProject
: : +- CometFilter
: : +- CometNativeScan parquet spark_catalog.default.date_dim
: +- BroadcastExchange
- : +- CometNativeColumnarToRow
+ : +- CometColumnarToRow
: +- CometProject
: +- CometFilter
: +- CometNativeScan parquet spark_catalog.default.customer_address
+- BroadcastExchange
- +- CometNativeColumnarToRow
+ +- CometColumnarToRow
+- CometProject
+- CometFilter
+- CometNativeScan parquet spark_catalog.default.customer_demographics
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q11/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q11/extended.txt
index 7f06caa2e1..75410ea79c 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q11/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q11/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometProject
+- CometBroadcastHashJoin
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q12/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q12/extended.txt
index 6b79b21f1e..40556d4eeb 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q12/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q12/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometProject
+- CometWindowExec
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q13/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q13/extended.txt
index 33c2dd1bbc..80dfee9629 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q13/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q13/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometHashAggregate
+- CometExchange
+- CometHashAggregate
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q14a/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q14a/extended.txt
index 1ae3f23b40..fc9bdb2ca6 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q14a/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q14a/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
@@ -8,7 +8,7 @@ CometNativeColumnarToRow
:- CometProject
: +- CometFilter
: : +- Subquery
- : : +- CometNativeColumnarToRow
+ : : +- CometColumnarToRow
: : +- CometHashAggregate
: : +- CometExchange
: : +- CometHashAggregate
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q14b/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q14b/extended.txt
index 1b9b46662f..ea5b8c720d 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q14b/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q14b/extended.txt
@@ -1,9 +1,9 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometBroadcastHashJoin
:- CometFilter
: : +- Subquery
- : : +- CometNativeColumnarToRow
+ : : +- CometColumnarToRow
: : +- CometHashAggregate
: : +- CometExchange
: : +- CometHashAggregate
@@ -47,7 +47,7 @@ CometNativeColumnarToRow
: : : : +- CometProject
: : : : +- CometFilter
: : : : : +- Subquery
- : : : : : +- CometNativeColumnarToRow
+ : : : : : +- CometColumnarToRow
: : : : : +- CometProject
: : : : : +- CometFilter
: : : : : +- CometNativeScan parquet spark_catalog.default.date_dim
@@ -178,7 +178,7 @@ CometNativeColumnarToRow
: +- CometProject
: +- CometFilter
: : +- Subquery
- : : +- CometNativeColumnarToRow
+ : : +- CometColumnarToRow
: : +- CometProject
: : +- CometFilter
: : +- CometNativeScan parquet spark_catalog.default.date_dim
@@ -201,7 +201,7 @@ CometNativeColumnarToRow
: : : +- CometProject
: : : +- CometFilter
: : : : +- Subquery
- : : : : +- CometNativeColumnarToRow
+ : : : : +- CometColumnarToRow
: : : : +- CometProject
: : : : +- CometFilter
: : : : +- CometNativeScan parquet spark_catalog.default.date_dim
@@ -332,7 +332,7 @@ CometNativeColumnarToRow
+- CometProject
+- CometFilter
: +- Subquery
- : +- CometNativeColumnarToRow
+ : +- CometColumnarToRow
: +- CometProject
: +- CometFilter
: +- CometNativeScan parquet spark_catalog.default.date_dim
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q15/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q15/extended.txt
index da1e91c969..fe6d670b80 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q15/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q15/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q16/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q16/extended.txt
index 97b705f044..39aabb8990 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q16/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q16/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometHashAggregate
+- CometExchange
+- CometHashAggregate
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q17/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q17/extended.txt
index a3f43554cf..d66233c1d4 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q17/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q17/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q18/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q18/extended.txt
index 4040a49d5a..d25c078df9 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q18/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q18/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q19/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q19/extended.txt
index fa37da7c94..fbe6798e3d 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q19/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q19/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q2/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q2/extended.txt
index c3d8dd11af..7e6f4d3a3c 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q2/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q2/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometSort
+- CometExchange
+- CometProject
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q20/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q20/extended.txt
index cc42c45f5a..1120945bf0 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q20/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q20/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometProject
+- CometWindowExec
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q21/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q21/extended.txt
index 9cbd136255..ab3a968257 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q21/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q21/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometFilter
+- CometHashAggregate
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q22/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q22/extended.txt
index 36a0eb0c8a..f8b21e320b 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q22/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q22/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q23a/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q23a/extended.txt
index 6dd0348345..245933b787 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q23a/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q23a/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometHashAggregate
+- CometExchange
+- CometHashAggregate
@@ -45,7 +45,7 @@ CometNativeColumnarToRow
: : +- CometProject
: : +- CometFilter
: : : +- Subquery
- : : : +- CometNativeColumnarToRow
+ : : : +- CometColumnarToRow
: : : +- CometHashAggregate
: : : +- CometExchange
: : : +- CometHashAggregate
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q23b/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q23b/extended.txt
index f2228c277c..d9bd63b89c 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q23b/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q23b/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometUnion
:- CometHashAggregate
@@ -48,7 +48,7 @@ CometNativeColumnarToRow
: : : +- CometProject
: : : +- CometFilter
: : : : +- Subquery
- : : : : +- CometNativeColumnarToRow
+ : : : : +- CometColumnarToRow
: : : : +- CometHashAggregate
: : : : +- CometExchange
: : : : +- CometHashAggregate
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q24a/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q24a/extended.txt
index 7cafc5725d..2febf2e0ac 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q24a/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q24a/extended.txt
@@ -1,7 +1,7 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometFilter
: +- Subquery
- : +- CometNativeColumnarToRow
+ : +- CometColumnarToRow
: +- CometHashAggregate
: +- CometExchange
: +- CometHashAggregate
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q24b/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q24b/extended.txt
index 7cafc5725d..2febf2e0ac 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q24b/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q24b/extended.txt
@@ -1,7 +1,7 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometFilter
: +- Subquery
- : +- CometNativeColumnarToRow
+ : +- CometColumnarToRow
: +- CometHashAggregate
: +- CometExchange
: +- CometHashAggregate
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q25/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q25/extended.txt
index a3f43554cf..d66233c1d4 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q25/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q25/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q26/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q26/extended.txt
index 2f7fe7b668..764e2b9c71 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q26/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q26/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q27/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q27/extended.txt
index df27dd568f..7f2df4754b 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q27/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q27/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q28/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q28/extended.txt
index 6bc95e1a33..b63d8a2b9d 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q28/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q28/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometBroadcastNestedLoopJoin
:- CometBroadcastNestedLoopJoin
: :- CometBroadcastNestedLoopJoin
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q29/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q29/extended.txt
index 2650cd8f1a..7768d49261 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q29/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q29/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q3/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q3/extended.txt
index b65033bdd7..e09de16f3a 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q3/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q3/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q30/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q30/extended.txt
index 3f88234deb..e7ac6071dd 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q30/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q30/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometProject
+- CometBroadcastHashJoin
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q31/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q31/extended.txt
index 188e553f1a..0253a22724 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q31/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q31/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometSort
+- CometExchange
+- CometProject
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q32/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q32/extended.txt
index a536c4b38f..88b18a4e60 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q32/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q32/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometHashAggregate
+- CometExchange
+- CometHashAggregate
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q33/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q33/extended.txt
index 9f17b73589..dd40231466 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q33/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q33/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q34/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q34/extended.txt
index 4c0ef9abcd..8d48877de0 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q34/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q34/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometSort
+- CometExchange
+- CometProject
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q35/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q35/extended.txt
index 0354bdd3b2..3c3e9e8487 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q35/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q35/extended.txt
@@ -10,7 +10,7 @@ TakeOrderedAndProject
: : +- Filter
: : +- BroadcastHashJoin
: : :- BroadcastHashJoin [COMET: Unsupported join type ExistenceJoin(exists#1)]
- : : : :- CometNativeColumnarToRow
+ : : : :- CometColumnarToRow
: : : : +- CometBroadcastHashJoin
: : : : :- CometFilter
: : : : : +- CometNativeScan parquet spark_catalog.default.customer
@@ -28,7 +28,7 @@ TakeOrderedAndProject
: : : : +- CometFilter
: : : : +- CometNativeScan parquet spark_catalog.default.date_dim
: : : +- BroadcastExchange
- : : : +- CometNativeColumnarToRow
+ : : : +- CometColumnarToRow
: : : +- CometProject
: : : +- CometBroadcastHashJoin
: : : :- CometNativeScan parquet spark_catalog.default.web_sales
@@ -38,7 +38,7 @@ TakeOrderedAndProject
: : : +- CometFilter
: : : +- CometNativeScan parquet spark_catalog.default.date_dim
: : +- BroadcastExchange
- : : +- CometNativeColumnarToRow
+ : : +- CometColumnarToRow
: : +- CometProject
: : +- CometBroadcastHashJoin
: : :- CometNativeScan parquet spark_catalog.default.catalog_sales
@@ -48,12 +48,12 @@ TakeOrderedAndProject
: : +- CometFilter
: : +- CometNativeScan parquet spark_catalog.default.date_dim
: +- BroadcastExchange
- : +- CometNativeColumnarToRow
+ : +- CometColumnarToRow
: +- CometProject
: +- CometFilter
: +- CometNativeScan parquet spark_catalog.default.customer_address
+- BroadcastExchange
- +- CometNativeColumnarToRow
+ +- CometColumnarToRow
+- CometProject
+- CometFilter
+- CometNativeScan parquet spark_catalog.default.customer_demographics
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q36/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q36/extended.txt
index 91b1c49a79..b5290a05cf 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q36/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q36/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometProject
+- CometWindowExec
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q37/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q37/extended.txt
index a83c218727..32d0669b49 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q37/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q37/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q38/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q38/extended.txt
index c965be9cc3..c7c3e5bd71 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q38/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q38/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometHashAggregate
+- CometExchange
+- CometHashAggregate
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q39a/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q39a/extended.txt
index 67ff950c02..4d2865560d 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q39a/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q39a/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometSort
+- CometExchange
+- CometBroadcastHashJoin
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q39b/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q39b/extended.txt
index 67ff950c02..4d2865560d 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q39b/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q39b/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometSort
+- CometExchange
+- CometBroadcastHashJoin
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q4/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q4/extended.txt
index ff66588e1a..859851243a 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q4/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q4/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometProject
+- CometBroadcastHashJoin
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q40/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q40/extended.txt
index 1a148d7ab4..b061d44341 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q40/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q40/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q41/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q41/extended.txt
index 6f7d077cf3..b40ebddb6f 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q41/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q41/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q42/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q42/extended.txt
index b65033bdd7..e09de16f3a 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q42/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q42/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q43/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q43/extended.txt
index cebd2e28d8..5eaea983af 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q43/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q43/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q44/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q44/extended.txt
index b9a5a6e3eb..d606397281 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q44/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q44/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometProject
+- CometBroadcastHashJoin
@@ -14,7 +14,7 @@ CometNativeColumnarToRow
: : : +- CometExchange
: : : +- CometFilter
: : : : +- Subquery
- : : : : +- CometNativeColumnarToRow
+ : : : : +- CometColumnarToRow
: : : : +- CometHashAggregate
: : : : +- CometExchange
: : : : +- CometHashAggregate
@@ -35,7 +35,7 @@ CometNativeColumnarToRow
: : +- CometExchange
: : +- CometFilter
: : : +- Subquery
- : : : +- CometNativeColumnarToRow
+ : : : +- CometColumnarToRow
: : : +- CometHashAggregate
: : : +- CometExchange
: : : +- CometHashAggregate
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q45/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q45/extended.txt
index 6f73e28782..6204bf94fe 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q45/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q45/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometColumnarExchange
@@ -6,7 +6,7 @@ CometNativeColumnarToRow
+- Project
+- Filter
+- BroadcastHashJoin [COMET: Unsupported join type ExistenceJoin(exists#1)]
- :- CometNativeColumnarToRow
+ :- CometColumnarToRow
: +- CometProject
: +- CometBroadcastHashJoin
: :- CometProject
@@ -38,7 +38,7 @@ CometNativeColumnarToRow
: +- CometFilter
: +- CometNativeScan parquet spark_catalog.default.item
+- BroadcastExchange
- +- CometNativeColumnarToRow
+ +- CometColumnarToRow
+- CometProject
+- CometFilter
+- CometNativeScan parquet spark_catalog.default.item
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q46/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q46/extended.txt
index f58213e7cb..9dc96c4ab2 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q46/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q46/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometProject
+- CometBroadcastHashJoin
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q47/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q47/extended.txt
index 20697609d5..236c537d6e 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q47/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q47/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometProject
+- CometBroadcastHashJoin
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q48/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q48/extended.txt
index 4b1541c674..e32cd0a7da 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q48/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q48/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometHashAggregate
+- CometExchange
+- CometHashAggregate
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q49/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q49/extended.txt
index 26438c9ca8..c89d0f1379 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q49/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q49/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q5/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q5/extended.txt
index 7fcc516b17..a37f2a4ca7 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q5/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q5/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q50/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q50/extended.txt
index e20ab4a6d6..c972e6282f 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q50/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q50/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q51/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q51/extended.txt
index 9f54e03733..a856dd3df7 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q51/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q51/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometFilter
+- CometWindowExec
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q52/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q52/extended.txt
index b65033bdd7..e09de16f3a 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q52/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q52/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q53/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q53/extended.txt
index de381dfff4..0b4473136d 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q53/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q53/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometProject
+- CometFilter
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q54/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q54/extended.txt
index af2b39b224..1c37d90b81 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q54/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q54/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
@@ -55,7 +55,7 @@ CometNativeColumnarToRow
: : : +- CometProject
: : : +- CometFilter
: : : : :- Subquery
- : : : : : +- CometNativeColumnarToRow
+ : : : : : +- CometColumnarToRow
: : : : : +- CometHashAggregate
: : : : : +- CometExchange
: : : : : +- CometHashAggregate
@@ -63,7 +63,7 @@ CometNativeColumnarToRow
: : : : : +- CometFilter
: : : : : +- CometNativeScan parquet spark_catalog.default.date_dim
: : : : +- Subquery
- : : : : +- CometNativeColumnarToRow
+ : : : : +- CometColumnarToRow
: : : : +- CometHashAggregate
: : : : +- CometExchange
: : : : +- CometHashAggregate
@@ -83,7 +83,7 @@ CometNativeColumnarToRow
+- CometProject
+- CometFilter
: :- Subquery
- : : +- CometNativeColumnarToRow
+ : : +- CometColumnarToRow
: : +- CometHashAggregate
: : +- CometExchange
: : +- CometHashAggregate
@@ -91,7 +91,7 @@ CometNativeColumnarToRow
: : +- CometFilter
: : +- CometNativeScan parquet spark_catalog.default.date_dim
: +- Subquery
- : +- CometNativeColumnarToRow
+ : +- CometColumnarToRow
: +- CometHashAggregate
: +- CometExchange
: +- CometHashAggregate
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q55/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q55/extended.txt
index b65033bdd7..e09de16f3a 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q55/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q55/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q56/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q56/extended.txt
index e8b3e8e97f..29332bd1bd 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q56/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q56/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q57/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q57/extended.txt
index c46aca28f5..7ebb291c28 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q57/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q57/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometProject
+- CometBroadcastHashJoin
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q58/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q58/extended.txt
index 93bffeba01..91167b64e2 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q58/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q58/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometProject
+- CometBroadcastHashJoin
@@ -24,7 +24,7 @@ CometNativeColumnarToRow
: : : : +- CometProject
: : : : +- CometFilter
: : : : : +- Subquery
- : : : : : +- CometNativeColumnarToRow
+ : : : : : +- CometColumnarToRow
: : : : : +- CometProject
: : : : : +- CometFilter
: : : : : +- CometNativeScan parquet spark_catalog.default.date_dim
@@ -42,7 +42,7 @@ CometNativeColumnarToRow
: : +- CometProject
: : +- CometFilter
: : : +- Subquery
- : : : +- CometNativeColumnarToRow
+ : : : +- CometColumnarToRow
: : : +- CometProject
: : : +- CometFilter
: : : +- CometNativeScan parquet spark_catalog.default.date_dim
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q59/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q59/extended.txt
index e23616d099..bfd467b72b 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q59/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q59/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometProject
+- CometBroadcastHashJoin
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q6/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q6/extended.txt
index 4b31bf751a..c9c8cfb975 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q6/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q6/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometFilter
+- CometHashAggregate
@@ -26,7 +26,7 @@ CometNativeColumnarToRow
: : +- CometProject
: : +- CometFilter
: : : +- Subquery
- : : : +- CometNativeColumnarToRow
+ : : : +- CometColumnarToRow
: : : +- CometHashAggregate
: : : +- CometExchange
: : : +- CometHashAggregate
@@ -38,7 +38,7 @@ CometNativeColumnarToRow
: +- CometProject
: +- CometFilter
: : +- Subquery
- : : +- CometNativeColumnarToRow
+ : : +- CometColumnarToRow
: : +- CometHashAggregate
: : +- CometExchange
: : +- CometHashAggregate
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q60/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q60/extended.txt
index e8b3e8e97f..29332bd1bd 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q60/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q60/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q61/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q61/extended.txt
index 1fd67d1103..ba0e6e65b9 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q61/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q61/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometProject
+- CometBroadcastNestedLoopJoin
:- CometHashAggregate
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q62/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q62/extended.txt
index dc88244743..52d7828b06 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q62/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q62/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q63/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q63/extended.txt
index de381dfff4..0b4473136d 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q63/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q63/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometProject
+- CometFilter
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q64/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q64/extended.txt
index 14ffe4eab9..7614734ab1 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q64/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q64/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometSort
+- CometExchange
+- CometProject
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q65/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q65/extended.txt
index b3937f6c97..3c41f55e3f 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q65/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q65/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometProject
+- CometBroadcastHashJoin
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q66/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q66/extended.txt
index 3b8d1937f2..fffdbc6f9d 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q66/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q66/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q67/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q67/extended.txt
index 16126921c8..a9ecef9ca1 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q67/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q67/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometFilter
+- CometWindowExec
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q68/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q68/extended.txt
index f58213e7cb..9dc96c4ab2 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q68/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q68/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometProject
+- CometBroadcastHashJoin
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q69/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q69/extended.txt
index 41b9fb6b4e..5ee187053f 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q69/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q69/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q7/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q7/extended.txt
index 8750081c55..ff85af4ff4 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q7/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q7/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q70/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q70/extended.txt
index a4eda1ee01..7342f59bb9 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q70/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q70/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometProject
+- CometWindowExec
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q71/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q71/extended.txt
index 2c056d01d7..dc8e15a88b 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q71/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q71/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometSort
+- CometExchange
+- CometHashAggregate
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q72/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q72/extended.txt
index d443b31d1e..a7c4c81e44 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q72/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q72/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q73/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q73/extended.txt
index 4c0ef9abcd..8d48877de0 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q73/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q73/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometSort
+- CometExchange
+- CometProject
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q74/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q74/extended.txt
index cfe634568f..a0cd78d1d3 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q74/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q74/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometProject
+- CometBroadcastHashJoin
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q75/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q75/extended.txt
index bccd23b141..f6a8642a21 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q75/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q75/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometProject
+- CometSortMergeJoin
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q76/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q76/extended.txt
index cfa19a28b0..cbb627c528 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q76/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q76/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q77/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q77/extended.txt
index 67c31a6ac1..aaa7ed094f 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q77/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q77/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q78/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q78/extended.txt
index d29dbc13e5..d194aa16ca 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q78/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q78/extended.txt
@@ -1,6 +1,6 @@
TakeOrderedAndProject
+- Project [COMET: Comet does not support Spark's BigDecimal rounding]
- +- CometNativeColumnarToRow
+ +- CometColumnarToRow
+- CometSortMergeJoin
:- CometProject
: +- CometSortMergeJoin
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q79/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q79/extended.txt
index 5af6449428..ff5274ba83 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q79/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q79/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometProject
+- CometBroadcastHashJoin
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q8/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q8/extended.txt
index 209a4e2bc0..0f5cd9db0d 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q8/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q8/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q80/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q80/extended.txt
index 9f67d9b8b5..45d918149d 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q80/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q80/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q81/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q81/extended.txt
index f10339641b..697d9b18db 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q81/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q81/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometProject
+- CometBroadcastHashJoin
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q82/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q82/extended.txt
index e7b75e3a55..91e9c75f1c 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q82/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q82/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q83/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q83/extended.txt
index ef8debea9a..08b1178aa5 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q83/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q83/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometProject
+- CometBroadcastHashJoin
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q84/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q84/extended.txt
index 402322f69f..b025c868d1 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q84/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q84/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometProject
+- CometBroadcastHashJoin
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q85/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q85/extended.txt
index 13506e196f..7ea084adf4 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q85/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q85/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q86/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q86/extended.txt
index e10c157987..f8a68e8555 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q86/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q86/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometProject
+- CometWindowExec
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q87/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q87/extended.txt
index c965be9cc3..c7c3e5bd71 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q87/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q87/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometHashAggregate
+- CometExchange
+- CometHashAggregate
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q88/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q88/extended.txt
index 603d8e0b52..b190f3399a 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q88/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q88/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometBroadcastNestedLoopJoin
:- CometBroadcastNestedLoopJoin
: :- CometBroadcastNestedLoopJoin
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q89/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q89/extended.txt
index de381dfff4..0b4473136d 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q89/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q89/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometProject
+- CometFilter
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q9/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q9/extended.txt
index ff39852ed0..53ba3252cf 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q9/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q9/extended.txt
@@ -1,6 +1,6 @@
Project [COMET: ]
: :- Subquery
-: : +- CometNativeColumnarToRow
+: : +- CometColumnarToRow
: : +- CometProject
: : +- CometHashAggregate
: : +- CometExchange
@@ -11,7 +11,7 @@
: :- ReusedSubquery
: :- ReusedSubquery
: :- Subquery
-: : +- CometNativeColumnarToRow
+: : +- CometColumnarToRow
: : +- CometProject
: : +- CometHashAggregate
: : +- CometExchange
@@ -22,7 +22,7 @@
: :- ReusedSubquery
: :- ReusedSubquery
: :- Subquery
-: : +- CometNativeColumnarToRow
+: : +- CometColumnarToRow
: : +- CometProject
: : +- CometHashAggregate
: : +- CometExchange
@@ -33,7 +33,7 @@
: :- ReusedSubquery
: :- ReusedSubquery
: :- Subquery
-: : +- CometNativeColumnarToRow
+: : +- CometColumnarToRow
: : +- CometProject
: : +- CometHashAggregate
: : +- CometExchange
@@ -44,7 +44,7 @@
: :- ReusedSubquery
: :- ReusedSubquery
: :- Subquery
-: : +- CometNativeColumnarToRow
+: : +- CometColumnarToRow
: : +- CometProject
: : +- CometHashAggregate
: : +- CometExchange
@@ -54,7 +54,7 @@
: : +- CometNativeScan parquet spark_catalog.default.store_sales
: :- ReusedSubquery
: +- ReusedSubquery
-+- CometNativeColumnarToRow
++- CometColumnarToRow
+- CometFilter
+- CometNativeScan parquet spark_catalog.default.reason
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q90/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q90/extended.txt
index ebe68e5447..1287aa99fb 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q90/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q90/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometProject
+- CometBroadcastNestedLoopJoin
:- CometHashAggregate
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q91/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q91/extended.txt
index 9b191f8492..d864557eb2 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q91/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q91/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometSort
+- CometExchange
+- CometHashAggregate
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q92/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q92/extended.txt
index bcf7db282b..eb03ca3a22 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q92/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q92/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometHashAggregate
+- CometExchange
+- CometHashAggregate
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q93/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q93/extended.txt
index 1496f26233..7203a678b0 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q93/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q93/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q94/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q94/extended.txt
index 11de43f62c..820af3a3ed 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q94/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q94/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometHashAggregate
+- CometExchange
+- CometHashAggregate
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q95/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q95/extended.txt
index 45ec12b82b..0817731b93 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q95/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q95/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometHashAggregate
+- CometExchange
+- CometHashAggregate
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q96/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q96/extended.txt
index 9ee165830a..170d3b7879 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q96/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q96/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometHashAggregate
+- CometExchange
+- CometHashAggregate
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q97/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q97/extended.txt
index a56bd059fa..7026307a74 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q97/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q97/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometHashAggregate
+- CometExchange
+- CometHashAggregate
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q98/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q98/extended.txt
index 2cd06214ac..c3da91bcea 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q98/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q98/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometProject
+- CometSort
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q99/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q99/extended.txt
index c236a1647f..c075163849 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q99/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q99/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7-spark3_5/q67a/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7-spark3_5/q67a/extended.txt
index 8abd1fc15f..d7c95f4c0a 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7-spark3_5/q67a/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7-spark3_5/q67a/extended.txt
@@ -2,11 +2,11 @@ TakeOrderedAndProject
+- Filter
+- Window
+- WindowGroupLimit [COMET: WindowGroupLimit is not supported]
- +- CometNativeColumnarToRow
+ +- CometColumnarToRow
+- CometSort
+- CometColumnarExchange
+- WindowGroupLimit [COMET: WindowGroupLimit is not supported]
- +- CometNativeColumnarToRow
+ +- CometColumnarToRow
+- CometSort
+- CometUnion
:- CometHashAggregate
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7-spark3_5/q70a/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7-spark3_5/q70a/extended.txt
index 2aac2972c3..e6197f9299 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7-spark3_5/q70a/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7-spark3_5/q70a/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometProject
+- CometWindowExec
@@ -13,7 +13,7 @@ CometNativeColumnarToRow
: +- HashAggregate
: +- Project
: +- BroadcastHashJoin
- : :- CometNativeColumnarToRow
+ : :- CometColumnarToRow
: : +- CometProject
: : +- CometBroadcastHashJoin
: : :- CometFilter
@@ -30,7 +30,7 @@ CometNativeColumnarToRow
: +- BroadcastExchange
: +- Project
: +- BroadcastHashJoin
- : :- CometNativeColumnarToRow
+ : :- CometColumnarToRow
: : +- CometFilter
: : +- CometNativeScan parquet spark_catalog.default.store
: +- BroadcastExchange
@@ -38,7 +38,7 @@ CometNativeColumnarToRow
: +- Filter
: +- Window
: +- WindowGroupLimit [COMET: WindowGroupLimit is not supported]
- : +- CometNativeColumnarToRow
+ : +- CometColumnarToRow
: +- CometSort
: +- CometHashAggregate
: +- CometExchange
@@ -66,7 +66,7 @@ CometNativeColumnarToRow
: +- HashAggregate
: +- Project
: +- BroadcastHashJoin
- : :- CometNativeColumnarToRow
+ : :- CometColumnarToRow
: : +- CometProject
: : +- CometBroadcastHashJoin
: : :- CometFilter
@@ -83,7 +83,7 @@ CometNativeColumnarToRow
: +- BroadcastExchange
: +- Project
: +- BroadcastHashJoin
- : :- CometNativeColumnarToRow
+ : :- CometColumnarToRow
: : +- CometFilter
: : +- CometNativeScan parquet spark_catalog.default.store
: +- BroadcastExchange
@@ -91,7 +91,7 @@ CometNativeColumnarToRow
: +- Filter
: +- Window
: +- WindowGroupLimit [COMET: WindowGroupLimit is not supported]
- : +- CometNativeColumnarToRow
+ : +- CometColumnarToRow
: +- CometSort
: +- CometHashAggregate
: +- CometExchange
@@ -119,7 +119,7 @@ CometNativeColumnarToRow
+- HashAggregate
+- Project
+- BroadcastHashJoin
- :- CometNativeColumnarToRow
+ :- CometColumnarToRow
: +- CometProject
: +- CometBroadcastHashJoin
: :- CometFilter
@@ -136,7 +136,7 @@ CometNativeColumnarToRow
+- BroadcastExchange
+- Project
+- BroadcastHashJoin
- :- CometNativeColumnarToRow
+ :- CometColumnarToRow
: +- CometFilter
: +- CometNativeScan parquet spark_catalog.default.store
+- BroadcastExchange
@@ -144,7 +144,7 @@ CometNativeColumnarToRow
+- Filter
+- Window
+- WindowGroupLimit [COMET: WindowGroupLimit is not supported]
- +- CometNativeColumnarToRow
+ +- CometColumnarToRow
+- CometSort
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7-spark4_0/q14/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7-spark4_0/q14/extended.txt
index 85cda8b553..9a56bcf3fe 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7-spark4_0/q14/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7-spark4_0/q14/extended.txt
@@ -1,9 +1,9 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometBroadcastHashJoin
:- CometFilter
: : +- Subquery
- : : +- CometNativeColumnarToRow
+ : : +- CometColumnarToRow
: : +- CometHashAggregate
: : +- CometExchange
: : +- CometHashAggregate
@@ -49,7 +49,7 @@ CometNativeColumnarToRow
: : : : : +- ReusedSubquery
: : : : +- CometNativeScan parquet spark_catalog.default.date_dim
: : : : +- Subquery
- : : : : +- CometNativeColumnarToRow
+ : : : : +- CometColumnarToRow
: : : : +- CometProject
: : : : +- CometFilter
: : : : +- CometNativeScan parquet spark_catalog.default.date_dim
@@ -181,7 +181,7 @@ CometNativeColumnarToRow
: : +- ReusedSubquery
: +- CometNativeScan parquet spark_catalog.default.date_dim
: +- Subquery
- : +- CometNativeColumnarToRow
+ : +- CometColumnarToRow
: +- CometProject
: +- CometFilter
: +- CometNativeScan parquet spark_catalog.default.date_dim
@@ -205,7 +205,7 @@ CometNativeColumnarToRow
: : : : +- ReusedSubquery
: : : +- CometNativeScan parquet spark_catalog.default.date_dim
: : : +- Subquery
- : : : +- CometNativeColumnarToRow
+ : : : +- CometColumnarToRow
: : : +- CometProject
: : : +- CometFilter
: : : +- CometNativeScan parquet spark_catalog.default.date_dim
@@ -337,7 +337,7 @@ CometNativeColumnarToRow
: +- ReusedSubquery
+- CometNativeScan parquet spark_catalog.default.date_dim
+- Subquery
- +- CometNativeColumnarToRow
+ +- CometColumnarToRow
+- CometProject
+- CometFilter
+- CometNativeScan parquet spark_catalog.default.date_dim
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7-spark4_0/q6/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7-spark4_0/q6/extended.txt
index dd68f2476e..d452f76572 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7-spark4_0/q6/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7-spark4_0/q6/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometFilter
+- CometHashAggregate
@@ -28,7 +28,7 @@ CometNativeColumnarToRow
: : : +- ReusedSubquery
: : +- CometNativeScan parquet spark_catalog.default.date_dim
: : +- Subquery
- : : +- CometNativeColumnarToRow
+ : : +- CometColumnarToRow
: : +- CometHashAggregate
: : +- CometExchange
: : +- CometHashAggregate
@@ -41,7 +41,7 @@ CometNativeColumnarToRow
: : +- ReusedSubquery
: +- CometNativeScan parquet spark_catalog.default.date_dim
: +- Subquery
- : +- CometNativeColumnarToRow
+ : +- CometColumnarToRow
: +- CometHashAggregate
: +- CometExchange
: +- CometHashAggregate
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7-spark4_1/q14a/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7-spark4_1/q14a/extended.txt
index dd43130d46..9875ca936e 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7-spark4_1/q14a/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7-spark4_1/q14a/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
@@ -9,7 +9,7 @@ CometNativeColumnarToRow
: +- CometUnion
: :- CometFilter
: : : +- Subquery
- : : : +- CometNativeColumnarToRow
+ : : : +- CometColumnarToRow
: : : +- CometHashAggregate
: : : +- CometExchange
: : : +- CometHashAggregate
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7-spark4_1/q49/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7-spark4_1/q49/extended.txt
index 0cec7e115e..403a2b2590 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7-spark4_1/q49/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7-spark4_1/q49/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometHashAggregate
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7-spark4_2/q77a/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7-spark4_2/q77a/extended.txt
index cf441b7592..dee0ae599f 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7-spark4_2/q77a/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7-spark4_2/q77a/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometColumnarExchange
@@ -8,7 +8,7 @@ CometNativeColumnarToRow
: +- Exchange
: +- HashAggregate
: +- Union
- : :- CometNativeColumnarToRow
+ : :- CometColumnarToRow
: : +- CometProject
: : +- CometBroadcastHashJoin
: : :- CometHashAggregate
@@ -53,7 +53,7 @@ CometNativeColumnarToRow
: :- Project
: : +- BroadcastNestedLoopJoin
: : :- BroadcastExchange
- : : : +- CometNativeColumnarToRow
+ : : : +- CometColumnarToRow
: : : +- CometHashAggregate
: : : +- CometExchange
: : : +- CometHashAggregate
@@ -67,7 +67,7 @@ CometNativeColumnarToRow
: : : +- CometNativeScan parquet spark_catalog.default.date_dim
: : +- Project
: : : :- Subquery
- : : : : +- CometNativeColumnarToRow
+ : : : : +- CometColumnarToRow
: : : : +- CometProject
: : : : +- CometHashAggregate
: : : : +- CometExchange
@@ -82,7 +82,7 @@ CometNativeColumnarToRow
: : : : +- CometNativeScan parquet spark_catalog.default.date_dim
: : : +- ReusedSubquery
: : +- Scan OneRowRelation [COMET: Scan OneRowRelation is not supported]
- : +- CometNativeColumnarToRow
+ : +- CometColumnarToRow
: +- CometProject
: +- CometBroadcastHashJoin
: :- CometHashAggregate
@@ -127,7 +127,7 @@ CometNativeColumnarToRow
: +- Exchange
: +- HashAggregate
: +- Union
- : :- CometNativeColumnarToRow
+ : :- CometColumnarToRow
: : +- CometProject
: : +- CometBroadcastHashJoin
: : :- CometHashAggregate
@@ -172,7 +172,7 @@ CometNativeColumnarToRow
: :- Project
: : +- BroadcastNestedLoopJoin
: : :- BroadcastExchange
- : : : +- CometNativeColumnarToRow
+ : : : +- CometColumnarToRow
: : : +- CometHashAggregate
: : : +- CometExchange
: : : +- CometHashAggregate
@@ -186,7 +186,7 @@ CometNativeColumnarToRow
: : : +- CometNativeScan parquet spark_catalog.default.date_dim
: : +- Project
: : : :- Subquery
- : : : : +- CometNativeColumnarToRow
+ : : : : +- CometColumnarToRow
: : : : +- CometProject
: : : : +- CometHashAggregate
: : : : +- CometExchange
@@ -201,7 +201,7 @@ CometNativeColumnarToRow
: : : : +- CometNativeScan parquet spark_catalog.default.date_dim
: : : +- ReusedSubquery
: : +- Scan OneRowRelation [COMET: Scan OneRowRelation is not supported]
- : +- CometNativeColumnarToRow
+ : +- CometColumnarToRow
: +- CometProject
: +- CometBroadcastHashJoin
: :- CometHashAggregate
@@ -246,7 +246,7 @@ CometNativeColumnarToRow
+- Exchange
+- HashAggregate
+- Union
- :- CometNativeColumnarToRow
+ :- CometColumnarToRow
: +- CometProject
: +- CometBroadcastHashJoin
: :- CometHashAggregate
@@ -291,7 +291,7 @@ CometNativeColumnarToRow
:- Project
: +- BroadcastNestedLoopJoin
: :- BroadcastExchange
- : : +- CometNativeColumnarToRow
+ : : +- CometColumnarToRow
: : +- CometHashAggregate
: : +- CometExchange
: : +- CometHashAggregate
@@ -305,7 +305,7 @@ CometNativeColumnarToRow
: : +- CometNativeScan parquet spark_catalog.default.date_dim
: +- Project
: : :- Subquery
- : : : +- CometNativeColumnarToRow
+ : : : +- CometColumnarToRow
: : : +- CometProject
: : : +- CometHashAggregate
: : : +- CometExchange
@@ -320,7 +320,7 @@ CometNativeColumnarToRow
: : : +- CometNativeScan parquet spark_catalog.default.date_dim
: : +- ReusedSubquery
: +- Scan OneRowRelation [COMET: Scan OneRowRelation is not supported]
- +- CometNativeColumnarToRow
+ +- CometColumnarToRow
+- CometProject
+- CometBroadcastHashJoin
:- CometHashAggregate
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q10a/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q10a/extended.txt
index f27de2fdbb..62974b51d9 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q10a/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q10a/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q11/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q11/extended.txt
index cfe634568f..a0cd78d1d3 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q11/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q11/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometProject
+- CometBroadcastHashJoin
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q12/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q12/extended.txt
index 6b79b21f1e..40556d4eeb 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q12/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q12/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometProject
+- CometWindowExec
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q14/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q14/extended.txt
index 1b9b46662f..ea5b8c720d 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q14/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q14/extended.txt
@@ -1,9 +1,9 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometBroadcastHashJoin
:- CometFilter
: : +- Subquery
- : : +- CometNativeColumnarToRow
+ : : +- CometColumnarToRow
: : +- CometHashAggregate
: : +- CometExchange
: : +- CometHashAggregate
@@ -47,7 +47,7 @@ CometNativeColumnarToRow
: : : : +- CometProject
: : : : +- CometFilter
: : : : : +- Subquery
- : : : : : +- CometNativeColumnarToRow
+ : : : : : +- CometColumnarToRow
: : : : : +- CometProject
: : : : : +- CometFilter
: : : : : +- CometNativeScan parquet spark_catalog.default.date_dim
@@ -178,7 +178,7 @@ CometNativeColumnarToRow
: +- CometProject
: +- CometFilter
: : +- Subquery
- : : +- CometNativeColumnarToRow
+ : : +- CometColumnarToRow
: : +- CometProject
: : +- CometFilter
: : +- CometNativeScan parquet spark_catalog.default.date_dim
@@ -201,7 +201,7 @@ CometNativeColumnarToRow
: : : +- CometProject
: : : +- CometFilter
: : : : +- Subquery
- : : : : +- CometNativeColumnarToRow
+ : : : : +- CometColumnarToRow
: : : : +- CometProject
: : : : +- CometFilter
: : : : +- CometNativeScan parquet spark_catalog.default.date_dim
@@ -332,7 +332,7 @@ CometNativeColumnarToRow
+- CometProject
+- CometFilter
: +- Subquery
- : +- CometNativeColumnarToRow
+ : +- CometColumnarToRow
: +- CometProject
: +- CometFilter
: +- CometNativeScan parquet spark_catalog.default.date_dim
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q14a/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q14a/extended.txt
index 64d8fff5be..89ec4efd9c 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q14a/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q14a/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
@@ -10,7 +10,7 @@ CometNativeColumnarToRow
: +- CometUnion
: :- CometFilter
: : : +- Subquery
- : : : +- CometNativeColumnarToRow
+ : : : +- CometColumnarToRow
: : : +- CometHashAggregate
: : : +- CometExchange
: : : +- CometHashAggregate
@@ -471,7 +471,7 @@ CometNativeColumnarToRow
: +- CometUnion
: :- CometFilter
: : : +- Subquery
- : : : +- CometNativeColumnarToRow
+ : : : +- CometColumnarToRow
: : : +- CometHashAggregate
: : : +- CometExchange
: : : +- CometHashAggregate
@@ -932,7 +932,7 @@ CometNativeColumnarToRow
: +- CometUnion
: :- CometFilter
: : : +- Subquery
- : : : +- CometNativeColumnarToRow
+ : : : +- CometColumnarToRow
: : : +- CometHashAggregate
: : : +- CometExchange
: : : +- CometHashAggregate
@@ -1393,7 +1393,7 @@ CometNativeColumnarToRow
: +- CometUnion
: :- CometFilter
: : : +- Subquery
- : : : +- CometNativeColumnarToRow
+ : : : +- CometColumnarToRow
: : : +- CometHashAggregate
: : : +- CometExchange
: : : +- CometHashAggregate
@@ -1854,7 +1854,7 @@ CometNativeColumnarToRow
+- CometUnion
:- CometFilter
: : +- Subquery
- : : +- CometNativeColumnarToRow
+ : : +- CometColumnarToRow
: : +- CometHashAggregate
: : +- CometExchange
: : +- CometHashAggregate
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q18a/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q18a/extended.txt
index 75f132f6fb..b87b40bcd8 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q18a/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q18a/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometUnion
:- CometHashAggregate
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q20/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q20/extended.txt
index cc42c45f5a..1120945bf0 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q20/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q20/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometProject
+- CometWindowExec
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q22/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q22/extended.txt
index 43cba378a4..8d9fa2dc46 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q22/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q22/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q22a/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q22a/extended.txt
index 0d8c15e00c..24c9660a59 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q22a/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q22a/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometUnion
:- CometHashAggregate
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q24/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q24/extended.txt
index 98135f6edd..2b19a8d6e6 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q24/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q24/extended.txt
@@ -1,9 +1,9 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometSort
+- CometExchange
+- CometFilter
: +- Subquery
- : +- CometNativeColumnarToRow
+ : +- CometColumnarToRow
: +- CometHashAggregate
: +- CometExchange
: +- CometHashAggregate
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q27a/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q27a/extended.txt
index 70614792ba..05101798b2 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q27a/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q27a/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometUnion
:- CometHashAggregate
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q34/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q34/extended.txt
index 4c0ef9abcd..8d48877de0 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q34/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q34/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometSort
+- CometExchange
+- CometProject
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q35/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q35/extended.txt
index 0354bdd3b2..3c3e9e8487 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q35/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q35/extended.txt
@@ -10,7 +10,7 @@ TakeOrderedAndProject
: : +- Filter
: : +- BroadcastHashJoin
: : :- BroadcastHashJoin [COMET: Unsupported join type ExistenceJoin(exists#1)]
- : : : :- CometNativeColumnarToRow
+ : : : :- CometColumnarToRow
: : : : +- CometBroadcastHashJoin
: : : : :- CometFilter
: : : : : +- CometNativeScan parquet spark_catalog.default.customer
@@ -28,7 +28,7 @@ TakeOrderedAndProject
: : : : +- CometFilter
: : : : +- CometNativeScan parquet spark_catalog.default.date_dim
: : : +- BroadcastExchange
- : : : +- CometNativeColumnarToRow
+ : : : +- CometColumnarToRow
: : : +- CometProject
: : : +- CometBroadcastHashJoin
: : : :- CometNativeScan parquet spark_catalog.default.web_sales
@@ -38,7 +38,7 @@ TakeOrderedAndProject
: : : +- CometFilter
: : : +- CometNativeScan parquet spark_catalog.default.date_dim
: : +- BroadcastExchange
- : : +- CometNativeColumnarToRow
+ : : +- CometColumnarToRow
: : +- CometProject
: : +- CometBroadcastHashJoin
: : :- CometNativeScan parquet spark_catalog.default.catalog_sales
@@ -48,12 +48,12 @@ TakeOrderedAndProject
: : +- CometFilter
: : +- CometNativeScan parquet spark_catalog.default.date_dim
: +- BroadcastExchange
- : +- CometNativeColumnarToRow
+ : +- CometColumnarToRow
: +- CometProject
: +- CometFilter
: +- CometNativeScan parquet spark_catalog.default.customer_address
+- BroadcastExchange
- +- CometNativeColumnarToRow
+ +- CometColumnarToRow
+- CometProject
+- CometFilter
+- CometNativeScan parquet spark_catalog.default.customer_demographics
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q35a/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q35a/extended.txt
index f27de2fdbb..62974b51d9 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q35a/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q35a/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q36a/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q36a/extended.txt
index 1427cfbe10..ed2344bd6f 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q36a/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q36a/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometProject
+- CometWindowExec
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q47/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q47/extended.txt
index 20697609d5..236c537d6e 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q47/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q47/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometProject
+- CometBroadcastHashJoin
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q49/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q49/extended.txt
index 26438c9ca8..c89d0f1379 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q49/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q49/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q51a/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q51a/extended.txt
index 360045edb6..3800a2ede5 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q51a/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q51a/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometFilter
+- CometHashAggregate
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q57/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q57/extended.txt
index c46aca28f5..7ebb291c28 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q57/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q57/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometProject
+- CometBroadcastHashJoin
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q5a/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q5a/extended.txt
index 8d61d1e1ad..82105f38c8 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q5a/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q5a/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q6/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q6/extended.txt
index 4b31bf751a..c9c8cfb975 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q6/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q6/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometFilter
+- CometHashAggregate
@@ -26,7 +26,7 @@ CometNativeColumnarToRow
: : +- CometProject
: : +- CometFilter
: : : +- Subquery
- : : : +- CometNativeColumnarToRow
+ : : : +- CometColumnarToRow
: : : +- CometHashAggregate
: : : +- CometExchange
: : : +- CometHashAggregate
@@ -38,7 +38,7 @@ CometNativeColumnarToRow
: +- CometProject
: +- CometFilter
: : +- Subquery
- : : +- CometNativeColumnarToRow
+ : : +- CometColumnarToRow
: : +- CometHashAggregate
: : +- CometExchange
: : +- CometHashAggregate
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q64/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q64/extended.txt
index 14ffe4eab9..7614734ab1 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q64/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q64/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometSort
+- CometExchange
+- CometProject
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q67a/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q67a/extended.txt
index 04ccad38d6..e95993b1fb 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q67a/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q67a/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometFilter
+- CometWindowExec
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q70a/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q70a/extended.txt
index 4e699a0b40..e5e768da5a 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q70a/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q70a/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometProject
+- CometWindowExec
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q72/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q72/extended.txt
index d443b31d1e..a7c4c81e44 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q72/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q72/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q74/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q74/extended.txt
index cfe634568f..a0cd78d1d3 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q74/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q74/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometProject
+- CometBroadcastHashJoin
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q75/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q75/extended.txt
index bccd23b141..f6a8642a21 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q75/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q75/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometProject
+- CometSortMergeJoin
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q77a/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q77a/extended.txt
index f7614895a6..2e428ae705 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q77a/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q77a/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q78/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q78/extended.txt
index d29dbc13e5..d194aa16ca 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q78/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q78/extended.txt
@@ -1,6 +1,6 @@
TakeOrderedAndProject
+- Project [COMET: Comet does not support Spark's BigDecimal rounding]
- +- CometNativeColumnarToRow
+ +- CometColumnarToRow
+- CometSortMergeJoin
:- CometProject
: +- CometSortMergeJoin
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q80a/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q80a/extended.txt
index 10e0803953..5de2204eb9 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q80a/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q80a/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometHashAggregate
+- CometExchange
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q86a/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q86a/extended.txt
index a9e3b1bd8f..2eef363aa7 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q86a/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q86a/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometTakeOrderedAndProject
+- CometProject
+- CometWindowExec
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q98/extended.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q98/extended.txt
index d7e9b9bc5e..7acf09130f 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q98/extended.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q98/extended.txt
@@ -1,4 +1,4 @@
-CometNativeColumnarToRow
+CometColumnarToRow
+- CometSort
+- CometExchange
+- CometProject
diff --git a/spark/src/test/scala/org/apache/comet/exec/CometAggregateSuite.scala b/spark/src/test/scala/org/apache/comet/exec/CometAggregateSuite.scala
index b3a7015385..2a3e19f1fa 100644
--- a/spark/src/test/scala/org/apache/comet/exec/CometAggregateSuite.scala
+++ b/spark/src/test/scala/org/apache/comet/exec/CometAggregateSuite.scala
@@ -1203,6 +1203,30 @@ class CometAggregateSuite extends CometTestBase with AdaptiveSparkPlanHelper {
}
}
+ test("avg decimal with nothing to average") {
+ // There is no sum to overflow when the input is empty or entirely null, so avg must
+ // return null rather than raising ARITHMETIC_OVERFLOW in ANSI mode.
+ // https://github.com/apache/datafusion-comet/issues/5148
+ Seq(true, false).foreach { ansiEnabled =>
+ withSQLConf(
+ SQLConf.ANSI_ENABLED.key -> ansiEnabled.toString,
+ CometConf.COMET_SHUFFLE_ENABLED.key -> "true",
+ CometConf.COMET_SHUFFLE_MODE.key -> "native") {
+ val table = s"avg_decimal_empty_ansi_$ansiEnabled"
+ withTable(table) {
+ sql(s"create table $table(a decimal(38, 2), b INT) using parquet")
+ // no rows at all
+ checkSparkAnswer(s"select avg(a) from $table")
+ checkSparkAnswer(s"select b, avg(a) from $table group by b")
+ // rows, but every value to average is null
+ sql(s"insert into $table values(null, 1), (null, 2)")
+ checkSparkAnswer(s"select avg(a) from $table")
+ checkSparkAnswer(s"select b, avg(a) from $table group by b")
+ }
+ }
+ }
+ }
+
test("test final avg") {
withSQLConf(
CometConf.COMET_SHUFFLE_ENABLED.key -> "true",
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datafusion.apache.org
For additional commands, e-mail: commits-help@datafusion.apache.org