From f01289bf1c5ca1ba91a30f6507b1a2db0bf4979b Mon Sep 17 00:00:00 2001 From: Hongze Zhang Date: Tue, 8 Oct 2024 16:39:52 +0800 Subject: [PATCH 1/8] fixup --- .../execution/VeloxColumnarToRowExec.scala | 2 -- .../execution/ColumnarToColumnarExec.scala | 2 +- .../ColumnarToColumnarTransition.scala | 22 +++++++++++++++++++ .../columnar/transition/package.scala | 4 ++-- 4 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 gluten-core/src/main/scala/org/apache/gluten/execution/ColumnarToColumnarTransition.scala 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 ec6531b717a2..9118e0d236f0 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/gluten-core/src/main/scala/org/apache/gluten/execution/ColumnarToColumnarExec.scala b/gluten-core/src/main/scala/org/apache/gluten/execution/ColumnarToColumnarExec.scala index 86f9ddab4603..cf8a9633990d 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 @@ -31,7 +31,7 @@ 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 000000000000..3e6942454156 --- /dev/null +++ b/gluten-core/src/main/scala/org/apache/gluten/execution/ColumnarToColumnarTransition.scala @@ -0,0 +1,22 @@ +/* + * 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/package.scala b/gluten-core/src/main/scala/org/apache/gluten/extension/columnar/transition/package.scala index f02a513362c2..7120daa0d61b 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 } From 35a8722b0f9841208dc5fb6fc858e57f961e0822 Mon Sep 17 00:00:00 2001 From: Hongze Zhang Date: Tue, 8 Oct 2024 17:07:55 +0800 Subject: [PATCH 2/8] [GLUTEN-7313][VL] Explicit Arrow transitions, part 5: extra code cleanups --- .../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 ++-- .../resources/tpch-approved-plan/v1-bhj/spark32/1.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark32/10.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark32/11.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark32/12.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark32/13.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark32/14.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark32/15.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark32/16.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark32/17.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark32/18.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark32/19.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark32/20.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark32/21.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark32/22.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark32/3.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark32/4.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark32/5.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark32/6.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark32/7.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark32/8.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark32/9.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark33/1.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark33/10.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark33/11.txt | 8 ++++---- .../resources/tpch-approved-plan/v1-bhj/spark33/12.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark33/13.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark33/14.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark33/15.txt | 8 ++++---- .../resources/tpch-approved-plan/v1-bhj/spark33/16.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark33/17.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark33/18.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark33/19.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark33/20.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark33/21.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark33/22.txt | 10 +++++----- .../resources/tpch-approved-plan/v1-bhj/spark33/3.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark33/4.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark33/5.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark33/6.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark33/7.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark33/8.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark33/9.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark34/1.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark34/10.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark34/11.txt | 8 ++++---- .../resources/tpch-approved-plan/v1-bhj/spark34/12.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark34/13.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark34/14.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark34/15.txt | 8 ++++---- .../resources/tpch-approved-plan/v1-bhj/spark34/16.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark34/17.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark34/18.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark34/19.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark34/20.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark34/21.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark34/22.txt | 10 +++++----- .../resources/tpch-approved-plan/v1-bhj/spark34/3.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark34/4.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark34/5.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark34/6.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark34/7.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark34/8.txt | 4 ++-- .../resources/tpch-approved-plan/v1-bhj/spark34/9.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark32/1.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark32/10.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark32/11.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark32/12.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark32/13.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark32/14.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark32/15.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark32/16.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark32/17.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark32/18.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark32/19.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark32/20.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark32/21.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark32/22.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark32/3.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark32/4.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark32/5.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark32/6.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark32/7.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark32/8.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark32/9.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark33/1.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark33/10.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark33/11.txt | 8 ++++---- .../resources/tpch-approved-plan/v1-ras/spark33/12.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark33/13.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark33/14.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark33/15.txt | 8 ++++---- .../resources/tpch-approved-plan/v1-ras/spark33/16.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark33/17.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark33/18.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark33/19.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark33/20.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark33/21.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark33/22.txt | 10 +++++----- .../resources/tpch-approved-plan/v1-ras/spark33/3.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark33/4.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark33/5.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark33/6.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark33/7.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark33/8.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark33/9.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark34/1.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark34/10.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark34/11.txt | 8 ++++---- .../resources/tpch-approved-plan/v1-ras/spark34/12.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark34/13.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark34/14.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark34/15.txt | 8 ++++---- .../resources/tpch-approved-plan/v1-ras/spark34/16.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark34/17.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark34/18.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark34/19.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark34/20.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark34/21.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark34/22.txt | 10 +++++----- .../resources/tpch-approved-plan/v1-ras/spark34/3.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark34/4.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark34/5.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark34/6.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark34/7.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark34/8.txt | 4 ++-- .../resources/tpch-approved-plan/v1-ras/spark34/9.txt | 4 ++-- .../test/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 ++-- .../test/resources/tpch-approved-plan/v1/spark32/3.txt | 4 ++-- .../test/resources/tpch-approved-plan/v1/spark32/4.txt | 4 ++-- .../test/resources/tpch-approved-plan/v1/spark32/5.txt | 4 ++-- .../test/resources/tpch-approved-plan/v1/spark32/6.txt | 4 ++-- .../test/resources/tpch-approved-plan/v1/spark32/7.txt | 4 ++-- .../test/resources/tpch-approved-plan/v1/spark32/8.txt | 4 ++-- .../test/resources/tpch-approved-plan/v1/spark32/9.txt | 4 ++-- .../test/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 +++++----- .../test/resources/tpch-approved-plan/v1/spark33/3.txt | 4 ++-- .../test/resources/tpch-approved-plan/v1/spark33/4.txt | 4 ++-- .../test/resources/tpch-approved-plan/v1/spark33/5.txt | 4 ++-- .../test/resources/tpch-approved-plan/v1/spark33/6.txt | 4 ++-- .../test/resources/tpch-approved-plan/v1/spark33/7.txt | 4 ++-- .../test/resources/tpch-approved-plan/v1/spark33/8.txt | 4 ++-- .../test/resources/tpch-approved-plan/v1/spark33/9.txt | 4 ++-- .../test/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 +++++----- .../test/resources/tpch-approved-plan/v1/spark34/3.txt | 4 ++-- .../test/resources/tpch-approved-plan/v1/spark34/4.txt | 4 ++-- .../test/resources/tpch-approved-plan/v1/spark34/5.txt | 4 ++-- .../test/resources/tpch-approved-plan/v1/spark34/6.txt | 4 ++-- .../test/resources/tpch-approved-plan/v1/spark34/7.txt | 4 ++-- .../test/resources/tpch-approved-plan/v1/spark34/8.txt | 4 ++-- .../test/resources/tpch-approved-plan/v1/spark34/9.txt | 4 ++-- .../gluten/execution/ColumnarToColumnarExec.scala | 2 +- 253 files changed, 561 insertions(+), 561 deletions(-) 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 b1b2a7507c21..efe7f3908506 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 a87354004bf3..5b913a06db13 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 5ad408607111..45838869f6a5 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 0bbd522e9ca7..8a17f5db2419 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 eceeb7738e8b..8de6de78df55 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 f991f7b32cb0..946c150d8654 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 c5c3670b3108..39b1c80d441b 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 51e5f9c64466..f7b9f730e38b 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 200674c0b132..77441777bbfc 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 d6528a10e0d6..2cd26d020ae7 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 218c7e7d3682..b5b2fff7c593 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 925c9b4c1df7..b457f6f10d29 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 0ef77a3b4058..2ef6280501aa 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 e3cda8bcfc8b..271e9e810ec3 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 4e3cdc99706b..f0fca318bf20 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 1332c8ba9663..b8cdf1656c05 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 1445f75cfcb4..0ef8d9d4fc1a 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 2b97fd28f147..a1830678d0de 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 5f3cf3fa7c56..cac53895b981 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 a64588c5ba98..33544f0796a5 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 45bfb4c1996d..7112bb021b0c 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 417ddf9de25d..0851fa2447ea 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 7b8d0238637d..42cf8e1b7f58 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 e01bfff2886b..85d974b5db8c 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 490806d71daa..2c8b48e6c1d1 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 c3ac3e0903c8..c08eaab2dce8 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 67bce21483fb..8956ddaa2184 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 9a7879d5c1d1..d7603e49ffb6 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 6faaec51bb6b..394bbd2469c2 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 d0d18bdf816a..372d6bc719c3 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 661a04a3db6a..6c279f2d124d 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 47e5d26dbdd6..3fb33773dde1 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 b15eb6d9c365..e670a838bfac 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 8a2bf8db611d..eae4758613ee 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 e7ea95ab686f..a3d3f0a08eeb 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 03ff6cc3d00e..e7fa21b6f1f1 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 c6f0f246e5fe..a1eaaca4d448 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 213c8e698e9d..638a442362e3 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 bb9d04cdcdc7..5df63675caee 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 3f54f20f050e..86db01e58b53 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 ba0d25c60800..ccc7941882b7 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 d15efa6a6567..212413568214 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 450797d3aefd..6dbee1ad7ffb 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 7a2404c1d610..47dc04d100db 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 2bf02786562e..e95764f4de43 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 b796cfae2665..1b7065e11421 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 3b7ac85bf23d..233f33a31f29 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 7f4949cf7288..6d2233b3e09f 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 5fa837e185f0..1ec03a2f9edd 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 a6302f1beeb5..e64cb0990026 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 f2b7262c7596..b66a80731b7b 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 029c44b1547f..c92587c9d791 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 069500cf6bdf..80e7860df008 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 3e2b19835441..9d7b9d216220 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 c93cb695dbd9..8382dbcd504e 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 b5450682267e..7f3836740155 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 a1635e742a6b..1035e0eb7715 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 4a26f959b7bb..150788a3d7c1 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 3ba742ae5b6a..035c5c388972 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 fa37c656a1aa..e9dc68456e55 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 ab8abd6df364..cd877f54bd7a 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 e075a7b33885..d381d21da73d 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 8ba39a425d25..f0ebba6efac5 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 b1b2a7507c21..efe7f3908506 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 a87354004bf3..5b913a06db13 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 5ad408607111..45838869f6a5 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 0bbd522e9ca7..8a17f5db2419 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 eceeb7738e8b..8de6de78df55 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 f991f7b32cb0..946c150d8654 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 c5c3670b3108..39b1c80d441b 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 51e5f9c64466..f7b9f730e38b 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 200674c0b132..77441777bbfc 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 d6528a10e0d6..2cd26d020ae7 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 218c7e7d3682..b5b2fff7c593 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 925c9b4c1df7..b457f6f10d29 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 0ef77a3b4058..2ef6280501aa 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 e3cda8bcfc8b..271e9e810ec3 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 4e3cdc99706b..f0fca318bf20 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 1332c8ba9663..b8cdf1656c05 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 1445f75cfcb4..0ef8d9d4fc1a 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 2b97fd28f147..a1830678d0de 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 5f3cf3fa7c56..cac53895b981 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 a64588c5ba98..33544f0796a5 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 45bfb4c1996d..7112bb021b0c 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 417ddf9de25d..0851fa2447ea 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 7b8d0238637d..42cf8e1b7f58 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 e01bfff2886b..85d974b5db8c 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 490806d71daa..2c8b48e6c1d1 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 c3ac3e0903c8..c08eaab2dce8 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 67bce21483fb..8956ddaa2184 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 9a7879d5c1d1..d7603e49ffb6 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 6faaec51bb6b..394bbd2469c2 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 d0d18bdf816a..372d6bc719c3 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 661a04a3db6a..6c279f2d124d 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 47e5d26dbdd6..3fb33773dde1 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 b15eb6d9c365..e670a838bfac 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 8a2bf8db611d..eae4758613ee 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 e7ea95ab686f..a3d3f0a08eeb 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 03ff6cc3d00e..e7fa21b6f1f1 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 c6f0f246e5fe..a1eaaca4d448 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 213c8e698e9d..638a442362e3 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 bb9d04cdcdc7..5df63675caee 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 3f54f20f050e..86db01e58b53 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 ba0d25c60800..ccc7941882b7 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 d15efa6a6567..212413568214 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 450797d3aefd..6dbee1ad7ffb 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 7a2404c1d610..47dc04d100db 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 2bf02786562e..e95764f4de43 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 b796cfae2665..1b7065e11421 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 3b7ac85bf23d..233f33a31f29 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 7f4949cf7288..6d2233b3e09f 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 5fa837e185f0..1ec03a2f9edd 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 a6302f1beeb5..e64cb0990026 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 f2b7262c7596..b66a80731b7b 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 029c44b1547f..c92587c9d791 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 069500cf6bdf..80e7860df008 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 3e2b19835441..9d7b9d216220 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 c93cb695dbd9..8382dbcd504e 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 b5450682267e..7f3836740155 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 a1635e742a6b..1035e0eb7715 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 4a26f959b7bb..150788a3d7c1 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 3ba742ae5b6a..035c5c388972 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 fa37c656a1aa..e9dc68456e55 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 ab8abd6df364..cd877f54bd7a 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 e075a7b33885..d381d21da73d 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 8ba39a425d25..f0ebba6efac5 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 b1b2a7507c21..efe7f3908506 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 6bb1784778cd..a7ced66a82e7 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 42e37d72f12d..b385b7719de2 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 40f651dd347e..71dee80fab86 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 6c48d7e59901..edbcb50206df 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 b04d8d643fda..91df642595a3 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 83bd88329661..56169a244bf9 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 4c43ec8f19b6..8ef7d4d51441 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 6a9d19d0defe..fe915989f9e6 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 587eb37cd4c6..a2345ca9ed35 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 75795b3eaab5..d06cdb0fecff 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 ebcbc702cf47..6fa1271a5a39 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 af2e469119be..e70a145e9c1d 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 7e43e67ab1e6..674e0b96983f 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 b5d79b581920..3b9b7fd93b96 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 7c07aa013416..ffb35d1813ae 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 f481ec2d47ef..0e48f73c7795 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 2b97fd28f147..a1830678d0de 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 82d0d75e311f..f089996aa4e3 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 6a7d97a628f8..80b0d02a6cb2 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 a0f1d9c68a43..a41822a60a19 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 417ddf9de25d..0851fa2447ea 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 e42af1ec4cdc..1b89e64860f3 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 fe2dcc9190df..6ca992b70988 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 2ee35e463cb3..346a6866342e 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 d59a69766201..9e927782f6c3 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 e570d1a4cfb0..d82e4f2b21db 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 51baae5186fa..950441af70e9 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 ab417c50bc7b..aa7aa005a9b2 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 ad32d4cb586d..e48379edc9fa 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 42f398883883..8dbf9429961a 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 20fea0a01629..41da1d28e987 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 fdaed6a1a7e8..1fad7160bf64 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 557dd678da52..fd61236faaf8 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 edd50a4764be..44c57da7482f 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 ea8a29d6594f..a698975568fb 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 ca3f2707b8e7..8b00d867cd70 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 ccedfac29b46..dd869d25d416 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 bb9d04cdcdc7..5df63675caee 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 046147da8ef8..ac6dda065bb0 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 664d74c61985..6f5ed0d82b80 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 1ae7a93998dc..22cd2b9967fb 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 450797d3aefd..6dbee1ad7ffb 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 6a296c163eb3..a052989ba525 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 8fef547f8d1f..68e87c39a078 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 a5ff0ee4b58b..9175845083ca 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 f0604101ed62..b527c2bc3bc3 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 768c18ddac04..cc6d364dea22 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 c91d8a7f5026..8f1a1b4415db 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 501e4a122ebe..ee7826c8aa7e 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 b8d72004b185..eaad0429ab40 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 2cb8a12dd05a..85b11fa8ca18 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 37cdd2a85b29..c72ca859ce37 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 cbb0cdea3405..ed09215178a4 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 5ec8fe9d155b..271d0c6d5098 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 fee21bac69fe..b8123fb6dc0e 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 83064ad3a01d..8eea7581a417 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 3f055feb01b6..286881fb99b1 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 87eaa9b8dce6..0a9af460526c 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 fa37c656a1aa..e9dc68456e55 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 4f781dd6d07e..aa69dbcd11f7 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 ae71cca0e43c..05f9c2c90e5d 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 a26c30f45f85..e298d2a75196 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 b1b2a7507c21..efe7f3908506 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 6bb1784778cd..a7ced66a82e7 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 42e37d72f12d..b385b7719de2 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 40f651dd347e..71dee80fab86 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 6c48d7e59901..edbcb50206df 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 b04d8d643fda..91df642595a3 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 83bd88329661..56169a244bf9 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 4c43ec8f19b6..8ef7d4d51441 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 6a9d19d0defe..fe915989f9e6 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 587eb37cd4c6..a2345ca9ed35 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 75795b3eaab5..d06cdb0fecff 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 ebcbc702cf47..6fa1271a5a39 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 af2e469119be..e70a145e9c1d 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 7e43e67ab1e6..674e0b96983f 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 b5d79b581920..3b9b7fd93b96 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 7c07aa013416..ffb35d1813ae 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 f481ec2d47ef..0e48f73c7795 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 2b97fd28f147..a1830678d0de 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 82d0d75e311f..f089996aa4e3 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 6a7d97a628f8..80b0d02a6cb2 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 a0f1d9c68a43..a41822a60a19 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 417ddf9de25d..0851fa2447ea 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 e42af1ec4cdc..1b89e64860f3 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 fe2dcc9190df..6ca992b70988 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 2ee35e463cb3..346a6866342e 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 d59a69766201..9e927782f6c3 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 e570d1a4cfb0..d82e4f2b21db 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 51baae5186fa..950441af70e9 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 ab417c50bc7b..aa7aa005a9b2 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 ad32d4cb586d..e48379edc9fa 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 42f398883883..8dbf9429961a 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 20fea0a01629..41da1d28e987 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 fdaed6a1a7e8..1fad7160bf64 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 557dd678da52..fd61236faaf8 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 edd50a4764be..44c57da7482f 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 ea8a29d6594f..a698975568fb 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 ca3f2707b8e7..8b00d867cd70 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 ccedfac29b46..dd869d25d416 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 bb9d04cdcdc7..5df63675caee 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 046147da8ef8..ac6dda065bb0 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 664d74c61985..6f5ed0d82b80 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 1ae7a93998dc..22cd2b9967fb 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 450797d3aefd..6dbee1ad7ffb 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 6a296c163eb3..a052989ba525 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 8fef547f8d1f..68e87c39a078 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 a5ff0ee4b58b..9175845083ca 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 f0604101ed62..b527c2bc3bc3 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 768c18ddac04..cc6d364dea22 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 c91d8a7f5026..8f1a1b4415db 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 501e4a122ebe..ee7826c8aa7e 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 b8d72004b185..eaad0429ab40 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 2cb8a12dd05a..85b11fa8ca18 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 37cdd2a85b29..c72ca859ce37 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 cbb0cdea3405..ed09215178a4 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 5ec8fe9d155b..271d0c6d5098 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 fee21bac69fe..b8123fb6dc0e 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 83064ad3a01d..8eea7581a417 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 3f055feb01b6..286881fb99b1 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 87eaa9b8dce6..0a9af460526c 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 fa37c656a1aa..e9dc68456e55 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 4f781dd6d07e..aa69dbcd11f7 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 ae71cca0e43c..05f9c2c90e5d 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 a26c30f45f85..e298d2a75196 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 cf8a9633990d..d0eacc1e4dac 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,7 +24,7 @@ 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 From 832db0ec8d87dbad4fd9a9e1453f70870280891c Mon Sep 17 00:00:00 2001 From: Hongze Zhang Date: Tue, 8 Oct 2024 17:09:22 +0800 Subject: [PATCH 3/8] fixup --- .../apache/gluten/execution/ColumnarToColumnarTransition.scala | 1 - 1 file changed, 1 deletion(-) 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 index 3e6942454156..36c79c3f197e 100644 --- a/gluten-core/src/main/scala/org/apache/gluten/execution/ColumnarToColumnarTransition.scala +++ b/gluten-core/src/main/scala/org/apache/gluten/execution/ColumnarToColumnarTransition.scala @@ -14,7 +14,6 @@ * 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 From 20d6346342bcb1400034ec5ad243b8e560957db3 Mon Sep 17 00:00:00 2001 From: Hongze Zhang Date: Tue, 8 Oct 2024 18:16:01 +0800 Subject: [PATCH 4/8] fixup --- .../transition/VeloxTransitionSuite.scala | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/backends-velox/src/test/scala/org/apache/gluten/extension/columnar/transition/VeloxTransitionSuite.scala b/backends-velox/src/test/scala/org/apache/gluten/extension/columnar/transition/VeloxTransitionSuite.scala index d12faae0f73d..102277a1602f 100644 --- a/backends-velox/src/test/scala/org/apache/gluten/extension/columnar/transition/VeloxTransitionSuite.scala +++ b/backends-velox/src/test/scala/org/apache/gluten/extension/columnar/transition/VeloxTransitionSuite.scala @@ -52,21 +52,24 @@ class VeloxTransitionSuite extends SharedSparkSession { test("ArrowNative C2R - outputs row") { val in = BatchLeaf(ArrowNativeBatch) val out = Transitions.insertTransitions(in, outputsColumnar = false) - assert(out == ColumnarToRowExec(LoadArrowDataExec(BatchLeaf(ArrowNativeBatch)))) + assert( + out == VeloxColumnarToRowExec(ArrowColumnarToVeloxColumnarExec(BatchLeaf(ArrowNativeBatch)))) } test("ArrowNative C2R - requires row input") { val in = RowUnary(BatchLeaf(ArrowNativeBatch)) val out = Transitions.insertTransitions(in, outputsColumnar = false) - assert(out == RowUnary(ColumnarToRowExec(LoadArrowDataExec(BatchLeaf(ArrowNativeBatch))))) + assert( + out == RowUnary( + VeloxColumnarToRowExec(ArrowColumnarToVeloxColumnarExec(BatchLeaf(ArrowNativeBatch))))) } test("ArrowNative R2C - requires Arrow input") { val in = BatchUnary(ArrowNativeBatch, RowLeaf()) val out = Transitions.insertTransitions(in, outputsColumnar = false) assert( - out == ColumnarToRowExec( - LoadArrowDataExec(BatchUnary(ArrowNativeBatch, RowToVeloxColumnarExec(RowLeaf()))))) + out == VeloxColumnarToRowExec(ArrowColumnarToVeloxColumnarExec( + BatchUnary(ArrowNativeBatch, RowToVeloxColumnarExec(RowLeaf()))))) } test("ArrowNative-to-Velox C2C") { @@ -84,16 +87,16 @@ class VeloxTransitionSuite extends SharedSparkSession { val in = BatchUnary(ArrowNativeBatch, BatchLeaf(VeloxBatch)) val out = Transitions.insertTransitions(in, outputsColumnar = false) assert( - out == ColumnarToRowExec( - LoadArrowDataExec(BatchUnary(ArrowNativeBatch, BatchLeaf(VeloxBatch))))) + out == VeloxColumnarToRowExec( + ArrowColumnarToVeloxColumnarExec(BatchUnary(ArrowNativeBatch, BatchLeaf(VeloxBatch))))) } test("Vanilla-to-ArrowNative C2C") { val in = BatchUnary(ArrowNativeBatch, BatchLeaf(VanillaBatch)) val out = Transitions.insertTransitions(in, outputsColumnar = false) assert( - out == ColumnarToRowExec( - LoadArrowDataExec(BatchUnary( + out == VeloxColumnarToRowExec( + ArrowColumnarToVeloxColumnarExec(BatchUnary( ArrowNativeBatch, RowToVeloxColumnarExec(ColumnarToRowExec(BatchLeaf(VanillaBatch))))))) } From 9a62479af6ece8b6ad813b8bb2ab2c174126e0ce Mon Sep 17 00:00:00 2001 From: Hongze Zhang Date: Wed, 9 Oct 2024 08:40:44 +0800 Subject: [PATCH 5/8] fixup --- .../transition/VeloxTransitionSuite.scala | 19 ++++++++----------- .../columnar/transition/TransitionGraph.scala | 2 +- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/backends-velox/src/test/scala/org/apache/gluten/extension/columnar/transition/VeloxTransitionSuite.scala b/backends-velox/src/test/scala/org/apache/gluten/extension/columnar/transition/VeloxTransitionSuite.scala index 102277a1602f..d12faae0f73d 100644 --- a/backends-velox/src/test/scala/org/apache/gluten/extension/columnar/transition/VeloxTransitionSuite.scala +++ b/backends-velox/src/test/scala/org/apache/gluten/extension/columnar/transition/VeloxTransitionSuite.scala @@ -52,24 +52,21 @@ class VeloxTransitionSuite extends SharedSparkSession { test("ArrowNative C2R - outputs row") { val in = BatchLeaf(ArrowNativeBatch) val out = Transitions.insertTransitions(in, outputsColumnar = false) - assert( - out == VeloxColumnarToRowExec(ArrowColumnarToVeloxColumnarExec(BatchLeaf(ArrowNativeBatch)))) + assert(out == ColumnarToRowExec(LoadArrowDataExec(BatchLeaf(ArrowNativeBatch)))) } test("ArrowNative C2R - requires row input") { val in = RowUnary(BatchLeaf(ArrowNativeBatch)) val out = Transitions.insertTransitions(in, outputsColumnar = false) - assert( - out == RowUnary( - VeloxColumnarToRowExec(ArrowColumnarToVeloxColumnarExec(BatchLeaf(ArrowNativeBatch))))) + assert(out == RowUnary(ColumnarToRowExec(LoadArrowDataExec(BatchLeaf(ArrowNativeBatch))))) } test("ArrowNative R2C - requires Arrow input") { val in = BatchUnary(ArrowNativeBatch, RowLeaf()) val out = Transitions.insertTransitions(in, outputsColumnar = false) assert( - out == VeloxColumnarToRowExec(ArrowColumnarToVeloxColumnarExec( - BatchUnary(ArrowNativeBatch, RowToVeloxColumnarExec(RowLeaf()))))) + out == ColumnarToRowExec( + LoadArrowDataExec(BatchUnary(ArrowNativeBatch, RowToVeloxColumnarExec(RowLeaf()))))) } test("ArrowNative-to-Velox C2C") { @@ -87,16 +84,16 @@ class VeloxTransitionSuite extends SharedSparkSession { val in = BatchUnary(ArrowNativeBatch, BatchLeaf(VeloxBatch)) val out = Transitions.insertTransitions(in, outputsColumnar = false) assert( - out == VeloxColumnarToRowExec( - ArrowColumnarToVeloxColumnarExec(BatchUnary(ArrowNativeBatch, BatchLeaf(VeloxBatch))))) + out == ColumnarToRowExec( + LoadArrowDataExec(BatchUnary(ArrowNativeBatch, BatchLeaf(VeloxBatch))))) } test("Vanilla-to-ArrowNative C2C") { val in = BatchUnary(ArrowNativeBatch, BatchLeaf(VanillaBatch)) val out = Transitions.insertTransitions(in, outputsColumnar = false) assert( - out == VeloxColumnarToRowExec( - ArrowColumnarToVeloxColumnarExec(BatchUnary( + out == ColumnarToRowExec( + LoadArrowDataExec(BatchUnary( ArrowNativeBatch, RowToVeloxColumnarExec(ColumnarToRowExec(BatchLeaf(VanillaBatch))))))) } 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 23fe9ed57e9a..795f9aa15329 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.map(_.hashCode()).sum - otherNodeNames.map(_.hashCode()).sum } } } From cd2d985af551810c531de397ef0f5a3798c353ef Mon Sep 17 00:00:00 2001 From: Hongze Zhang Date: Wed, 9 Oct 2024 09:21:35 +0800 Subject: [PATCH 6/8] fixup --- .../transition/VeloxTransitionSuite.scala | 19 +++++++++++-------- .../columnar/transition/TransitionGraph.scala | 2 +- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/backends-velox/src/test/scala/org/apache/gluten/extension/columnar/transition/VeloxTransitionSuite.scala b/backends-velox/src/test/scala/org/apache/gluten/extension/columnar/transition/VeloxTransitionSuite.scala index d12faae0f73d..102277a1602f 100644 --- a/backends-velox/src/test/scala/org/apache/gluten/extension/columnar/transition/VeloxTransitionSuite.scala +++ b/backends-velox/src/test/scala/org/apache/gluten/extension/columnar/transition/VeloxTransitionSuite.scala @@ -52,21 +52,24 @@ class VeloxTransitionSuite extends SharedSparkSession { test("ArrowNative C2R - outputs row") { val in = BatchLeaf(ArrowNativeBatch) val out = Transitions.insertTransitions(in, outputsColumnar = false) - assert(out == ColumnarToRowExec(LoadArrowDataExec(BatchLeaf(ArrowNativeBatch)))) + assert( + out == VeloxColumnarToRowExec(ArrowColumnarToVeloxColumnarExec(BatchLeaf(ArrowNativeBatch)))) } test("ArrowNative C2R - requires row input") { val in = RowUnary(BatchLeaf(ArrowNativeBatch)) val out = Transitions.insertTransitions(in, outputsColumnar = false) - assert(out == RowUnary(ColumnarToRowExec(LoadArrowDataExec(BatchLeaf(ArrowNativeBatch))))) + assert( + out == RowUnary( + VeloxColumnarToRowExec(ArrowColumnarToVeloxColumnarExec(BatchLeaf(ArrowNativeBatch))))) } test("ArrowNative R2C - requires Arrow input") { val in = BatchUnary(ArrowNativeBatch, RowLeaf()) val out = Transitions.insertTransitions(in, outputsColumnar = false) assert( - out == ColumnarToRowExec( - LoadArrowDataExec(BatchUnary(ArrowNativeBatch, RowToVeloxColumnarExec(RowLeaf()))))) + out == VeloxColumnarToRowExec(ArrowColumnarToVeloxColumnarExec( + BatchUnary(ArrowNativeBatch, RowToVeloxColumnarExec(RowLeaf()))))) } test("ArrowNative-to-Velox C2C") { @@ -84,16 +87,16 @@ class VeloxTransitionSuite extends SharedSparkSession { val in = BatchUnary(ArrowNativeBatch, BatchLeaf(VeloxBatch)) val out = Transitions.insertTransitions(in, outputsColumnar = false) assert( - out == ColumnarToRowExec( - LoadArrowDataExec(BatchUnary(ArrowNativeBatch, BatchLeaf(VeloxBatch))))) + out == VeloxColumnarToRowExec( + ArrowColumnarToVeloxColumnarExec(BatchUnary(ArrowNativeBatch, BatchLeaf(VeloxBatch))))) } test("Vanilla-to-ArrowNative C2C") { val in = BatchUnary(ArrowNativeBatch, BatchLeaf(VanillaBatch)) val out = Transitions.insertTransitions(in, outputsColumnar = false) assert( - out == ColumnarToRowExec( - LoadArrowDataExec(BatchUnary( + out == VeloxColumnarToRowExec( + ArrowColumnarToVeloxColumnarExec(BatchUnary( ArrowNativeBatch, RowToVeloxColumnarExec(ColumnarToRowExec(BatchLeaf(VanillaBatch))))))) } 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 795f9aa15329..6683b2dd14a0 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.map(_.hashCode()).sum - otherNodeNames.map(_.hashCode()).sum + nodeNames.mkString("|").hashCode - otherNodeNames.mkString("|").hashCode } } } From 62a3ae8d4a9b920f3af3157314735541d81da2cc Mon Sep 17 00:00:00 2001 From: Hongze Zhang Date: Wed, 9 Oct 2024 09:21:52 +0800 Subject: [PATCH 7/8] fixup --- .../gluten/extension/columnar/transition/TransitionGraph.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6683b2dd14a0..2733ed9f4ff6 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.mkString("|").hashCode - otherNodeNames.mkString("|").hashCode + nodeNames.mkString.hashCode - otherNodeNames.mkString.hashCode } } } From 7cfb7eaa2184992b40a08bd6387bad44c2e812dc Mon Sep 17 00:00:00 2001 From: Hongze Zhang Date: Wed, 9 Oct 2024 09:22:17 +0800 Subject: [PATCH 8/8] fixup --- .../transition/VeloxTransitionSuite.scala | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/backends-velox/src/test/scala/org/apache/gluten/extension/columnar/transition/VeloxTransitionSuite.scala b/backends-velox/src/test/scala/org/apache/gluten/extension/columnar/transition/VeloxTransitionSuite.scala index 102277a1602f..d12faae0f73d 100644 --- a/backends-velox/src/test/scala/org/apache/gluten/extension/columnar/transition/VeloxTransitionSuite.scala +++ b/backends-velox/src/test/scala/org/apache/gluten/extension/columnar/transition/VeloxTransitionSuite.scala @@ -52,24 +52,21 @@ class VeloxTransitionSuite extends SharedSparkSession { test("ArrowNative C2R - outputs row") { val in = BatchLeaf(ArrowNativeBatch) val out = Transitions.insertTransitions(in, outputsColumnar = false) - assert( - out == VeloxColumnarToRowExec(ArrowColumnarToVeloxColumnarExec(BatchLeaf(ArrowNativeBatch)))) + assert(out == ColumnarToRowExec(LoadArrowDataExec(BatchLeaf(ArrowNativeBatch)))) } test("ArrowNative C2R - requires row input") { val in = RowUnary(BatchLeaf(ArrowNativeBatch)) val out = Transitions.insertTransitions(in, outputsColumnar = false) - assert( - out == RowUnary( - VeloxColumnarToRowExec(ArrowColumnarToVeloxColumnarExec(BatchLeaf(ArrowNativeBatch))))) + assert(out == RowUnary(ColumnarToRowExec(LoadArrowDataExec(BatchLeaf(ArrowNativeBatch))))) } test("ArrowNative R2C - requires Arrow input") { val in = BatchUnary(ArrowNativeBatch, RowLeaf()) val out = Transitions.insertTransitions(in, outputsColumnar = false) assert( - out == VeloxColumnarToRowExec(ArrowColumnarToVeloxColumnarExec( - BatchUnary(ArrowNativeBatch, RowToVeloxColumnarExec(RowLeaf()))))) + out == ColumnarToRowExec( + LoadArrowDataExec(BatchUnary(ArrowNativeBatch, RowToVeloxColumnarExec(RowLeaf()))))) } test("ArrowNative-to-Velox C2C") { @@ -87,16 +84,16 @@ class VeloxTransitionSuite extends SharedSparkSession { val in = BatchUnary(ArrowNativeBatch, BatchLeaf(VeloxBatch)) val out = Transitions.insertTransitions(in, outputsColumnar = false) assert( - out == VeloxColumnarToRowExec( - ArrowColumnarToVeloxColumnarExec(BatchUnary(ArrowNativeBatch, BatchLeaf(VeloxBatch))))) + out == ColumnarToRowExec( + LoadArrowDataExec(BatchUnary(ArrowNativeBatch, BatchLeaf(VeloxBatch))))) } test("Vanilla-to-ArrowNative C2C") { val in = BatchUnary(ArrowNativeBatch, BatchLeaf(VanillaBatch)) val out = Transitions.insertTransitions(in, outputsColumnar = false) assert( - out == VeloxColumnarToRowExec( - ArrowColumnarToVeloxColumnarExec(BatchUnary( + out == ColumnarToRowExec( + LoadArrowDataExec(BatchUnary( ArrowNativeBatch, RowToVeloxColumnarExec(ColumnarToRowExec(BatchLeaf(VanillaBatch))))))) }