You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gluten.apache.org by ho...@apache.org on 2024/10/09 03:48:34 UTC
(incubator-gluten) branch main updated: [GLUTEN-7313][VL] Explicit Arrow transitions, part 5: extra code cleanups (#7436)
This is an automated email from the ASF dual-hosted git repository.
hongze pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new 21535ea970 [GLUTEN-7313][VL] Explicit Arrow transitions, part 5: extra code cleanups (#7436)
21535ea970 is described below
commit 21535ea970ccc0c001bd28be1423fda6009f0e2a
Author: Hongze Zhang <ho...@intel.com>
AuthorDate: Wed Oct 9 11:48:30 2024 +0800
[GLUTEN-7313][VL] Explicit Arrow transitions, part 5: extra code cleanups (#7436)
Closes #7313
---
.../gluten/execution/VeloxColumnarToRowExec.scala | 2 --
.../tpch-approved-plan/v1-bhj-ras/spark32/1.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark32/10.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark32/11.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark32/12.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark32/13.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark32/14.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark32/15.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark32/16.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark32/17.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark32/18.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark32/19.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark32/20.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark32/21.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark32/22.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark32/3.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark32/4.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark32/5.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark32/6.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark32/7.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark32/8.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark32/9.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark33/1.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark33/10.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark33/11.txt | 8 ++++----
.../tpch-approved-plan/v1-bhj-ras/spark33/12.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark33/13.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark33/14.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark33/15.txt | 8 ++++----
.../tpch-approved-plan/v1-bhj-ras/spark33/16.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark33/17.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark33/18.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark33/19.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark33/20.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark33/21.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark33/22.txt | 10 +++++-----
.../tpch-approved-plan/v1-bhj-ras/spark33/3.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark33/4.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark33/5.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark33/6.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark33/7.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark33/8.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark33/9.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark34/1.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark34/10.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark34/11.txt | 8 ++++----
.../tpch-approved-plan/v1-bhj-ras/spark34/12.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark34/13.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark34/14.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark34/15.txt | 8 ++++----
.../tpch-approved-plan/v1-bhj-ras/spark34/16.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark34/17.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark34/18.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark34/19.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark34/20.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark34/21.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark34/22.txt | 10 +++++-----
.../tpch-approved-plan/v1-bhj-ras/spark34/3.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark34/4.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark34/5.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark34/6.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark34/7.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark34/8.txt | 4 ++--
.../tpch-approved-plan/v1-bhj-ras/spark34/9.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark32/1.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark32/10.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark32/11.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark32/12.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark32/13.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark32/14.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark32/15.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark32/16.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark32/17.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark32/18.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark32/19.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark32/20.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark32/21.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark32/22.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark32/3.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark32/4.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark32/5.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark32/6.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark32/7.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark32/8.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark32/9.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark33/1.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark33/10.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark33/11.txt | 8 ++++----
.../tpch-approved-plan/v1-bhj/spark33/12.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark33/13.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark33/14.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark33/15.txt | 8 ++++----
.../tpch-approved-plan/v1-bhj/spark33/16.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark33/17.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark33/18.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark33/19.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark33/20.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark33/21.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark33/22.txt | 10 +++++-----
.../tpch-approved-plan/v1-bhj/spark33/3.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark33/4.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark33/5.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark33/6.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark33/7.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark33/8.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark33/9.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark34/1.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark34/10.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark34/11.txt | 8 ++++----
.../tpch-approved-plan/v1-bhj/spark34/12.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark34/13.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark34/14.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark34/15.txt | 8 ++++----
.../tpch-approved-plan/v1-bhj/spark34/16.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark34/17.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark34/18.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark34/19.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark34/20.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark34/21.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark34/22.txt | 10 +++++-----
.../tpch-approved-plan/v1-bhj/spark34/3.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark34/4.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark34/5.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark34/6.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark34/7.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark34/8.txt | 4 ++--
.../tpch-approved-plan/v1-bhj/spark34/9.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark32/1.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark32/10.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark32/11.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark32/12.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark32/13.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark32/14.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark32/15.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark32/16.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark32/17.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark32/18.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark32/19.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark32/20.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark32/21.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark32/22.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark32/3.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark32/4.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark32/5.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark32/6.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark32/7.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark32/8.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark32/9.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark33/1.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark33/10.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark33/11.txt | 8 ++++----
.../tpch-approved-plan/v1-ras/spark33/12.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark33/13.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark33/14.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark33/15.txt | 8 ++++----
.../tpch-approved-plan/v1-ras/spark33/16.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark33/17.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark33/18.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark33/19.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark33/20.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark33/21.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark33/22.txt | 10 +++++-----
.../tpch-approved-plan/v1-ras/spark33/3.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark33/4.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark33/5.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark33/6.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark33/7.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark33/8.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark33/9.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark34/1.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark34/10.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark34/11.txt | 8 ++++----
.../tpch-approved-plan/v1-ras/spark34/12.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark34/13.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark34/14.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark34/15.txt | 8 ++++----
.../tpch-approved-plan/v1-ras/spark34/16.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark34/17.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark34/18.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark34/19.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark34/20.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark34/21.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark34/22.txt | 10 +++++-----
.../tpch-approved-plan/v1-ras/spark34/3.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark34/4.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark34/5.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark34/6.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark34/7.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark34/8.txt | 4 ++--
.../tpch-approved-plan/v1-ras/spark34/9.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark32/1.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark32/10.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark32/11.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark32/12.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark32/13.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark32/14.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark32/15.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark32/16.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark32/17.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark32/18.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark32/19.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark32/20.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark32/21.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark32/22.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark32/3.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark32/4.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark32/5.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark32/6.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark32/7.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark32/8.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark32/9.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark33/1.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark33/10.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark33/11.txt | 8 ++++----
.../resources/tpch-approved-plan/v1/spark33/12.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark33/13.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark33/14.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark33/15.txt | 8 ++++----
.../resources/tpch-approved-plan/v1/spark33/16.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark33/17.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark33/18.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark33/19.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark33/20.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark33/21.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark33/22.txt | 10 +++++-----
.../resources/tpch-approved-plan/v1/spark33/3.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark33/4.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark33/5.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark33/6.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark33/7.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark33/8.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark33/9.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark34/1.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark34/10.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark34/11.txt | 8 ++++----
.../resources/tpch-approved-plan/v1/spark34/12.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark34/13.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark34/14.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark34/15.txt | 8 ++++----
.../resources/tpch-approved-plan/v1/spark34/16.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark34/17.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark34/18.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark34/19.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark34/20.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark34/21.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark34/22.txt | 10 +++++-----
.../resources/tpch-approved-plan/v1/spark34/3.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark34/4.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark34/5.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark34/6.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark34/7.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark34/8.txt | 4 ++--
.../resources/tpch-approved-plan/v1/spark34/9.txt | 4 ++--
.../gluten/execution/ColumnarToColumnarExec.scala | 4 ++--
.../execution/ColumnarToColumnarTransition.scala | 21 +++++++++++++++++++++
.../columnar/transition/TransitionGraph.scala | 2 +-
.../extension/columnar/transition/package.scala | 4 ++--
257 files changed, 586 insertions(+), 567 deletions(-)
diff --git a/backends-velox/src/main/scala/org/apache/gluten/execution/VeloxColumnarToRowExec.scala b/backends-velox/src/main/scala/org/apache/gluten/execution/VeloxColumnarToRowExec.scala
index ec6531b717..9118e0d236 100644
--- a/backends-velox/src/main/scala/org/apache/gluten/execution/VeloxColumnarToRowExec.scala
+++ b/backends-velox/src/main/scala/org/apache/gluten/execution/VeloxColumnarToRowExec.scala
@@ -36,8 +36,6 @@ import scala.collection.JavaConverters._
case class VeloxColumnarToRowExec(child: SparkPlan) extends ColumnarToRowExecBase(child = child) {
- override def nodeName: String = "VeloxColumnarToRowExec"
-
override protected def doValidateInternal(): ValidationResult = {
val schema = child.schema
// Depending on the input type, VeloxColumnarToRowConverter.
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/1.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/1.txt
index b1b2a7507c..efe7f39085 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/1.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/1.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (30)
+- == Final Plan ==
- VeloxColumnarToRowExec (21)
+ VeloxColumnarToRow (21)
+- ^ SortExecTransformer (19)
+- ^ InputIteratorTransformer (18)
+- ShuffleQueryStage (16)
@@ -113,7 +113,7 @@ Arguments: [l_returnflag#X ASC NULLS FIRST, l_linestatus#X ASC NULLS FIRST], tru
Input [10]: [l_returnflag#X, l_linestatus#X, sum_qty#X, sum_base_price#X, sum_disc_price#X, sum_charge#X, avg_qty#X, avg_price#X, avg_disc#X, count_order#X]
Arguments: false
-(21) VeloxColumnarToRowExec
+(21) VeloxColumnarToRow
Input [10]: [l_returnflag#X, l_linestatus#X, sum_qty#X, sum_base_price#X, sum_disc_price#X, sum_charge#X, avg_qty#X, avg_price#X, avg_disc#X, count_order#X]
(22) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/10.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/10.txt
index a87354004b..5b913a06db 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/10.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/10.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (68)
+- == Final Plan ==
- VeloxColumnarToRowExec (44)
+ VeloxColumnarToRow (44)
+- TakeOrderedAndProjectExecTransformer (43)
+- ^ ProjectExecTransformer (41)
+- ^ RegularHashAggregateExecTransformer (40)
@@ -247,7 +247,7 @@ Arguments: false
Input [8]: [c_custkey#X, c_name#X, revenue#X, c_acctbal#X, n_name#X, c_address#X, c_phone#X, c_comment#X]
Arguments: X, [revenue#X DESC NULLS LAST], [c_custkey#X, c_name#X, revenue#X, c_acctbal#X, n_name#X, c_address#X, c_phone#X, c_comment#X], 0
-(44) VeloxColumnarToRowExec
+(44) VeloxColumnarToRow
Input [8]: [c_custkey#X, c_name#X, revenue#X, c_acctbal#X, n_name#X, c_address#X, c_phone#X, c_comment#X]
(45) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/11.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/11.txt
index 5ad4086071..45838869f6 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/11.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/11.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (60)
+- == Final Plan ==
- VeloxColumnarToRowExec (40)
+ VeloxColumnarToRow (40)
+- ^ SortExecTransformer (38)
+- ^ InputIteratorTransformer (37)
+- ShuffleQueryStage (35)
@@ -219,7 +219,7 @@ Arguments: [value#X DESC NULLS LAST], true, 0
Input [2]: [ps_partkey#X, value#X]
Arguments: false
-(40) VeloxColumnarToRowExec
+(40) VeloxColumnarToRow
Input [2]: [ps_partkey#X, value#X]
(41) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/12.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/12.txt
index 0bbd522e9c..8a17f5db24 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/12.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/12.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (44)
+- == Final Plan ==
- VeloxColumnarToRowExec (30)
+ VeloxColumnarToRow (30)
+- ^ SortExecTransformer (28)
+- ^ InputIteratorTransformer (27)
+- ShuffleQueryStage (25)
@@ -163,7 +163,7 @@ Arguments: [l_shipmode#X ASC NULLS FIRST], true, 0
Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X]
Arguments: false
-(30) VeloxColumnarToRowExec
+(30) VeloxColumnarToRow
Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X]
(31) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/13.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/13.txt
index eceeb7738e..8de6de78df 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/13.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/13.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (55)
+- == Final Plan ==
- VeloxColumnarToRowExec (39)
+ VeloxColumnarToRow (39)
+- ^ SortExecTransformer (37)
+- ^ InputIteratorTransformer (36)
+- ShuffleQueryStage (34)
@@ -211,7 +211,7 @@ Arguments: [custdist#X DESC NULLS LAST, c_count#X DESC NULLS LAST], true, 0
Input [2]: [c_count#X, custdist#X]
Arguments: false
-(39) VeloxColumnarToRowExec
+(39) VeloxColumnarToRow
Input [2]: [c_count#X, custdist#X]
(40) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/14.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/14.txt
index f991f7b32c..946c150d86 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/14.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/14.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (35)
+- == Final Plan ==
- VeloxColumnarToRowExec (23)
+ VeloxColumnarToRow (23)
+- ^ ProjectExecTransformer (21)
+- ^ RegularHashAggregateExecTransformer (20)
+- ^ InputIteratorTransformer (19)
@@ -130,7 +130,7 @@ Input [2]: [sum(CASE WHEN StartsWith(p_type#X, PROMO) THEN CheckOverflow((promot
Input [1]: [promo_revenue#X]
Arguments: false
-(23) VeloxColumnarToRowExec
+(23) VeloxColumnarToRow
Input [1]: [promo_revenue#X]
(24) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/15.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/15.txt
index c5c3670b31..39b1c80d44 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/15.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/15.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (46)
+- == Final Plan ==
- VeloxColumnarToRowExec (31)
+ VeloxColumnarToRow (31)
+- ^ SortExecTransformer (29)
+- ^ InputIteratorTransformer (28)
+- ShuffleQueryStage (26)
@@ -169,7 +169,7 @@ Arguments: [s_suppkey#X ASC NULLS FIRST], true, 0
Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X]
Arguments: false
-(31) VeloxColumnarToRowExec
+(31) VeloxColumnarToRow
Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X]
(32) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/16.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/16.txt
index 51e5f9c644..f7b9f730e3 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/16.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/16.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (59)
+- == Final Plan ==
- VeloxColumnarToRowExec (38)
+ VeloxColumnarToRow (38)
+- ^ SortExecTransformer (36)
+- ^ InputIteratorTransformer (35)
+- ShuffleQueryStage (33)
@@ -212,7 +212,7 @@ Arguments: [supplier_cnt#X DESC NULLS LAST, p_brand#X ASC NULLS FIRST, p_type#X
Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X]
Arguments: false
-(38) VeloxColumnarToRowExec
+(38) VeloxColumnarToRow
Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X]
(39) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/17.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/17.txt
index 200674c0b1..77441777bb 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/17.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/17.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (36)
+- == Final Plan ==
- VeloxColumnarToRowExec (15)
+ VeloxColumnarToRow (15)
+- ^ ProjectExecTransformer (13)
+- ^ RegularHashAggregateExecTransformer (12)
+- ^ InputIteratorTransformer (11)
@@ -92,7 +92,7 @@ Input [1]: [sum(l_extendedprice#X)#X]
Input [1]: [avg_yearly#X]
Arguments: false
-(15) VeloxColumnarToRowExec
+(15) VeloxColumnarToRow
Input [1]: [avg_yearly#X]
(16) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/18.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/18.txt
index d6528a10e0..2cd26d020a 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/18.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/18.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (88)
+- == Final Plan ==
- VeloxColumnarToRowExec (55)
+ VeloxColumnarToRow (55)
+- TakeOrderedAndProjectExecTransformer (54)
+- ^ RegularHashAggregateExecTransformer (52)
+- ^ InputIteratorTransformer (51)
@@ -309,7 +309,7 @@ Arguments: false
Input [6]: [c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum(l_quantity)#X]
Arguments: X, [o_totalprice#X DESC NULLS LAST, o_orderdate#X ASC NULLS FIRST], [c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum(l_quantity)#X], 0
-(55) VeloxColumnarToRowExec
+(55) VeloxColumnarToRow
Input [6]: [c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum(l_quantity)#X]
(56) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/19.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/19.txt
index 218c7e7d36..b5b2fff7c5 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/19.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/19.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (34)
+- == Final Plan ==
- VeloxColumnarToRowExec (22)
+ VeloxColumnarToRow (22)
+- ^ RegularHashAggregateExecTransformer (20)
+- ^ InputIteratorTransformer (19)
+- ShuffleQueryStage (17)
@@ -125,7 +125,7 @@ Results [1]: [sum(CheckOverflow((promote_precision(cast(l_extendedprice#X as dec
Input [1]: [revenue#X]
Arguments: false
-(22) VeloxColumnarToRowExec
+(22) VeloxColumnarToRow
Input [1]: [revenue#X]
(23) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/20.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/20.txt
index 925c9b4c1d..b457f6f10d 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/20.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/20.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (112)
+- == Final Plan ==
- VeloxColumnarToRowExec (73)
+ VeloxColumnarToRow (73)
+- ^ SortExecTransformer (71)
+- ^ InputIteratorTransformer (70)
+- ShuffleQueryStage (68)
@@ -396,7 +396,7 @@ Arguments: [s_name#X ASC NULLS FIRST], true, 0
Input [2]: [s_name#X, s_address#X]
Arguments: false
-(73) VeloxColumnarToRowExec
+(73) VeloxColumnarToRow
Input [2]: [s_name#X, s_address#X]
(74) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/21.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/21.txt
index 0ef77a3b40..2ef6280501 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/21.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/21.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (93)
+- == Final Plan ==
- VeloxColumnarToRowExec (60)
+ VeloxColumnarToRow (60)
+- TakeOrderedAndProjectExecTransformer (59)
+- ^ RegularHashAggregateExecTransformer (57)
+- ^ InputIteratorTransformer (56)
@@ -335,7 +335,7 @@ Arguments: false
Input [2]: [s_name#X, numwait#X]
Arguments: X, [numwait#X DESC NULLS LAST, s_name#X ASC NULLS FIRST], [s_name#X, numwait#X], 0
-(60) VeloxColumnarToRowExec
+(60) VeloxColumnarToRow
Input [2]: [s_name#X, numwait#X]
(61) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/22.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/22.txt
index e3cda8bcfc..271e9e810e 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/22.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/22.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (40)
+- == Final Plan ==
- VeloxColumnarToRowExec (28)
+ VeloxColumnarToRow (28)
+- ^ SortExecTransformer (26)
+- ^ InputIteratorTransformer (25)
+- ShuffleQueryStage (23)
@@ -150,7 +150,7 @@ Arguments: [cntrycode#X ASC NULLS FIRST], true, 0
Input [3]: [cntrycode#X, numcust#X, totacctbal#X]
Arguments: false
-(28) VeloxColumnarToRowExec
+(28) VeloxColumnarToRow
Input [3]: [cntrycode#X, numcust#X, totacctbal#X]
(29) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/3.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/3.txt
index 4e3cdc9970..f0fca318bf 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/3.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/3.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (54)
+- == Final Plan ==
- VeloxColumnarToRowExec (35)
+ VeloxColumnarToRow (35)
+- TakeOrderedAndProjectExecTransformer (34)
+- ^ ProjectExecTransformer (32)
+- ^ RegularHashAggregateExecTransformer (31)
@@ -197,7 +197,7 @@ Arguments: false
Input [4]: [l_orderkey#X, revenue#X, o_orderdate#X, o_shippriority#X]
Arguments: X, [revenue#X DESC NULLS LAST, o_orderdate#X ASC NULLS FIRST], [l_orderkey#X, revenue#X, o_orderdate#X, o_shippriority#X], 0
-(35) VeloxColumnarToRowExec
+(35) VeloxColumnarToRow
Input [4]: [l_orderkey#X, revenue#X, o_orderdate#X, o_shippriority#X]
(36) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/4.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/4.txt
index 1332c8ba96..b8cdf1656c 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/4.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/4.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (46)
+- == Final Plan ==
- VeloxColumnarToRowExec (31)
+ VeloxColumnarToRow (31)
+- ^ SortExecTransformer (29)
+- ^ InputIteratorTransformer (28)
+- ShuffleQueryStage (26)
@@ -169,7 +169,7 @@ Arguments: [o_orderpriority#X ASC NULLS FIRST], true, 0
Input [2]: [o_orderpriority#X, order_count#X]
Arguments: false
-(31) VeloxColumnarToRowExec
+(31) VeloxColumnarToRow
Input [2]: [o_orderpriority#X, order_count#X]
(32) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/5.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/5.txt
index 1445f75cfc..0ef8d9d4fc 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/5.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/5.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (102)
+- == Final Plan ==
- VeloxColumnarToRowExec (67)
+ VeloxColumnarToRow (67)
+- ^ SortExecTransformer (65)
+- ^ InputIteratorTransformer (64)
+- ShuffleQueryStage (62)
@@ -369,7 +369,7 @@ Arguments: [revenue#X DESC NULLS LAST], true, 0
Input [2]: [n_name#X, revenue#X]
Arguments: false
-(67) VeloxColumnarToRowExec
+(67) VeloxColumnarToRow
Input [2]: [n_name#X, revenue#X]
(68) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/6.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/6.txt
index 2b97fd28f1..a1830678d0 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/6.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/6.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (20)
+- == Final Plan ==
- VeloxColumnarToRowExec (13)
+ VeloxColumnarToRow (13)
+- ^ RegularHashAggregateExecTransformer (11)
+- ^ InputIteratorTransformer (10)
+- ShuffleQueryStage (8)
@@ -75,7 +75,7 @@ Results [1]: [sum(CheckOverflow((promote_precision(l_extendedprice#X) * promote_
Input [1]: [revenue#X]
Arguments: false
-(13) VeloxColumnarToRowExec
+(13) VeloxColumnarToRow
Input [1]: [revenue#X]
(14) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/7.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/7.txt
index 5f3cf3fa7c..cac53895b9 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/7.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/7.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (95)
+- == Final Plan ==
- VeloxColumnarToRowExec (62)
+ VeloxColumnarToRow (62)
+- ^ SortExecTransformer (60)
+- ^ InputIteratorTransformer (59)
+- ShuffleQueryStage (57)
@@ -339,7 +339,7 @@ Arguments: [supp_nation#X ASC NULLS FIRST, cust_nation#X ASC NULLS FIRST, l_year
Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X]
Arguments: false
-(62) VeloxColumnarToRowExec
+(62) VeloxColumnarToRow
Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X]
(63) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/8.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/8.txt
index a64588c5ba..33544f0796 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/8.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/8.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (131)
+- == Final Plan ==
- VeloxColumnarToRowExec (86)
+ VeloxColumnarToRow (86)
+- ^ SortExecTransformer (84)
+- ^ InputIteratorTransformer (83)
+- ShuffleQueryStage (81)
@@ -474,7 +474,7 @@ Arguments: [o_year#X ASC NULLS FIRST], true, 0
Input [2]: [o_year#X, mkt_share#X]
Arguments: false
-(86) VeloxColumnarToRowExec
+(86) VeloxColumnarToRow
Input [2]: [o_year#X, mkt_share#X]
(87) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/9.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/9.txt
index 45bfb4c199..7112bb021b 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/9.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark32/9.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (100)
+- == Final Plan ==
- VeloxColumnarToRowExec (66)
+ VeloxColumnarToRow (66)
+- ^ SortExecTransformer (64)
+- ^ InputIteratorTransformer (63)
+- ShuffleQueryStage (61)
@@ -363,7 +363,7 @@ Arguments: [nation#X ASC NULLS FIRST, o_year#X DESC NULLS LAST], true, 0
Input [3]: [nation#X, o_year#X, sum_profit#X]
Arguments: false
-(66) VeloxColumnarToRowExec
+(66) VeloxColumnarToRow
Input [3]: [nation#X, o_year#X, sum_profit#X]
(67) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/1.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/1.txt
index 417ddf9de2..0851fa2447 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/1.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/1.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (30)
+- == Final Plan ==
- VeloxColumnarToRowExec (21)
+ VeloxColumnarToRow (21)
+- ^ SortExecTransformer (19)
+- ^ InputIteratorTransformer (18)
+- ShuffleQueryStage (16), Statistics(X)
@@ -113,7 +113,7 @@ Arguments: [l_returnflag#X ASC NULLS FIRST, l_linestatus#X ASC NULLS FIRST], tru
Input [10]: [l_returnflag#X, l_linestatus#X, sum_qty#X, sum_base_price#X, sum_disc_price#X, sum_charge#X, avg_qty#X, avg_price#X, avg_disc#X, count_order#X]
Arguments: false
-(21) VeloxColumnarToRowExec
+(21) VeloxColumnarToRow
Input [10]: [l_returnflag#X, l_linestatus#X, sum_qty#X, sum_base_price#X, sum_disc_price#X, sum_charge#X, avg_qty#X, avg_price#X, avg_disc#X, count_order#X]
(22) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/10.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/10.txt
index 7b8d023863..42cf8e1b7f 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/10.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/10.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (68)
+- == Final Plan ==
- VeloxColumnarToRowExec (44)
+ VeloxColumnarToRow (44)
+- TakeOrderedAndProjectExecTransformer (43)
+- ^ ProjectExecTransformer (41)
+- ^ RegularHashAggregateExecTransformer (40)
@@ -247,7 +247,7 @@ Arguments: false
Input [8]: [c_custkey#X, c_name#X, revenue#X, c_acctbal#X, n_name#X, c_address#X, c_phone#X, c_comment#X]
Arguments: X, [revenue#X DESC NULLS LAST], [c_custkey#X, c_name#X, revenue#X, c_acctbal#X, n_name#X, c_address#X, c_phone#X, c_comment#X], 0
-(44) VeloxColumnarToRowExec
+(44) VeloxColumnarToRow
Input [8]: [c_custkey#X, c_name#X, revenue#X, c_acctbal#X, n_name#X, c_address#X, c_phone#X, c_comment#X]
(45) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/11.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/11.txt
index e01bfff288..85d974b5db 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/11.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/11.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (60)
+- == Final Plan ==
- VeloxColumnarToRowExec (40)
+ VeloxColumnarToRow (40)
+- ^ SortExecTransformer (38)
+- ^ InputIteratorTransformer (37)
+- ShuffleQueryStage (35), Statistics(X)
@@ -219,7 +219,7 @@ Arguments: [value#X DESC NULLS LAST], true, 0
Input [2]: [ps_partkey#X, value#X]
Arguments: false
-(40) VeloxColumnarToRowExec
+(40) VeloxColumnarToRow
Input [2]: [ps_partkey#X, value#X]
(41) Scan parquet
@@ -324,7 +324,7 @@ Arguments: isFinalPlan=true
Subquery:1 Hosting operator id = 31 Hosting Expression = Subquery subquery#X, [id=#X]
AdaptiveSparkPlan (102)
+- == Final Plan ==
- VeloxColumnarToRowExec (85)
+ VeloxColumnarToRow (85)
+- ^ ProjectExecTransformer (83)
+- ^ RegularHashAggregateExecTransformer (82)
+- ^ InputIteratorTransformer (81)
@@ -462,7 +462,7 @@ Input [1]: [sum(CheckOverflow((promote_precision(ps_supplycost#X) * promote_prec
Input [1]: [(sum((ps_supplycost * ps_availqty)) * 0.0001000000)#X]
Arguments: false
-(85) VeloxColumnarToRowExec
+(85) VeloxColumnarToRow
Input [1]: [(sum((ps_supplycost * ps_availqty)) * 0.0001000000)#X]
(86) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/12.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/12.txt
index 490806d71d..2c8b48e6c1 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/12.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/12.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (44)
+- == Final Plan ==
- VeloxColumnarToRowExec (30)
+ VeloxColumnarToRow (30)
+- ^ SortExecTransformer (28)
+- ^ InputIteratorTransformer (27)
+- ShuffleQueryStage (25), Statistics(X)
@@ -163,7 +163,7 @@ Arguments: [l_shipmode#X ASC NULLS FIRST], true, 0
Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X]
Arguments: false
-(30) VeloxColumnarToRowExec
+(30) VeloxColumnarToRow
Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X]
(31) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/13.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/13.txt
index c3ac3e0903..c08eaab2dc 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/13.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/13.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (55)
+- == Final Plan ==
- VeloxColumnarToRowExec (39)
+ VeloxColumnarToRow (39)
+- ^ SortExecTransformer (37)
+- ^ InputIteratorTransformer (36)
+- ShuffleQueryStage (34), Statistics(X)
@@ -211,7 +211,7 @@ Arguments: [custdist#X DESC NULLS LAST, c_count#X DESC NULLS LAST], true, 0
Input [2]: [c_count#X, custdist#X]
Arguments: false
-(39) VeloxColumnarToRowExec
+(39) VeloxColumnarToRow
Input [2]: [c_count#X, custdist#X]
(40) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/14.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/14.txt
index 67bce21483..8956ddaa21 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/14.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/14.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (35)
+- == Final Plan ==
- VeloxColumnarToRowExec (23)
+ VeloxColumnarToRow (23)
+- ^ ProjectExecTransformer (21)
+- ^ RegularHashAggregateExecTransformer (20)
+- ^ InputIteratorTransformer (19)
@@ -130,7 +130,7 @@ Input [2]: [sum(CASE WHEN StartsWith(p_type#X, PROMO) THEN CheckOverflow((promot
Input [1]: [promo_revenue#X]
Arguments: false
-(23) VeloxColumnarToRowExec
+(23) VeloxColumnarToRow
Input [1]: [promo_revenue#X]
(24) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/15.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/15.txt
index 9a7879d5c1..d7603e49ff 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/15.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/15.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (43)
+- == Final Plan ==
- VeloxColumnarToRowExec (28)
+ VeloxColumnarToRow (28)
+- AQEShuffleRead (27)
+- ShuffleQueryStage (26), Statistics(X)
+- ColumnarExchange (25)
@@ -158,7 +158,7 @@ Arguments: X
Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X]
Arguments: local
-(28) VeloxColumnarToRowExec
+(28) VeloxColumnarToRow
Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X]
(29) Scan parquet
@@ -239,7 +239,7 @@ Arguments: isFinalPlan=true
Subquery:1 Hosting operator id = 20 Hosting Expression = Subquery subquery#X, [id=#X]
AdaptiveSparkPlan (69)
+- == Final Plan ==
- VeloxColumnarToRowExec (60)
+ VeloxColumnarToRow (60)
+- ^ RegularHashAggregateExecTransformer (58)
+- ^ RegularHashAggregateExecTransformer (57)
+- ^ ProjectExecTransformer (56)
@@ -341,7 +341,7 @@ Results [1]: [max(total_revenue#X)#X AS max(total_revenue)#X]
Input [1]: [max(total_revenue)#X]
Arguments: false
-(60) VeloxColumnarToRowExec
+(60) VeloxColumnarToRow
Input [1]: [max(total_revenue)#X]
(61) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/16.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/16.txt
index 6faaec51bb..394bbd2469 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/16.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/16.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (59)
+- == Final Plan ==
- VeloxColumnarToRowExec (38)
+ VeloxColumnarToRow (38)
+- ^ SortExecTransformer (36)
+- ^ InputIteratorTransformer (35)
+- ShuffleQueryStage (33), Statistics(X)
@@ -212,7 +212,7 @@ Arguments: [supplier_cnt#X DESC NULLS LAST, p_brand#X ASC NULLS FIRST, p_type#X
Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X]
Arguments: false
-(38) VeloxColumnarToRowExec
+(38) VeloxColumnarToRow
Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X]
(39) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/17.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/17.txt
index d0d18bdf81..372d6bc719 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/17.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/17.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (36)
+- == Final Plan ==
- VeloxColumnarToRowExec (15)
+ VeloxColumnarToRow (15)
+- ^ ProjectExecTransformer (13)
+- ^ RegularHashAggregateExecTransformer (12)
+- ^ InputIteratorTransformer (11)
@@ -92,7 +92,7 @@ Input [1]: [sum(l_extendedprice#X)#X]
Input [1]: [avg_yearly#X]
Arguments: false
-(15) VeloxColumnarToRowExec
+(15) VeloxColumnarToRow
Input [1]: [avg_yearly#X]
(16) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/18.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/18.txt
index 661a04a3db..6c279f2d12 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/18.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/18.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (88)
+- == Final Plan ==
- VeloxColumnarToRowExec (55)
+ VeloxColumnarToRow (55)
+- TakeOrderedAndProjectExecTransformer (54)
+- ^ RegularHashAggregateExecTransformer (52)
+- ^ InputIteratorTransformer (51)
@@ -309,7 +309,7 @@ Arguments: false
Input [6]: [c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum(l_quantity)#X]
Arguments: X, [o_totalprice#X DESC NULLS LAST, o_orderdate#X ASC NULLS FIRST], [c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum(l_quantity)#X], 0
-(55) VeloxColumnarToRowExec
+(55) VeloxColumnarToRow
Input [6]: [c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum(l_quantity)#X]
(56) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/19.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/19.txt
index 47e5d26dbd..3fb33773dd 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/19.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/19.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (34)
+- == Final Plan ==
- VeloxColumnarToRowExec (22)
+ VeloxColumnarToRow (22)
+- ^ RegularHashAggregateExecTransformer (20)
+- ^ InputIteratorTransformer (19)
+- ShuffleQueryStage (17), Statistics(X)
@@ -125,7 +125,7 @@ Results [1]: [sum(CheckOverflow((promote_precision(cast(l_extendedprice#X as dec
Input [1]: [revenue#X]
Arguments: false
-(22) VeloxColumnarToRowExec
+(22) VeloxColumnarToRow
Input [1]: [revenue#X]
(23) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/20.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/20.txt
index b15eb6d9c3..e670a838bf 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/20.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/20.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (109)
+- == Final Plan ==
- VeloxColumnarToRowExec (70)
+ VeloxColumnarToRow (70)
+- AQEShuffleRead (69)
+- ShuffleQueryStage (68), Statistics(X)
+- ColumnarExchange (67)
@@ -385,7 +385,7 @@ Arguments: X
Input [2]: [s_name#X, s_address#X]
Arguments: local
-(70) VeloxColumnarToRowExec
+(70) VeloxColumnarToRow
Input [2]: [s_name#X, s_address#X]
(71) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/21.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/21.txt
index 8a2bf8db61..eae4758613 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/21.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/21.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (92)
+- == Final Plan ==
- VeloxColumnarToRowExec (59)
+ VeloxColumnarToRow (59)
+- ^ RegularHashAggregateExecTransformer (57)
+- ^ InputIteratorTransformer (56)
+- ShuffleQueryStage (54), Statistics(X)
@@ -330,7 +330,7 @@ Results [2]: [s_name#X, count(1)#X AS numwait#X]
Input [2]: [s_name#X, numwait#X]
Arguments: false
-(59) VeloxColumnarToRowExec
+(59) VeloxColumnarToRow
Input [2]: [s_name#X, numwait#X]
(60) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/22.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/22.txt
index e7ea95ab68..a3d3f0a08e 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/22.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/22.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (40)
+- == Final Plan ==
- VeloxColumnarToRowExec (28)
+ VeloxColumnarToRow (28)
+- ^ SortExecTransformer (26)
+- ^ InputIteratorTransformer (25)
+- ShuffleQueryStage (23), Statistics(X)
@@ -150,7 +150,7 @@ Arguments: [cntrycode#X ASC NULLS FIRST], true, 0
Input [3]: [cntrycode#X, numcust#X, totacctbal#X]
Arguments: false
-(28) VeloxColumnarToRowExec
+(28) VeloxColumnarToRow
Input [3]: [cntrycode#X, numcust#X, totacctbal#X]
(29) Scan parquet
@@ -218,7 +218,7 @@ Arguments: isFinalPlan=true
Subquery:1 Hosting operator id = 2 Hosting Expression = Subquery subquery#X, [id=#X]
AdaptiveSparkPlan (60)
+- == Final Plan ==
- VeloxColumnarToRowExec (53)
+ VeloxColumnarToRow (53)
+- ^ RegularHashAggregateExecTransformer (51)
+- ^ InputIteratorTransformer (50)
+- ShuffleQueryStage (48), Statistics(X)
@@ -292,7 +292,7 @@ Results [1]: [avg(c_acctbal#X)#X AS avg(c_acctbal)#X]
Input [1]: [avg(c_acctbal)#X]
Arguments: false
-(53) VeloxColumnarToRowExec
+(53) VeloxColumnarToRow
Input [1]: [avg(c_acctbal)#X]
(54) Scan parquet
@@ -335,7 +335,7 @@ Arguments: isFinalPlan=true
Subquery:2 Hosting operator id = 1 Hosting Expression = Subquery subquery#X, [id=#X]
AdaptiveSparkPlan (60)
+- == Final Plan ==
- VeloxColumnarToRowExec (53)
+ VeloxColumnarToRow (53)
+- ^ RegularHashAggregateExecTransformer (51)
+- ^ InputIteratorTransformer (50)
+- ShuffleQueryStage (48), Statistics(X)
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/3.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/3.txt
index 03ff6cc3d0..e7fa21b6f1 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/3.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/3.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (54)
+- == Final Plan ==
- VeloxColumnarToRowExec (35)
+ VeloxColumnarToRow (35)
+- TakeOrderedAndProjectExecTransformer (34)
+- ^ ProjectExecTransformer (32)
+- ^ RegularHashAggregateExecTransformer (31)
@@ -197,7 +197,7 @@ Arguments: false
Input [4]: [l_orderkey#X, revenue#X, o_orderdate#X, o_shippriority#X]
Arguments: X, [revenue#X DESC NULLS LAST, o_orderdate#X ASC NULLS FIRST], [l_orderkey#X, revenue#X, o_orderdate#X, o_shippriority#X], 0
-(35) VeloxColumnarToRowExec
+(35) VeloxColumnarToRow
Input [4]: [l_orderkey#X, revenue#X, o_orderdate#X, o_shippriority#X]
(36) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/4.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/4.txt
index c6f0f246e5..a1eaaca4d4 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/4.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/4.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (46)
+- == Final Plan ==
- VeloxColumnarToRowExec (31)
+ VeloxColumnarToRow (31)
+- ^ SortExecTransformer (29)
+- ^ InputIteratorTransformer (28)
+- ShuffleQueryStage (26), Statistics(X)
@@ -169,7 +169,7 @@ Arguments: [o_orderpriority#X ASC NULLS FIRST], true, 0
Input [2]: [o_orderpriority#X, order_count#X]
Arguments: false
-(31) VeloxColumnarToRowExec
+(31) VeloxColumnarToRow
Input [2]: [o_orderpriority#X, order_count#X]
(32) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/5.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/5.txt
index 213c8e698e..638a442362 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/5.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/5.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (102)
+- == Final Plan ==
- VeloxColumnarToRowExec (67)
+ VeloxColumnarToRow (67)
+- ^ SortExecTransformer (65)
+- ^ InputIteratorTransformer (64)
+- ShuffleQueryStage (62), Statistics(X)
@@ -369,7 +369,7 @@ Arguments: [revenue#X DESC NULLS LAST], true, 0
Input [2]: [n_name#X, revenue#X]
Arguments: false
-(67) VeloxColumnarToRowExec
+(67) VeloxColumnarToRow
Input [2]: [n_name#X, revenue#X]
(68) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/6.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/6.txt
index bb9d04cdcd..5df63675ca 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/6.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/6.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (20)
+- == Final Plan ==
- VeloxColumnarToRowExec (13)
+ VeloxColumnarToRow (13)
+- ^ RegularHashAggregateExecTransformer (11)
+- ^ InputIteratorTransformer (10)
+- ShuffleQueryStage (8), Statistics(X)
@@ -75,7 +75,7 @@ Results [1]: [sum(CheckOverflow((promote_precision(l_extendedprice#X) * promote_
Input [1]: [revenue#X]
Arguments: false
-(13) VeloxColumnarToRowExec
+(13) VeloxColumnarToRow
Input [1]: [revenue#X]
(14) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/7.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/7.txt
index 3f54f20f05..86db01e58b 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/7.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/7.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (95)
+- == Final Plan ==
- VeloxColumnarToRowExec (62)
+ VeloxColumnarToRow (62)
+- ^ SortExecTransformer (60)
+- ^ InputIteratorTransformer (59)
+- ShuffleQueryStage (57), Statistics(X)
@@ -339,7 +339,7 @@ Arguments: [supp_nation#X ASC NULLS FIRST, cust_nation#X ASC NULLS FIRST, l_year
Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X]
Arguments: false
-(62) VeloxColumnarToRowExec
+(62) VeloxColumnarToRow
Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X]
(63) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/8.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/8.txt
index ba0d25c608..ccc7941882 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/8.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/8.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (131)
+- == Final Plan ==
- VeloxColumnarToRowExec (86)
+ VeloxColumnarToRow (86)
+- ^ SortExecTransformer (84)
+- ^ InputIteratorTransformer (83)
+- ShuffleQueryStage (81), Statistics(X)
@@ -474,7 +474,7 @@ Arguments: [o_year#X ASC NULLS FIRST], true, 0
Input [2]: [o_year#X, mkt_share#X]
Arguments: false
-(86) VeloxColumnarToRowExec
+(86) VeloxColumnarToRow
Input [2]: [o_year#X, mkt_share#X]
(87) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/9.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/9.txt
index d15efa6a65..2124135682 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/9.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark33/9.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (100)
+- == Final Plan ==
- VeloxColumnarToRowExec (66)
+ VeloxColumnarToRow (66)
+- ^ SortExecTransformer (64)
+- ^ InputIteratorTransformer (63)
+- ShuffleQueryStage (61), Statistics(X)
@@ -363,7 +363,7 @@ Arguments: [nation#X ASC NULLS FIRST, o_year#X DESC NULLS LAST], true, 0
Input [3]: [nation#X, o_year#X, sum_profit#X]
Arguments: false
-(66) VeloxColumnarToRowExec
+(66) VeloxColumnarToRow
Input [3]: [nation#X, o_year#X, sum_profit#X]
(67) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/1.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/1.txt
index 450797d3ae..6dbee1ad7f 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/1.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/1.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (30)
+- == Final Plan ==
- VeloxColumnarToRowExec (21)
+ VeloxColumnarToRow (21)
+- ^ SortExecTransformer (19)
+- ^ InputIteratorTransformer (18)
+- ShuffleQueryStage (16), Statistics(X)
@@ -113,7 +113,7 @@ Arguments: [l_returnflag#X ASC NULLS FIRST, l_linestatus#X ASC NULLS FIRST], tru
Input [10]: [l_returnflag#X, l_linestatus#X, sum_qty#X, sum_base_price#X, sum_disc_price#X, sum_charge#X, avg_qty#X, avg_price#X, avg_disc#X, count_order#X]
Arguments: false
-(21) VeloxColumnarToRowExec
+(21) VeloxColumnarToRow
Input [10]: [l_returnflag#X, l_linestatus#X, sum_qty#X, sum_base_price#X, sum_disc_price#X, sum_charge#X, avg_qty#X, avg_price#X, avg_disc#X, count_order#X]
(22) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/10.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/10.txt
index 7a2404c1d6..47dc04d100 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/10.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/10.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (68)
+- == Final Plan ==
- VeloxColumnarToRowExec (44)
+ VeloxColumnarToRow (44)
+- TakeOrderedAndProjectExecTransformer (43)
+- ^ ProjectExecTransformer (41)
+- ^ RegularHashAggregateExecTransformer (40)
@@ -250,7 +250,7 @@ Arguments: false
Input [8]: [c_custkey#X, c_name#X, revenue#X, c_acctbal#X, n_name#X, c_address#X, c_phone#X, c_comment#X]
Arguments: X, [revenue#X DESC NULLS LAST], [c_custkey#X, c_name#X, revenue#X, c_acctbal#X, n_name#X, c_address#X, c_phone#X, c_comment#X], 0
-(44) VeloxColumnarToRowExec
+(44) VeloxColumnarToRow
Input [8]: [c_custkey#X, c_name#X, revenue#X, c_acctbal#X, n_name#X, c_address#X, c_phone#X, c_comment#X]
(45) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/11.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/11.txt
index 2bf0278656..e95764f4de 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/11.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/11.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (60)
+- == Final Plan ==
- VeloxColumnarToRowExec (40)
+ VeloxColumnarToRow (40)
+- ^ SortExecTransformer (38)
+- ^ InputIteratorTransformer (37)
+- ShuffleQueryStage (35), Statistics(X)
@@ -221,7 +221,7 @@ Arguments: [value#X DESC NULLS LAST], true, 0
Input [2]: [ps_partkey#X, value#X]
Arguments: false
-(40) VeloxColumnarToRowExec
+(40) VeloxColumnarToRow
Input [2]: [ps_partkey#X, value#X]
(41) Scan parquet
@@ -328,7 +328,7 @@ Arguments: isFinalPlan=true
Subquery:1 Hosting operator id = 31 Hosting Expression = Subquery subquery#X, [id=#X]
AdaptiveSparkPlan (102)
+- == Final Plan ==
- VeloxColumnarToRowExec (85)
+ VeloxColumnarToRow (85)
+- ^ ProjectExecTransformer (83)
+- ^ RegularHashAggregateExecTransformer (82)
+- ^ InputIteratorTransformer (81)
@@ -468,7 +468,7 @@ Input [1]: [sum((ps_supplycost#X * cast(ps_availqty#X as decimal(10,0))))#X]
Input [1]: [(sum((ps_supplycost * ps_availqty)) * 0.0001000000)#X]
Arguments: false
-(85) VeloxColumnarToRowExec
+(85) VeloxColumnarToRow
Input [1]: [(sum((ps_supplycost * ps_availqty)) * 0.0001000000)#X]
(86) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/12.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/12.txt
index b796cfae26..1b7065e114 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/12.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/12.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (44)
+- == Final Plan ==
- VeloxColumnarToRowExec (30)
+ VeloxColumnarToRow (30)
+- ^ SortExecTransformer (28)
+- ^ InputIteratorTransformer (27)
+- ShuffleQueryStage (25), Statistics(X)
@@ -164,7 +164,7 @@ Arguments: [l_shipmode#X ASC NULLS FIRST], true, 0
Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X]
Arguments: false
-(30) VeloxColumnarToRowExec
+(30) VeloxColumnarToRow
Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X]
(31) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/13.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/13.txt
index 3b7ac85bf2..233f33a31f 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/13.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/13.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (55)
+- == Final Plan ==
- VeloxColumnarToRowExec (39)
+ VeloxColumnarToRow (39)
+- ^ SortExecTransformer (37)
+- ^ InputIteratorTransformer (36)
+- ShuffleQueryStage (34), Statistics(X)
@@ -212,7 +212,7 @@ Arguments: [custdist#X DESC NULLS LAST, c_count#X DESC NULLS LAST], true, 0
Input [2]: [c_count#X, custdist#X]
Arguments: false
-(39) VeloxColumnarToRowExec
+(39) VeloxColumnarToRow
Input [2]: [c_count#X, custdist#X]
(40) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/14.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/14.txt
index 7f4949cf72..6d2233b3e0 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/14.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/14.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (35)
+- == Final Plan ==
- VeloxColumnarToRowExec (23)
+ VeloxColumnarToRow (23)
+- ^ ProjectExecTransformer (21)
+- ^ RegularHashAggregateExecTransformer (20)
+- ^ InputIteratorTransformer (19)
@@ -131,7 +131,7 @@ Input [2]: [sum(CASE WHEN StartsWith(p_type#X, PROMO) THEN (l_extendedprice#X *
Input [1]: [promo_revenue#X]
Arguments: false
-(23) VeloxColumnarToRowExec
+(23) VeloxColumnarToRow
Input [1]: [promo_revenue#X]
(24) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/15.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/15.txt
index 5fa837e185..1ec03a2f9e 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/15.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/15.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (43)
+- == Final Plan ==
- VeloxColumnarToRowExec (28)
+ VeloxColumnarToRow (28)
+- AQEShuffleRead (27)
+- ShuffleQueryStage (26), Statistics(X)
+- ColumnarExchange (25)
@@ -159,7 +159,7 @@ Arguments: X
Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X]
Arguments: local
-(28) VeloxColumnarToRowExec
+(28) VeloxColumnarToRow
Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X]
(29) Scan parquet
@@ -241,7 +241,7 @@ Arguments: isFinalPlan=true
Subquery:1 Hosting operator id = 20 Hosting Expression = Subquery subquery#X, [id=#X]
AdaptiveSparkPlan (69)
+- == Final Plan ==
- VeloxColumnarToRowExec (60)
+ VeloxColumnarToRow (60)
+- ^ RegularHashAggregateExecTransformer (58)
+- ^ RegularHashAggregateExecTransformer (57)
+- ^ ProjectExecTransformer (56)
@@ -343,7 +343,7 @@ Results [1]: [max(total_revenue#X)#X AS max(total_revenue)#X]
Input [1]: [max(total_revenue)#X]
Arguments: false
-(60) VeloxColumnarToRowExec
+(60) VeloxColumnarToRow
Input [1]: [max(total_revenue)#X]
(61) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/16.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/16.txt
index a6302f1bee..e64cb09900 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/16.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/16.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (59)
+- == Final Plan ==
- VeloxColumnarToRowExec (38)
+ VeloxColumnarToRow (38)
+- ^ SortExecTransformer (36)
+- ^ InputIteratorTransformer (35)
+- ShuffleQueryStage (33), Statistics(X)
@@ -213,7 +213,7 @@ Arguments: [supplier_cnt#X DESC NULLS LAST, p_brand#X ASC NULLS FIRST, p_type#X
Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X]
Arguments: false
-(38) VeloxColumnarToRowExec
+(38) VeloxColumnarToRow
Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X]
(39) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/17.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/17.txt
index f2b7262c75..b66a80731b 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/17.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/17.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (36)
+- == Final Plan ==
- VeloxColumnarToRowExec (15)
+ VeloxColumnarToRow (15)
+- ^ ProjectExecTransformer (13)
+- ^ RegularHashAggregateExecTransformer (12)
+- ^ InputIteratorTransformer (11)
@@ -92,7 +92,7 @@ Input [1]: [sum(l_extendedprice#X)#X]
Input [1]: [avg_yearly#X]
Arguments: false
-(15) VeloxColumnarToRowExec
+(15) VeloxColumnarToRow
Input [1]: [avg_yearly#X]
(16) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/18.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/18.txt
index 029c44b154..c92587c9d7 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/18.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/18.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (88)
+- == Final Plan ==
- VeloxColumnarToRowExec (55)
+ VeloxColumnarToRow (55)
+- TakeOrderedAndProjectExecTransformer (54)
+- ^ RegularHashAggregateExecTransformer (52)
+- ^ InputIteratorTransformer (51)
@@ -313,7 +313,7 @@ Arguments: false
Input [6]: [c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum(l_quantity)#X]
Arguments: X, [o_totalprice#X DESC NULLS LAST, o_orderdate#X ASC NULLS FIRST], [c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum(l_quantity)#X], 0
-(55) VeloxColumnarToRowExec
+(55) VeloxColumnarToRow
Input [6]: [c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum(l_quantity)#X]
(56) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/19.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/19.txt
index 069500cf6b..80e7860df0 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/19.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/19.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (34)
+- == Final Plan ==
- VeloxColumnarToRowExec (22)
+ VeloxColumnarToRow (22)
+- ^ RegularHashAggregateExecTransformer (20)
+- ^ InputIteratorTransformer (19)
+- ShuffleQueryStage (17), Statistics(X)
@@ -126,7 +126,7 @@ Results [1]: [sum((l_extendedprice#X * (1 - l_discount#X)))#X AS revenue#X]
Input [1]: [revenue#X]
Arguments: false
-(22) VeloxColumnarToRowExec
+(22) VeloxColumnarToRow
Input [1]: [revenue#X]
(23) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/20.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/20.txt
index 3e2b198354..9d7b9d2162 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/20.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/20.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (98)
+- == Final Plan ==
- VeloxColumnarToRowExec (62)
+ VeloxColumnarToRow (62)
+- AQEShuffleRead (61)
+- ShuffleQueryStage (60), Statistics(X)
+- ColumnarExchange (59)
@@ -351,7 +351,7 @@ Arguments: X
Input [2]: [s_name#X, s_address#X]
Arguments: local
-(62) VeloxColumnarToRowExec
+(62) VeloxColumnarToRow
Input [2]: [s_name#X, s_address#X]
(63) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/21.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/21.txt
index c93cb695db..8382dbcd50 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/21.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/21.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (92)
+- == Final Plan ==
- VeloxColumnarToRowExec (59)
+ VeloxColumnarToRow (59)
+- ^ RegularHashAggregateExecTransformer (57)
+- ^ InputIteratorTransformer (56)
+- ShuffleQueryStage (54), Statistics(X)
@@ -335,7 +335,7 @@ Results [2]: [s_name#X, count(1)#X AS numwait#X]
Input [2]: [s_name#X, numwait#X]
Arguments: false
-(59) VeloxColumnarToRowExec
+(59) VeloxColumnarToRow
Input [2]: [s_name#X, numwait#X]
(60) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/22.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/22.txt
index b545068226..7f38367401 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/22.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/22.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (40)
+- == Final Plan ==
- VeloxColumnarToRowExec (28)
+ VeloxColumnarToRow (28)
+- ^ SortExecTransformer (26)
+- ^ InputIteratorTransformer (25)
+- ShuffleQueryStage (23), Statistics(X)
@@ -151,7 +151,7 @@ Arguments: [cntrycode#X ASC NULLS FIRST], true, 0
Input [3]: [cntrycode#X, numcust#X, totacctbal#X]
Arguments: false
-(28) VeloxColumnarToRowExec
+(28) VeloxColumnarToRow
Input [3]: [cntrycode#X, numcust#X, totacctbal#X]
(29) Scan parquet
@@ -220,7 +220,7 @@ Arguments: isFinalPlan=true
Subquery:1 Hosting operator id = 2 Hosting Expression = Subquery subquery#X, [id=#X]
AdaptiveSparkPlan (60)
+- == Final Plan ==
- VeloxColumnarToRowExec (53)
+ VeloxColumnarToRow (53)
+- ^ RegularHashAggregateExecTransformer (51)
+- ^ InputIteratorTransformer (50)
+- ShuffleQueryStage (48), Statistics(X)
@@ -294,7 +294,7 @@ Results [1]: [avg(c_acctbal#X)#X AS avg(c_acctbal)#X]
Input [1]: [avg(c_acctbal)#X]
Arguments: false
-(53) VeloxColumnarToRowExec
+(53) VeloxColumnarToRow
Input [1]: [avg(c_acctbal)#X]
(54) Scan parquet
@@ -337,7 +337,7 @@ Arguments: isFinalPlan=true
Subquery:2 Hosting operator id = 1 Hosting Expression = Subquery subquery#X, [id=#X]
AdaptiveSparkPlan (60)
+- == Final Plan ==
- VeloxColumnarToRowExec (53)
+ VeloxColumnarToRow (53)
+- ^ RegularHashAggregateExecTransformer (51)
+- ^ InputIteratorTransformer (50)
+- ShuffleQueryStage (48), Statistics(X)
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/3.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/3.txt
index a1635e742a..1035e0eb77 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/3.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/3.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (54)
+- == Final Plan ==
- VeloxColumnarToRowExec (35)
+ VeloxColumnarToRow (35)
+- TakeOrderedAndProjectExecTransformer (34)
+- ^ ProjectExecTransformer (32)
+- ^ RegularHashAggregateExecTransformer (31)
@@ -199,7 +199,7 @@ Arguments: false
Input [4]: [l_orderkey#X, revenue#X, o_orderdate#X, o_shippriority#X]
Arguments: X, [revenue#X DESC NULLS LAST, o_orderdate#X ASC NULLS FIRST], [l_orderkey#X, revenue#X, o_orderdate#X, o_shippriority#X], 0
-(35) VeloxColumnarToRowExec
+(35) VeloxColumnarToRow
Input [4]: [l_orderkey#X, revenue#X, o_orderdate#X, o_shippriority#X]
(36) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/4.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/4.txt
index 4a26f959b7..150788a3d7 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/4.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/4.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (46)
+- == Final Plan ==
- VeloxColumnarToRowExec (31)
+ VeloxColumnarToRow (31)
+- ^ SortExecTransformer (29)
+- ^ InputIteratorTransformer (28)
+- ShuffleQueryStage (26), Statistics(X)
@@ -170,7 +170,7 @@ Arguments: [o_orderpriority#X ASC NULLS FIRST], true, 0
Input [2]: [o_orderpriority#X, order_count#X]
Arguments: false
-(31) VeloxColumnarToRowExec
+(31) VeloxColumnarToRow
Input [2]: [o_orderpriority#X, order_count#X]
(32) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/5.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/5.txt
index 3ba742ae5b..035c5c3889 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/5.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/5.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (102)
+- == Final Plan ==
- VeloxColumnarToRowExec (67)
+ VeloxColumnarToRow (67)
+- ^ SortExecTransformer (65)
+- ^ InputIteratorTransformer (64)
+- ShuffleQueryStage (62), Statistics(X)
@@ -374,7 +374,7 @@ Arguments: [revenue#X DESC NULLS LAST], true, 0
Input [2]: [n_name#X, revenue#X]
Arguments: false
-(67) VeloxColumnarToRowExec
+(67) VeloxColumnarToRow
Input [2]: [n_name#X, revenue#X]
(68) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/6.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/6.txt
index fa37c656a1..e9dc68456e 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/6.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/6.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (20)
+- == Final Plan ==
- VeloxColumnarToRowExec (13)
+ VeloxColumnarToRow (13)
+- ^ RegularHashAggregateExecTransformer (11)
+- ^ InputIteratorTransformer (10)
+- ShuffleQueryStage (8), Statistics(X)
@@ -75,7 +75,7 @@ Results [1]: [sum((l_extendedprice#X * l_discount#X))#X AS revenue#X]
Input [1]: [revenue#X]
Arguments: false
-(13) VeloxColumnarToRowExec
+(13) VeloxColumnarToRow
Input [1]: [revenue#X]
(14) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/7.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/7.txt
index ab8abd6df3..cd877f54bd 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/7.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/7.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (95)
+- == Final Plan ==
- VeloxColumnarToRowExec (62)
+ VeloxColumnarToRow (62)
+- ^ SortExecTransformer (60)
+- ^ InputIteratorTransformer (59)
+- ShuffleQueryStage (57), Statistics(X)
@@ -344,7 +344,7 @@ Arguments: [supp_nation#X ASC NULLS FIRST, cust_nation#X ASC NULLS FIRST, l_year
Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X]
Arguments: false
-(62) VeloxColumnarToRowExec
+(62) VeloxColumnarToRow
Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X]
(63) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/8.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/8.txt
index e075a7b338..d381d21da7 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/8.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/8.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (131)
+- == Final Plan ==
- VeloxColumnarToRowExec (86)
+ VeloxColumnarToRow (86)
+- ^ SortExecTransformer (84)
+- ^ InputIteratorTransformer (83)
+- ShuffleQueryStage (81), Statistics(X)
@@ -481,7 +481,7 @@ Arguments: [o_year#X ASC NULLS FIRST], true, 0
Input [2]: [o_year#X, mkt_share#X]
Arguments: false
-(86) VeloxColumnarToRowExec
+(86) VeloxColumnarToRow
Input [2]: [o_year#X, mkt_share#X]
(87) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/9.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/9.txt
index 8ba39a425d..f0ebba6efa 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/9.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark34/9.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (100)
+- == Final Plan ==
- VeloxColumnarToRowExec (66)
+ VeloxColumnarToRow (66)
+- ^ SortExecTransformer (64)
+- ^ InputIteratorTransformer (63)
+- ShuffleQueryStage (61), Statistics(X)
@@ -368,7 +368,7 @@ Arguments: [nation#X ASC NULLS FIRST, o_year#X DESC NULLS LAST], true, 0
Input [3]: [nation#X, o_year#X, sum_profit#X]
Arguments: false
-(66) VeloxColumnarToRowExec
+(66) VeloxColumnarToRow
Input [3]: [nation#X, o_year#X, sum_profit#X]
(67) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/1.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/1.txt
index b1b2a7507c..efe7f39085 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/1.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/1.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (30)
+- == Final Plan ==
- VeloxColumnarToRowExec (21)
+ VeloxColumnarToRow (21)
+- ^ SortExecTransformer (19)
+- ^ InputIteratorTransformer (18)
+- ShuffleQueryStage (16)
@@ -113,7 +113,7 @@ Arguments: [l_returnflag#X ASC NULLS FIRST, l_linestatus#X ASC NULLS FIRST], tru
Input [10]: [l_returnflag#X, l_linestatus#X, sum_qty#X, sum_base_price#X, sum_disc_price#X, sum_charge#X, avg_qty#X, avg_price#X, avg_disc#X, count_order#X]
Arguments: false
-(21) VeloxColumnarToRowExec
+(21) VeloxColumnarToRow
Input [10]: [l_returnflag#X, l_linestatus#X, sum_qty#X, sum_base_price#X, sum_disc_price#X, sum_charge#X, avg_qty#X, avg_price#X, avg_disc#X, count_order#X]
(22) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/10.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/10.txt
index a87354004b..5b913a06db 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/10.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/10.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (68)
+- == Final Plan ==
- VeloxColumnarToRowExec (44)
+ VeloxColumnarToRow (44)
+- TakeOrderedAndProjectExecTransformer (43)
+- ^ ProjectExecTransformer (41)
+- ^ RegularHashAggregateExecTransformer (40)
@@ -247,7 +247,7 @@ Arguments: false
Input [8]: [c_custkey#X, c_name#X, revenue#X, c_acctbal#X, n_name#X, c_address#X, c_phone#X, c_comment#X]
Arguments: X, [revenue#X DESC NULLS LAST], [c_custkey#X, c_name#X, revenue#X, c_acctbal#X, n_name#X, c_address#X, c_phone#X, c_comment#X], 0
-(44) VeloxColumnarToRowExec
+(44) VeloxColumnarToRow
Input [8]: [c_custkey#X, c_name#X, revenue#X, c_acctbal#X, n_name#X, c_address#X, c_phone#X, c_comment#X]
(45) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/11.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/11.txt
index 5ad4086071..45838869f6 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/11.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/11.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (60)
+- == Final Plan ==
- VeloxColumnarToRowExec (40)
+ VeloxColumnarToRow (40)
+- ^ SortExecTransformer (38)
+- ^ InputIteratorTransformer (37)
+- ShuffleQueryStage (35)
@@ -219,7 +219,7 @@ Arguments: [value#X DESC NULLS LAST], true, 0
Input [2]: [ps_partkey#X, value#X]
Arguments: false
-(40) VeloxColumnarToRowExec
+(40) VeloxColumnarToRow
Input [2]: [ps_partkey#X, value#X]
(41) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/12.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/12.txt
index 0bbd522e9c..8a17f5db24 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/12.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/12.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (44)
+- == Final Plan ==
- VeloxColumnarToRowExec (30)
+ VeloxColumnarToRow (30)
+- ^ SortExecTransformer (28)
+- ^ InputIteratorTransformer (27)
+- ShuffleQueryStage (25)
@@ -163,7 +163,7 @@ Arguments: [l_shipmode#X ASC NULLS FIRST], true, 0
Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X]
Arguments: false
-(30) VeloxColumnarToRowExec
+(30) VeloxColumnarToRow
Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X]
(31) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/13.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/13.txt
index eceeb7738e..8de6de78df 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/13.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/13.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (55)
+- == Final Plan ==
- VeloxColumnarToRowExec (39)
+ VeloxColumnarToRow (39)
+- ^ SortExecTransformer (37)
+- ^ InputIteratorTransformer (36)
+- ShuffleQueryStage (34)
@@ -211,7 +211,7 @@ Arguments: [custdist#X DESC NULLS LAST, c_count#X DESC NULLS LAST], true, 0
Input [2]: [c_count#X, custdist#X]
Arguments: false
-(39) VeloxColumnarToRowExec
+(39) VeloxColumnarToRow
Input [2]: [c_count#X, custdist#X]
(40) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/14.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/14.txt
index f991f7b32c..946c150d86 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/14.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/14.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (35)
+- == Final Plan ==
- VeloxColumnarToRowExec (23)
+ VeloxColumnarToRow (23)
+- ^ ProjectExecTransformer (21)
+- ^ RegularHashAggregateExecTransformer (20)
+- ^ InputIteratorTransformer (19)
@@ -130,7 +130,7 @@ Input [2]: [sum(CASE WHEN StartsWith(p_type#X, PROMO) THEN CheckOverflow((promot
Input [1]: [promo_revenue#X]
Arguments: false
-(23) VeloxColumnarToRowExec
+(23) VeloxColumnarToRow
Input [1]: [promo_revenue#X]
(24) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/15.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/15.txt
index c5c3670b31..39b1c80d44 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/15.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/15.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (46)
+- == Final Plan ==
- VeloxColumnarToRowExec (31)
+ VeloxColumnarToRow (31)
+- ^ SortExecTransformer (29)
+- ^ InputIteratorTransformer (28)
+- ShuffleQueryStage (26)
@@ -169,7 +169,7 @@ Arguments: [s_suppkey#X ASC NULLS FIRST], true, 0
Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X]
Arguments: false
-(31) VeloxColumnarToRowExec
+(31) VeloxColumnarToRow
Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X]
(32) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/16.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/16.txt
index 51e5f9c644..f7b9f730e3 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/16.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/16.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (59)
+- == Final Plan ==
- VeloxColumnarToRowExec (38)
+ VeloxColumnarToRow (38)
+- ^ SortExecTransformer (36)
+- ^ InputIteratorTransformer (35)
+- ShuffleQueryStage (33)
@@ -212,7 +212,7 @@ Arguments: [supplier_cnt#X DESC NULLS LAST, p_brand#X ASC NULLS FIRST, p_type#X
Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X]
Arguments: false
-(38) VeloxColumnarToRowExec
+(38) VeloxColumnarToRow
Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X]
(39) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/17.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/17.txt
index 200674c0b1..77441777bb 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/17.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/17.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (36)
+- == Final Plan ==
- VeloxColumnarToRowExec (15)
+ VeloxColumnarToRow (15)
+- ^ ProjectExecTransformer (13)
+- ^ RegularHashAggregateExecTransformer (12)
+- ^ InputIteratorTransformer (11)
@@ -92,7 +92,7 @@ Input [1]: [sum(l_extendedprice#X)#X]
Input [1]: [avg_yearly#X]
Arguments: false
-(15) VeloxColumnarToRowExec
+(15) VeloxColumnarToRow
Input [1]: [avg_yearly#X]
(16) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/18.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/18.txt
index d6528a10e0..2cd26d020a 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/18.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/18.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (88)
+- == Final Plan ==
- VeloxColumnarToRowExec (55)
+ VeloxColumnarToRow (55)
+- TakeOrderedAndProjectExecTransformer (54)
+- ^ RegularHashAggregateExecTransformer (52)
+- ^ InputIteratorTransformer (51)
@@ -309,7 +309,7 @@ Arguments: false
Input [6]: [c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum(l_quantity)#X]
Arguments: X, [o_totalprice#X DESC NULLS LAST, o_orderdate#X ASC NULLS FIRST], [c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum(l_quantity)#X], 0
-(55) VeloxColumnarToRowExec
+(55) VeloxColumnarToRow
Input [6]: [c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum(l_quantity)#X]
(56) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/19.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/19.txt
index 218c7e7d36..b5b2fff7c5 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/19.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/19.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (34)
+- == Final Plan ==
- VeloxColumnarToRowExec (22)
+ VeloxColumnarToRow (22)
+- ^ RegularHashAggregateExecTransformer (20)
+- ^ InputIteratorTransformer (19)
+- ShuffleQueryStage (17)
@@ -125,7 +125,7 @@ Results [1]: [sum(CheckOverflow((promote_precision(cast(l_extendedprice#X as dec
Input [1]: [revenue#X]
Arguments: false
-(22) VeloxColumnarToRowExec
+(22) VeloxColumnarToRow
Input [1]: [revenue#X]
(23) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/20.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/20.txt
index 925c9b4c1d..b457f6f10d 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/20.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/20.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (112)
+- == Final Plan ==
- VeloxColumnarToRowExec (73)
+ VeloxColumnarToRow (73)
+- ^ SortExecTransformer (71)
+- ^ InputIteratorTransformer (70)
+- ShuffleQueryStage (68)
@@ -396,7 +396,7 @@ Arguments: [s_name#X ASC NULLS FIRST], true, 0
Input [2]: [s_name#X, s_address#X]
Arguments: false
-(73) VeloxColumnarToRowExec
+(73) VeloxColumnarToRow
Input [2]: [s_name#X, s_address#X]
(74) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/21.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/21.txt
index 0ef77a3b40..2ef6280501 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/21.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/21.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (93)
+- == Final Plan ==
- VeloxColumnarToRowExec (60)
+ VeloxColumnarToRow (60)
+- TakeOrderedAndProjectExecTransformer (59)
+- ^ RegularHashAggregateExecTransformer (57)
+- ^ InputIteratorTransformer (56)
@@ -335,7 +335,7 @@ Arguments: false
Input [2]: [s_name#X, numwait#X]
Arguments: X, [numwait#X DESC NULLS LAST, s_name#X ASC NULLS FIRST], [s_name#X, numwait#X], 0
-(60) VeloxColumnarToRowExec
+(60) VeloxColumnarToRow
Input [2]: [s_name#X, numwait#X]
(61) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/22.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/22.txt
index e3cda8bcfc..271e9e810e 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/22.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/22.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (40)
+- == Final Plan ==
- VeloxColumnarToRowExec (28)
+ VeloxColumnarToRow (28)
+- ^ SortExecTransformer (26)
+- ^ InputIteratorTransformer (25)
+- ShuffleQueryStage (23)
@@ -150,7 +150,7 @@ Arguments: [cntrycode#X ASC NULLS FIRST], true, 0
Input [3]: [cntrycode#X, numcust#X, totacctbal#X]
Arguments: false
-(28) VeloxColumnarToRowExec
+(28) VeloxColumnarToRow
Input [3]: [cntrycode#X, numcust#X, totacctbal#X]
(29) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/3.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/3.txt
index 4e3cdc9970..f0fca318bf 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/3.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/3.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (54)
+- == Final Plan ==
- VeloxColumnarToRowExec (35)
+ VeloxColumnarToRow (35)
+- TakeOrderedAndProjectExecTransformer (34)
+- ^ ProjectExecTransformer (32)
+- ^ RegularHashAggregateExecTransformer (31)
@@ -197,7 +197,7 @@ Arguments: false
Input [4]: [l_orderkey#X, revenue#X, o_orderdate#X, o_shippriority#X]
Arguments: X, [revenue#X DESC NULLS LAST, o_orderdate#X ASC NULLS FIRST], [l_orderkey#X, revenue#X, o_orderdate#X, o_shippriority#X], 0
-(35) VeloxColumnarToRowExec
+(35) VeloxColumnarToRow
Input [4]: [l_orderkey#X, revenue#X, o_orderdate#X, o_shippriority#X]
(36) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/4.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/4.txt
index 1332c8ba96..b8cdf1656c 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/4.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/4.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (46)
+- == Final Plan ==
- VeloxColumnarToRowExec (31)
+ VeloxColumnarToRow (31)
+- ^ SortExecTransformer (29)
+- ^ InputIteratorTransformer (28)
+- ShuffleQueryStage (26)
@@ -169,7 +169,7 @@ Arguments: [o_orderpriority#X ASC NULLS FIRST], true, 0
Input [2]: [o_orderpriority#X, order_count#X]
Arguments: false
-(31) VeloxColumnarToRowExec
+(31) VeloxColumnarToRow
Input [2]: [o_orderpriority#X, order_count#X]
(32) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/5.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/5.txt
index 1445f75cfc..0ef8d9d4fc 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/5.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/5.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (102)
+- == Final Plan ==
- VeloxColumnarToRowExec (67)
+ VeloxColumnarToRow (67)
+- ^ SortExecTransformer (65)
+- ^ InputIteratorTransformer (64)
+- ShuffleQueryStage (62)
@@ -369,7 +369,7 @@ Arguments: [revenue#X DESC NULLS LAST], true, 0
Input [2]: [n_name#X, revenue#X]
Arguments: false
-(67) VeloxColumnarToRowExec
+(67) VeloxColumnarToRow
Input [2]: [n_name#X, revenue#X]
(68) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/6.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/6.txt
index 2b97fd28f1..a1830678d0 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/6.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/6.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (20)
+- == Final Plan ==
- VeloxColumnarToRowExec (13)
+ VeloxColumnarToRow (13)
+- ^ RegularHashAggregateExecTransformer (11)
+- ^ InputIteratorTransformer (10)
+- ShuffleQueryStage (8)
@@ -75,7 +75,7 @@ Results [1]: [sum(CheckOverflow((promote_precision(l_extendedprice#X) * promote_
Input [1]: [revenue#X]
Arguments: false
-(13) VeloxColumnarToRowExec
+(13) VeloxColumnarToRow
Input [1]: [revenue#X]
(14) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/7.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/7.txt
index 5f3cf3fa7c..cac53895b9 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/7.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/7.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (95)
+- == Final Plan ==
- VeloxColumnarToRowExec (62)
+ VeloxColumnarToRow (62)
+- ^ SortExecTransformer (60)
+- ^ InputIteratorTransformer (59)
+- ShuffleQueryStage (57)
@@ -339,7 +339,7 @@ Arguments: [supp_nation#X ASC NULLS FIRST, cust_nation#X ASC NULLS FIRST, l_year
Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X]
Arguments: false
-(62) VeloxColumnarToRowExec
+(62) VeloxColumnarToRow
Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X]
(63) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/8.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/8.txt
index a64588c5ba..33544f0796 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/8.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/8.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (131)
+- == Final Plan ==
- VeloxColumnarToRowExec (86)
+ VeloxColumnarToRow (86)
+- ^ SortExecTransformer (84)
+- ^ InputIteratorTransformer (83)
+- ShuffleQueryStage (81)
@@ -474,7 +474,7 @@ Arguments: [o_year#X ASC NULLS FIRST], true, 0
Input [2]: [o_year#X, mkt_share#X]
Arguments: false
-(86) VeloxColumnarToRowExec
+(86) VeloxColumnarToRow
Input [2]: [o_year#X, mkt_share#X]
(87) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/9.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/9.txt
index 45bfb4c199..7112bb021b 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/9.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark32/9.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (100)
+- == Final Plan ==
- VeloxColumnarToRowExec (66)
+ VeloxColumnarToRow (66)
+- ^ SortExecTransformer (64)
+- ^ InputIteratorTransformer (63)
+- ShuffleQueryStage (61)
@@ -363,7 +363,7 @@ Arguments: [nation#X ASC NULLS FIRST, o_year#X DESC NULLS LAST], true, 0
Input [3]: [nation#X, o_year#X, sum_profit#X]
Arguments: false
-(66) VeloxColumnarToRowExec
+(66) VeloxColumnarToRow
Input [3]: [nation#X, o_year#X, sum_profit#X]
(67) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/1.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/1.txt
index 417ddf9de2..0851fa2447 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/1.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/1.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (30)
+- == Final Plan ==
- VeloxColumnarToRowExec (21)
+ VeloxColumnarToRow (21)
+- ^ SortExecTransformer (19)
+- ^ InputIteratorTransformer (18)
+- ShuffleQueryStage (16), Statistics(X)
@@ -113,7 +113,7 @@ Arguments: [l_returnflag#X ASC NULLS FIRST, l_linestatus#X ASC NULLS FIRST], tru
Input [10]: [l_returnflag#X, l_linestatus#X, sum_qty#X, sum_base_price#X, sum_disc_price#X, sum_charge#X, avg_qty#X, avg_price#X, avg_disc#X, count_order#X]
Arguments: false
-(21) VeloxColumnarToRowExec
+(21) VeloxColumnarToRow
Input [10]: [l_returnflag#X, l_linestatus#X, sum_qty#X, sum_base_price#X, sum_disc_price#X, sum_charge#X, avg_qty#X, avg_price#X, avg_disc#X, count_order#X]
(22) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/10.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/10.txt
index 7b8d023863..42cf8e1b7f 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/10.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/10.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (68)
+- == Final Plan ==
- VeloxColumnarToRowExec (44)
+ VeloxColumnarToRow (44)
+- TakeOrderedAndProjectExecTransformer (43)
+- ^ ProjectExecTransformer (41)
+- ^ RegularHashAggregateExecTransformer (40)
@@ -247,7 +247,7 @@ Arguments: false
Input [8]: [c_custkey#X, c_name#X, revenue#X, c_acctbal#X, n_name#X, c_address#X, c_phone#X, c_comment#X]
Arguments: X, [revenue#X DESC NULLS LAST], [c_custkey#X, c_name#X, revenue#X, c_acctbal#X, n_name#X, c_address#X, c_phone#X, c_comment#X], 0
-(44) VeloxColumnarToRowExec
+(44) VeloxColumnarToRow
Input [8]: [c_custkey#X, c_name#X, revenue#X, c_acctbal#X, n_name#X, c_address#X, c_phone#X, c_comment#X]
(45) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/11.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/11.txt
index e01bfff288..85d974b5db 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/11.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/11.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (60)
+- == Final Plan ==
- VeloxColumnarToRowExec (40)
+ VeloxColumnarToRow (40)
+- ^ SortExecTransformer (38)
+- ^ InputIteratorTransformer (37)
+- ShuffleQueryStage (35), Statistics(X)
@@ -219,7 +219,7 @@ Arguments: [value#X DESC NULLS LAST], true, 0
Input [2]: [ps_partkey#X, value#X]
Arguments: false
-(40) VeloxColumnarToRowExec
+(40) VeloxColumnarToRow
Input [2]: [ps_partkey#X, value#X]
(41) Scan parquet
@@ -324,7 +324,7 @@ Arguments: isFinalPlan=true
Subquery:1 Hosting operator id = 31 Hosting Expression = Subquery subquery#X, [id=#X]
AdaptiveSparkPlan (102)
+- == Final Plan ==
- VeloxColumnarToRowExec (85)
+ VeloxColumnarToRow (85)
+- ^ ProjectExecTransformer (83)
+- ^ RegularHashAggregateExecTransformer (82)
+- ^ InputIteratorTransformer (81)
@@ -462,7 +462,7 @@ Input [1]: [sum(CheckOverflow((promote_precision(ps_supplycost#X) * promote_prec
Input [1]: [(sum((ps_supplycost * ps_availqty)) * 0.0001000000)#X]
Arguments: false
-(85) VeloxColumnarToRowExec
+(85) VeloxColumnarToRow
Input [1]: [(sum((ps_supplycost * ps_availqty)) * 0.0001000000)#X]
(86) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/12.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/12.txt
index 490806d71d..2c8b48e6c1 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/12.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/12.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (44)
+- == Final Plan ==
- VeloxColumnarToRowExec (30)
+ VeloxColumnarToRow (30)
+- ^ SortExecTransformer (28)
+- ^ InputIteratorTransformer (27)
+- ShuffleQueryStage (25), Statistics(X)
@@ -163,7 +163,7 @@ Arguments: [l_shipmode#X ASC NULLS FIRST], true, 0
Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X]
Arguments: false
-(30) VeloxColumnarToRowExec
+(30) VeloxColumnarToRow
Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X]
(31) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/13.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/13.txt
index c3ac3e0903..c08eaab2dc 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/13.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/13.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (55)
+- == Final Plan ==
- VeloxColumnarToRowExec (39)
+ VeloxColumnarToRow (39)
+- ^ SortExecTransformer (37)
+- ^ InputIteratorTransformer (36)
+- ShuffleQueryStage (34), Statistics(X)
@@ -211,7 +211,7 @@ Arguments: [custdist#X DESC NULLS LAST, c_count#X DESC NULLS LAST], true, 0
Input [2]: [c_count#X, custdist#X]
Arguments: false
-(39) VeloxColumnarToRowExec
+(39) VeloxColumnarToRow
Input [2]: [c_count#X, custdist#X]
(40) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/14.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/14.txt
index 67bce21483..8956ddaa21 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/14.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/14.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (35)
+- == Final Plan ==
- VeloxColumnarToRowExec (23)
+ VeloxColumnarToRow (23)
+- ^ ProjectExecTransformer (21)
+- ^ RegularHashAggregateExecTransformer (20)
+- ^ InputIteratorTransformer (19)
@@ -130,7 +130,7 @@ Input [2]: [sum(CASE WHEN StartsWith(p_type#X, PROMO) THEN CheckOverflow((promot
Input [1]: [promo_revenue#X]
Arguments: false
-(23) VeloxColumnarToRowExec
+(23) VeloxColumnarToRow
Input [1]: [promo_revenue#X]
(24) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/15.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/15.txt
index 9a7879d5c1..d7603e49ff 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/15.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/15.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (43)
+- == Final Plan ==
- VeloxColumnarToRowExec (28)
+ VeloxColumnarToRow (28)
+- AQEShuffleRead (27)
+- ShuffleQueryStage (26), Statistics(X)
+- ColumnarExchange (25)
@@ -158,7 +158,7 @@ Arguments: X
Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X]
Arguments: local
-(28) VeloxColumnarToRowExec
+(28) VeloxColumnarToRow
Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X]
(29) Scan parquet
@@ -239,7 +239,7 @@ Arguments: isFinalPlan=true
Subquery:1 Hosting operator id = 20 Hosting Expression = Subquery subquery#X, [id=#X]
AdaptiveSparkPlan (69)
+- == Final Plan ==
- VeloxColumnarToRowExec (60)
+ VeloxColumnarToRow (60)
+- ^ RegularHashAggregateExecTransformer (58)
+- ^ RegularHashAggregateExecTransformer (57)
+- ^ ProjectExecTransformer (56)
@@ -341,7 +341,7 @@ Results [1]: [max(total_revenue#X)#X AS max(total_revenue)#X]
Input [1]: [max(total_revenue)#X]
Arguments: false
-(60) VeloxColumnarToRowExec
+(60) VeloxColumnarToRow
Input [1]: [max(total_revenue)#X]
(61) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/16.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/16.txt
index 6faaec51bb..394bbd2469 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/16.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/16.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (59)
+- == Final Plan ==
- VeloxColumnarToRowExec (38)
+ VeloxColumnarToRow (38)
+- ^ SortExecTransformer (36)
+- ^ InputIteratorTransformer (35)
+- ShuffleQueryStage (33), Statistics(X)
@@ -212,7 +212,7 @@ Arguments: [supplier_cnt#X DESC NULLS LAST, p_brand#X ASC NULLS FIRST, p_type#X
Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X]
Arguments: false
-(38) VeloxColumnarToRowExec
+(38) VeloxColumnarToRow
Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X]
(39) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/17.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/17.txt
index d0d18bdf81..372d6bc719 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/17.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/17.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (36)
+- == Final Plan ==
- VeloxColumnarToRowExec (15)
+ VeloxColumnarToRow (15)
+- ^ ProjectExecTransformer (13)
+- ^ RegularHashAggregateExecTransformer (12)
+- ^ InputIteratorTransformer (11)
@@ -92,7 +92,7 @@ Input [1]: [sum(l_extendedprice#X)#X]
Input [1]: [avg_yearly#X]
Arguments: false
-(15) VeloxColumnarToRowExec
+(15) VeloxColumnarToRow
Input [1]: [avg_yearly#X]
(16) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/18.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/18.txt
index 661a04a3db..6c279f2d12 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/18.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/18.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (88)
+- == Final Plan ==
- VeloxColumnarToRowExec (55)
+ VeloxColumnarToRow (55)
+- TakeOrderedAndProjectExecTransformer (54)
+- ^ RegularHashAggregateExecTransformer (52)
+- ^ InputIteratorTransformer (51)
@@ -309,7 +309,7 @@ Arguments: false
Input [6]: [c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum(l_quantity)#X]
Arguments: X, [o_totalprice#X DESC NULLS LAST, o_orderdate#X ASC NULLS FIRST], [c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum(l_quantity)#X], 0
-(55) VeloxColumnarToRowExec
+(55) VeloxColumnarToRow
Input [6]: [c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum(l_quantity)#X]
(56) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/19.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/19.txt
index 47e5d26dbd..3fb33773dd 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/19.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/19.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (34)
+- == Final Plan ==
- VeloxColumnarToRowExec (22)
+ VeloxColumnarToRow (22)
+- ^ RegularHashAggregateExecTransformer (20)
+- ^ InputIteratorTransformer (19)
+- ShuffleQueryStage (17), Statistics(X)
@@ -125,7 +125,7 @@ Results [1]: [sum(CheckOverflow((promote_precision(cast(l_extendedprice#X as dec
Input [1]: [revenue#X]
Arguments: false
-(22) VeloxColumnarToRowExec
+(22) VeloxColumnarToRow
Input [1]: [revenue#X]
(23) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/20.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/20.txt
index b15eb6d9c3..e670a838bf 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/20.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/20.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (109)
+- == Final Plan ==
- VeloxColumnarToRowExec (70)
+ VeloxColumnarToRow (70)
+- AQEShuffleRead (69)
+- ShuffleQueryStage (68), Statistics(X)
+- ColumnarExchange (67)
@@ -385,7 +385,7 @@ Arguments: X
Input [2]: [s_name#X, s_address#X]
Arguments: local
-(70) VeloxColumnarToRowExec
+(70) VeloxColumnarToRow
Input [2]: [s_name#X, s_address#X]
(71) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/21.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/21.txt
index 8a2bf8db61..eae4758613 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/21.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/21.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (92)
+- == Final Plan ==
- VeloxColumnarToRowExec (59)
+ VeloxColumnarToRow (59)
+- ^ RegularHashAggregateExecTransformer (57)
+- ^ InputIteratorTransformer (56)
+- ShuffleQueryStage (54), Statistics(X)
@@ -330,7 +330,7 @@ Results [2]: [s_name#X, count(1)#X AS numwait#X]
Input [2]: [s_name#X, numwait#X]
Arguments: false
-(59) VeloxColumnarToRowExec
+(59) VeloxColumnarToRow
Input [2]: [s_name#X, numwait#X]
(60) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/22.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/22.txt
index e7ea95ab68..a3d3f0a08e 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/22.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/22.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (40)
+- == Final Plan ==
- VeloxColumnarToRowExec (28)
+ VeloxColumnarToRow (28)
+- ^ SortExecTransformer (26)
+- ^ InputIteratorTransformer (25)
+- ShuffleQueryStage (23), Statistics(X)
@@ -150,7 +150,7 @@ Arguments: [cntrycode#X ASC NULLS FIRST], true, 0
Input [3]: [cntrycode#X, numcust#X, totacctbal#X]
Arguments: false
-(28) VeloxColumnarToRowExec
+(28) VeloxColumnarToRow
Input [3]: [cntrycode#X, numcust#X, totacctbal#X]
(29) Scan parquet
@@ -218,7 +218,7 @@ Arguments: isFinalPlan=true
Subquery:1 Hosting operator id = 2 Hosting Expression = Subquery subquery#X, [id=#X]
AdaptiveSparkPlan (60)
+- == Final Plan ==
- VeloxColumnarToRowExec (53)
+ VeloxColumnarToRow (53)
+- ^ RegularHashAggregateExecTransformer (51)
+- ^ InputIteratorTransformer (50)
+- ShuffleQueryStage (48), Statistics(X)
@@ -292,7 +292,7 @@ Results [1]: [avg(c_acctbal#X)#X AS avg(c_acctbal)#X]
Input [1]: [avg(c_acctbal)#X]
Arguments: false
-(53) VeloxColumnarToRowExec
+(53) VeloxColumnarToRow
Input [1]: [avg(c_acctbal)#X]
(54) Scan parquet
@@ -335,7 +335,7 @@ Arguments: isFinalPlan=true
Subquery:2 Hosting operator id = 1 Hosting Expression = Subquery subquery#X, [id=#X]
AdaptiveSparkPlan (60)
+- == Final Plan ==
- VeloxColumnarToRowExec (53)
+ VeloxColumnarToRow (53)
+- ^ RegularHashAggregateExecTransformer (51)
+- ^ InputIteratorTransformer (50)
+- ShuffleQueryStage (48), Statistics(X)
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/3.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/3.txt
index 03ff6cc3d0..e7fa21b6f1 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/3.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/3.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (54)
+- == Final Plan ==
- VeloxColumnarToRowExec (35)
+ VeloxColumnarToRow (35)
+- TakeOrderedAndProjectExecTransformer (34)
+- ^ ProjectExecTransformer (32)
+- ^ RegularHashAggregateExecTransformer (31)
@@ -197,7 +197,7 @@ Arguments: false
Input [4]: [l_orderkey#X, revenue#X, o_orderdate#X, o_shippriority#X]
Arguments: X, [revenue#X DESC NULLS LAST, o_orderdate#X ASC NULLS FIRST], [l_orderkey#X, revenue#X, o_orderdate#X, o_shippriority#X], 0
-(35) VeloxColumnarToRowExec
+(35) VeloxColumnarToRow
Input [4]: [l_orderkey#X, revenue#X, o_orderdate#X, o_shippriority#X]
(36) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/4.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/4.txt
index c6f0f246e5..a1eaaca4d4 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/4.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/4.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (46)
+- == Final Plan ==
- VeloxColumnarToRowExec (31)
+ VeloxColumnarToRow (31)
+- ^ SortExecTransformer (29)
+- ^ InputIteratorTransformer (28)
+- ShuffleQueryStage (26), Statistics(X)
@@ -169,7 +169,7 @@ Arguments: [o_orderpriority#X ASC NULLS FIRST], true, 0
Input [2]: [o_orderpriority#X, order_count#X]
Arguments: false
-(31) VeloxColumnarToRowExec
+(31) VeloxColumnarToRow
Input [2]: [o_orderpriority#X, order_count#X]
(32) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/5.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/5.txt
index 213c8e698e..638a442362 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/5.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/5.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (102)
+- == Final Plan ==
- VeloxColumnarToRowExec (67)
+ VeloxColumnarToRow (67)
+- ^ SortExecTransformer (65)
+- ^ InputIteratorTransformer (64)
+- ShuffleQueryStage (62), Statistics(X)
@@ -369,7 +369,7 @@ Arguments: [revenue#X DESC NULLS LAST], true, 0
Input [2]: [n_name#X, revenue#X]
Arguments: false
-(67) VeloxColumnarToRowExec
+(67) VeloxColumnarToRow
Input [2]: [n_name#X, revenue#X]
(68) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/6.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/6.txt
index bb9d04cdcd..5df63675ca 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/6.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/6.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (20)
+- == Final Plan ==
- VeloxColumnarToRowExec (13)
+ VeloxColumnarToRow (13)
+- ^ RegularHashAggregateExecTransformer (11)
+- ^ InputIteratorTransformer (10)
+- ShuffleQueryStage (8), Statistics(X)
@@ -75,7 +75,7 @@ Results [1]: [sum(CheckOverflow((promote_precision(l_extendedprice#X) * promote_
Input [1]: [revenue#X]
Arguments: false
-(13) VeloxColumnarToRowExec
+(13) VeloxColumnarToRow
Input [1]: [revenue#X]
(14) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/7.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/7.txt
index 3f54f20f05..86db01e58b 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/7.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/7.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (95)
+- == Final Plan ==
- VeloxColumnarToRowExec (62)
+ VeloxColumnarToRow (62)
+- ^ SortExecTransformer (60)
+- ^ InputIteratorTransformer (59)
+- ShuffleQueryStage (57), Statistics(X)
@@ -339,7 +339,7 @@ Arguments: [supp_nation#X ASC NULLS FIRST, cust_nation#X ASC NULLS FIRST, l_year
Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X]
Arguments: false
-(62) VeloxColumnarToRowExec
+(62) VeloxColumnarToRow
Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X]
(63) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/8.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/8.txt
index ba0d25c608..ccc7941882 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/8.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/8.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (131)
+- == Final Plan ==
- VeloxColumnarToRowExec (86)
+ VeloxColumnarToRow (86)
+- ^ SortExecTransformer (84)
+- ^ InputIteratorTransformer (83)
+- ShuffleQueryStage (81), Statistics(X)
@@ -474,7 +474,7 @@ Arguments: [o_year#X ASC NULLS FIRST], true, 0
Input [2]: [o_year#X, mkt_share#X]
Arguments: false
-(86) VeloxColumnarToRowExec
+(86) VeloxColumnarToRow
Input [2]: [o_year#X, mkt_share#X]
(87) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/9.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/9.txt
index d15efa6a65..2124135682 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/9.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark33/9.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (100)
+- == Final Plan ==
- VeloxColumnarToRowExec (66)
+ VeloxColumnarToRow (66)
+- ^ SortExecTransformer (64)
+- ^ InputIteratorTransformer (63)
+- ShuffleQueryStage (61), Statistics(X)
@@ -363,7 +363,7 @@ Arguments: [nation#X ASC NULLS FIRST, o_year#X DESC NULLS LAST], true, 0
Input [3]: [nation#X, o_year#X, sum_profit#X]
Arguments: false
-(66) VeloxColumnarToRowExec
+(66) VeloxColumnarToRow
Input [3]: [nation#X, o_year#X, sum_profit#X]
(67) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/1.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/1.txt
index 450797d3ae..6dbee1ad7f 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/1.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/1.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (30)
+- == Final Plan ==
- VeloxColumnarToRowExec (21)
+ VeloxColumnarToRow (21)
+- ^ SortExecTransformer (19)
+- ^ InputIteratorTransformer (18)
+- ShuffleQueryStage (16), Statistics(X)
@@ -113,7 +113,7 @@ Arguments: [l_returnflag#X ASC NULLS FIRST, l_linestatus#X ASC NULLS FIRST], tru
Input [10]: [l_returnflag#X, l_linestatus#X, sum_qty#X, sum_base_price#X, sum_disc_price#X, sum_charge#X, avg_qty#X, avg_price#X, avg_disc#X, count_order#X]
Arguments: false
-(21) VeloxColumnarToRowExec
+(21) VeloxColumnarToRow
Input [10]: [l_returnflag#X, l_linestatus#X, sum_qty#X, sum_base_price#X, sum_disc_price#X, sum_charge#X, avg_qty#X, avg_price#X, avg_disc#X, count_order#X]
(22) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/10.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/10.txt
index 7a2404c1d6..47dc04d100 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/10.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/10.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (68)
+- == Final Plan ==
- VeloxColumnarToRowExec (44)
+ VeloxColumnarToRow (44)
+- TakeOrderedAndProjectExecTransformer (43)
+- ^ ProjectExecTransformer (41)
+- ^ RegularHashAggregateExecTransformer (40)
@@ -250,7 +250,7 @@ Arguments: false
Input [8]: [c_custkey#X, c_name#X, revenue#X, c_acctbal#X, n_name#X, c_address#X, c_phone#X, c_comment#X]
Arguments: X, [revenue#X DESC NULLS LAST], [c_custkey#X, c_name#X, revenue#X, c_acctbal#X, n_name#X, c_address#X, c_phone#X, c_comment#X], 0
-(44) VeloxColumnarToRowExec
+(44) VeloxColumnarToRow
Input [8]: [c_custkey#X, c_name#X, revenue#X, c_acctbal#X, n_name#X, c_address#X, c_phone#X, c_comment#X]
(45) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/11.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/11.txt
index 2bf0278656..e95764f4de 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/11.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/11.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (60)
+- == Final Plan ==
- VeloxColumnarToRowExec (40)
+ VeloxColumnarToRow (40)
+- ^ SortExecTransformer (38)
+- ^ InputIteratorTransformer (37)
+- ShuffleQueryStage (35), Statistics(X)
@@ -221,7 +221,7 @@ Arguments: [value#X DESC NULLS LAST], true, 0
Input [2]: [ps_partkey#X, value#X]
Arguments: false
-(40) VeloxColumnarToRowExec
+(40) VeloxColumnarToRow
Input [2]: [ps_partkey#X, value#X]
(41) Scan parquet
@@ -328,7 +328,7 @@ Arguments: isFinalPlan=true
Subquery:1 Hosting operator id = 31 Hosting Expression = Subquery subquery#X, [id=#X]
AdaptiveSparkPlan (102)
+- == Final Plan ==
- VeloxColumnarToRowExec (85)
+ VeloxColumnarToRow (85)
+- ^ ProjectExecTransformer (83)
+- ^ RegularHashAggregateExecTransformer (82)
+- ^ InputIteratorTransformer (81)
@@ -468,7 +468,7 @@ Input [1]: [sum((ps_supplycost#X * cast(ps_availqty#X as decimal(10,0))))#X]
Input [1]: [(sum((ps_supplycost * ps_availqty)) * 0.0001000000)#X]
Arguments: false
-(85) VeloxColumnarToRowExec
+(85) VeloxColumnarToRow
Input [1]: [(sum((ps_supplycost * ps_availqty)) * 0.0001000000)#X]
(86) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/12.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/12.txt
index b796cfae26..1b7065e114 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/12.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/12.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (44)
+- == Final Plan ==
- VeloxColumnarToRowExec (30)
+ VeloxColumnarToRow (30)
+- ^ SortExecTransformer (28)
+- ^ InputIteratorTransformer (27)
+- ShuffleQueryStage (25), Statistics(X)
@@ -164,7 +164,7 @@ Arguments: [l_shipmode#X ASC NULLS FIRST], true, 0
Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X]
Arguments: false
-(30) VeloxColumnarToRowExec
+(30) VeloxColumnarToRow
Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X]
(31) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/13.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/13.txt
index 3b7ac85bf2..233f33a31f 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/13.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/13.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (55)
+- == Final Plan ==
- VeloxColumnarToRowExec (39)
+ VeloxColumnarToRow (39)
+- ^ SortExecTransformer (37)
+- ^ InputIteratorTransformer (36)
+- ShuffleQueryStage (34), Statistics(X)
@@ -212,7 +212,7 @@ Arguments: [custdist#X DESC NULLS LAST, c_count#X DESC NULLS LAST], true, 0
Input [2]: [c_count#X, custdist#X]
Arguments: false
-(39) VeloxColumnarToRowExec
+(39) VeloxColumnarToRow
Input [2]: [c_count#X, custdist#X]
(40) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/14.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/14.txt
index 7f4949cf72..6d2233b3e0 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/14.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/14.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (35)
+- == Final Plan ==
- VeloxColumnarToRowExec (23)
+ VeloxColumnarToRow (23)
+- ^ ProjectExecTransformer (21)
+- ^ RegularHashAggregateExecTransformer (20)
+- ^ InputIteratorTransformer (19)
@@ -131,7 +131,7 @@ Input [2]: [sum(CASE WHEN StartsWith(p_type#X, PROMO) THEN (l_extendedprice#X *
Input [1]: [promo_revenue#X]
Arguments: false
-(23) VeloxColumnarToRowExec
+(23) VeloxColumnarToRow
Input [1]: [promo_revenue#X]
(24) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/15.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/15.txt
index 5fa837e185..1ec03a2f9e 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/15.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/15.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (43)
+- == Final Plan ==
- VeloxColumnarToRowExec (28)
+ VeloxColumnarToRow (28)
+- AQEShuffleRead (27)
+- ShuffleQueryStage (26), Statistics(X)
+- ColumnarExchange (25)
@@ -159,7 +159,7 @@ Arguments: X
Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X]
Arguments: local
-(28) VeloxColumnarToRowExec
+(28) VeloxColumnarToRow
Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X]
(29) Scan parquet
@@ -241,7 +241,7 @@ Arguments: isFinalPlan=true
Subquery:1 Hosting operator id = 20 Hosting Expression = Subquery subquery#X, [id=#X]
AdaptiveSparkPlan (69)
+- == Final Plan ==
- VeloxColumnarToRowExec (60)
+ VeloxColumnarToRow (60)
+- ^ RegularHashAggregateExecTransformer (58)
+- ^ RegularHashAggregateExecTransformer (57)
+- ^ ProjectExecTransformer (56)
@@ -343,7 +343,7 @@ Results [1]: [max(total_revenue#X)#X AS max(total_revenue)#X]
Input [1]: [max(total_revenue)#X]
Arguments: false
-(60) VeloxColumnarToRowExec
+(60) VeloxColumnarToRow
Input [1]: [max(total_revenue)#X]
(61) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/16.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/16.txt
index a6302f1bee..e64cb09900 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/16.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/16.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (59)
+- == Final Plan ==
- VeloxColumnarToRowExec (38)
+ VeloxColumnarToRow (38)
+- ^ SortExecTransformer (36)
+- ^ InputIteratorTransformer (35)
+- ShuffleQueryStage (33), Statistics(X)
@@ -213,7 +213,7 @@ Arguments: [supplier_cnt#X DESC NULLS LAST, p_brand#X ASC NULLS FIRST, p_type#X
Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X]
Arguments: false
-(38) VeloxColumnarToRowExec
+(38) VeloxColumnarToRow
Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X]
(39) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/17.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/17.txt
index f2b7262c75..b66a80731b 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/17.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/17.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (36)
+- == Final Plan ==
- VeloxColumnarToRowExec (15)
+ VeloxColumnarToRow (15)
+- ^ ProjectExecTransformer (13)
+- ^ RegularHashAggregateExecTransformer (12)
+- ^ InputIteratorTransformer (11)
@@ -92,7 +92,7 @@ Input [1]: [sum(l_extendedprice#X)#X]
Input [1]: [avg_yearly#X]
Arguments: false
-(15) VeloxColumnarToRowExec
+(15) VeloxColumnarToRow
Input [1]: [avg_yearly#X]
(16) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/18.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/18.txt
index 029c44b154..c92587c9d7 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/18.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/18.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (88)
+- == Final Plan ==
- VeloxColumnarToRowExec (55)
+ VeloxColumnarToRow (55)
+- TakeOrderedAndProjectExecTransformer (54)
+- ^ RegularHashAggregateExecTransformer (52)
+- ^ InputIteratorTransformer (51)
@@ -313,7 +313,7 @@ Arguments: false
Input [6]: [c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum(l_quantity)#X]
Arguments: X, [o_totalprice#X DESC NULLS LAST, o_orderdate#X ASC NULLS FIRST], [c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum(l_quantity)#X], 0
-(55) VeloxColumnarToRowExec
+(55) VeloxColumnarToRow
Input [6]: [c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum(l_quantity)#X]
(56) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/19.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/19.txt
index 069500cf6b..80e7860df0 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/19.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/19.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (34)
+- == Final Plan ==
- VeloxColumnarToRowExec (22)
+ VeloxColumnarToRow (22)
+- ^ RegularHashAggregateExecTransformer (20)
+- ^ InputIteratorTransformer (19)
+- ShuffleQueryStage (17), Statistics(X)
@@ -126,7 +126,7 @@ Results [1]: [sum((l_extendedprice#X * (1 - l_discount#X)))#X AS revenue#X]
Input [1]: [revenue#X]
Arguments: false
-(22) VeloxColumnarToRowExec
+(22) VeloxColumnarToRow
Input [1]: [revenue#X]
(23) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/20.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/20.txt
index 3e2b198354..9d7b9d2162 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/20.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/20.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (98)
+- == Final Plan ==
- VeloxColumnarToRowExec (62)
+ VeloxColumnarToRow (62)
+- AQEShuffleRead (61)
+- ShuffleQueryStage (60), Statistics(X)
+- ColumnarExchange (59)
@@ -351,7 +351,7 @@ Arguments: X
Input [2]: [s_name#X, s_address#X]
Arguments: local
-(62) VeloxColumnarToRowExec
+(62) VeloxColumnarToRow
Input [2]: [s_name#X, s_address#X]
(63) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/21.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/21.txt
index c93cb695db..8382dbcd50 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/21.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/21.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (92)
+- == Final Plan ==
- VeloxColumnarToRowExec (59)
+ VeloxColumnarToRow (59)
+- ^ RegularHashAggregateExecTransformer (57)
+- ^ InputIteratorTransformer (56)
+- ShuffleQueryStage (54), Statistics(X)
@@ -335,7 +335,7 @@ Results [2]: [s_name#X, count(1)#X AS numwait#X]
Input [2]: [s_name#X, numwait#X]
Arguments: false
-(59) VeloxColumnarToRowExec
+(59) VeloxColumnarToRow
Input [2]: [s_name#X, numwait#X]
(60) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/22.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/22.txt
index b545068226..7f38367401 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/22.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/22.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (40)
+- == Final Plan ==
- VeloxColumnarToRowExec (28)
+ VeloxColumnarToRow (28)
+- ^ SortExecTransformer (26)
+- ^ InputIteratorTransformer (25)
+- ShuffleQueryStage (23), Statistics(X)
@@ -151,7 +151,7 @@ Arguments: [cntrycode#X ASC NULLS FIRST], true, 0
Input [3]: [cntrycode#X, numcust#X, totacctbal#X]
Arguments: false
-(28) VeloxColumnarToRowExec
+(28) VeloxColumnarToRow
Input [3]: [cntrycode#X, numcust#X, totacctbal#X]
(29) Scan parquet
@@ -220,7 +220,7 @@ Arguments: isFinalPlan=true
Subquery:1 Hosting operator id = 2 Hosting Expression = Subquery subquery#X, [id=#X]
AdaptiveSparkPlan (60)
+- == Final Plan ==
- VeloxColumnarToRowExec (53)
+ VeloxColumnarToRow (53)
+- ^ RegularHashAggregateExecTransformer (51)
+- ^ InputIteratorTransformer (50)
+- ShuffleQueryStage (48), Statistics(X)
@@ -294,7 +294,7 @@ Results [1]: [avg(c_acctbal#X)#X AS avg(c_acctbal)#X]
Input [1]: [avg(c_acctbal)#X]
Arguments: false
-(53) VeloxColumnarToRowExec
+(53) VeloxColumnarToRow
Input [1]: [avg(c_acctbal)#X]
(54) Scan parquet
@@ -337,7 +337,7 @@ Arguments: isFinalPlan=true
Subquery:2 Hosting operator id = 1 Hosting Expression = Subquery subquery#X, [id=#X]
AdaptiveSparkPlan (60)
+- == Final Plan ==
- VeloxColumnarToRowExec (53)
+ VeloxColumnarToRow (53)
+- ^ RegularHashAggregateExecTransformer (51)
+- ^ InputIteratorTransformer (50)
+- ShuffleQueryStage (48), Statistics(X)
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/3.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/3.txt
index a1635e742a..1035e0eb77 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/3.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/3.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (54)
+- == Final Plan ==
- VeloxColumnarToRowExec (35)
+ VeloxColumnarToRow (35)
+- TakeOrderedAndProjectExecTransformer (34)
+- ^ ProjectExecTransformer (32)
+- ^ RegularHashAggregateExecTransformer (31)
@@ -199,7 +199,7 @@ Arguments: false
Input [4]: [l_orderkey#X, revenue#X, o_orderdate#X, o_shippriority#X]
Arguments: X, [revenue#X DESC NULLS LAST, o_orderdate#X ASC NULLS FIRST], [l_orderkey#X, revenue#X, o_orderdate#X, o_shippriority#X], 0
-(35) VeloxColumnarToRowExec
+(35) VeloxColumnarToRow
Input [4]: [l_orderkey#X, revenue#X, o_orderdate#X, o_shippriority#X]
(36) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/4.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/4.txt
index 4a26f959b7..150788a3d7 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/4.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/4.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (46)
+- == Final Plan ==
- VeloxColumnarToRowExec (31)
+ VeloxColumnarToRow (31)
+- ^ SortExecTransformer (29)
+- ^ InputIteratorTransformer (28)
+- ShuffleQueryStage (26), Statistics(X)
@@ -170,7 +170,7 @@ Arguments: [o_orderpriority#X ASC NULLS FIRST], true, 0
Input [2]: [o_orderpriority#X, order_count#X]
Arguments: false
-(31) VeloxColumnarToRowExec
+(31) VeloxColumnarToRow
Input [2]: [o_orderpriority#X, order_count#X]
(32) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/5.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/5.txt
index 3ba742ae5b..035c5c3889 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/5.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/5.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (102)
+- == Final Plan ==
- VeloxColumnarToRowExec (67)
+ VeloxColumnarToRow (67)
+- ^ SortExecTransformer (65)
+- ^ InputIteratorTransformer (64)
+- ShuffleQueryStage (62), Statistics(X)
@@ -374,7 +374,7 @@ Arguments: [revenue#X DESC NULLS LAST], true, 0
Input [2]: [n_name#X, revenue#X]
Arguments: false
-(67) VeloxColumnarToRowExec
+(67) VeloxColumnarToRow
Input [2]: [n_name#X, revenue#X]
(68) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/6.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/6.txt
index fa37c656a1..e9dc68456e 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/6.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/6.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (20)
+- == Final Plan ==
- VeloxColumnarToRowExec (13)
+ VeloxColumnarToRow (13)
+- ^ RegularHashAggregateExecTransformer (11)
+- ^ InputIteratorTransformer (10)
+- ShuffleQueryStage (8), Statistics(X)
@@ -75,7 +75,7 @@ Results [1]: [sum((l_extendedprice#X * l_discount#X))#X AS revenue#X]
Input [1]: [revenue#X]
Arguments: false
-(13) VeloxColumnarToRowExec
+(13) VeloxColumnarToRow
Input [1]: [revenue#X]
(14) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/7.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/7.txt
index ab8abd6df3..cd877f54bd 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/7.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/7.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (95)
+- == Final Plan ==
- VeloxColumnarToRowExec (62)
+ VeloxColumnarToRow (62)
+- ^ SortExecTransformer (60)
+- ^ InputIteratorTransformer (59)
+- ShuffleQueryStage (57), Statistics(X)
@@ -344,7 +344,7 @@ Arguments: [supp_nation#X ASC NULLS FIRST, cust_nation#X ASC NULLS FIRST, l_year
Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X]
Arguments: false
-(62) VeloxColumnarToRowExec
+(62) VeloxColumnarToRow
Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X]
(63) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/8.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/8.txt
index e075a7b338..d381d21da7 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/8.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/8.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (131)
+- == Final Plan ==
- VeloxColumnarToRowExec (86)
+ VeloxColumnarToRow (86)
+- ^ SortExecTransformer (84)
+- ^ InputIteratorTransformer (83)
+- ShuffleQueryStage (81), Statistics(X)
@@ -481,7 +481,7 @@ Arguments: [o_year#X ASC NULLS FIRST], true, 0
Input [2]: [o_year#X, mkt_share#X]
Arguments: false
-(86) VeloxColumnarToRowExec
+(86) VeloxColumnarToRow
Input [2]: [o_year#X, mkt_share#X]
(87) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/9.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/9.txt
index 8ba39a425d..f0ebba6efa 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/9.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark34/9.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (100)
+- == Final Plan ==
- VeloxColumnarToRowExec (66)
+ VeloxColumnarToRow (66)
+- ^ SortExecTransformer (64)
+- ^ InputIteratorTransformer (63)
+- ShuffleQueryStage (61), Statistics(X)
@@ -368,7 +368,7 @@ Arguments: [nation#X ASC NULLS FIRST, o_year#X DESC NULLS LAST], true, 0
Input [3]: [nation#X, o_year#X, sum_profit#X]
Arguments: false
-(66) VeloxColumnarToRowExec
+(66) VeloxColumnarToRow
Input [3]: [nation#X, o_year#X, sum_profit#X]
(67) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/1.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/1.txt
index b1b2a7507c..efe7f39085 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/1.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/1.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (30)
+- == Final Plan ==
- VeloxColumnarToRowExec (21)
+ VeloxColumnarToRow (21)
+- ^ SortExecTransformer (19)
+- ^ InputIteratorTransformer (18)
+- ShuffleQueryStage (16)
@@ -113,7 +113,7 @@ Arguments: [l_returnflag#X ASC NULLS FIRST, l_linestatus#X ASC NULLS FIRST], tru
Input [10]: [l_returnflag#X, l_linestatus#X, sum_qty#X, sum_base_price#X, sum_disc_price#X, sum_charge#X, avg_qty#X, avg_price#X, avg_disc#X, count_order#X]
Arguments: false
-(21) VeloxColumnarToRowExec
+(21) VeloxColumnarToRow
Input [10]: [l_returnflag#X, l_linestatus#X, sum_qty#X, sum_base_price#X, sum_disc_price#X, sum_charge#X, avg_qty#X, avg_price#X, avg_disc#X, count_order#X]
(22) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/10.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/10.txt
index 6bb1784778..a7ced66a82 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/10.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/10.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (100)
+- == Final Plan ==
- VeloxColumnarToRowExec (67)
+ VeloxColumnarToRow (67)
+- TakeOrderedAndProjectExecTransformer (66)
+- ^ ProjectExecTransformer (64)
+- ^ RegularHashAggregateExecTransformer (63)
@@ -359,7 +359,7 @@ Arguments: false
Input [8]: [c_custkey#X, c_name#X, revenue#X, c_acctbal#X, n_name#X, c_address#X, c_phone#X, c_comment#X]
Arguments: X, [revenue#X DESC NULLS LAST], [c_custkey#X, c_name#X, revenue#X, c_acctbal#X, n_name#X, c_address#X, c_phone#X, c_comment#X], 0
-(67) VeloxColumnarToRowExec
+(67) VeloxColumnarToRow
Input [8]: [c_custkey#X, c_name#X, revenue#X, c_acctbal#X, n_name#X, c_address#X, c_phone#X, c_comment#X]
(68) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/11.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/11.txt
index 42e37d72f1..b385b7719d 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/11.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/11.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (82)
+- == Final Plan ==
- VeloxColumnarToRowExec (56)
+ VeloxColumnarToRow (56)
+- ^ SortExecTransformer (54)
+- ^ InputIteratorTransformer (53)
+- ShuffleQueryStage (51)
@@ -297,7 +297,7 @@ Arguments: [value#X DESC NULLS LAST], true, 0
Input [2]: [ps_partkey#X, value#X]
Arguments: false
-(56) VeloxColumnarToRowExec
+(56) VeloxColumnarToRow
Input [2]: [ps_partkey#X, value#X]
(57) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/12.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/12.txt
index 40f651dd34..71dee80fab 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/12.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/12.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (55)
+- == Final Plan ==
- VeloxColumnarToRowExec (38)
+ VeloxColumnarToRow (38)
+- ^ SortExecTransformer (36)
+- ^ InputIteratorTransformer (35)
+- ShuffleQueryStage (33)
@@ -202,7 +202,7 @@ Arguments: [l_shipmode#X ASC NULLS FIRST], true, 0
Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X]
Arguments: false
-(38) VeloxColumnarToRowExec
+(38) VeloxColumnarToRow
Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X]
(39) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/13.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/13.txt
index 6c48d7e599..edbcb50206 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/13.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/13.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (58)
+- == Final Plan ==
- VeloxColumnarToRowExec (40)
+ VeloxColumnarToRow (40)
+- ^ SortExecTransformer (38)
+- ^ InputIteratorTransformer (37)
+- ShuffleQueryStage (35)
@@ -218,7 +218,7 @@ Arguments: [custdist#X DESC NULLS LAST, c_count#X DESC NULLS LAST], true, 0
Input [2]: [c_count#X, custdist#X]
Arguments: false
-(40) VeloxColumnarToRowExec
+(40) VeloxColumnarToRow
Input [2]: [c_count#X, custdist#X]
(41) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/14.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/14.txt
index b04d8d643f..91df642595 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/14.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/14.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (39)
+- == Final Plan ==
- VeloxColumnarToRowExec (25)
+ VeloxColumnarToRow (25)
+- ^ ProjectExecTransformer (23)
+- ^ RegularHashAggregateExecTransformer (22)
+- ^ RegularHashAggregateExecTransformer (21)
@@ -142,7 +142,7 @@ Input [2]: [sum(CASE WHEN StartsWith(p_type#X, PROMO) THEN CheckOverflow((promot
Input [1]: [promo_revenue#X]
Arguments: false
-(25) VeloxColumnarToRowExec
+(25) VeloxColumnarToRow
Input [1]: [promo_revenue#X]
(26) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/15.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/15.txt
index 83bd883296..56169a244b 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/15.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/15.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (50)
+- == Final Plan ==
- VeloxColumnarToRowExec (33)
+ VeloxColumnarToRow (33)
+- ^ SortExecTransformer (31)
+- ^ InputIteratorTransformer (30)
+- ShuffleQueryStage (28)
@@ -181,7 +181,7 @@ Arguments: [s_suppkey#X ASC NULLS FIRST], true, 0
Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X]
Arguments: false
-(33) VeloxColumnarToRowExec
+(33) VeloxColumnarToRow
Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X]
(34) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/16.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/16.txt
index 4c43ec8f19..8ef7d4d514 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/16.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/16.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (71)
+- == Final Plan ==
- VeloxColumnarToRowExec (47)
+ VeloxColumnarToRow (47)
+- ^ SortExecTransformer (45)
+- ^ InputIteratorTransformer (44)
+- ShuffleQueryStage (42)
@@ -256,7 +256,7 @@ Arguments: [supplier_cnt#X DESC NULLS LAST, p_brand#X ASC NULLS FIRST, p_type#X
Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X]
Arguments: false
-(47) VeloxColumnarToRowExec
+(47) VeloxColumnarToRow
Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X]
(48) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/17.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/17.txt
index 6a9d19d0de..fe915989f9 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/17.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/17.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (63)
+- == Final Plan ==
- VeloxColumnarToRowExec (40)
+ VeloxColumnarToRow (40)
+- ^ ProjectExecTransformer (38)
+- ^ RegularHashAggregateExecTransformer (37)
+- ^ RegularHashAggregateExecTransformer (36)
@@ -232,7 +232,7 @@ Input [1]: [sum(l_extendedprice#X)#X]
Input [1]: [avg_yearly#X]
Arguments: false
-(40) VeloxColumnarToRowExec
+(40) VeloxColumnarToRow
Input [1]: [avg_yearly#X]
(41) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/18.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/18.txt
index 587eb37cd4..a2345ca9ed 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/18.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/18.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (110)
+- == Final Plan ==
- VeloxColumnarToRowExec (70)
+ VeloxColumnarToRow (70)
+- TakeOrderedAndProjectExecTransformer (69)
+- ^ RegularHashAggregateExecTransformer (67)
+- ^ RegularHashAggregateExecTransformer (66)
@@ -390,7 +390,7 @@ Arguments: false
Input [6]: [c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum(l_quantity)#X]
Arguments: X, [o_totalprice#X DESC NULLS LAST, o_orderdate#X ASC NULLS FIRST], [c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum(l_quantity)#X], 0
-(70) VeloxColumnarToRowExec
+(70) VeloxColumnarToRow
Input [6]: [c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum(l_quantity)#X]
(71) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/19.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/19.txt
index 75795b3eaa..d06cdb0fec 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/19.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/19.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (38)
+- == Final Plan ==
- VeloxColumnarToRowExec (24)
+ VeloxColumnarToRow (24)
+- ^ RegularHashAggregateExecTransformer (22)
+- ^ RegularHashAggregateExecTransformer (21)
+- ^ ProjectExecTransformer (20)
@@ -137,7 +137,7 @@ Results [1]: [sum(CheckOverflow((promote_precision(cast(l_extendedprice#X as dec
Input [1]: [revenue#X]
Arguments: false
-(24) VeloxColumnarToRowExec
+(24) VeloxColumnarToRow
Input [1]: [revenue#X]
(25) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/20.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/20.txt
index ebcbc702cf..6fa1271a5a 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/20.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/20.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (146)
+- == Final Plan ==
- VeloxColumnarToRowExec (96)
+ VeloxColumnarToRow (96)
+- ^ SortExecTransformer (94)
+- ^ InputIteratorTransformer (93)
+- ShuffleQueryStage (91)
@@ -510,7 +510,7 @@ Arguments: [s_name#X ASC NULLS FIRST], true, 0
Input [2]: [s_name#X, s_address#X]
Arguments: false
-(96) VeloxColumnarToRowExec
+(96) VeloxColumnarToRow
Input [2]: [s_name#X, s_address#X]
(97) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/21.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/21.txt
index af2e469119..e70a145e9c 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/21.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/21.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (138)
+- == Final Plan ==
- VeloxColumnarToRowExec (92)
+ VeloxColumnarToRow (92)
+- TakeOrderedAndProjectExecTransformer (91)
+- ^ RegularHashAggregateExecTransformer (89)
+- ^ InputIteratorTransformer (88)
@@ -492,7 +492,7 @@ Arguments: false
Input [2]: [s_name#X, numwait#X]
Arguments: X, [numwait#X DESC NULLS LAST, s_name#X ASC NULLS FIRST], [s_name#X, numwait#X], 0
-(92) VeloxColumnarToRowExec
+(92) VeloxColumnarToRow
Input [2]: [s_name#X, numwait#X]
(93) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/22.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/22.txt
index 7e43e67ab1..674e0b9698 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/22.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/22.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (52)
+- == Final Plan ==
- VeloxColumnarToRowExec (37)
+ VeloxColumnarToRow (37)
+- ^ SortExecTransformer (35)
+- ^ InputIteratorTransformer (34)
+- ShuffleQueryStage (32)
@@ -194,7 +194,7 @@ Arguments: [cntrycode#X ASC NULLS FIRST], true, 0
Input [3]: [cntrycode#X, numcust#X, totacctbal#X]
Arguments: false
-(37) VeloxColumnarToRowExec
+(37) VeloxColumnarToRow
Input [3]: [cntrycode#X, numcust#X, totacctbal#X]
(38) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/3.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/3.txt
index b5d79b5819..3b9b7fd93b 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/3.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/3.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (67)
+- == Final Plan ==
- VeloxColumnarToRowExec (43)
+ VeloxColumnarToRow (43)
+- TakeOrderedAndProjectExecTransformer (42)
+- ^ ProjectExecTransformer (40)
+- ^ RegularHashAggregateExecTransformer (39)
@@ -238,7 +238,7 @@ Arguments: false
Input [4]: [l_orderkey#X, revenue#X, o_orderdate#X, o_shippriority#X]
Arguments: X, [revenue#X DESC NULLS LAST, o_orderdate#X ASC NULLS FIRST], [l_orderkey#X, revenue#X, o_orderdate#X, o_shippriority#X], 0
-(43) VeloxColumnarToRowExec
+(43) VeloxColumnarToRow
Input [4]: [l_orderkey#X, revenue#X, o_orderdate#X, o_shippriority#X]
(44) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/4.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/4.txt
index 7c07aa0134..ffb35d1813 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/4.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/4.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (56)
+- == Final Plan ==
- VeloxColumnarToRowExec (38)
+ VeloxColumnarToRow (38)
+- ^ SortExecTransformer (36)
+- ^ InputIteratorTransformer (35)
+- ShuffleQueryStage (33)
@@ -203,7 +203,7 @@ Arguments: [o_orderpriority#X ASC NULLS FIRST], true, 0
Input [2]: [o_orderpriority#X, order_count#X]
Arguments: false
-(38) VeloxColumnarToRowExec
+(38) VeloxColumnarToRow
Input [2]: [o_orderpriority#X, order_count#X]
(39) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/5.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/5.txt
index f481ec2d47..0e48f73c77 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/5.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/5.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (156)
+- == Final Plan ==
- VeloxColumnarToRowExec (106)
+ VeloxColumnarToRow (106)
+- ^ SortExecTransformer (104)
+- ^ InputIteratorTransformer (103)
+- ShuffleQueryStage (101)
@@ -559,7 +559,7 @@ Arguments: [revenue#X DESC NULLS LAST], true, 0
Input [2]: [n_name#X, revenue#X]
Arguments: false
-(106) VeloxColumnarToRowExec
+(106) VeloxColumnarToRow
Input [2]: [n_name#X, revenue#X]
(107) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/6.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/6.txt
index 2b97fd28f1..a1830678d0 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/6.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/6.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (20)
+- == Final Plan ==
- VeloxColumnarToRowExec (13)
+ VeloxColumnarToRow (13)
+- ^ RegularHashAggregateExecTransformer (11)
+- ^ InputIteratorTransformer (10)
+- ShuffleQueryStage (8)
@@ -75,7 +75,7 @@ Results [1]: [sum(CheckOverflow((promote_precision(l_extendedprice#X) * promote_
Input [1]: [revenue#X]
Arguments: false
-(13) VeloxColumnarToRowExec
+(13) VeloxColumnarToRow
Input [1]: [revenue#X]
(14) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/7.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/7.txt
index 82d0d75e31..f089996aa4 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/7.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/7.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (149)
+- == Final Plan ==
- VeloxColumnarToRowExec (101)
+ VeloxColumnarToRow (101)
+- ^ SortExecTransformer (99)
+- ^ InputIteratorTransformer (98)
+- ShuffleQueryStage (96)
@@ -529,7 +529,7 @@ Arguments: [supp_nation#X ASC NULLS FIRST, cust_nation#X ASC NULLS FIRST, l_year
Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X]
Arguments: false
-(101) VeloxColumnarToRowExec
+(101) VeloxColumnarToRow
Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X]
(102) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/8.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/8.txt
index 6a7d97a628..80b0d02a6c 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/8.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/8.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (207)
+- == Final Plan ==
- VeloxColumnarToRowExec (141)
+ VeloxColumnarToRow (141)
+- ^ SortExecTransformer (139)
+- ^ InputIteratorTransformer (138)
+- ShuffleQueryStage (136)
@@ -742,7 +742,7 @@ Arguments: [o_year#X ASC NULLS FIRST], true, 0
Input [2]: [o_year#X, mkt_share#X]
Arguments: false
-(141) VeloxColumnarToRowExec
+(141) VeloxColumnarToRow
Input [2]: [o_year#X, mkt_share#X]
(142) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/9.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/9.txt
index a0f1d9c68a..a41822a60a 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/9.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark32/9.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (155)
+- == Final Plan ==
- VeloxColumnarToRowExec (106)
+ VeloxColumnarToRow (106)
+- ^ SortExecTransformer (104)
+- ^ InputIteratorTransformer (103)
+- ShuffleQueryStage (101)
@@ -558,7 +558,7 @@ Arguments: [nation#X ASC NULLS FIRST, o_year#X DESC NULLS LAST], true, 0
Input [3]: [nation#X, o_year#X, sum_profit#X]
Arguments: false
-(106) VeloxColumnarToRowExec
+(106) VeloxColumnarToRow
Input [3]: [nation#X, o_year#X, sum_profit#X]
(107) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/1.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/1.txt
index 417ddf9de2..0851fa2447 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/1.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/1.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (30)
+- == Final Plan ==
- VeloxColumnarToRowExec (21)
+ VeloxColumnarToRow (21)
+- ^ SortExecTransformer (19)
+- ^ InputIteratorTransformer (18)
+- ShuffleQueryStage (16), Statistics(X)
@@ -113,7 +113,7 @@ Arguments: [l_returnflag#X ASC NULLS FIRST, l_linestatus#X ASC NULLS FIRST], tru
Input [10]: [l_returnflag#X, l_linestatus#X, sum_qty#X, sum_base_price#X, sum_disc_price#X, sum_charge#X, avg_qty#X, avg_price#X, avg_disc#X, count_order#X]
Arguments: false
-(21) VeloxColumnarToRowExec
+(21) VeloxColumnarToRow
Input [10]: [l_returnflag#X, l_linestatus#X, sum_qty#X, sum_base_price#X, sum_disc_price#X, sum_charge#X, avg_qty#X, avg_price#X, avg_disc#X, count_order#X]
(22) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/10.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/10.txt
index e42af1ec4c..1b89e64860 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/10.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/10.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (100)
+- == Final Plan ==
- VeloxColumnarToRowExec (67)
+ VeloxColumnarToRow (67)
+- TakeOrderedAndProjectExecTransformer (66)
+- ^ ProjectExecTransformer (64)
+- ^ RegularHashAggregateExecTransformer (63)
@@ -359,7 +359,7 @@ Arguments: false
Input [8]: [c_custkey#X, c_name#X, revenue#X, c_acctbal#X, n_name#X, c_address#X, c_phone#X, c_comment#X]
Arguments: X, [revenue#X DESC NULLS LAST], [c_custkey#X, c_name#X, revenue#X, c_acctbal#X, n_name#X, c_address#X, c_phone#X, c_comment#X], 0
-(67) VeloxColumnarToRowExec
+(67) VeloxColumnarToRow
Input [8]: [c_custkey#X, c_name#X, revenue#X, c_acctbal#X, n_name#X, c_address#X, c_phone#X, c_comment#X]
(68) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/11.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/11.txt
index fe2dcc9190..6ca992b709 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/11.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/11.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (82)
+- == Final Plan ==
- VeloxColumnarToRowExec (56)
+ VeloxColumnarToRow (56)
+- ^ SortExecTransformer (54)
+- ^ InputIteratorTransformer (53)
+- ShuffleQueryStage (51), Statistics(X)
@@ -297,7 +297,7 @@ Arguments: [value#X DESC NULLS LAST], true, 0
Input [2]: [ps_partkey#X, value#X]
Arguments: false
-(56) VeloxColumnarToRowExec
+(56) VeloxColumnarToRow
Input [2]: [ps_partkey#X, value#X]
(57) Scan parquet
@@ -426,7 +426,7 @@ Arguments: isFinalPlan=true
Subquery:1 Hosting operator id = 47 Hosting Expression = Subquery subquery#X, [id=#X]
AdaptiveSparkPlan (136)
+- == Final Plan ==
- VeloxColumnarToRowExec (114)
+ VeloxColumnarToRow (114)
+- ^ ProjectExecTransformer (112)
+- ^ RegularHashAggregateExecTransformer (111)
+- ^ RegularHashAggregateExecTransformer (110)
@@ -600,7 +600,7 @@ Input [1]: [sum(CheckOverflow((promote_precision(ps_supplycost#X) * promote_prec
Input [1]: [(sum((ps_supplycost * ps_availqty)) * 0.0001000000)#X]
Arguments: false
-(114) VeloxColumnarToRowExec
+(114) VeloxColumnarToRow
Input [1]: [(sum((ps_supplycost * ps_availqty)) * 0.0001000000)#X]
(115) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/12.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/12.txt
index 2ee35e463c..346a686634 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/12.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/12.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (55)
+- == Final Plan ==
- VeloxColumnarToRowExec (38)
+ VeloxColumnarToRow (38)
+- ^ SortExecTransformer (36)
+- ^ InputIteratorTransformer (35)
+- ShuffleQueryStage (33), Statistics(X)
@@ -202,7 +202,7 @@ Arguments: [l_shipmode#X ASC NULLS FIRST], true, 0
Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X]
Arguments: false
-(38) VeloxColumnarToRowExec
+(38) VeloxColumnarToRow
Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X]
(39) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/13.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/13.txt
index d59a697662..9e927782f6 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/13.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/13.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (58)
+- == Final Plan ==
- VeloxColumnarToRowExec (40)
+ VeloxColumnarToRow (40)
+- ^ SortExecTransformer (38)
+- ^ InputIteratorTransformer (37)
+- ShuffleQueryStage (35), Statistics(X)
@@ -218,7 +218,7 @@ Arguments: [custdist#X DESC NULLS LAST, c_count#X DESC NULLS LAST], true, 0
Input [2]: [c_count#X, custdist#X]
Arguments: false
-(40) VeloxColumnarToRowExec
+(40) VeloxColumnarToRow
Input [2]: [c_count#X, custdist#X]
(41) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/14.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/14.txt
index e570d1a4cf..d82e4f2b21 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/14.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/14.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (39)
+- == Final Plan ==
- VeloxColumnarToRowExec (25)
+ VeloxColumnarToRow (25)
+- ^ ProjectExecTransformer (23)
+- ^ RegularHashAggregateExecTransformer (22)
+- ^ RegularHashAggregateExecTransformer (21)
@@ -142,7 +142,7 @@ Input [2]: [sum(CASE WHEN StartsWith(p_type#X, PROMO) THEN CheckOverflow((promot
Input [1]: [promo_revenue#X]
Arguments: false
-(25) VeloxColumnarToRowExec
+(25) VeloxColumnarToRow
Input [1]: [promo_revenue#X]
(26) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/15.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/15.txt
index 51baae5186..950441af70 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/15.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/15.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (47)
+- == Final Plan ==
- VeloxColumnarToRowExec (30)
+ VeloxColumnarToRow (30)
+- AQEShuffleRead (29)
+- ShuffleQueryStage (28), Statistics(X)
+- ColumnarExchange (27)
@@ -170,7 +170,7 @@ Arguments: X
Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X]
Arguments: local
-(30) VeloxColumnarToRowExec
+(30) VeloxColumnarToRow
Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X]
(31) Scan parquet
@@ -259,7 +259,7 @@ Arguments: isFinalPlan=true
Subquery:1 Hosting operator id = 22 Hosting Expression = Subquery subquery#X, [id=#X]
AdaptiveSparkPlan (73)
+- == Final Plan ==
- VeloxColumnarToRowExec (64)
+ VeloxColumnarToRow (64)
+- ^ RegularHashAggregateExecTransformer (62)
+- ^ RegularHashAggregateExecTransformer (61)
+- ^ ProjectExecTransformer (60)
@@ -361,7 +361,7 @@ Results [1]: [max(total_revenue#X)#X AS max(total_revenue)#X]
Input [1]: [max(total_revenue)#X]
Arguments: false
-(64) VeloxColumnarToRowExec
+(64) VeloxColumnarToRow
Input [1]: [max(total_revenue)#X]
(65) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/16.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/16.txt
index ab417c50bc..aa7aa005a9 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/16.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/16.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (71)
+- == Final Plan ==
- VeloxColumnarToRowExec (47)
+ VeloxColumnarToRow (47)
+- ^ SortExecTransformer (45)
+- ^ InputIteratorTransformer (44)
+- ShuffleQueryStage (42), Statistics(X)
@@ -256,7 +256,7 @@ Arguments: [supplier_cnt#X DESC NULLS LAST, p_brand#X ASC NULLS FIRST, p_type#X
Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X]
Arguments: false
-(47) VeloxColumnarToRowExec
+(47) VeloxColumnarToRow
Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X]
(48) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/17.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/17.txt
index ad32d4cb58..e48379edc9 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/17.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/17.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (63)
+- == Final Plan ==
- VeloxColumnarToRowExec (40)
+ VeloxColumnarToRow (40)
+- ^ ProjectExecTransformer (38)
+- ^ RegularHashAggregateExecTransformer (37)
+- ^ RegularHashAggregateExecTransformer (36)
@@ -232,7 +232,7 @@ Input [1]: [sum(l_extendedprice#X)#X]
Input [1]: [avg_yearly#X]
Arguments: false
-(40) VeloxColumnarToRowExec
+(40) VeloxColumnarToRow
Input [1]: [avg_yearly#X]
(41) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/18.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/18.txt
index 42f3988838..8dbf942996 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/18.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/18.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (110)
+- == Final Plan ==
- VeloxColumnarToRowExec (70)
+ VeloxColumnarToRow (70)
+- TakeOrderedAndProjectExecTransformer (69)
+- ^ RegularHashAggregateExecTransformer (67)
+- ^ RegularHashAggregateExecTransformer (66)
@@ -390,7 +390,7 @@ Arguments: false
Input [6]: [c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum(l_quantity)#X]
Arguments: X, [o_totalprice#X DESC NULLS LAST, o_orderdate#X ASC NULLS FIRST], [c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum(l_quantity)#X], 0
-(70) VeloxColumnarToRowExec
+(70) VeloxColumnarToRow
Input [6]: [c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum(l_quantity)#X]
(71) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/19.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/19.txt
index 20fea0a016..41da1d28e9 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/19.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/19.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (38)
+- == Final Plan ==
- VeloxColumnarToRowExec (24)
+ VeloxColumnarToRow (24)
+- ^ RegularHashAggregateExecTransformer (22)
+- ^ RegularHashAggregateExecTransformer (21)
+- ^ ProjectExecTransformer (20)
@@ -137,7 +137,7 @@ Results [1]: [sum(CheckOverflow((promote_precision(cast(l_extendedprice#X as dec
Input [1]: [revenue#X]
Arguments: false
-(24) VeloxColumnarToRowExec
+(24) VeloxColumnarToRow
Input [1]: [revenue#X]
(25) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/20.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/20.txt
index fdaed6a1a7..1fad7160bf 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/20.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/20.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (143)
+- == Final Plan ==
- VeloxColumnarToRowExec (93)
+ VeloxColumnarToRow (93)
+- AQEShuffleRead (92)
+- ShuffleQueryStage (91), Statistics(X)
+- ColumnarExchange (90)
@@ -499,7 +499,7 @@ Arguments: X
Input [2]: [s_name#X, s_address#X]
Arguments: local
-(93) VeloxColumnarToRowExec
+(93) VeloxColumnarToRow
Input [2]: [s_name#X, s_address#X]
(94) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/21.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/21.txt
index 557dd678da..fd61236faa 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/21.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/21.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (137)
+- == Final Plan ==
- VeloxColumnarToRowExec (91)
+ VeloxColumnarToRow (91)
+- ^ RegularHashAggregateExecTransformer (89)
+- ^ InputIteratorTransformer (88)
+- ShuffleQueryStage (86), Statistics(X)
@@ -487,7 +487,7 @@ Results [2]: [s_name#X, count(1)#X AS numwait#X]
Input [2]: [s_name#X, numwait#X]
Arguments: false
-(91) VeloxColumnarToRowExec
+(91) VeloxColumnarToRow
Input [2]: [s_name#X, numwait#X]
(92) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/22.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/22.txt
index edd50a4764..44c57da748 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/22.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/22.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (52)
+- == Final Plan ==
- VeloxColumnarToRowExec (37)
+ VeloxColumnarToRow (37)
+- ^ SortExecTransformer (35)
+- ^ InputIteratorTransformer (34)
+- ShuffleQueryStage (32), Statistics(X)
@@ -194,7 +194,7 @@ Arguments: [cntrycode#X ASC NULLS FIRST], true, 0
Input [3]: [cntrycode#X, numcust#X, totacctbal#X]
Arguments: false
-(37) VeloxColumnarToRowExec
+(37) VeloxColumnarToRow
Input [3]: [cntrycode#X, numcust#X, totacctbal#X]
(38) Scan parquet
@@ -274,7 +274,7 @@ Arguments: isFinalPlan=true
Subquery:1 Hosting operator id = 2 Hosting Expression = Subquery subquery#X, [id=#X]
AdaptiveSparkPlan (72)
+- == Final Plan ==
- VeloxColumnarToRowExec (65)
+ VeloxColumnarToRow (65)
+- ^ RegularHashAggregateExecTransformer (63)
+- ^ InputIteratorTransformer (62)
+- ShuffleQueryStage (60), Statistics(X)
@@ -348,7 +348,7 @@ Results [1]: [avg(c_acctbal#X)#X AS avg(c_acctbal)#X]
Input [1]: [avg(c_acctbal)#X]
Arguments: false
-(65) VeloxColumnarToRowExec
+(65) VeloxColumnarToRow
Input [1]: [avg(c_acctbal)#X]
(66) Scan parquet
@@ -391,7 +391,7 @@ Arguments: isFinalPlan=true
Subquery:2 Hosting operator id = 1 Hosting Expression = Subquery subquery#X, [id=#X]
AdaptiveSparkPlan (72)
+- == Final Plan ==
- VeloxColumnarToRowExec (65)
+ VeloxColumnarToRow (65)
+- ^ RegularHashAggregateExecTransformer (63)
+- ^ InputIteratorTransformer (62)
+- ShuffleQueryStage (60), Statistics(X)
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/3.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/3.txt
index ea8a29d659..a698975568 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/3.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/3.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (67)
+- == Final Plan ==
- VeloxColumnarToRowExec (43)
+ VeloxColumnarToRow (43)
+- TakeOrderedAndProjectExecTransformer (42)
+- ^ ProjectExecTransformer (40)
+- ^ RegularHashAggregateExecTransformer (39)
@@ -238,7 +238,7 @@ Arguments: false
Input [4]: [l_orderkey#X, revenue#X, o_orderdate#X, o_shippriority#X]
Arguments: X, [revenue#X DESC NULLS LAST, o_orderdate#X ASC NULLS FIRST], [l_orderkey#X, revenue#X, o_orderdate#X, o_shippriority#X], 0
-(43) VeloxColumnarToRowExec
+(43) VeloxColumnarToRow
Input [4]: [l_orderkey#X, revenue#X, o_orderdate#X, o_shippriority#X]
(44) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/4.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/4.txt
index ca3f2707b8..8b00d867cd 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/4.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/4.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (56)
+- == Final Plan ==
- VeloxColumnarToRowExec (38)
+ VeloxColumnarToRow (38)
+- ^ SortExecTransformer (36)
+- ^ InputIteratorTransformer (35)
+- ShuffleQueryStage (33), Statistics(X)
@@ -203,7 +203,7 @@ Arguments: [o_orderpriority#X ASC NULLS FIRST], true, 0
Input [2]: [o_orderpriority#X, order_count#X]
Arguments: false
-(38) VeloxColumnarToRowExec
+(38) VeloxColumnarToRow
Input [2]: [o_orderpriority#X, order_count#X]
(39) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/5.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/5.txt
index ccedfac29b..dd869d25d4 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/5.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/5.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (156)
+- == Final Plan ==
- VeloxColumnarToRowExec (106)
+ VeloxColumnarToRow (106)
+- ^ SortExecTransformer (104)
+- ^ InputIteratorTransformer (103)
+- ShuffleQueryStage (101), Statistics(X)
@@ -559,7 +559,7 @@ Arguments: [revenue#X DESC NULLS LAST], true, 0
Input [2]: [n_name#X, revenue#X]
Arguments: false
-(106) VeloxColumnarToRowExec
+(106) VeloxColumnarToRow
Input [2]: [n_name#X, revenue#X]
(107) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/6.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/6.txt
index bb9d04cdcd..5df63675ca 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/6.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/6.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (20)
+- == Final Plan ==
- VeloxColumnarToRowExec (13)
+ VeloxColumnarToRow (13)
+- ^ RegularHashAggregateExecTransformer (11)
+- ^ InputIteratorTransformer (10)
+- ShuffleQueryStage (8), Statistics(X)
@@ -75,7 +75,7 @@ Results [1]: [sum(CheckOverflow((promote_precision(l_extendedprice#X) * promote_
Input [1]: [revenue#X]
Arguments: false
-(13) VeloxColumnarToRowExec
+(13) VeloxColumnarToRow
Input [1]: [revenue#X]
(14) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/7.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/7.txt
index 046147da8e..ac6dda065b 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/7.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/7.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (149)
+- == Final Plan ==
- VeloxColumnarToRowExec (101)
+ VeloxColumnarToRow (101)
+- ^ SortExecTransformer (99)
+- ^ InputIteratorTransformer (98)
+- ShuffleQueryStage (96), Statistics(X)
@@ -529,7 +529,7 @@ Arguments: [supp_nation#X ASC NULLS FIRST, cust_nation#X ASC NULLS FIRST, l_year
Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X]
Arguments: false
-(101) VeloxColumnarToRowExec
+(101) VeloxColumnarToRow
Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X]
(102) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/8.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/8.txt
index 664d74c619..6f5ed0d82b 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/8.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/8.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (207)
+- == Final Plan ==
- VeloxColumnarToRowExec (141)
+ VeloxColumnarToRow (141)
+- ^ SortExecTransformer (139)
+- ^ InputIteratorTransformer (138)
+- ShuffleQueryStage (136), Statistics(X)
@@ -742,7 +742,7 @@ Arguments: [o_year#X ASC NULLS FIRST], true, 0
Input [2]: [o_year#X, mkt_share#X]
Arguments: false
-(141) VeloxColumnarToRowExec
+(141) VeloxColumnarToRow
Input [2]: [o_year#X, mkt_share#X]
(142) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/9.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/9.txt
index 1ae7a93998..22cd2b9967 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/9.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark33/9.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (155)
+- == Final Plan ==
- VeloxColumnarToRowExec (106)
+ VeloxColumnarToRow (106)
+- ^ SortExecTransformer (104)
+- ^ InputIteratorTransformer (103)
+- ShuffleQueryStage (101), Statistics(X)
@@ -558,7 +558,7 @@ Arguments: [nation#X ASC NULLS FIRST, o_year#X DESC NULLS LAST], true, 0
Input [3]: [nation#X, o_year#X, sum_profit#X]
Arguments: false
-(106) VeloxColumnarToRowExec
+(106) VeloxColumnarToRow
Input [3]: [nation#X, o_year#X, sum_profit#X]
(107) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/1.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/1.txt
index 450797d3ae..6dbee1ad7f 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/1.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/1.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (30)
+- == Final Plan ==
- VeloxColumnarToRowExec (21)
+ VeloxColumnarToRow (21)
+- ^ SortExecTransformer (19)
+- ^ InputIteratorTransformer (18)
+- ShuffleQueryStage (16), Statistics(X)
@@ -113,7 +113,7 @@ Arguments: [l_returnflag#X ASC NULLS FIRST, l_linestatus#X ASC NULLS FIRST], tru
Input [10]: [l_returnflag#X, l_linestatus#X, sum_qty#X, sum_base_price#X, sum_disc_price#X, sum_charge#X, avg_qty#X, avg_price#X, avg_disc#X, count_order#X]
Arguments: false
-(21) VeloxColumnarToRowExec
+(21) VeloxColumnarToRow
Input [10]: [l_returnflag#X, l_linestatus#X, sum_qty#X, sum_base_price#X, sum_disc_price#X, sum_charge#X, avg_qty#X, avg_price#X, avg_disc#X, count_order#X]
(22) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/10.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/10.txt
index 6a296c163e..a052989ba5 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/10.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/10.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (100)
+- == Final Plan ==
- VeloxColumnarToRowExec (67)
+ VeloxColumnarToRow (67)
+- TakeOrderedAndProjectExecTransformer (66)
+- ^ ProjectExecTransformer (64)
+- ^ RegularHashAggregateExecTransformer (63)
@@ -362,7 +362,7 @@ Arguments: false
Input [8]: [c_custkey#X, c_name#X, revenue#X, c_acctbal#X, n_name#X, c_address#X, c_phone#X, c_comment#X]
Arguments: X, [revenue#X DESC NULLS LAST], [c_custkey#X, c_name#X, revenue#X, c_acctbal#X, n_name#X, c_address#X, c_phone#X, c_comment#X], 0
-(67) VeloxColumnarToRowExec
+(67) VeloxColumnarToRow
Input [8]: [c_custkey#X, c_name#X, revenue#X, c_acctbal#X, n_name#X, c_address#X, c_phone#X, c_comment#X]
(68) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/11.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/11.txt
index 8fef547f8d..68e87c39a0 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/11.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/11.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (82)
+- == Final Plan ==
- VeloxColumnarToRowExec (56)
+ VeloxColumnarToRow (56)
+- ^ SortExecTransformer (54)
+- ^ InputIteratorTransformer (53)
+- ShuffleQueryStage (51), Statistics(X)
@@ -299,7 +299,7 @@ Arguments: [value#X DESC NULLS LAST], true, 0
Input [2]: [ps_partkey#X, value#X]
Arguments: false
-(56) VeloxColumnarToRowExec
+(56) VeloxColumnarToRow
Input [2]: [ps_partkey#X, value#X]
(57) Scan parquet
@@ -430,7 +430,7 @@ Arguments: isFinalPlan=true
Subquery:1 Hosting operator id = 47 Hosting Expression = Subquery subquery#X, [id=#X]
AdaptiveSparkPlan (136)
+- == Final Plan ==
- VeloxColumnarToRowExec (114)
+ VeloxColumnarToRow (114)
+- ^ ProjectExecTransformer (112)
+- ^ RegularHashAggregateExecTransformer (111)
+- ^ RegularHashAggregateExecTransformer (110)
@@ -606,7 +606,7 @@ Input [1]: [sum((ps_supplycost#X * cast(ps_availqty#X as decimal(10,0))))#X]
Input [1]: [(sum((ps_supplycost * ps_availqty)) * 0.0001000000)#X]
Arguments: false
-(114) VeloxColumnarToRowExec
+(114) VeloxColumnarToRow
Input [1]: [(sum((ps_supplycost * ps_availqty)) * 0.0001000000)#X]
(115) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/12.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/12.txt
index a5ff0ee4b5..9175845083 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/12.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/12.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (55)
+- == Final Plan ==
- VeloxColumnarToRowExec (38)
+ VeloxColumnarToRow (38)
+- ^ SortExecTransformer (36)
+- ^ InputIteratorTransformer (35)
+- ShuffleQueryStage (33), Statistics(X)
@@ -203,7 +203,7 @@ Arguments: [l_shipmode#X ASC NULLS FIRST], true, 0
Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X]
Arguments: false
-(38) VeloxColumnarToRowExec
+(38) VeloxColumnarToRow
Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X]
(39) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/13.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/13.txt
index f0604101ed..b527c2bc3b 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/13.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/13.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (58)
+- == Final Plan ==
- VeloxColumnarToRowExec (40)
+ VeloxColumnarToRow (40)
+- ^ SortExecTransformer (38)
+- ^ InputIteratorTransformer (37)
+- ShuffleQueryStage (35), Statistics(X)
@@ -219,7 +219,7 @@ Arguments: [custdist#X DESC NULLS LAST, c_count#X DESC NULLS LAST], true, 0
Input [2]: [c_count#X, custdist#X]
Arguments: false
-(40) VeloxColumnarToRowExec
+(40) VeloxColumnarToRow
Input [2]: [c_count#X, custdist#X]
(41) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/14.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/14.txt
index 768c18ddac..cc6d364dea 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/14.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/14.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (39)
+- == Final Plan ==
- VeloxColumnarToRowExec (25)
+ VeloxColumnarToRow (25)
+- ^ ProjectExecTransformer (23)
+- ^ RegularHashAggregateExecTransformer (22)
+- ^ RegularHashAggregateExecTransformer (21)
@@ -143,7 +143,7 @@ Input [2]: [sum(CASE WHEN StartsWith(p_type#X, PROMO) THEN (l_extendedprice#X *
Input [1]: [promo_revenue#X]
Arguments: false
-(25) VeloxColumnarToRowExec
+(25) VeloxColumnarToRow
Input [1]: [promo_revenue#X]
(26) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/15.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/15.txt
index c91d8a7f50..8f1a1b4415 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/15.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/15.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (47)
+- == Final Plan ==
- VeloxColumnarToRowExec (30)
+ VeloxColumnarToRow (30)
+- AQEShuffleRead (29)
+- ShuffleQueryStage (28), Statistics(X)
+- ColumnarExchange (27)
@@ -171,7 +171,7 @@ Arguments: X
Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X]
Arguments: local
-(30) VeloxColumnarToRowExec
+(30) VeloxColumnarToRow
Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X]
(31) Scan parquet
@@ -261,7 +261,7 @@ Arguments: isFinalPlan=true
Subquery:1 Hosting operator id = 22 Hosting Expression = Subquery subquery#X, [id=#X]
AdaptiveSparkPlan (73)
+- == Final Plan ==
- VeloxColumnarToRowExec (64)
+ VeloxColumnarToRow (64)
+- ^ RegularHashAggregateExecTransformer (62)
+- ^ RegularHashAggregateExecTransformer (61)
+- ^ ProjectExecTransformer (60)
@@ -363,7 +363,7 @@ Results [1]: [max(total_revenue#X)#X AS max(total_revenue)#X]
Input [1]: [max(total_revenue)#X]
Arguments: false
-(64) VeloxColumnarToRowExec
+(64) VeloxColumnarToRow
Input [1]: [max(total_revenue)#X]
(65) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/16.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/16.txt
index 501e4a122e..ee7826c8aa 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/16.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/16.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (71)
+- == Final Plan ==
- VeloxColumnarToRowExec (47)
+ VeloxColumnarToRow (47)
+- ^ SortExecTransformer (45)
+- ^ InputIteratorTransformer (44)
+- ShuffleQueryStage (42), Statistics(X)
@@ -257,7 +257,7 @@ Arguments: [supplier_cnt#X DESC NULLS LAST, p_brand#X ASC NULLS FIRST, p_type#X
Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X]
Arguments: false
-(47) VeloxColumnarToRowExec
+(47) VeloxColumnarToRow
Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X]
(48) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/17.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/17.txt
index b8d72004b1..eaad0429ab 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/17.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/17.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (63)
+- == Final Plan ==
- VeloxColumnarToRowExec (40)
+ VeloxColumnarToRow (40)
+- ^ ProjectExecTransformer (38)
+- ^ RegularHashAggregateExecTransformer (37)
+- ^ RegularHashAggregateExecTransformer (36)
@@ -234,7 +234,7 @@ Input [1]: [sum(l_extendedprice#X)#X]
Input [1]: [avg_yearly#X]
Arguments: false
-(40) VeloxColumnarToRowExec
+(40) VeloxColumnarToRow
Input [1]: [avg_yearly#X]
(41) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/18.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/18.txt
index 2cb8a12dd0..85b11fa8ca 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/18.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/18.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (110)
+- == Final Plan ==
- VeloxColumnarToRowExec (70)
+ VeloxColumnarToRow (70)
+- TakeOrderedAndProjectExecTransformer (69)
+- ^ RegularHashAggregateExecTransformer (67)
+- ^ RegularHashAggregateExecTransformer (66)
@@ -394,7 +394,7 @@ Arguments: false
Input [6]: [c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum(l_quantity)#X]
Arguments: X, [o_totalprice#X DESC NULLS LAST, o_orderdate#X ASC NULLS FIRST], [c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum(l_quantity)#X], 0
-(70) VeloxColumnarToRowExec
+(70) VeloxColumnarToRow
Input [6]: [c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum(l_quantity)#X]
(71) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/19.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/19.txt
index 37cdd2a85b..c72ca859ce 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/19.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/19.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (38)
+- == Final Plan ==
- VeloxColumnarToRowExec (24)
+ VeloxColumnarToRow (24)
+- ^ RegularHashAggregateExecTransformer (22)
+- ^ RegularHashAggregateExecTransformer (21)
+- ^ ProjectExecTransformer (20)
@@ -138,7 +138,7 @@ Results [1]: [sum((l_extendedprice#X * (1 - l_discount#X)))#X AS revenue#X]
Input [1]: [revenue#X]
Arguments: false
-(24) VeloxColumnarToRowExec
+(24) VeloxColumnarToRow
Input [1]: [revenue#X]
(25) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/20.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/20.txt
index cbb0cdea34..ed09215178 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/20.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/20.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (143)
+- == Final Plan ==
- VeloxColumnarToRowExec (93)
+ VeloxColumnarToRow (93)
+- AQEShuffleRead (92)
+- ShuffleQueryStage (91), Statistics(X)
+- ColumnarExchange (90)
@@ -504,7 +504,7 @@ Arguments: X
Input [2]: [s_name#X, s_address#X]
Arguments: local
-(93) VeloxColumnarToRowExec
+(93) VeloxColumnarToRow
Input [2]: [s_name#X, s_address#X]
(94) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/21.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/21.txt
index 5ec8fe9d15..271d0c6d50 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/21.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/21.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (137)
+- == Final Plan ==
- VeloxColumnarToRowExec (91)
+ VeloxColumnarToRow (91)
+- ^ RegularHashAggregateExecTransformer (89)
+- ^ InputIteratorTransformer (88)
+- ShuffleQueryStage (86), Statistics(X)
@@ -492,7 +492,7 @@ Results [2]: [s_name#X, count(1)#X AS numwait#X]
Input [2]: [s_name#X, numwait#X]
Arguments: false
-(91) VeloxColumnarToRowExec
+(91) VeloxColumnarToRow
Input [2]: [s_name#X, numwait#X]
(92) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/22.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/22.txt
index fee21bac69..b8123fb6dc 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/22.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/22.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (52)
+- == Final Plan ==
- VeloxColumnarToRowExec (37)
+ VeloxColumnarToRow (37)
+- ^ SortExecTransformer (35)
+- ^ InputIteratorTransformer (34)
+- ShuffleQueryStage (32), Statistics(X)
@@ -195,7 +195,7 @@ Arguments: [cntrycode#X ASC NULLS FIRST], true, 0
Input [3]: [cntrycode#X, numcust#X, totacctbal#X]
Arguments: false
-(37) VeloxColumnarToRowExec
+(37) VeloxColumnarToRow
Input [3]: [cntrycode#X, numcust#X, totacctbal#X]
(38) Scan parquet
@@ -276,7 +276,7 @@ Arguments: isFinalPlan=true
Subquery:1 Hosting operator id = 2 Hosting Expression = Subquery subquery#X, [id=#X]
AdaptiveSparkPlan (72)
+- == Final Plan ==
- VeloxColumnarToRowExec (65)
+ VeloxColumnarToRow (65)
+- ^ RegularHashAggregateExecTransformer (63)
+- ^ InputIteratorTransformer (62)
+- ShuffleQueryStage (60), Statistics(X)
@@ -350,7 +350,7 @@ Results [1]: [avg(c_acctbal#X)#X AS avg(c_acctbal)#X]
Input [1]: [avg(c_acctbal)#X]
Arguments: false
-(65) VeloxColumnarToRowExec
+(65) VeloxColumnarToRow
Input [1]: [avg(c_acctbal)#X]
(66) Scan parquet
@@ -393,7 +393,7 @@ Arguments: isFinalPlan=true
Subquery:2 Hosting operator id = 1 Hosting Expression = Subquery subquery#X, [id=#X]
AdaptiveSparkPlan (72)
+- == Final Plan ==
- VeloxColumnarToRowExec (65)
+ VeloxColumnarToRow (65)
+- ^ RegularHashAggregateExecTransformer (63)
+- ^ InputIteratorTransformer (62)
+- ShuffleQueryStage (60), Statistics(X)
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/3.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/3.txt
index 83064ad3a0..8eea7581a4 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/3.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/3.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (67)
+- == Final Plan ==
- VeloxColumnarToRowExec (43)
+ VeloxColumnarToRow (43)
+- TakeOrderedAndProjectExecTransformer (42)
+- ^ ProjectExecTransformer (40)
+- ^ RegularHashAggregateExecTransformer (39)
@@ -240,7 +240,7 @@ Arguments: false
Input [4]: [l_orderkey#X, revenue#X, o_orderdate#X, o_shippriority#X]
Arguments: X, [revenue#X DESC NULLS LAST, o_orderdate#X ASC NULLS FIRST], [l_orderkey#X, revenue#X, o_orderdate#X, o_shippriority#X], 0
-(43) VeloxColumnarToRowExec
+(43) VeloxColumnarToRow
Input [4]: [l_orderkey#X, revenue#X, o_orderdate#X, o_shippriority#X]
(44) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/4.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/4.txt
index 3f055feb01..286881fb99 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/4.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/4.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (56)
+- == Final Plan ==
- VeloxColumnarToRowExec (38)
+ VeloxColumnarToRow (38)
+- ^ SortExecTransformer (36)
+- ^ InputIteratorTransformer (35)
+- ShuffleQueryStage (33), Statistics(X)
@@ -204,7 +204,7 @@ Arguments: [o_orderpriority#X ASC NULLS FIRST], true, 0
Input [2]: [o_orderpriority#X, order_count#X]
Arguments: false
-(38) VeloxColumnarToRowExec
+(38) VeloxColumnarToRow
Input [2]: [o_orderpriority#X, order_count#X]
(39) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/5.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/5.txt
index 87eaa9b8dc..0a9af46052 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/5.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/5.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (156)
+- == Final Plan ==
- VeloxColumnarToRowExec (106)
+ VeloxColumnarToRow (106)
+- ^ SortExecTransformer (104)
+- ^ InputIteratorTransformer (103)
+- ShuffleQueryStage (101), Statistics(X)
@@ -564,7 +564,7 @@ Arguments: [revenue#X DESC NULLS LAST], true, 0
Input [2]: [n_name#X, revenue#X]
Arguments: false
-(106) VeloxColumnarToRowExec
+(106) VeloxColumnarToRow
Input [2]: [n_name#X, revenue#X]
(107) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/6.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/6.txt
index fa37c656a1..e9dc68456e 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/6.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/6.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (20)
+- == Final Plan ==
- VeloxColumnarToRowExec (13)
+ VeloxColumnarToRow (13)
+- ^ RegularHashAggregateExecTransformer (11)
+- ^ InputIteratorTransformer (10)
+- ShuffleQueryStage (8), Statistics(X)
@@ -75,7 +75,7 @@ Results [1]: [sum((l_extendedprice#X * l_discount#X))#X AS revenue#X]
Input [1]: [revenue#X]
Arguments: false
-(13) VeloxColumnarToRowExec
+(13) VeloxColumnarToRow
Input [1]: [revenue#X]
(14) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/7.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/7.txt
index 4f781dd6d0..aa69dbcd11 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/7.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/7.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (149)
+- == Final Plan ==
- VeloxColumnarToRowExec (101)
+ VeloxColumnarToRow (101)
+- ^ SortExecTransformer (99)
+- ^ InputIteratorTransformer (98)
+- ShuffleQueryStage (96), Statistics(X)
@@ -534,7 +534,7 @@ Arguments: [supp_nation#X ASC NULLS FIRST, cust_nation#X ASC NULLS FIRST, l_year
Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X]
Arguments: false
-(101) VeloxColumnarToRowExec
+(101) VeloxColumnarToRow
Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X]
(102) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/8.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/8.txt
index ae71cca0e4..05f9c2c90e 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/8.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/8.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (207)
+- == Final Plan ==
- VeloxColumnarToRowExec (141)
+ VeloxColumnarToRow (141)
+- ^ SortExecTransformer (139)
+- ^ InputIteratorTransformer (138)
+- ShuffleQueryStage (136), Statistics(X)
@@ -749,7 +749,7 @@ Arguments: [o_year#X ASC NULLS FIRST], true, 0
Input [2]: [o_year#X, mkt_share#X]
Arguments: false
-(141) VeloxColumnarToRowExec
+(141) VeloxColumnarToRow
Input [2]: [o_year#X, mkt_share#X]
(142) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/9.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/9.txt
index a26c30f45f..e298d2a751 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/9.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark34/9.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (155)
+- == Final Plan ==
- VeloxColumnarToRowExec (106)
+ VeloxColumnarToRow (106)
+- ^ SortExecTransformer (104)
+- ^ InputIteratorTransformer (103)
+- ShuffleQueryStage (101), Statistics(X)
@@ -563,7 +563,7 @@ Arguments: [nation#X ASC NULLS FIRST, o_year#X DESC NULLS LAST], true, 0
Input [3]: [nation#X, o_year#X, sum_profit#X]
Arguments: false
-(106) VeloxColumnarToRowExec
+(106) VeloxColumnarToRow
Input [3]: [nation#X, o_year#X, sum_profit#X]
(107) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/1.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/1.txt
index b1b2a7507c..efe7f39085 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/1.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/1.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (30)
+- == Final Plan ==
- VeloxColumnarToRowExec (21)
+ VeloxColumnarToRow (21)
+- ^ SortExecTransformer (19)
+- ^ InputIteratorTransformer (18)
+- ShuffleQueryStage (16)
@@ -113,7 +113,7 @@ Arguments: [l_returnflag#X ASC NULLS FIRST, l_linestatus#X ASC NULLS FIRST], tru
Input [10]: [l_returnflag#X, l_linestatus#X, sum_qty#X, sum_base_price#X, sum_disc_price#X, sum_charge#X, avg_qty#X, avg_price#X, avg_disc#X, count_order#X]
Arguments: false
-(21) VeloxColumnarToRowExec
+(21) VeloxColumnarToRow
Input [10]: [l_returnflag#X, l_linestatus#X, sum_qty#X, sum_base_price#X, sum_disc_price#X, sum_charge#X, avg_qty#X, avg_price#X, avg_disc#X, count_order#X]
(22) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/10.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/10.txt
index 6bb1784778..a7ced66a82 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/10.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/10.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (100)
+- == Final Plan ==
- VeloxColumnarToRowExec (67)
+ VeloxColumnarToRow (67)
+- TakeOrderedAndProjectExecTransformer (66)
+- ^ ProjectExecTransformer (64)
+- ^ RegularHashAggregateExecTransformer (63)
@@ -359,7 +359,7 @@ Arguments: false
Input [8]: [c_custkey#X, c_name#X, revenue#X, c_acctbal#X, n_name#X, c_address#X, c_phone#X, c_comment#X]
Arguments: X, [revenue#X DESC NULLS LAST], [c_custkey#X, c_name#X, revenue#X, c_acctbal#X, n_name#X, c_address#X, c_phone#X, c_comment#X], 0
-(67) VeloxColumnarToRowExec
+(67) VeloxColumnarToRow
Input [8]: [c_custkey#X, c_name#X, revenue#X, c_acctbal#X, n_name#X, c_address#X, c_phone#X, c_comment#X]
(68) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/11.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/11.txt
index 42e37d72f1..b385b7719d 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/11.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/11.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (82)
+- == Final Plan ==
- VeloxColumnarToRowExec (56)
+ VeloxColumnarToRow (56)
+- ^ SortExecTransformer (54)
+- ^ InputIteratorTransformer (53)
+- ShuffleQueryStage (51)
@@ -297,7 +297,7 @@ Arguments: [value#X DESC NULLS LAST], true, 0
Input [2]: [ps_partkey#X, value#X]
Arguments: false
-(56) VeloxColumnarToRowExec
+(56) VeloxColumnarToRow
Input [2]: [ps_partkey#X, value#X]
(57) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/12.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/12.txt
index 40f651dd34..71dee80fab 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/12.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/12.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (55)
+- == Final Plan ==
- VeloxColumnarToRowExec (38)
+ VeloxColumnarToRow (38)
+- ^ SortExecTransformer (36)
+- ^ InputIteratorTransformer (35)
+- ShuffleQueryStage (33)
@@ -202,7 +202,7 @@ Arguments: [l_shipmode#X ASC NULLS FIRST], true, 0
Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X]
Arguments: false
-(38) VeloxColumnarToRowExec
+(38) VeloxColumnarToRow
Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X]
(39) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/13.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/13.txt
index 6c48d7e599..edbcb50206 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/13.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/13.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (58)
+- == Final Plan ==
- VeloxColumnarToRowExec (40)
+ VeloxColumnarToRow (40)
+- ^ SortExecTransformer (38)
+- ^ InputIteratorTransformer (37)
+- ShuffleQueryStage (35)
@@ -218,7 +218,7 @@ Arguments: [custdist#X DESC NULLS LAST, c_count#X DESC NULLS LAST], true, 0
Input [2]: [c_count#X, custdist#X]
Arguments: false
-(40) VeloxColumnarToRowExec
+(40) VeloxColumnarToRow
Input [2]: [c_count#X, custdist#X]
(41) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/14.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/14.txt
index b04d8d643f..91df642595 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/14.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/14.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (39)
+- == Final Plan ==
- VeloxColumnarToRowExec (25)
+ VeloxColumnarToRow (25)
+- ^ ProjectExecTransformer (23)
+- ^ RegularHashAggregateExecTransformer (22)
+- ^ RegularHashAggregateExecTransformer (21)
@@ -142,7 +142,7 @@ Input [2]: [sum(CASE WHEN StartsWith(p_type#X, PROMO) THEN CheckOverflow((promot
Input [1]: [promo_revenue#X]
Arguments: false
-(25) VeloxColumnarToRowExec
+(25) VeloxColumnarToRow
Input [1]: [promo_revenue#X]
(26) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/15.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/15.txt
index 83bd883296..56169a244b 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/15.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/15.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (50)
+- == Final Plan ==
- VeloxColumnarToRowExec (33)
+ VeloxColumnarToRow (33)
+- ^ SortExecTransformer (31)
+- ^ InputIteratorTransformer (30)
+- ShuffleQueryStage (28)
@@ -181,7 +181,7 @@ Arguments: [s_suppkey#X ASC NULLS FIRST], true, 0
Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X]
Arguments: false
-(33) VeloxColumnarToRowExec
+(33) VeloxColumnarToRow
Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X]
(34) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/16.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/16.txt
index 4c43ec8f19..8ef7d4d514 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/16.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/16.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (71)
+- == Final Plan ==
- VeloxColumnarToRowExec (47)
+ VeloxColumnarToRow (47)
+- ^ SortExecTransformer (45)
+- ^ InputIteratorTransformer (44)
+- ShuffleQueryStage (42)
@@ -256,7 +256,7 @@ Arguments: [supplier_cnt#X DESC NULLS LAST, p_brand#X ASC NULLS FIRST, p_type#X
Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X]
Arguments: false
-(47) VeloxColumnarToRowExec
+(47) VeloxColumnarToRow
Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X]
(48) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/17.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/17.txt
index 6a9d19d0de..fe915989f9 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/17.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/17.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (63)
+- == Final Plan ==
- VeloxColumnarToRowExec (40)
+ VeloxColumnarToRow (40)
+- ^ ProjectExecTransformer (38)
+- ^ RegularHashAggregateExecTransformer (37)
+- ^ RegularHashAggregateExecTransformer (36)
@@ -232,7 +232,7 @@ Input [1]: [sum(l_extendedprice#X)#X]
Input [1]: [avg_yearly#X]
Arguments: false
-(40) VeloxColumnarToRowExec
+(40) VeloxColumnarToRow
Input [1]: [avg_yearly#X]
(41) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/18.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/18.txt
index 587eb37cd4..a2345ca9ed 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/18.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/18.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (110)
+- == Final Plan ==
- VeloxColumnarToRowExec (70)
+ VeloxColumnarToRow (70)
+- TakeOrderedAndProjectExecTransformer (69)
+- ^ RegularHashAggregateExecTransformer (67)
+- ^ RegularHashAggregateExecTransformer (66)
@@ -390,7 +390,7 @@ Arguments: false
Input [6]: [c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum(l_quantity)#X]
Arguments: X, [o_totalprice#X DESC NULLS LAST, o_orderdate#X ASC NULLS FIRST], [c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum(l_quantity)#X], 0
-(70) VeloxColumnarToRowExec
+(70) VeloxColumnarToRow
Input [6]: [c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum(l_quantity)#X]
(71) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/19.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/19.txt
index 75795b3eaa..d06cdb0fec 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/19.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/19.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (38)
+- == Final Plan ==
- VeloxColumnarToRowExec (24)
+ VeloxColumnarToRow (24)
+- ^ RegularHashAggregateExecTransformer (22)
+- ^ RegularHashAggregateExecTransformer (21)
+- ^ ProjectExecTransformer (20)
@@ -137,7 +137,7 @@ Results [1]: [sum(CheckOverflow((promote_precision(cast(l_extendedprice#X as dec
Input [1]: [revenue#X]
Arguments: false
-(24) VeloxColumnarToRowExec
+(24) VeloxColumnarToRow
Input [1]: [revenue#X]
(25) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/20.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/20.txt
index ebcbc702cf..6fa1271a5a 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/20.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/20.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (146)
+- == Final Plan ==
- VeloxColumnarToRowExec (96)
+ VeloxColumnarToRow (96)
+- ^ SortExecTransformer (94)
+- ^ InputIteratorTransformer (93)
+- ShuffleQueryStage (91)
@@ -510,7 +510,7 @@ Arguments: [s_name#X ASC NULLS FIRST], true, 0
Input [2]: [s_name#X, s_address#X]
Arguments: false
-(96) VeloxColumnarToRowExec
+(96) VeloxColumnarToRow
Input [2]: [s_name#X, s_address#X]
(97) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/21.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/21.txt
index af2e469119..e70a145e9c 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/21.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/21.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (138)
+- == Final Plan ==
- VeloxColumnarToRowExec (92)
+ VeloxColumnarToRow (92)
+- TakeOrderedAndProjectExecTransformer (91)
+- ^ RegularHashAggregateExecTransformer (89)
+- ^ InputIteratorTransformer (88)
@@ -492,7 +492,7 @@ Arguments: false
Input [2]: [s_name#X, numwait#X]
Arguments: X, [numwait#X DESC NULLS LAST, s_name#X ASC NULLS FIRST], [s_name#X, numwait#X], 0
-(92) VeloxColumnarToRowExec
+(92) VeloxColumnarToRow
Input [2]: [s_name#X, numwait#X]
(93) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/22.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/22.txt
index 7e43e67ab1..674e0b9698 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/22.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/22.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (52)
+- == Final Plan ==
- VeloxColumnarToRowExec (37)
+ VeloxColumnarToRow (37)
+- ^ SortExecTransformer (35)
+- ^ InputIteratorTransformer (34)
+- ShuffleQueryStage (32)
@@ -194,7 +194,7 @@ Arguments: [cntrycode#X ASC NULLS FIRST], true, 0
Input [3]: [cntrycode#X, numcust#X, totacctbal#X]
Arguments: false
-(37) VeloxColumnarToRowExec
+(37) VeloxColumnarToRow
Input [3]: [cntrycode#X, numcust#X, totacctbal#X]
(38) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/3.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/3.txt
index b5d79b5819..3b9b7fd93b 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/3.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/3.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (67)
+- == Final Plan ==
- VeloxColumnarToRowExec (43)
+ VeloxColumnarToRow (43)
+- TakeOrderedAndProjectExecTransformer (42)
+- ^ ProjectExecTransformer (40)
+- ^ RegularHashAggregateExecTransformer (39)
@@ -238,7 +238,7 @@ Arguments: false
Input [4]: [l_orderkey#X, revenue#X, o_orderdate#X, o_shippriority#X]
Arguments: X, [revenue#X DESC NULLS LAST, o_orderdate#X ASC NULLS FIRST], [l_orderkey#X, revenue#X, o_orderdate#X, o_shippriority#X], 0
-(43) VeloxColumnarToRowExec
+(43) VeloxColumnarToRow
Input [4]: [l_orderkey#X, revenue#X, o_orderdate#X, o_shippriority#X]
(44) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/4.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/4.txt
index 7c07aa0134..ffb35d1813 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/4.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/4.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (56)
+- == Final Plan ==
- VeloxColumnarToRowExec (38)
+ VeloxColumnarToRow (38)
+- ^ SortExecTransformer (36)
+- ^ InputIteratorTransformer (35)
+- ShuffleQueryStage (33)
@@ -203,7 +203,7 @@ Arguments: [o_orderpriority#X ASC NULLS FIRST], true, 0
Input [2]: [o_orderpriority#X, order_count#X]
Arguments: false
-(38) VeloxColumnarToRowExec
+(38) VeloxColumnarToRow
Input [2]: [o_orderpriority#X, order_count#X]
(39) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/5.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/5.txt
index f481ec2d47..0e48f73c77 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/5.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/5.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (156)
+- == Final Plan ==
- VeloxColumnarToRowExec (106)
+ VeloxColumnarToRow (106)
+- ^ SortExecTransformer (104)
+- ^ InputIteratorTransformer (103)
+- ShuffleQueryStage (101)
@@ -559,7 +559,7 @@ Arguments: [revenue#X DESC NULLS LAST], true, 0
Input [2]: [n_name#X, revenue#X]
Arguments: false
-(106) VeloxColumnarToRowExec
+(106) VeloxColumnarToRow
Input [2]: [n_name#X, revenue#X]
(107) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/6.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/6.txt
index 2b97fd28f1..a1830678d0 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/6.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/6.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (20)
+- == Final Plan ==
- VeloxColumnarToRowExec (13)
+ VeloxColumnarToRow (13)
+- ^ RegularHashAggregateExecTransformer (11)
+- ^ InputIteratorTransformer (10)
+- ShuffleQueryStage (8)
@@ -75,7 +75,7 @@ Results [1]: [sum(CheckOverflow((promote_precision(l_extendedprice#X) * promote_
Input [1]: [revenue#X]
Arguments: false
-(13) VeloxColumnarToRowExec
+(13) VeloxColumnarToRow
Input [1]: [revenue#X]
(14) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/7.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/7.txt
index 82d0d75e31..f089996aa4 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/7.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/7.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (149)
+- == Final Plan ==
- VeloxColumnarToRowExec (101)
+ VeloxColumnarToRow (101)
+- ^ SortExecTransformer (99)
+- ^ InputIteratorTransformer (98)
+- ShuffleQueryStage (96)
@@ -529,7 +529,7 @@ Arguments: [supp_nation#X ASC NULLS FIRST, cust_nation#X ASC NULLS FIRST, l_year
Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X]
Arguments: false
-(101) VeloxColumnarToRowExec
+(101) VeloxColumnarToRow
Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X]
(102) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/8.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/8.txt
index 6a7d97a628..80b0d02a6c 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/8.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/8.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (207)
+- == Final Plan ==
- VeloxColumnarToRowExec (141)
+ VeloxColumnarToRow (141)
+- ^ SortExecTransformer (139)
+- ^ InputIteratorTransformer (138)
+- ShuffleQueryStage (136)
@@ -742,7 +742,7 @@ Arguments: [o_year#X ASC NULLS FIRST], true, 0
Input [2]: [o_year#X, mkt_share#X]
Arguments: false
-(141) VeloxColumnarToRowExec
+(141) VeloxColumnarToRow
Input [2]: [o_year#X, mkt_share#X]
(142) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/9.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/9.txt
index a0f1d9c68a..a41822a60a 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/9.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark32/9.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (155)
+- == Final Plan ==
- VeloxColumnarToRowExec (106)
+ VeloxColumnarToRow (106)
+- ^ SortExecTransformer (104)
+- ^ InputIteratorTransformer (103)
+- ShuffleQueryStage (101)
@@ -558,7 +558,7 @@ Arguments: [nation#X ASC NULLS FIRST, o_year#X DESC NULLS LAST], true, 0
Input [3]: [nation#X, o_year#X, sum_profit#X]
Arguments: false
-(106) VeloxColumnarToRowExec
+(106) VeloxColumnarToRow
Input [3]: [nation#X, o_year#X, sum_profit#X]
(107) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/1.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/1.txt
index 417ddf9de2..0851fa2447 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/1.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/1.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (30)
+- == Final Plan ==
- VeloxColumnarToRowExec (21)
+ VeloxColumnarToRow (21)
+- ^ SortExecTransformer (19)
+- ^ InputIteratorTransformer (18)
+- ShuffleQueryStage (16), Statistics(X)
@@ -113,7 +113,7 @@ Arguments: [l_returnflag#X ASC NULLS FIRST, l_linestatus#X ASC NULLS FIRST], tru
Input [10]: [l_returnflag#X, l_linestatus#X, sum_qty#X, sum_base_price#X, sum_disc_price#X, sum_charge#X, avg_qty#X, avg_price#X, avg_disc#X, count_order#X]
Arguments: false
-(21) VeloxColumnarToRowExec
+(21) VeloxColumnarToRow
Input [10]: [l_returnflag#X, l_linestatus#X, sum_qty#X, sum_base_price#X, sum_disc_price#X, sum_charge#X, avg_qty#X, avg_price#X, avg_disc#X, count_order#X]
(22) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/10.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/10.txt
index e42af1ec4c..1b89e64860 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/10.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/10.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (100)
+- == Final Plan ==
- VeloxColumnarToRowExec (67)
+ VeloxColumnarToRow (67)
+- TakeOrderedAndProjectExecTransformer (66)
+- ^ ProjectExecTransformer (64)
+- ^ RegularHashAggregateExecTransformer (63)
@@ -359,7 +359,7 @@ Arguments: false
Input [8]: [c_custkey#X, c_name#X, revenue#X, c_acctbal#X, n_name#X, c_address#X, c_phone#X, c_comment#X]
Arguments: X, [revenue#X DESC NULLS LAST], [c_custkey#X, c_name#X, revenue#X, c_acctbal#X, n_name#X, c_address#X, c_phone#X, c_comment#X], 0
-(67) VeloxColumnarToRowExec
+(67) VeloxColumnarToRow
Input [8]: [c_custkey#X, c_name#X, revenue#X, c_acctbal#X, n_name#X, c_address#X, c_phone#X, c_comment#X]
(68) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/11.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/11.txt
index fe2dcc9190..6ca992b709 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/11.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/11.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (82)
+- == Final Plan ==
- VeloxColumnarToRowExec (56)
+ VeloxColumnarToRow (56)
+- ^ SortExecTransformer (54)
+- ^ InputIteratorTransformer (53)
+- ShuffleQueryStage (51), Statistics(X)
@@ -297,7 +297,7 @@ Arguments: [value#X DESC NULLS LAST], true, 0
Input [2]: [ps_partkey#X, value#X]
Arguments: false
-(56) VeloxColumnarToRowExec
+(56) VeloxColumnarToRow
Input [2]: [ps_partkey#X, value#X]
(57) Scan parquet
@@ -426,7 +426,7 @@ Arguments: isFinalPlan=true
Subquery:1 Hosting operator id = 47 Hosting Expression = Subquery subquery#X, [id=#X]
AdaptiveSparkPlan (136)
+- == Final Plan ==
- VeloxColumnarToRowExec (114)
+ VeloxColumnarToRow (114)
+- ^ ProjectExecTransformer (112)
+- ^ RegularHashAggregateExecTransformer (111)
+- ^ RegularHashAggregateExecTransformer (110)
@@ -600,7 +600,7 @@ Input [1]: [sum(CheckOverflow((promote_precision(ps_supplycost#X) * promote_prec
Input [1]: [(sum((ps_supplycost * ps_availqty)) * 0.0001000000)#X]
Arguments: false
-(114) VeloxColumnarToRowExec
+(114) VeloxColumnarToRow
Input [1]: [(sum((ps_supplycost * ps_availqty)) * 0.0001000000)#X]
(115) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/12.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/12.txt
index 2ee35e463c..346a686634 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/12.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/12.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (55)
+- == Final Plan ==
- VeloxColumnarToRowExec (38)
+ VeloxColumnarToRow (38)
+- ^ SortExecTransformer (36)
+- ^ InputIteratorTransformer (35)
+- ShuffleQueryStage (33), Statistics(X)
@@ -202,7 +202,7 @@ Arguments: [l_shipmode#X ASC NULLS FIRST], true, 0
Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X]
Arguments: false
-(38) VeloxColumnarToRowExec
+(38) VeloxColumnarToRow
Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X]
(39) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/13.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/13.txt
index d59a697662..9e927782f6 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/13.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/13.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (58)
+- == Final Plan ==
- VeloxColumnarToRowExec (40)
+ VeloxColumnarToRow (40)
+- ^ SortExecTransformer (38)
+- ^ InputIteratorTransformer (37)
+- ShuffleQueryStage (35), Statistics(X)
@@ -218,7 +218,7 @@ Arguments: [custdist#X DESC NULLS LAST, c_count#X DESC NULLS LAST], true, 0
Input [2]: [c_count#X, custdist#X]
Arguments: false
-(40) VeloxColumnarToRowExec
+(40) VeloxColumnarToRow
Input [2]: [c_count#X, custdist#X]
(41) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/14.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/14.txt
index e570d1a4cf..d82e4f2b21 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/14.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/14.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (39)
+- == Final Plan ==
- VeloxColumnarToRowExec (25)
+ VeloxColumnarToRow (25)
+- ^ ProjectExecTransformer (23)
+- ^ RegularHashAggregateExecTransformer (22)
+- ^ RegularHashAggregateExecTransformer (21)
@@ -142,7 +142,7 @@ Input [2]: [sum(CASE WHEN StartsWith(p_type#X, PROMO) THEN CheckOverflow((promot
Input [1]: [promo_revenue#X]
Arguments: false
-(25) VeloxColumnarToRowExec
+(25) VeloxColumnarToRow
Input [1]: [promo_revenue#X]
(26) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/15.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/15.txt
index 51baae5186..950441af70 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/15.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/15.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (47)
+- == Final Plan ==
- VeloxColumnarToRowExec (30)
+ VeloxColumnarToRow (30)
+- AQEShuffleRead (29)
+- ShuffleQueryStage (28), Statistics(X)
+- ColumnarExchange (27)
@@ -170,7 +170,7 @@ Arguments: X
Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X]
Arguments: local
-(30) VeloxColumnarToRowExec
+(30) VeloxColumnarToRow
Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X]
(31) Scan parquet
@@ -259,7 +259,7 @@ Arguments: isFinalPlan=true
Subquery:1 Hosting operator id = 22 Hosting Expression = Subquery subquery#X, [id=#X]
AdaptiveSparkPlan (73)
+- == Final Plan ==
- VeloxColumnarToRowExec (64)
+ VeloxColumnarToRow (64)
+- ^ RegularHashAggregateExecTransformer (62)
+- ^ RegularHashAggregateExecTransformer (61)
+- ^ ProjectExecTransformer (60)
@@ -361,7 +361,7 @@ Results [1]: [max(total_revenue#X)#X AS max(total_revenue)#X]
Input [1]: [max(total_revenue)#X]
Arguments: false
-(64) VeloxColumnarToRowExec
+(64) VeloxColumnarToRow
Input [1]: [max(total_revenue)#X]
(65) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/16.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/16.txt
index ab417c50bc..aa7aa005a9 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/16.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/16.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (71)
+- == Final Plan ==
- VeloxColumnarToRowExec (47)
+ VeloxColumnarToRow (47)
+- ^ SortExecTransformer (45)
+- ^ InputIteratorTransformer (44)
+- ShuffleQueryStage (42), Statistics(X)
@@ -256,7 +256,7 @@ Arguments: [supplier_cnt#X DESC NULLS LAST, p_brand#X ASC NULLS FIRST, p_type#X
Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X]
Arguments: false
-(47) VeloxColumnarToRowExec
+(47) VeloxColumnarToRow
Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X]
(48) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/17.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/17.txt
index ad32d4cb58..e48379edc9 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/17.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/17.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (63)
+- == Final Plan ==
- VeloxColumnarToRowExec (40)
+ VeloxColumnarToRow (40)
+- ^ ProjectExecTransformer (38)
+- ^ RegularHashAggregateExecTransformer (37)
+- ^ RegularHashAggregateExecTransformer (36)
@@ -232,7 +232,7 @@ Input [1]: [sum(l_extendedprice#X)#X]
Input [1]: [avg_yearly#X]
Arguments: false
-(40) VeloxColumnarToRowExec
+(40) VeloxColumnarToRow
Input [1]: [avg_yearly#X]
(41) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/18.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/18.txt
index 42f3988838..8dbf942996 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/18.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/18.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (110)
+- == Final Plan ==
- VeloxColumnarToRowExec (70)
+ VeloxColumnarToRow (70)
+- TakeOrderedAndProjectExecTransformer (69)
+- ^ RegularHashAggregateExecTransformer (67)
+- ^ RegularHashAggregateExecTransformer (66)
@@ -390,7 +390,7 @@ Arguments: false
Input [6]: [c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum(l_quantity)#X]
Arguments: X, [o_totalprice#X DESC NULLS LAST, o_orderdate#X ASC NULLS FIRST], [c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum(l_quantity)#X], 0
-(70) VeloxColumnarToRowExec
+(70) VeloxColumnarToRow
Input [6]: [c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum(l_quantity)#X]
(71) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/19.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/19.txt
index 20fea0a016..41da1d28e9 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/19.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/19.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (38)
+- == Final Plan ==
- VeloxColumnarToRowExec (24)
+ VeloxColumnarToRow (24)
+- ^ RegularHashAggregateExecTransformer (22)
+- ^ RegularHashAggregateExecTransformer (21)
+- ^ ProjectExecTransformer (20)
@@ -137,7 +137,7 @@ Results [1]: [sum(CheckOverflow((promote_precision(cast(l_extendedprice#X as dec
Input [1]: [revenue#X]
Arguments: false
-(24) VeloxColumnarToRowExec
+(24) VeloxColumnarToRow
Input [1]: [revenue#X]
(25) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/20.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/20.txt
index fdaed6a1a7..1fad7160bf 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/20.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/20.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (143)
+- == Final Plan ==
- VeloxColumnarToRowExec (93)
+ VeloxColumnarToRow (93)
+- AQEShuffleRead (92)
+- ShuffleQueryStage (91), Statistics(X)
+- ColumnarExchange (90)
@@ -499,7 +499,7 @@ Arguments: X
Input [2]: [s_name#X, s_address#X]
Arguments: local
-(93) VeloxColumnarToRowExec
+(93) VeloxColumnarToRow
Input [2]: [s_name#X, s_address#X]
(94) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/21.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/21.txt
index 557dd678da..fd61236faa 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/21.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/21.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (137)
+- == Final Plan ==
- VeloxColumnarToRowExec (91)
+ VeloxColumnarToRow (91)
+- ^ RegularHashAggregateExecTransformer (89)
+- ^ InputIteratorTransformer (88)
+- ShuffleQueryStage (86), Statistics(X)
@@ -487,7 +487,7 @@ Results [2]: [s_name#X, count(1)#X AS numwait#X]
Input [2]: [s_name#X, numwait#X]
Arguments: false
-(91) VeloxColumnarToRowExec
+(91) VeloxColumnarToRow
Input [2]: [s_name#X, numwait#X]
(92) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/22.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/22.txt
index edd50a4764..44c57da748 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/22.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/22.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (52)
+- == Final Plan ==
- VeloxColumnarToRowExec (37)
+ VeloxColumnarToRow (37)
+- ^ SortExecTransformer (35)
+- ^ InputIteratorTransformer (34)
+- ShuffleQueryStage (32), Statistics(X)
@@ -194,7 +194,7 @@ Arguments: [cntrycode#X ASC NULLS FIRST], true, 0
Input [3]: [cntrycode#X, numcust#X, totacctbal#X]
Arguments: false
-(37) VeloxColumnarToRowExec
+(37) VeloxColumnarToRow
Input [3]: [cntrycode#X, numcust#X, totacctbal#X]
(38) Scan parquet
@@ -274,7 +274,7 @@ Arguments: isFinalPlan=true
Subquery:1 Hosting operator id = 2 Hosting Expression = Subquery subquery#X, [id=#X]
AdaptiveSparkPlan (72)
+- == Final Plan ==
- VeloxColumnarToRowExec (65)
+ VeloxColumnarToRow (65)
+- ^ RegularHashAggregateExecTransformer (63)
+- ^ InputIteratorTransformer (62)
+- ShuffleQueryStage (60), Statistics(X)
@@ -348,7 +348,7 @@ Results [1]: [avg(c_acctbal#X)#X AS avg(c_acctbal)#X]
Input [1]: [avg(c_acctbal)#X]
Arguments: false
-(65) VeloxColumnarToRowExec
+(65) VeloxColumnarToRow
Input [1]: [avg(c_acctbal)#X]
(66) Scan parquet
@@ -391,7 +391,7 @@ Arguments: isFinalPlan=true
Subquery:2 Hosting operator id = 1 Hosting Expression = Subquery subquery#X, [id=#X]
AdaptiveSparkPlan (72)
+- == Final Plan ==
- VeloxColumnarToRowExec (65)
+ VeloxColumnarToRow (65)
+- ^ RegularHashAggregateExecTransformer (63)
+- ^ InputIteratorTransformer (62)
+- ShuffleQueryStage (60), Statistics(X)
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/3.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/3.txt
index ea8a29d659..a698975568 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/3.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/3.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (67)
+- == Final Plan ==
- VeloxColumnarToRowExec (43)
+ VeloxColumnarToRow (43)
+- TakeOrderedAndProjectExecTransformer (42)
+- ^ ProjectExecTransformer (40)
+- ^ RegularHashAggregateExecTransformer (39)
@@ -238,7 +238,7 @@ Arguments: false
Input [4]: [l_orderkey#X, revenue#X, o_orderdate#X, o_shippriority#X]
Arguments: X, [revenue#X DESC NULLS LAST, o_orderdate#X ASC NULLS FIRST], [l_orderkey#X, revenue#X, o_orderdate#X, o_shippriority#X], 0
-(43) VeloxColumnarToRowExec
+(43) VeloxColumnarToRow
Input [4]: [l_orderkey#X, revenue#X, o_orderdate#X, o_shippriority#X]
(44) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/4.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/4.txt
index ca3f2707b8..8b00d867cd 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/4.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/4.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (56)
+- == Final Plan ==
- VeloxColumnarToRowExec (38)
+ VeloxColumnarToRow (38)
+- ^ SortExecTransformer (36)
+- ^ InputIteratorTransformer (35)
+- ShuffleQueryStage (33), Statistics(X)
@@ -203,7 +203,7 @@ Arguments: [o_orderpriority#X ASC NULLS FIRST], true, 0
Input [2]: [o_orderpriority#X, order_count#X]
Arguments: false
-(38) VeloxColumnarToRowExec
+(38) VeloxColumnarToRow
Input [2]: [o_orderpriority#X, order_count#X]
(39) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/5.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/5.txt
index ccedfac29b..dd869d25d4 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/5.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/5.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (156)
+- == Final Plan ==
- VeloxColumnarToRowExec (106)
+ VeloxColumnarToRow (106)
+- ^ SortExecTransformer (104)
+- ^ InputIteratorTransformer (103)
+- ShuffleQueryStage (101), Statistics(X)
@@ -559,7 +559,7 @@ Arguments: [revenue#X DESC NULLS LAST], true, 0
Input [2]: [n_name#X, revenue#X]
Arguments: false
-(106) VeloxColumnarToRowExec
+(106) VeloxColumnarToRow
Input [2]: [n_name#X, revenue#X]
(107) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/6.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/6.txt
index bb9d04cdcd..5df63675ca 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/6.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/6.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (20)
+- == Final Plan ==
- VeloxColumnarToRowExec (13)
+ VeloxColumnarToRow (13)
+- ^ RegularHashAggregateExecTransformer (11)
+- ^ InputIteratorTransformer (10)
+- ShuffleQueryStage (8), Statistics(X)
@@ -75,7 +75,7 @@ Results [1]: [sum(CheckOverflow((promote_precision(l_extendedprice#X) * promote_
Input [1]: [revenue#X]
Arguments: false
-(13) VeloxColumnarToRowExec
+(13) VeloxColumnarToRow
Input [1]: [revenue#X]
(14) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/7.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/7.txt
index 046147da8e..ac6dda065b 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/7.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/7.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (149)
+- == Final Plan ==
- VeloxColumnarToRowExec (101)
+ VeloxColumnarToRow (101)
+- ^ SortExecTransformer (99)
+- ^ InputIteratorTransformer (98)
+- ShuffleQueryStage (96), Statistics(X)
@@ -529,7 +529,7 @@ Arguments: [supp_nation#X ASC NULLS FIRST, cust_nation#X ASC NULLS FIRST, l_year
Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X]
Arguments: false
-(101) VeloxColumnarToRowExec
+(101) VeloxColumnarToRow
Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X]
(102) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/8.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/8.txt
index 664d74c619..6f5ed0d82b 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/8.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/8.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (207)
+- == Final Plan ==
- VeloxColumnarToRowExec (141)
+ VeloxColumnarToRow (141)
+- ^ SortExecTransformer (139)
+- ^ InputIteratorTransformer (138)
+- ShuffleQueryStage (136), Statistics(X)
@@ -742,7 +742,7 @@ Arguments: [o_year#X ASC NULLS FIRST], true, 0
Input [2]: [o_year#X, mkt_share#X]
Arguments: false
-(141) VeloxColumnarToRowExec
+(141) VeloxColumnarToRow
Input [2]: [o_year#X, mkt_share#X]
(142) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/9.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/9.txt
index 1ae7a93998..22cd2b9967 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/9.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark33/9.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (155)
+- == Final Plan ==
- VeloxColumnarToRowExec (106)
+ VeloxColumnarToRow (106)
+- ^ SortExecTransformer (104)
+- ^ InputIteratorTransformer (103)
+- ShuffleQueryStage (101), Statistics(X)
@@ -558,7 +558,7 @@ Arguments: [nation#X ASC NULLS FIRST, o_year#X DESC NULLS LAST], true, 0
Input [3]: [nation#X, o_year#X, sum_profit#X]
Arguments: false
-(106) VeloxColumnarToRowExec
+(106) VeloxColumnarToRow
Input [3]: [nation#X, o_year#X, sum_profit#X]
(107) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/1.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/1.txt
index 450797d3ae..6dbee1ad7f 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/1.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/1.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (30)
+- == Final Plan ==
- VeloxColumnarToRowExec (21)
+ VeloxColumnarToRow (21)
+- ^ SortExecTransformer (19)
+- ^ InputIteratorTransformer (18)
+- ShuffleQueryStage (16), Statistics(X)
@@ -113,7 +113,7 @@ Arguments: [l_returnflag#X ASC NULLS FIRST, l_linestatus#X ASC NULLS FIRST], tru
Input [10]: [l_returnflag#X, l_linestatus#X, sum_qty#X, sum_base_price#X, sum_disc_price#X, sum_charge#X, avg_qty#X, avg_price#X, avg_disc#X, count_order#X]
Arguments: false
-(21) VeloxColumnarToRowExec
+(21) VeloxColumnarToRow
Input [10]: [l_returnflag#X, l_linestatus#X, sum_qty#X, sum_base_price#X, sum_disc_price#X, sum_charge#X, avg_qty#X, avg_price#X, avg_disc#X, count_order#X]
(22) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/10.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/10.txt
index 6a296c163e..a052989ba5 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/10.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/10.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (100)
+- == Final Plan ==
- VeloxColumnarToRowExec (67)
+ VeloxColumnarToRow (67)
+- TakeOrderedAndProjectExecTransformer (66)
+- ^ ProjectExecTransformer (64)
+- ^ RegularHashAggregateExecTransformer (63)
@@ -362,7 +362,7 @@ Arguments: false
Input [8]: [c_custkey#X, c_name#X, revenue#X, c_acctbal#X, n_name#X, c_address#X, c_phone#X, c_comment#X]
Arguments: X, [revenue#X DESC NULLS LAST], [c_custkey#X, c_name#X, revenue#X, c_acctbal#X, n_name#X, c_address#X, c_phone#X, c_comment#X], 0
-(67) VeloxColumnarToRowExec
+(67) VeloxColumnarToRow
Input [8]: [c_custkey#X, c_name#X, revenue#X, c_acctbal#X, n_name#X, c_address#X, c_phone#X, c_comment#X]
(68) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/11.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/11.txt
index 8fef547f8d..68e87c39a0 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/11.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/11.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (82)
+- == Final Plan ==
- VeloxColumnarToRowExec (56)
+ VeloxColumnarToRow (56)
+- ^ SortExecTransformer (54)
+- ^ InputIteratorTransformer (53)
+- ShuffleQueryStage (51), Statistics(X)
@@ -299,7 +299,7 @@ Arguments: [value#X DESC NULLS LAST], true, 0
Input [2]: [ps_partkey#X, value#X]
Arguments: false
-(56) VeloxColumnarToRowExec
+(56) VeloxColumnarToRow
Input [2]: [ps_partkey#X, value#X]
(57) Scan parquet
@@ -430,7 +430,7 @@ Arguments: isFinalPlan=true
Subquery:1 Hosting operator id = 47 Hosting Expression = Subquery subquery#X, [id=#X]
AdaptiveSparkPlan (136)
+- == Final Plan ==
- VeloxColumnarToRowExec (114)
+ VeloxColumnarToRow (114)
+- ^ ProjectExecTransformer (112)
+- ^ RegularHashAggregateExecTransformer (111)
+- ^ RegularHashAggregateExecTransformer (110)
@@ -606,7 +606,7 @@ Input [1]: [sum((ps_supplycost#X * cast(ps_availqty#X as decimal(10,0))))#X]
Input [1]: [(sum((ps_supplycost * ps_availqty)) * 0.0001000000)#X]
Arguments: false
-(114) VeloxColumnarToRowExec
+(114) VeloxColumnarToRow
Input [1]: [(sum((ps_supplycost * ps_availqty)) * 0.0001000000)#X]
(115) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/12.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/12.txt
index a5ff0ee4b5..9175845083 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/12.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/12.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (55)
+- == Final Plan ==
- VeloxColumnarToRowExec (38)
+ VeloxColumnarToRow (38)
+- ^ SortExecTransformer (36)
+- ^ InputIteratorTransformer (35)
+- ShuffleQueryStage (33), Statistics(X)
@@ -203,7 +203,7 @@ Arguments: [l_shipmode#X ASC NULLS FIRST], true, 0
Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X]
Arguments: false
-(38) VeloxColumnarToRowExec
+(38) VeloxColumnarToRow
Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X]
(39) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/13.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/13.txt
index f0604101ed..b527c2bc3b 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/13.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/13.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (58)
+- == Final Plan ==
- VeloxColumnarToRowExec (40)
+ VeloxColumnarToRow (40)
+- ^ SortExecTransformer (38)
+- ^ InputIteratorTransformer (37)
+- ShuffleQueryStage (35), Statistics(X)
@@ -219,7 +219,7 @@ Arguments: [custdist#X DESC NULLS LAST, c_count#X DESC NULLS LAST], true, 0
Input [2]: [c_count#X, custdist#X]
Arguments: false
-(40) VeloxColumnarToRowExec
+(40) VeloxColumnarToRow
Input [2]: [c_count#X, custdist#X]
(41) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/14.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/14.txt
index 768c18ddac..cc6d364dea 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/14.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/14.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (39)
+- == Final Plan ==
- VeloxColumnarToRowExec (25)
+ VeloxColumnarToRow (25)
+- ^ ProjectExecTransformer (23)
+- ^ RegularHashAggregateExecTransformer (22)
+- ^ RegularHashAggregateExecTransformer (21)
@@ -143,7 +143,7 @@ Input [2]: [sum(CASE WHEN StartsWith(p_type#X, PROMO) THEN (l_extendedprice#X *
Input [1]: [promo_revenue#X]
Arguments: false
-(25) VeloxColumnarToRowExec
+(25) VeloxColumnarToRow
Input [1]: [promo_revenue#X]
(26) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/15.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/15.txt
index c91d8a7f50..8f1a1b4415 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/15.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/15.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (47)
+- == Final Plan ==
- VeloxColumnarToRowExec (30)
+ VeloxColumnarToRow (30)
+- AQEShuffleRead (29)
+- ShuffleQueryStage (28), Statistics(X)
+- ColumnarExchange (27)
@@ -171,7 +171,7 @@ Arguments: X
Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X]
Arguments: local
-(30) VeloxColumnarToRowExec
+(30) VeloxColumnarToRow
Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X]
(31) Scan parquet
@@ -261,7 +261,7 @@ Arguments: isFinalPlan=true
Subquery:1 Hosting operator id = 22 Hosting Expression = Subquery subquery#X, [id=#X]
AdaptiveSparkPlan (73)
+- == Final Plan ==
- VeloxColumnarToRowExec (64)
+ VeloxColumnarToRow (64)
+- ^ RegularHashAggregateExecTransformer (62)
+- ^ RegularHashAggregateExecTransformer (61)
+- ^ ProjectExecTransformer (60)
@@ -363,7 +363,7 @@ Results [1]: [max(total_revenue#X)#X AS max(total_revenue)#X]
Input [1]: [max(total_revenue)#X]
Arguments: false
-(64) VeloxColumnarToRowExec
+(64) VeloxColumnarToRow
Input [1]: [max(total_revenue)#X]
(65) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/16.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/16.txt
index 501e4a122e..ee7826c8aa 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/16.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/16.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (71)
+- == Final Plan ==
- VeloxColumnarToRowExec (47)
+ VeloxColumnarToRow (47)
+- ^ SortExecTransformer (45)
+- ^ InputIteratorTransformer (44)
+- ShuffleQueryStage (42), Statistics(X)
@@ -257,7 +257,7 @@ Arguments: [supplier_cnt#X DESC NULLS LAST, p_brand#X ASC NULLS FIRST, p_type#X
Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X]
Arguments: false
-(47) VeloxColumnarToRowExec
+(47) VeloxColumnarToRow
Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X]
(48) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/17.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/17.txt
index b8d72004b1..eaad0429ab 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/17.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/17.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (63)
+- == Final Plan ==
- VeloxColumnarToRowExec (40)
+ VeloxColumnarToRow (40)
+- ^ ProjectExecTransformer (38)
+- ^ RegularHashAggregateExecTransformer (37)
+- ^ RegularHashAggregateExecTransformer (36)
@@ -234,7 +234,7 @@ Input [1]: [sum(l_extendedprice#X)#X]
Input [1]: [avg_yearly#X]
Arguments: false
-(40) VeloxColumnarToRowExec
+(40) VeloxColumnarToRow
Input [1]: [avg_yearly#X]
(41) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/18.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/18.txt
index 2cb8a12dd0..85b11fa8ca 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/18.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/18.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (110)
+- == Final Plan ==
- VeloxColumnarToRowExec (70)
+ VeloxColumnarToRow (70)
+- TakeOrderedAndProjectExecTransformer (69)
+- ^ RegularHashAggregateExecTransformer (67)
+- ^ RegularHashAggregateExecTransformer (66)
@@ -394,7 +394,7 @@ Arguments: false
Input [6]: [c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum(l_quantity)#X]
Arguments: X, [o_totalprice#X DESC NULLS LAST, o_orderdate#X ASC NULLS FIRST], [c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum(l_quantity)#X], 0
-(70) VeloxColumnarToRowExec
+(70) VeloxColumnarToRow
Input [6]: [c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum(l_quantity)#X]
(71) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/19.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/19.txt
index 37cdd2a85b..c72ca859ce 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/19.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/19.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (38)
+- == Final Plan ==
- VeloxColumnarToRowExec (24)
+ VeloxColumnarToRow (24)
+- ^ RegularHashAggregateExecTransformer (22)
+- ^ RegularHashAggregateExecTransformer (21)
+- ^ ProjectExecTransformer (20)
@@ -138,7 +138,7 @@ Results [1]: [sum((l_extendedprice#X * (1 - l_discount#X)))#X AS revenue#X]
Input [1]: [revenue#X]
Arguments: false
-(24) VeloxColumnarToRowExec
+(24) VeloxColumnarToRow
Input [1]: [revenue#X]
(25) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/20.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/20.txt
index cbb0cdea34..ed09215178 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/20.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/20.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (143)
+- == Final Plan ==
- VeloxColumnarToRowExec (93)
+ VeloxColumnarToRow (93)
+- AQEShuffleRead (92)
+- ShuffleQueryStage (91), Statistics(X)
+- ColumnarExchange (90)
@@ -504,7 +504,7 @@ Arguments: X
Input [2]: [s_name#X, s_address#X]
Arguments: local
-(93) VeloxColumnarToRowExec
+(93) VeloxColumnarToRow
Input [2]: [s_name#X, s_address#X]
(94) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/21.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/21.txt
index 5ec8fe9d15..271d0c6d50 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/21.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/21.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (137)
+- == Final Plan ==
- VeloxColumnarToRowExec (91)
+ VeloxColumnarToRow (91)
+- ^ RegularHashAggregateExecTransformer (89)
+- ^ InputIteratorTransformer (88)
+- ShuffleQueryStage (86), Statistics(X)
@@ -492,7 +492,7 @@ Results [2]: [s_name#X, count(1)#X AS numwait#X]
Input [2]: [s_name#X, numwait#X]
Arguments: false
-(91) VeloxColumnarToRowExec
+(91) VeloxColumnarToRow
Input [2]: [s_name#X, numwait#X]
(92) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/22.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/22.txt
index fee21bac69..b8123fb6dc 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/22.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/22.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (52)
+- == Final Plan ==
- VeloxColumnarToRowExec (37)
+ VeloxColumnarToRow (37)
+- ^ SortExecTransformer (35)
+- ^ InputIteratorTransformer (34)
+- ShuffleQueryStage (32), Statistics(X)
@@ -195,7 +195,7 @@ Arguments: [cntrycode#X ASC NULLS FIRST], true, 0
Input [3]: [cntrycode#X, numcust#X, totacctbal#X]
Arguments: false
-(37) VeloxColumnarToRowExec
+(37) VeloxColumnarToRow
Input [3]: [cntrycode#X, numcust#X, totacctbal#X]
(38) Scan parquet
@@ -276,7 +276,7 @@ Arguments: isFinalPlan=true
Subquery:1 Hosting operator id = 2 Hosting Expression = Subquery subquery#X, [id=#X]
AdaptiveSparkPlan (72)
+- == Final Plan ==
- VeloxColumnarToRowExec (65)
+ VeloxColumnarToRow (65)
+- ^ RegularHashAggregateExecTransformer (63)
+- ^ InputIteratorTransformer (62)
+- ShuffleQueryStage (60), Statistics(X)
@@ -350,7 +350,7 @@ Results [1]: [avg(c_acctbal#X)#X AS avg(c_acctbal)#X]
Input [1]: [avg(c_acctbal)#X]
Arguments: false
-(65) VeloxColumnarToRowExec
+(65) VeloxColumnarToRow
Input [1]: [avg(c_acctbal)#X]
(66) Scan parquet
@@ -393,7 +393,7 @@ Arguments: isFinalPlan=true
Subquery:2 Hosting operator id = 1 Hosting Expression = Subquery subquery#X, [id=#X]
AdaptiveSparkPlan (72)
+- == Final Plan ==
- VeloxColumnarToRowExec (65)
+ VeloxColumnarToRow (65)
+- ^ RegularHashAggregateExecTransformer (63)
+- ^ InputIteratorTransformer (62)
+- ShuffleQueryStage (60), Statistics(X)
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/3.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/3.txt
index 83064ad3a0..8eea7581a4 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/3.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/3.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (67)
+- == Final Plan ==
- VeloxColumnarToRowExec (43)
+ VeloxColumnarToRow (43)
+- TakeOrderedAndProjectExecTransformer (42)
+- ^ ProjectExecTransformer (40)
+- ^ RegularHashAggregateExecTransformer (39)
@@ -240,7 +240,7 @@ Arguments: false
Input [4]: [l_orderkey#X, revenue#X, o_orderdate#X, o_shippriority#X]
Arguments: X, [revenue#X DESC NULLS LAST, o_orderdate#X ASC NULLS FIRST], [l_orderkey#X, revenue#X, o_orderdate#X, o_shippriority#X], 0
-(43) VeloxColumnarToRowExec
+(43) VeloxColumnarToRow
Input [4]: [l_orderkey#X, revenue#X, o_orderdate#X, o_shippriority#X]
(44) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/4.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/4.txt
index 3f055feb01..286881fb99 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/4.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/4.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (56)
+- == Final Plan ==
- VeloxColumnarToRowExec (38)
+ VeloxColumnarToRow (38)
+- ^ SortExecTransformer (36)
+- ^ InputIteratorTransformer (35)
+- ShuffleQueryStage (33), Statistics(X)
@@ -204,7 +204,7 @@ Arguments: [o_orderpriority#X ASC NULLS FIRST], true, 0
Input [2]: [o_orderpriority#X, order_count#X]
Arguments: false
-(38) VeloxColumnarToRowExec
+(38) VeloxColumnarToRow
Input [2]: [o_orderpriority#X, order_count#X]
(39) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/5.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/5.txt
index 87eaa9b8dc..0a9af46052 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/5.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/5.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (156)
+- == Final Plan ==
- VeloxColumnarToRowExec (106)
+ VeloxColumnarToRow (106)
+- ^ SortExecTransformer (104)
+- ^ InputIteratorTransformer (103)
+- ShuffleQueryStage (101), Statistics(X)
@@ -564,7 +564,7 @@ Arguments: [revenue#X DESC NULLS LAST], true, 0
Input [2]: [n_name#X, revenue#X]
Arguments: false
-(106) VeloxColumnarToRowExec
+(106) VeloxColumnarToRow
Input [2]: [n_name#X, revenue#X]
(107) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/6.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/6.txt
index fa37c656a1..e9dc68456e 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/6.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/6.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (20)
+- == Final Plan ==
- VeloxColumnarToRowExec (13)
+ VeloxColumnarToRow (13)
+- ^ RegularHashAggregateExecTransformer (11)
+- ^ InputIteratorTransformer (10)
+- ShuffleQueryStage (8), Statistics(X)
@@ -75,7 +75,7 @@ Results [1]: [sum((l_extendedprice#X * l_discount#X))#X AS revenue#X]
Input [1]: [revenue#X]
Arguments: false
-(13) VeloxColumnarToRowExec
+(13) VeloxColumnarToRow
Input [1]: [revenue#X]
(14) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/7.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/7.txt
index 4f781dd6d0..aa69dbcd11 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/7.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/7.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (149)
+- == Final Plan ==
- VeloxColumnarToRowExec (101)
+ VeloxColumnarToRow (101)
+- ^ SortExecTransformer (99)
+- ^ InputIteratorTransformer (98)
+- ShuffleQueryStage (96), Statistics(X)
@@ -534,7 +534,7 @@ Arguments: [supp_nation#X ASC NULLS FIRST, cust_nation#X ASC NULLS FIRST, l_year
Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X]
Arguments: false
-(101) VeloxColumnarToRowExec
+(101) VeloxColumnarToRow
Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X]
(102) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/8.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/8.txt
index ae71cca0e4..05f9c2c90e 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/8.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/8.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (207)
+- == Final Plan ==
- VeloxColumnarToRowExec (141)
+ VeloxColumnarToRow (141)
+- ^ SortExecTransformer (139)
+- ^ InputIteratorTransformer (138)
+- ShuffleQueryStage (136), Statistics(X)
@@ -749,7 +749,7 @@ Arguments: [o_year#X ASC NULLS FIRST], true, 0
Input [2]: [o_year#X, mkt_share#X]
Arguments: false
-(141) VeloxColumnarToRowExec
+(141) VeloxColumnarToRow
Input [2]: [o_year#X, mkt_share#X]
(142) Scan parquet
diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/9.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/9.txt
index a26c30f45f..e298d2a751 100644
--- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/9.txt
+++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark34/9.txt
@@ -1,7 +1,7 @@
== Physical Plan ==
AdaptiveSparkPlan (155)
+- == Final Plan ==
- VeloxColumnarToRowExec (106)
+ VeloxColumnarToRow (106)
+- ^ SortExecTransformer (104)
+- ^ InputIteratorTransformer (103)
+- ShuffleQueryStage (101), Statistics(X)
@@ -563,7 +563,7 @@ Arguments: [nation#X ASC NULLS FIRST, o_year#X DESC NULLS LAST], true, 0
Input [3]: [nation#X, o_year#X, sum_profit#X]
Arguments: false
-(106) VeloxColumnarToRowExec
+(106) VeloxColumnarToRow
Input [3]: [nation#X, o_year#X, sum_profit#X]
(107) Scan parquet
diff --git a/gluten-core/src/main/scala/org/apache/gluten/execution/ColumnarToColumnarExec.scala b/gluten-core/src/main/scala/org/apache/gluten/execution/ColumnarToColumnarExec.scala
index 86f9ddab46..d0eacc1e4d 100644
--- a/gluten-core/src/main/scala/org/apache/gluten/execution/ColumnarToColumnarExec.scala
+++ b/gluten-core/src/main/scala/org/apache/gluten/execution/ColumnarToColumnarExec.scala
@@ -24,14 +24,14 @@ import org.apache.gluten.iterator.Iterators
import org.apache.spark.rdd.RDD
import org.apache.spark.sql.catalyst.InternalRow
import org.apache.spark.sql.catalyst.expressions.Attribute
-import org.apache.spark.sql.execution.{SparkPlan, UnaryExecNode}
+import org.apache.spark.sql.execution.SparkPlan
import org.apache.spark.sql.execution.metric.{SQLMetric, SQLMetrics}
import org.apache.spark.sql.vectorized.ColumnarBatch
import java.util.concurrent.atomic.AtomicLong
abstract class ColumnarToColumnarExec(from: Convention.BatchType, to: Convention.BatchType)
- extends UnaryExecNode
+ extends ColumnarToColumnarTransition
with KnownBatchType
with KnownChildrenConventions {
diff --git a/gluten-core/src/main/scala/org/apache/gluten/execution/ColumnarToColumnarTransition.scala b/gluten-core/src/main/scala/org/apache/gluten/execution/ColumnarToColumnarTransition.scala
new file mode 100644
index 0000000000..36c79c3f19
--- /dev/null
+++ b/gluten-core/src/main/scala/org/apache/gluten/execution/ColumnarToColumnarTransition.scala
@@ -0,0 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.gluten.execution
+
+import org.apache.spark.sql.execution.UnaryExecNode
+
+trait ColumnarToColumnarTransition extends UnaryExecNode
diff --git a/gluten-core/src/main/scala/org/apache/gluten/extension/columnar/transition/TransitionGraph.scala b/gluten-core/src/main/scala/org/apache/gluten/extension/columnar/transition/TransitionGraph.scala
index 23fe9ed57e..2733ed9f4f 100644
--- a/gluten-core/src/main/scala/org/apache/gluten/extension/columnar/transition/TransitionGraph.scala
+++ b/gluten-core/src/main/scala/org/apache/gluten/extension/columnar/transition/TransitionGraph.scala
@@ -90,7 +90,7 @@ object TransitionGraph {
count - otherCount
} else {
// To make the output order stable.
- nodeNames.hashCode() - otherNodeNames.hashCode()
+ nodeNames.mkString.hashCode - otherNodeNames.mkString.hashCode
}
}
}
diff --git a/gluten-core/src/main/scala/org/apache/gluten/extension/columnar/transition/package.scala b/gluten-core/src/main/scala/org/apache/gluten/extension/columnar/transition/package.scala
index f02a513362..7120daa0d6 100644
--- a/gluten-core/src/main/scala/org/apache/gluten/extension/columnar/transition/package.scala
+++ b/gluten-core/src/main/scala/org/apache/gluten/extension/columnar/transition/package.scala
@@ -16,7 +16,7 @@
*/
package org.apache.gluten.extension.columnar
-import org.apache.gluten.execution.ColumnarToColumnarExec
+import org.apache.gluten.execution.ColumnarToColumnarTransition
import org.apache.spark.rdd.RDD
import org.apache.spark.sql.catalyst.InternalRow
@@ -66,7 +66,7 @@ package object transition {
object ColumnarToColumnarLike {
def unapply(plan: SparkPlan): Option[SparkPlan] = {
plan match {
- case c2c: ColumnarToColumnarExec =>
+ case c2c: ColumnarToColumnarTransition =>
Some(c2c.child)
case _ => None
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For additional commands, e-mail: commits-help@gluten.apache.org