diff --git a/backends-velox/src/main/java/org/apache/gluten/utils/VeloxBatchResizer.java b/backends-velox/src/main/java/org/apache/gluten/utils/VeloxBatchResizer.java index 73bfec08cf4..fec8e059789 100644 --- a/backends-velox/src/main/java/org/apache/gluten/utils/VeloxBatchResizer.java +++ b/backends-velox/src/main/java/org/apache/gluten/utils/VeloxBatchResizer.java @@ -28,7 +28,10 @@ public final class VeloxBatchResizer { public static ColumnarBatchOutIterator create( - int minOutputBatchSize, int maxOutputBatchSize, Iterator in) { + int minOutputBatchSize, + int maxOutputBatchSize, + long preferredBatchBytes, + Iterator in) { final Runtime runtime = Runtimes.contextInstance(BackendsApiManager.getBackendName(), "VeloxBatchResizer"); long outHandle = @@ -36,6 +39,7 @@ public static ColumnarBatchOutIterator create( .create( minOutputBatchSize, maxOutputBatchSize, + preferredBatchBytes, new ColumnarBatchInIterator(BackendsApiManager.getBackendName(), in)); return new ColumnarBatchOutIterator(runtime, outHandle); } diff --git a/backends-velox/src/main/java/org/apache/gluten/utils/VeloxBatchResizerJniWrapper.java b/backends-velox/src/main/java/org/apache/gluten/utils/VeloxBatchResizerJniWrapper.java index a1985057efe..e5b558e97d3 100644 --- a/backends-velox/src/main/java/org/apache/gluten/utils/VeloxBatchResizerJniWrapper.java +++ b/backends-velox/src/main/java/org/apache/gluten/utils/VeloxBatchResizerJniWrapper.java @@ -37,5 +37,8 @@ public long rtHandle() { } public native long create( - int minOutputBatchSize, int maxOutputBatchSize, ColumnarBatchInIterator itr); + int minOutputBatchSize, + int maxOutputBatchSize, + long preferredBatchBytes, + ColumnarBatchInIterator itr); } diff --git a/backends-velox/src/main/scala/org/apache/gluten/execution/VeloxResizeBatchesExec.scala b/backends-velox/src/main/scala/org/apache/gluten/execution/VeloxResizeBatchesExec.scala index acca0c7b68a..9febad0e94e 100644 --- a/backends-velox/src/main/scala/org/apache/gluten/execution/VeloxResizeBatchesExec.scala +++ b/backends-velox/src/main/scala/org/apache/gluten/execution/VeloxResizeBatchesExec.scala @@ -35,11 +35,14 @@ import scala.collection.JavaConverters._ case class VeloxResizeBatchesExec( override val child: SparkPlan, minOutputBatchSize: Int, - maxOutputBatchSize: Int) + maxOutputBatchSize: Int, + preferredBatchBytes: Long) extends ColumnarToColumnarExec(child) { override protected def mapIterator(in: Iterator[ColumnarBatch]): Iterator[ColumnarBatch] = { - VeloxBatchResizer.create(minOutputBatchSize, maxOutputBatchSize, in.asJava).asScala + VeloxBatchResizer + .create(minOutputBatchSize, maxOutputBatchSize, preferredBatchBytes, in.asJava) + .asScala } override protected def closeIterator(out: Iterator[ColumnarBatch]): Unit = { diff --git a/backends-velox/src/main/scala/org/apache/gluten/extension/AppendBatchResizeForShuffleInputAndOutput.scala b/backends-velox/src/main/scala/org/apache/gluten/extension/AppendBatchResizeForShuffleInputAndOutput.scala index 01340c3a0be..fcce64d6522 100644 --- a/backends-velox/src/main/scala/org/apache/gluten/extension/AppendBatchResizeForShuffleInputAndOutput.scala +++ b/backends-velox/src/main/scala/org/apache/gluten/extension/AppendBatchResizeForShuffleInputAndOutput.scala @@ -40,19 +40,20 @@ case class AppendBatchResizeForShuffleInputAndOutput() extends Rule[SparkPlan] { } val range = VeloxConfig.get.veloxResizeBatchesShuffleInputOutputRange + val preferredBatchBytes = VeloxConfig.get.veloxPreferredBatchBytes plan.transformUp { case shuffle: ColumnarShuffleExchangeExec if resizeBatchesShuffleInputEnabled && shuffle.shuffleWriterType.requiresResizingShuffleInput => val appendBatches = - VeloxResizeBatchesExec(shuffle.child, range.min, range.max) + VeloxResizeBatchesExec(shuffle.child, range.min, range.max, preferredBatchBytes) shuffle.withNewChildren(Seq(appendBatches)) case a @ AQEShuffleReadExec( ShuffleQueryStageExec(_, shuffle: ColumnarShuffleExchangeExec, _), _) if resizeBatchesShuffleOutputEnabled && shuffle.shuffleWriterType.requiresResizingShuffleOutput => - VeloxResizeBatchesExec(a, range.min, range.max) + VeloxResizeBatchesExec(a, range.min, range.max, preferredBatchBytes) case a @ AQEShuffleReadExec( ShuffleQueryStageExec( _, @@ -61,7 +62,7 @@ case class AppendBatchResizeForShuffleInputAndOutput() extends Rule[SparkPlan] { _) if resizeBatchesShuffleOutputEnabled && shuffle.shuffleWriterType.requiresResizingShuffleOutput => - VeloxResizeBatchesExec(a, range.min, range.max) + VeloxResizeBatchesExec(a, range.min, range.max, preferredBatchBytes) // Since it's transformed in a bottom to up order, so we may first encounter // ShuffeQueryStageExec, which is transformed to VeloxResizeBatchesExec(ShuffeQueryStageExec), // then we see AQEShuffleReadExec @@ -69,11 +70,12 @@ case class AppendBatchResizeForShuffleInputAndOutput() extends Rule[SparkPlan] { VeloxResizeBatchesExec( s @ ShuffleQueryStageExec(_, shuffle: ColumnarShuffleExchangeExec, _), _, + _, _), _) if resizeBatchesShuffleOutputEnabled && shuffle.shuffleWriterType.requiresResizingShuffleOutput => - VeloxResizeBatchesExec(a.copy(child = s), range.min, range.max) + VeloxResizeBatchesExec(a.copy(child = s), range.min, range.max, preferredBatchBytes) case a @ AQEShuffleReadExec( VeloxResizeBatchesExec( s @ ShuffleQueryStageExec( @@ -81,22 +83,23 @@ case class AppendBatchResizeForShuffleInputAndOutput() extends Rule[SparkPlan] { ReusedExchangeExec(_, shuffle: ColumnarShuffleExchangeExec), _), _, + _, _), _) if resizeBatchesShuffleOutputEnabled && shuffle.shuffleWriterType.requiresResizingShuffleOutput => - VeloxResizeBatchesExec(a.copy(child = s), range.min, range.max) + VeloxResizeBatchesExec(a.copy(child = s), range.min, range.max, preferredBatchBytes) case s @ ShuffleQueryStageExec(_, shuffle: ColumnarShuffleExchangeExec, _) if resizeBatchesShuffleOutputEnabled && shuffle.shuffleWriterType.requiresResizingShuffleOutput => - VeloxResizeBatchesExec(s, range.min, range.max) + VeloxResizeBatchesExec(s, range.min, range.max, preferredBatchBytes) case s @ ShuffleQueryStageExec( _, ReusedExchangeExec(_, shuffle: ColumnarShuffleExchangeExec), _) if resizeBatchesShuffleOutputEnabled && shuffle.shuffleWriterType.requiresResizingShuffleOutput => - VeloxResizeBatchesExec(s, range.min, range.max) + VeloxResizeBatchesExec(s, range.min, range.max, preferredBatchBytes) } } } diff --git a/backends-velox/src/main/scala/org/apache/gluten/extension/CudfNodeValidationRule.scala b/backends-velox/src/main/scala/org/apache/gluten/extension/CudfNodeValidationRule.scala index 29c85e0f5f9..14029cf28ff 100644 --- a/backends-velox/src/main/scala/org/apache/gluten/extension/CudfNodeValidationRule.scala +++ b/backends-velox/src/main/scala/org/apache/gluten/extension/CudfNodeValidationRule.scala @@ -35,7 +35,7 @@ case class CudfNodeValidationRule(glutenConf: GlutenConfig) extends Rule[SparkPl val transformedPlan = plan.transformUp { case shuffle @ ColumnarShuffleExchangeExec( _, - VeloxResizeBatchesExec(w: WholeStageTransformer, _, _), + VeloxResizeBatchesExec(w: WholeStageTransformer, _, _, _), _, _, _) => diff --git a/backends-velox/src/main/scala/org/apache/gluten/extension/GpuBufferBatchResizeForShuffleInputOutput.scala b/backends-velox/src/main/scala/org/apache/gluten/extension/GpuBufferBatchResizeForShuffleInputOutput.scala index d7a70e73295..bb30dc6c272 100644 --- a/backends-velox/src/main/scala/org/apache/gluten/extension/GpuBufferBatchResizeForShuffleInputOutput.scala +++ b/backends-velox/src/main/scala/org/apache/gluten/extension/GpuBufferBatchResizeForShuffleInputOutput.scala @@ -34,13 +34,14 @@ case class GpuBufferBatchResizeForShuffleInputOutput() extends Rule[SparkPlan] { return plan } val range = VeloxConfig.get.veloxResizeBatchesShuffleInputOutputRange + val preferredBatchBytes = VeloxConfig.get.veloxPreferredBatchBytes val batchSize = VeloxConfig.get.cudfBatchSize plan.transformUp { case shuffle: ColumnarShuffleExchangeExec if shuffle.shuffleWriterType == HashShuffleWriterType && VeloxConfig.get.veloxResizeBatchesShuffleInput => val appendBatches = - VeloxResizeBatchesExec(shuffle.child, range.min, range.max) + VeloxResizeBatchesExec(shuffle.child, range.min, range.max, preferredBatchBytes) shuffle.withNewChildren(Seq(appendBatches)) case a @ AQEShuffleReadExec( ShuffleQueryStageExec(_, _: ColumnarShuffleExchangeExecBase, _), 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 83b14670666..036f344fa36 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 @@ -60,7 +60,7 @@ Arguments: false (7) VeloxResizeBatches Input [18]: [hash_partition_key#X, l_returnflag#X, l_linestatus#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, count#X, sum#X, count#X, sum#X, count#X, count#X] -Arguments: X, X +Arguments: X, X, X (8) ColumnarExchange Input [18]: [hash_partition_key#X, l_returnflag#X, l_linestatus#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, count#X, sum#X, count#X, sum#X, count#X, count#X] @@ -89,7 +89,7 @@ Arguments: false (14) VeloxResizeBatches 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: X, X +Arguments: X, X, X (15) ColumnarExchange 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] 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 b2eace8aba0..4e50233ff6e 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 @@ -212,7 +212,7 @@ Arguments: false (35) VeloxResizeBatches Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_acctbal#X, c_phone#X, n_name#X, c_address#X, c_comment#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (36) ColumnarExchange Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_acctbal#X, c_phone#X, n_name#X, c_address#X, c_comment#X, sum#X, isEmpty#X] 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 7f239bdd609..fcacf2c1394 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 @@ -162,7 +162,7 @@ Arguments: false (25) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_partkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (26) ColumnarExchange Input [4]: [hash_partition_key#X, ps_partkey#X, sum#X, isEmpty#X] @@ -195,7 +195,7 @@ Arguments: false (33) VeloxResizeBatches Input [2]: [ps_partkey#X, value#X] -Arguments: X, X +Arguments: X, X, X (34) ColumnarExchange Input [2]: [ps_partkey#X, value#X] 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 d7bf5de650a..00c88c307e1 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 @@ -110,7 +110,7 @@ Arguments: false (16) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_shipmode#X, sum#X, sum#X] -Arguments: X, X +Arguments: X, X, X (17) ColumnarExchange Input [4]: [hash_partition_key#X, l_shipmode#X, sum#X, sum#X] @@ -139,7 +139,7 @@ Arguments: false (23) VeloxResizeBatches Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X] -Arguments: X, X +Arguments: X, X, X (24) ColumnarExchange Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X] 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 c12f03fc9ca..96280721807 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 @@ -114,7 +114,7 @@ Arguments: false (15) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_custkey#X, count#X] -Arguments: X, X +Arguments: X, X, X (16) ColumnarExchange Input [3]: [hash_partition_key#X, c_custkey#X, count#X] @@ -158,7 +158,7 @@ Arguments: false (25) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_count#X, count#X] -Arguments: X, X +Arguments: X, X, X (26) ColumnarExchange Input [3]: [hash_partition_key#X, c_count#X, count#X] @@ -187,7 +187,7 @@ Arguments: false (32) VeloxResizeBatches Input [2]: [c_count#X, custdist#X] -Arguments: X, X +Arguments: X, X, X (33) ColumnarExchange Input [2]: [c_count#X, custdist#X] 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 a4e88c149ca..92778c7b056 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 @@ -99,7 +99,7 @@ Arguments: false (15) VeloxResizeBatches Input [4]: [sum#X, isEmpty#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (16) ColumnarExchange Input [4]: [sum#X, isEmpty#X, sum#X, isEmpty#X] 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 8b129365923..56c32a3fa60 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 @@ -103,7 +103,7 @@ Arguments: false (14) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] @@ -145,7 +145,7 @@ Arguments: false (24) VeloxResizeBatches Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X] 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 10972d6c2f1..0b186d20c14 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 @@ -119,7 +119,7 @@ Arguments: false (15) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, ps_suppkey#X] -Arguments: X, X +Arguments: X, X, X (16) ColumnarExchange Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, ps_suppkey#X] @@ -159,7 +159,7 @@ Arguments: false (24) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, count#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, count#X] @@ -188,7 +188,7 @@ Arguments: false (31) VeloxResizeBatches Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X] 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 77441777bbf..49e72eca8a8 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 @@ -61,7 +61,7 @@ Arguments: false (7) VeloxResizeBatches Input [2]: [sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (8) ColumnarExchange Input [2]: [sum#X, isEmpty#X] 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 88d48cf5dfa..287299ec877 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 @@ -142,7 +142,7 @@ Arguments: false (14) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_orderkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [4]: [hash_partition_key#X, l_orderkey#X, sum#X, isEmpty#X] @@ -278,7 +278,7 @@ Arguments: false (47) VeloxResizeBatches Input [8]: [hash_partition_key#X, c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (48) ColumnarExchange Input [8]: [hash_partition_key#X, c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum#X, isEmpty#X] 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 3928ab2a3be..0013dfba841 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 @@ -98,7 +98,7 @@ Arguments: false (15) VeloxResizeBatches Input [2]: [sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (16) ColumnarExchange Input [2]: [sum#X, isEmpty#X] 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 92488e17c76..0d735f24cb0 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 @@ -120,7 +120,7 @@ Arguments: false (5) VeloxResizeBatches Input [5]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_address#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [5]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_address#X, s_nationkey#X] @@ -257,7 +257,7 @@ Arguments: false (38) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_partkey#X, l_suppkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (39) ColumnarExchange Input [5]: [hash_partition_key#X, l_partkey#X, l_suppkey#X, sum#X, isEmpty#X] @@ -372,7 +372,7 @@ Arguments: false (66) VeloxResizeBatches Input [2]: [s_name#X, s_address#X] -Arguments: X, X +Arguments: X, X, X (67) ColumnarExchange Input [2]: [s_name#X, s_address#X] 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 a1adaf31bf2..94350ffc3ee 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 @@ -304,7 +304,7 @@ Arguments: false (52) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_name#X, count#X] -Arguments: X, X +Arguments: X, X, X (53) ColumnarExchange Input [3]: [hash_partition_key#X, s_name#X, count#X] 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 afb719f1990..783bf11d3ab 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 @@ -97,7 +97,7 @@ Arguments: false (14) VeloxResizeBatches Input [5]: [hash_partition_key#X, cntrycode#X, count#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [5]: [hash_partition_key#X, cntrycode#X, count#X, sum#X, isEmpty#X] @@ -126,7 +126,7 @@ Arguments: false (21) VeloxResizeBatches Input [3]: [cntrycode#X, numcust#X, totacctbal#X] -Arguments: X, X +Arguments: X, X, X (22) ColumnarExchange Input [3]: [cntrycode#X, numcust#X, totacctbal#X] 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 16e87a6af76..b0abb0be00c 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 @@ -162,7 +162,7 @@ Arguments: false (26) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_orderkey#X, o_orderdate#X, o_shippriority#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (27) ColumnarExchange Input [6]: [hash_partition_key#X, l_orderkey#X, o_orderdate#X, o_shippriority#X, sum#X, isEmpty#X] 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 9ff9aba0a98..522357d9d1e 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 @@ -116,7 +116,7 @@ Arguments: false (17) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderpriority#X, count#X] -Arguments: X, X +Arguments: X, X, X (18) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderpriority#X, count#X] @@ -145,7 +145,7 @@ Arguments: false (24) VeloxResizeBatches Input [2]: [o_orderpriority#X, order_count#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [2]: [o_orderpriority#X, order_count#X] 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 6a8c9be97b5..2b3e7bd0dbb 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 @@ -316,7 +316,7 @@ Arguments: false (53) VeloxResizeBatches Input [4]: [hash_partition_key#X, n_name#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (54) ColumnarExchange Input [4]: [hash_partition_key#X, n_name#X, sum#X, isEmpty#X] @@ -345,7 +345,7 @@ Arguments: false (60) VeloxResizeBatches Input [2]: [n_name#X, revenue#X] -Arguments: X, X +Arguments: X, X, X (61) ColumnarExchange Input [2]: [n_name#X, revenue#X] 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 f5ca77c73ed..4b72ce731f1 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 @@ -48,7 +48,7 @@ Arguments: false (6) VeloxResizeBatches Input [2]: [sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (7) ColumnarExchange Input [2]: [sum#X, isEmpty#X] 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 88f83c467e8..76a6f149eac 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 @@ -286,7 +286,7 @@ Arguments: false (48) VeloxResizeBatches Input [6]: [hash_partition_key#X, supp_nation#X, cust_nation#X, l_year#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [6]: [hash_partition_key#X, supp_nation#X, cust_nation#X, l_year#X, sum#X, isEmpty#X] @@ -315,7 +315,7 @@ Arguments: false (55) VeloxResizeBatches Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X] -Arguments: X, X +Arguments: X, X, X (56) ColumnarExchange Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X] 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 680adf98378..acf0c114119 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 @@ -417,7 +417,7 @@ Arguments: false (71) VeloxResizeBatches Input [6]: [hash_partition_key#X, o_year#X, sum#X, isEmpty#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (72) ColumnarExchange Input [6]: [hash_partition_key#X, o_year#X, sum#X, isEmpty#X, sum#X, isEmpty#X] @@ -450,7 +450,7 @@ Arguments: false (79) VeloxResizeBatches Input [2]: [o_year#X, mkt_share#X] -Arguments: X, X +Arguments: X, X, X (80) ColumnarExchange Input [2]: [o_year#X, mkt_share#X] 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 830259ba82b..36028f97c69 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 @@ -310,7 +310,7 @@ Arguments: false (52) VeloxResizeBatches Input [5]: [hash_partition_key#X, nation#X, o_year#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (53) ColumnarExchange Input [5]: [hash_partition_key#X, nation#X, o_year#X, sum#X, isEmpty#X] @@ -339,7 +339,7 @@ Arguments: false (59) VeloxResizeBatches Input [3]: [nation#X, o_year#X, sum_profit#X] -Arguments: X, X +Arguments: X, X, X (60) ColumnarExchange Input [3]: [nation#X, o_year#X, sum_profit#X] 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 9c144ceed8a..06cd41c4878 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 @@ -60,7 +60,7 @@ Arguments: false (7) VeloxResizeBatches Input [18]: [hash_partition_key#X, l_returnflag#X, l_linestatus#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, count#X, sum#X, count#X, sum#X, count#X, count#X] -Arguments: X, X +Arguments: X, X, X (8) ColumnarExchange Input [18]: [hash_partition_key#X, l_returnflag#X, l_linestatus#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, count#X, sum#X, count#X, sum#X, count#X, count#X] @@ -89,7 +89,7 @@ Arguments: false (14) VeloxResizeBatches 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: X, X +Arguments: X, X, X (15) ColumnarExchange 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] 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 f6adf829144..b17f41e02c1 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 @@ -212,7 +212,7 @@ Arguments: false (35) VeloxResizeBatches Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_acctbal#X, c_phone#X, n_name#X, c_address#X, c_comment#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (36) ColumnarExchange Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_acctbal#X, c_phone#X, n_name#X, c_address#X, c_comment#X, sum#X, isEmpty#X] 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 f7b5363ce46..35451c64b79 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 @@ -162,7 +162,7 @@ Arguments: false (25) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_partkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (26) ColumnarExchange Input [4]: [hash_partition_key#X, ps_partkey#X, sum#X, isEmpty#X] @@ -195,7 +195,7 @@ Arguments: false (33) VeloxResizeBatches Input [2]: [ps_partkey#X, value#X] -Arguments: X, X +Arguments: X, X, X (34) ColumnarExchange Input [2]: [ps_partkey#X, value#X] @@ -431,7 +431,7 @@ Arguments: false (77) VeloxResizeBatches Input [2]: [sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (78) ColumnarExchange Input [2]: [sum#X, isEmpty#X] 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 032e0a7a81e..3952a39f70d 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 @@ -110,7 +110,7 @@ Arguments: false (16) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_shipmode#X, sum#X, sum#X] -Arguments: X, X +Arguments: X, X, X (17) ColumnarExchange Input [4]: [hash_partition_key#X, l_shipmode#X, sum#X, sum#X] @@ -139,7 +139,7 @@ Arguments: false (23) VeloxResizeBatches Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X] -Arguments: X, X +Arguments: X, X, X (24) ColumnarExchange Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X] 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 42f913eef2a..9925a325288 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 @@ -114,7 +114,7 @@ Arguments: false (15) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_custkey#X, count#X] -Arguments: X, X +Arguments: X, X, X (16) ColumnarExchange Input [3]: [hash_partition_key#X, c_custkey#X, count#X] @@ -158,7 +158,7 @@ Arguments: false (25) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_count#X, count#X] -Arguments: X, X +Arguments: X, X, X (26) ColumnarExchange Input [3]: [hash_partition_key#X, c_count#X, count#X] @@ -187,7 +187,7 @@ Arguments: false (32) VeloxResizeBatches Input [2]: [c_count#X, custdist#X] -Arguments: X, X +Arguments: X, X, X (33) ColumnarExchange Input [2]: [c_count#X, custdist#X] 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 5095f92eb6d..50d14949be6 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 @@ -99,7 +99,7 @@ Arguments: false (15) VeloxResizeBatches Input [4]: [sum#X, isEmpty#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (16) ColumnarExchange Input [4]: [sum#X, isEmpty#X, sum#X, isEmpty#X] 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 fc7c207f2f1..cb7006d4daa 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 @@ -102,7 +102,7 @@ Arguments: false (14) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] @@ -144,7 +144,7 @@ Arguments: false (24) VeloxResizeBatches Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X] @@ -295,7 +295,7 @@ Arguments: false (50) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (51) ColumnarExchange Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] 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 8cc2b417eb3..41e730d4933 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 @@ -119,7 +119,7 @@ Arguments: false (15) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, ps_suppkey#X] -Arguments: X, X +Arguments: X, X, X (16) ColumnarExchange Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, ps_suppkey#X] @@ -159,7 +159,7 @@ Arguments: false (24) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, count#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, count#X] @@ -188,7 +188,7 @@ Arguments: false (31) VeloxResizeBatches Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X] 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 372d6bc719c..21265ab560d 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 @@ -61,7 +61,7 @@ Arguments: false (7) VeloxResizeBatches Input [2]: [sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (8) ColumnarExchange Input [2]: [sum#X, isEmpty#X] 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 8fd71a81a26..4f2a50b62cb 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 @@ -142,7 +142,7 @@ Arguments: false (14) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_orderkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [4]: [hash_partition_key#X, l_orderkey#X, sum#X, isEmpty#X] @@ -278,7 +278,7 @@ Arguments: false (47) VeloxResizeBatches Input [8]: [hash_partition_key#X, c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (48) ColumnarExchange Input [8]: [hash_partition_key#X, c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum#X, isEmpty#X] 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 bf99a30faff..2c992cad794 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 @@ -98,7 +98,7 @@ Arguments: false (15) VeloxResizeBatches Input [2]: [sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (16) ColumnarExchange Input [2]: [sum#X, isEmpty#X] 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 9d98c96dbd0..643a655b565 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 @@ -119,7 +119,7 @@ Arguments: false (5) VeloxResizeBatches Input [5]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_address#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [5]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_address#X, s_nationkey#X] @@ -256,7 +256,7 @@ Arguments: false (38) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_partkey#X, l_suppkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (39) ColumnarExchange Input [5]: [hash_partition_key#X, l_partkey#X, l_suppkey#X, sum#X, isEmpty#X] @@ -371,7 +371,7 @@ Arguments: false (66) VeloxResizeBatches Input [2]: [s_name#X, s_address#X] -Arguments: X, X +Arguments: X, X, X (67) ColumnarExchange Input [2]: [s_name#X, s_address#X] 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 505dc59dc4c..10e727eab03 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 @@ -303,7 +303,7 @@ Arguments: false (52) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_name#X, count#X] -Arguments: X, X +Arguments: X, X, X (53) ColumnarExchange Input [3]: [hash_partition_key#X, s_name#X, count#X] 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 9113355acbd..bb301416595 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 @@ -97,7 +97,7 @@ Arguments: false (14) VeloxResizeBatches Input [5]: [hash_partition_key#X, cntrycode#X, count#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [5]: [hash_partition_key#X, cntrycode#X, count#X, sum#X, isEmpty#X] @@ -126,7 +126,7 @@ Arguments: false (21) VeloxResizeBatches Input [3]: [cntrycode#X, numcust#X, totacctbal#X] -Arguments: X, X +Arguments: X, X, X (22) ColumnarExchange Input [3]: [cntrycode#X, numcust#X, totacctbal#X] @@ -265,7 +265,7 @@ Arguments: false (46) VeloxResizeBatches Input [2]: [sum#X, count#X] -Arguments: X, X +Arguments: X, X, X (47) ColumnarExchange Input [2]: [sum#X, count#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 11188b22569..c75a5c71afe 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 @@ -162,7 +162,7 @@ Arguments: false (26) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_orderkey#X, o_orderdate#X, o_shippriority#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (27) ColumnarExchange Input [6]: [hash_partition_key#X, l_orderkey#X, o_orderdate#X, o_shippriority#X, sum#X, isEmpty#X] 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 52c99692cf4..35609235b75 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 @@ -116,7 +116,7 @@ Arguments: false (17) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderpriority#X, count#X] -Arguments: X, X +Arguments: X, X, X (18) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderpriority#X, count#X] @@ -145,7 +145,7 @@ Arguments: false (24) VeloxResizeBatches Input [2]: [o_orderpriority#X, order_count#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [2]: [o_orderpriority#X, order_count#X] 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 3bee6a399f3..4e747d16700 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 @@ -316,7 +316,7 @@ Arguments: false (53) VeloxResizeBatches Input [4]: [hash_partition_key#X, n_name#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (54) ColumnarExchange Input [4]: [hash_partition_key#X, n_name#X, sum#X, isEmpty#X] @@ -345,7 +345,7 @@ Arguments: false (60) VeloxResizeBatches Input [2]: [n_name#X, revenue#X] -Arguments: X, X +Arguments: X, X, X (61) ColumnarExchange Input [2]: [n_name#X, revenue#X] 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 ba50cb13105..9ba7f5c7293 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 @@ -48,7 +48,7 @@ Arguments: false (6) VeloxResizeBatches Input [2]: [sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (7) ColumnarExchange Input [2]: [sum#X, isEmpty#X] 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 5fdae3d7334..80aba104a09 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 @@ -286,7 +286,7 @@ Arguments: false (48) VeloxResizeBatches Input [6]: [hash_partition_key#X, supp_nation#X, cust_nation#X, l_year#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [6]: [hash_partition_key#X, supp_nation#X, cust_nation#X, l_year#X, sum#X, isEmpty#X] @@ -315,7 +315,7 @@ Arguments: false (55) VeloxResizeBatches Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X] -Arguments: X, X +Arguments: X, X, X (56) ColumnarExchange Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X] 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 23f58dc4346..468ef60af7f 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 @@ -417,7 +417,7 @@ Arguments: false (71) VeloxResizeBatches Input [6]: [hash_partition_key#X, o_year#X, sum#X, isEmpty#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (72) ColumnarExchange Input [6]: [hash_partition_key#X, o_year#X, sum#X, isEmpty#X, sum#X, isEmpty#X] @@ -450,7 +450,7 @@ Arguments: false (79) VeloxResizeBatches Input [2]: [o_year#X, mkt_share#X] -Arguments: X, X +Arguments: X, X, X (80) ColumnarExchange Input [2]: [o_year#X, mkt_share#X] 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 8c1db077485..f9bde8feb76 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 @@ -310,7 +310,7 @@ Arguments: false (52) VeloxResizeBatches Input [5]: [hash_partition_key#X, nation#X, o_year#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (53) ColumnarExchange Input [5]: [hash_partition_key#X, nation#X, o_year#X, sum#X, isEmpty#X] @@ -339,7 +339,7 @@ Arguments: false (59) VeloxResizeBatches Input [3]: [nation#X, o_year#X, sum_profit#X] -Arguments: X, X +Arguments: X, X, X (60) ColumnarExchange Input [3]: [nation#X, o_year#X, sum_profit#X] 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 4c768cbd8b0..c02e2a48cfc 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 @@ -60,7 +60,7 @@ Arguments: false (7) VeloxResizeBatches Input [18]: [hash_partition_key#X, l_returnflag#X, l_linestatus#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, count#X, sum#X, count#X, sum#X, count#X, count#X] -Arguments: X, X +Arguments: X, X, X (8) ColumnarExchange Input [18]: [hash_partition_key#X, l_returnflag#X, l_linestatus#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, count#X, sum#X, count#X, sum#X, count#X, count#X] @@ -89,7 +89,7 @@ Arguments: false (14) VeloxResizeBatches 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: X, X +Arguments: X, X, X (15) ColumnarExchange 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] @@ -159,4 +159,4 @@ Arguments: [l_returnflag#X ASC NULLS FIRST, l_linestatus#X ASC NULLS FIRST], tru (30) AdaptiveSparkPlan Output [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: isFinalPlan=true +Arguments: isFinalPlan=true \ No newline at end of file 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 8154ff50d7e..5890cbc6680 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 @@ -215,7 +215,7 @@ Arguments: false (35) VeloxResizeBatches Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_acctbal#X, c_phone#X, n_name#X, c_address#X, c_comment#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (36) ColumnarExchange Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_acctbal#X, c_phone#X, n_name#X, c_address#X, c_comment#X, sum#X, isEmpty#X] 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 1ae5e4c4fa4..c00f14e7976 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 @@ -164,7 +164,7 @@ Arguments: false (25) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_partkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (26) ColumnarExchange Input [4]: [hash_partition_key#X, ps_partkey#X, sum#X, isEmpty#X] @@ -197,7 +197,7 @@ Arguments: false (33) VeloxResizeBatches Input [2]: [ps_partkey#X, value#X] -Arguments: X, X +Arguments: X, X, X (34) ColumnarExchange Input [2]: [ps_partkey#X, value#X] @@ -437,7 +437,7 @@ Arguments: false (77) VeloxResizeBatches Input [2]: [sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (78) ColumnarExchange Input [2]: [sum#X, isEmpty#X] 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 d5dc00e6dc4..39b3eabe3f5 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 @@ -111,7 +111,7 @@ Arguments: false (16) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_shipmode#X, sum#X, sum#X] -Arguments: X, X +Arguments: X, X, X (17) ColumnarExchange Input [4]: [hash_partition_key#X, l_shipmode#X, sum#X, sum#X] @@ -140,7 +140,7 @@ Arguments: false (23) VeloxResizeBatches Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X] -Arguments: X, X +Arguments: X, X, X (24) ColumnarExchange Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X] 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 8848ac70c05..ef137943b56 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 @@ -115,7 +115,7 @@ Arguments: false (15) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_custkey#X, count#X] -Arguments: X, X +Arguments: X, X, X (16) ColumnarExchange Input [3]: [hash_partition_key#X, c_custkey#X, count#X] @@ -159,7 +159,7 @@ Arguments: false (25) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_count#X, count#X] -Arguments: X, X +Arguments: X, X, X (26) ColumnarExchange Input [3]: [hash_partition_key#X, c_count#X, count#X] @@ -188,7 +188,7 @@ Arguments: false (32) VeloxResizeBatches Input [2]: [c_count#X, custdist#X] -Arguments: X, X +Arguments: X, X, X (33) ColumnarExchange Input [2]: [c_count#X, custdist#X] 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 17ce5be290b..9daa590d3e6 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 @@ -100,7 +100,7 @@ Arguments: false (15) VeloxResizeBatches Input [4]: [sum#X, isEmpty#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (16) ColumnarExchange Input [4]: [sum#X, isEmpty#X, sum#X, isEmpty#X] 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 ad3c0445bde..52e6b69a649 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 @@ -102,7 +102,7 @@ Arguments: false (14) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] @@ -145,7 +145,7 @@ Arguments: false (24) VeloxResizeBatches Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X] @@ -297,7 +297,7 @@ Arguments: false (50) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (51) ColumnarExchange Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] 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 3a9b17afd60..b1a109bffae 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 @@ -120,7 +120,7 @@ Arguments: false (15) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, ps_suppkey#X] -Arguments: X, X +Arguments: X, X, X (16) ColumnarExchange Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, ps_suppkey#X] @@ -160,7 +160,7 @@ Arguments: false (24) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, count#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, count#X] @@ -189,7 +189,7 @@ Arguments: false (31) VeloxResizeBatches Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X] 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 b66a80731b7..ebcb8f8b169 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 @@ -61,7 +61,7 @@ Arguments: false (7) VeloxResizeBatches Input [2]: [sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (8) ColumnarExchange Input [2]: [sum#X, isEmpty#X] 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 c3ab86e5acf..67cba428677 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 @@ -142,7 +142,7 @@ Arguments: false (14) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_orderkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [4]: [hash_partition_key#X, l_orderkey#X, sum#X, isEmpty#X] @@ -282,7 +282,7 @@ Arguments: false (47) VeloxResizeBatches Input [8]: [hash_partition_key#X, c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (48) ColumnarExchange Input [8]: [hash_partition_key#X, c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum#X, isEmpty#X] 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 a93b6458dc6..2e596563726 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 @@ -99,7 +99,7 @@ Arguments: false (15) VeloxResizeBatches Input [2]: [sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (16) ColumnarExchange Input [2]: [sum#X, isEmpty#X] 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 ff8473e56f0..fc0ab3578b5 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 @@ -219,7 +219,7 @@ Arguments: false (30) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_partkey#X, l_suppkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (31) ColumnarExchange Input [5]: [hash_partition_key#X, l_partkey#X, l_suppkey#X, sum#X, isEmpty#X] @@ -337,7 +337,7 @@ Arguments: false (58) VeloxResizeBatches Input [2]: [s_name#X, s_address#X] -Arguments: X, X +Arguments: X, X, X (59) ColumnarExchange Input [2]: [s_name#X, s_address#X] 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 5fab9fa9da4..53149849146 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 @@ -308,7 +308,7 @@ Arguments: false (52) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_name#X, count#X] -Arguments: X, X +Arguments: X, X, X (53) ColumnarExchange Input [3]: [hash_partition_key#X, s_name#X, count#X] 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 0c2ce3c56b5..b4bdb60fc9f 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 @@ -98,7 +98,7 @@ Arguments: false (14) VeloxResizeBatches Input [5]: [hash_partition_key#X, cntrycode#X, count#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [5]: [hash_partition_key#X, cntrycode#X, count#X, sum#X, isEmpty#X] @@ -127,7 +127,7 @@ Arguments: false (21) VeloxResizeBatches Input [3]: [cntrycode#X, numcust#X, totacctbal#X] -Arguments: X, X +Arguments: X, X, X (22) ColumnarExchange Input [3]: [cntrycode#X, numcust#X, totacctbal#X] @@ -267,7 +267,7 @@ Arguments: false (46) VeloxResizeBatches Input [2]: [sum#X, count#X] -Arguments: X, X +Arguments: X, X, X (47) ColumnarExchange Input [2]: [sum#X, count#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 26db3004e2e..bf135386897 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 @@ -164,7 +164,7 @@ Arguments: false (26) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_orderkey#X, o_orderdate#X, o_shippriority#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (27) ColumnarExchange Input [6]: [hash_partition_key#X, l_orderkey#X, o_orderdate#X, o_shippriority#X, sum#X, isEmpty#X] 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 a77b48298d3..5059ce985e9 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 @@ -117,7 +117,7 @@ Arguments: false (17) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderpriority#X, count#X] -Arguments: X, X +Arguments: X, X, X (18) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderpriority#X, count#X] @@ -146,7 +146,7 @@ Arguments: false (24) VeloxResizeBatches Input [2]: [o_orderpriority#X, order_count#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [2]: [o_orderpriority#X, order_count#X] 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 60f009173f6..d331a14e487 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 @@ -321,7 +321,7 @@ Arguments: false (53) VeloxResizeBatches Input [4]: [hash_partition_key#X, n_name#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (54) ColumnarExchange Input [4]: [hash_partition_key#X, n_name#X, sum#X, isEmpty#X] @@ -350,7 +350,7 @@ Arguments: false (60) VeloxResizeBatches Input [2]: [n_name#X, revenue#X] -Arguments: X, X +Arguments: X, X, X (61) ColumnarExchange Input [2]: [n_name#X, revenue#X] 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 b85e63e1065..1e1d87db4b2 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 @@ -48,7 +48,7 @@ Arguments: false (6) VeloxResizeBatches Input [2]: [sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (7) ColumnarExchange Input [2]: [sum#X, isEmpty#X] 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 eaa84cfa46c..ea00d75f20d 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 @@ -291,7 +291,7 @@ Arguments: false (48) VeloxResizeBatches Input [6]: [hash_partition_key#X, supp_nation#X, cust_nation#X, l_year#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [6]: [hash_partition_key#X, supp_nation#X, cust_nation#X, l_year#X, sum#X, isEmpty#X] @@ -320,7 +320,7 @@ Arguments: false (55) VeloxResizeBatches Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X] -Arguments: X, X +Arguments: X, X, X (56) ColumnarExchange Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X] 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 1e76f5d7254..f89b2022250 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 @@ -424,7 +424,7 @@ Arguments: false (71) VeloxResizeBatches Input [6]: [hash_partition_key#X, o_year#X, sum#X, isEmpty#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (72) ColumnarExchange Input [6]: [hash_partition_key#X, o_year#X, sum#X, isEmpty#X, sum#X, isEmpty#X] @@ -457,7 +457,7 @@ Arguments: false (79) VeloxResizeBatches Input [2]: [o_year#X, mkt_share#X] -Arguments: X, X +Arguments: X, X, X (80) ColumnarExchange Input [2]: [o_year#X, mkt_share#X] 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 8baec4075ad..1e69b1425a3 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 @@ -315,7 +315,7 @@ Arguments: false (52) VeloxResizeBatches Input [5]: [hash_partition_key#X, nation#X, o_year#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (53) ColumnarExchange Input [5]: [hash_partition_key#X, nation#X, o_year#X, sum#X, isEmpty#X] @@ -344,7 +344,7 @@ Arguments: false (59) VeloxResizeBatches Input [3]: [nation#X, o_year#X, sum_profit#X] -Arguments: X, X +Arguments: X, X, X (60) ColumnarExchange Input [3]: [nation#X, o_year#X, sum_profit#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/1.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/1.txt index 4c768cbd8b0..c02e2a48cfc 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/1.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/1.txt @@ -60,7 +60,7 @@ Arguments: false (7) VeloxResizeBatches Input [18]: [hash_partition_key#X, l_returnflag#X, l_linestatus#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, count#X, sum#X, count#X, sum#X, count#X, count#X] -Arguments: X, X +Arguments: X, X, X (8) ColumnarExchange Input [18]: [hash_partition_key#X, l_returnflag#X, l_linestatus#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, count#X, sum#X, count#X, sum#X, count#X, count#X] @@ -89,7 +89,7 @@ Arguments: false (14) VeloxResizeBatches 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: X, X +Arguments: X, X, X (15) ColumnarExchange 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] @@ -159,4 +159,4 @@ Arguments: [l_returnflag#X ASC NULLS FIRST, l_linestatus#X ASC NULLS FIRST], tru (30) AdaptiveSparkPlan Output [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: isFinalPlan=true +Arguments: isFinalPlan=true \ No newline at end of file diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/10.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/10.txt index 8154ff50d7e..5890cbc6680 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/10.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/10.txt @@ -215,7 +215,7 @@ Arguments: false (35) VeloxResizeBatches Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_acctbal#X, c_phone#X, n_name#X, c_address#X, c_comment#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (36) ColumnarExchange Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_acctbal#X, c_phone#X, n_name#X, c_address#X, c_comment#X, sum#X, isEmpty#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/11.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/11.txt index 1ae5e4c4fa4..c00f14e7976 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/11.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/11.txt @@ -164,7 +164,7 @@ Arguments: false (25) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_partkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (26) ColumnarExchange Input [4]: [hash_partition_key#X, ps_partkey#X, sum#X, isEmpty#X] @@ -197,7 +197,7 @@ Arguments: false (33) VeloxResizeBatches Input [2]: [ps_partkey#X, value#X] -Arguments: X, X +Arguments: X, X, X (34) ColumnarExchange Input [2]: [ps_partkey#X, value#X] @@ -437,7 +437,7 @@ Arguments: false (77) VeloxResizeBatches Input [2]: [sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (78) ColumnarExchange Input [2]: [sum#X, isEmpty#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/12.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/12.txt index d5dc00e6dc4..39b3eabe3f5 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/12.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/12.txt @@ -111,7 +111,7 @@ Arguments: false (16) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_shipmode#X, sum#X, sum#X] -Arguments: X, X +Arguments: X, X, X (17) ColumnarExchange Input [4]: [hash_partition_key#X, l_shipmode#X, sum#X, sum#X] @@ -140,7 +140,7 @@ Arguments: false (23) VeloxResizeBatches Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X] -Arguments: X, X +Arguments: X, X, X (24) ColumnarExchange Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/13.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/13.txt index 8848ac70c05..ef137943b56 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/13.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/13.txt @@ -115,7 +115,7 @@ Arguments: false (15) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_custkey#X, count#X] -Arguments: X, X +Arguments: X, X, X (16) ColumnarExchange Input [3]: [hash_partition_key#X, c_custkey#X, count#X] @@ -159,7 +159,7 @@ Arguments: false (25) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_count#X, count#X] -Arguments: X, X +Arguments: X, X, X (26) ColumnarExchange Input [3]: [hash_partition_key#X, c_count#X, count#X] @@ -188,7 +188,7 @@ Arguments: false (32) VeloxResizeBatches Input [2]: [c_count#X, custdist#X] -Arguments: X, X +Arguments: X, X, X (33) ColumnarExchange Input [2]: [c_count#X, custdist#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/14.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/14.txt index 17ce5be290b..9daa590d3e6 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/14.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/14.txt @@ -100,7 +100,7 @@ Arguments: false (15) VeloxResizeBatches Input [4]: [sum#X, isEmpty#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (16) ColumnarExchange Input [4]: [sum#X, isEmpty#X, sum#X, isEmpty#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/15.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/15.txt index ad3c0445bde..52e6b69a649 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/15.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/15.txt @@ -102,7 +102,7 @@ Arguments: false (14) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] @@ -145,7 +145,7 @@ Arguments: false (24) VeloxResizeBatches Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X] @@ -297,7 +297,7 @@ Arguments: false (50) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (51) ColumnarExchange Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/16.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/16.txt index 3a9b17afd60..b1a109bffae 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/16.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/16.txt @@ -120,7 +120,7 @@ Arguments: false (15) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, ps_suppkey#X] -Arguments: X, X +Arguments: X, X, X (16) ColumnarExchange Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, ps_suppkey#X] @@ -160,7 +160,7 @@ Arguments: false (24) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, count#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, count#X] @@ -189,7 +189,7 @@ Arguments: false (31) VeloxResizeBatches Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/17.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/17.txt index b66a80731b7..ebcb8f8b169 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/17.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/17.txt @@ -61,7 +61,7 @@ Arguments: false (7) VeloxResizeBatches Input [2]: [sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (8) ColumnarExchange Input [2]: [sum#X, isEmpty#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/18.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/18.txt index c3ab86e5acf..67cba428677 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/18.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/18.txt @@ -142,7 +142,7 @@ Arguments: false (14) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_orderkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [4]: [hash_partition_key#X, l_orderkey#X, sum#X, isEmpty#X] @@ -282,7 +282,7 @@ Arguments: false (47) VeloxResizeBatches Input [8]: [hash_partition_key#X, c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (48) ColumnarExchange Input [8]: [hash_partition_key#X, c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum#X, isEmpty#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/19.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/19.txt index a93b6458dc6..2e596563726 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/19.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/19.txt @@ -99,7 +99,7 @@ Arguments: false (15) VeloxResizeBatches Input [2]: [sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (16) ColumnarExchange Input [2]: [sum#X, isEmpty#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/20.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/20.txt index ff8473e56f0..fc0ab3578b5 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/20.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/20.txt @@ -219,7 +219,7 @@ Arguments: false (30) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_partkey#X, l_suppkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (31) ColumnarExchange Input [5]: [hash_partition_key#X, l_partkey#X, l_suppkey#X, sum#X, isEmpty#X] @@ -337,7 +337,7 @@ Arguments: false (58) VeloxResizeBatches Input [2]: [s_name#X, s_address#X] -Arguments: X, X +Arguments: X, X, X (59) ColumnarExchange Input [2]: [s_name#X, s_address#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/21.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/21.txt index 5fab9fa9da4..53149849146 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/21.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/21.txt @@ -308,7 +308,7 @@ Arguments: false (52) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_name#X, count#X] -Arguments: X, X +Arguments: X, X, X (53) ColumnarExchange Input [3]: [hash_partition_key#X, s_name#X, count#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/22.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/22.txt index 0c2ce3c56b5..b4bdb60fc9f 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/22.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/22.txt @@ -98,7 +98,7 @@ Arguments: false (14) VeloxResizeBatches Input [5]: [hash_partition_key#X, cntrycode#X, count#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [5]: [hash_partition_key#X, cntrycode#X, count#X, sum#X, isEmpty#X] @@ -127,7 +127,7 @@ Arguments: false (21) VeloxResizeBatches Input [3]: [cntrycode#X, numcust#X, totacctbal#X] -Arguments: X, X +Arguments: X, X, X (22) ColumnarExchange Input [3]: [cntrycode#X, numcust#X, totacctbal#X] @@ -267,7 +267,7 @@ Arguments: false (46) VeloxResizeBatches Input [2]: [sum#X, count#X] -Arguments: X, X +Arguments: X, X, X (47) ColumnarExchange Input [2]: [sum#X, count#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/3.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/3.txt index 26db3004e2e..bf135386897 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/3.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/3.txt @@ -164,7 +164,7 @@ Arguments: false (26) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_orderkey#X, o_orderdate#X, o_shippriority#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (27) ColumnarExchange Input [6]: [hash_partition_key#X, l_orderkey#X, o_orderdate#X, o_shippriority#X, sum#X, isEmpty#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/4.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/4.txt index a77b48298d3..5059ce985e9 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/4.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/4.txt @@ -117,7 +117,7 @@ Arguments: false (17) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderpriority#X, count#X] -Arguments: X, X +Arguments: X, X, X (18) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderpriority#X, count#X] @@ -146,7 +146,7 @@ Arguments: false (24) VeloxResizeBatches Input [2]: [o_orderpriority#X, order_count#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [2]: [o_orderpriority#X, order_count#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/5.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/5.txt index 60f009173f6..d331a14e487 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/5.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/5.txt @@ -321,7 +321,7 @@ Arguments: false (53) VeloxResizeBatches Input [4]: [hash_partition_key#X, n_name#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (54) ColumnarExchange Input [4]: [hash_partition_key#X, n_name#X, sum#X, isEmpty#X] @@ -350,7 +350,7 @@ Arguments: false (60) VeloxResizeBatches Input [2]: [n_name#X, revenue#X] -Arguments: X, X +Arguments: X, X, X (61) ColumnarExchange Input [2]: [n_name#X, revenue#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/6.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/6.txt index b85e63e1065..1e1d87db4b2 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/6.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/6.txt @@ -48,7 +48,7 @@ Arguments: false (6) VeloxResizeBatches Input [2]: [sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (7) ColumnarExchange Input [2]: [sum#X, isEmpty#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/7.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/7.txt index eaa84cfa46c..ea00d75f20d 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/7.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/7.txt @@ -291,7 +291,7 @@ Arguments: false (48) VeloxResizeBatches Input [6]: [hash_partition_key#X, supp_nation#X, cust_nation#X, l_year#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [6]: [hash_partition_key#X, supp_nation#X, cust_nation#X, l_year#X, sum#X, isEmpty#X] @@ -320,7 +320,7 @@ Arguments: false (55) VeloxResizeBatches Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X] -Arguments: X, X +Arguments: X, X, X (56) ColumnarExchange Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/8.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/8.txt index 1e76f5d7254..f89b2022250 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/8.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/8.txt @@ -424,7 +424,7 @@ Arguments: false (71) VeloxResizeBatches Input [6]: [hash_partition_key#X, o_year#X, sum#X, isEmpty#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (72) ColumnarExchange Input [6]: [hash_partition_key#X, o_year#X, sum#X, isEmpty#X, sum#X, isEmpty#X] @@ -457,7 +457,7 @@ Arguments: false (79) VeloxResizeBatches Input [2]: [o_year#X, mkt_share#X] -Arguments: X, X +Arguments: X, X, X (80) ColumnarExchange Input [2]: [o_year#X, mkt_share#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/9.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/9.txt index 8baec4075ad..1e69b1425a3 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/9.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj-ras/spark35/9.txt @@ -315,7 +315,7 @@ Arguments: false (52) VeloxResizeBatches Input [5]: [hash_partition_key#X, nation#X, o_year#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (53) ColumnarExchange Input [5]: [hash_partition_key#X, nation#X, o_year#X, sum#X, isEmpty#X] @@ -344,7 +344,7 @@ Arguments: false (59) VeloxResizeBatches Input [3]: [nation#X, o_year#X, sum_profit#X] -Arguments: X, X +Arguments: X, X, X (60) ColumnarExchange Input [3]: [nation#X, o_year#X, sum_profit#X] 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 83b14670666..036f344fa36 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 @@ -60,7 +60,7 @@ Arguments: false (7) VeloxResizeBatches Input [18]: [hash_partition_key#X, l_returnflag#X, l_linestatus#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, count#X, sum#X, count#X, sum#X, count#X, count#X] -Arguments: X, X +Arguments: X, X, X (8) ColumnarExchange Input [18]: [hash_partition_key#X, l_returnflag#X, l_linestatus#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, count#X, sum#X, count#X, sum#X, count#X, count#X] @@ -89,7 +89,7 @@ Arguments: false (14) VeloxResizeBatches 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: X, X +Arguments: X, X, X (15) ColumnarExchange 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] 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 b2eace8aba0..4e50233ff6e 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 @@ -212,7 +212,7 @@ Arguments: false (35) VeloxResizeBatches Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_acctbal#X, c_phone#X, n_name#X, c_address#X, c_comment#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (36) ColumnarExchange Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_acctbal#X, c_phone#X, n_name#X, c_address#X, c_comment#X, sum#X, isEmpty#X] 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 7f239bdd609..fcacf2c1394 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 @@ -162,7 +162,7 @@ Arguments: false (25) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_partkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (26) ColumnarExchange Input [4]: [hash_partition_key#X, ps_partkey#X, sum#X, isEmpty#X] @@ -195,7 +195,7 @@ Arguments: false (33) VeloxResizeBatches Input [2]: [ps_partkey#X, value#X] -Arguments: X, X +Arguments: X, X, X (34) ColumnarExchange Input [2]: [ps_partkey#X, value#X] 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 d7bf5de650a..00c88c307e1 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 @@ -110,7 +110,7 @@ Arguments: false (16) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_shipmode#X, sum#X, sum#X] -Arguments: X, X +Arguments: X, X, X (17) ColumnarExchange Input [4]: [hash_partition_key#X, l_shipmode#X, sum#X, sum#X] @@ -139,7 +139,7 @@ Arguments: false (23) VeloxResizeBatches Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X] -Arguments: X, X +Arguments: X, X, X (24) ColumnarExchange Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X] 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 c12f03fc9ca..96280721807 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 @@ -114,7 +114,7 @@ Arguments: false (15) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_custkey#X, count#X] -Arguments: X, X +Arguments: X, X, X (16) ColumnarExchange Input [3]: [hash_partition_key#X, c_custkey#X, count#X] @@ -158,7 +158,7 @@ Arguments: false (25) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_count#X, count#X] -Arguments: X, X +Arguments: X, X, X (26) ColumnarExchange Input [3]: [hash_partition_key#X, c_count#X, count#X] @@ -187,7 +187,7 @@ Arguments: false (32) VeloxResizeBatches Input [2]: [c_count#X, custdist#X] -Arguments: X, X +Arguments: X, X, X (33) ColumnarExchange Input [2]: [c_count#X, custdist#X] 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 a4e88c149ca..92778c7b056 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 @@ -99,7 +99,7 @@ Arguments: false (15) VeloxResizeBatches Input [4]: [sum#X, isEmpty#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (16) ColumnarExchange Input [4]: [sum#X, isEmpty#X, sum#X, isEmpty#X] 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 8b129365923..56c32a3fa60 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 @@ -103,7 +103,7 @@ Arguments: false (14) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] @@ -145,7 +145,7 @@ Arguments: false (24) VeloxResizeBatches Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X] 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 10972d6c2f1..0b186d20c14 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 @@ -119,7 +119,7 @@ Arguments: false (15) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, ps_suppkey#X] -Arguments: X, X +Arguments: X, X, X (16) ColumnarExchange Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, ps_suppkey#X] @@ -159,7 +159,7 @@ Arguments: false (24) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, count#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, count#X] @@ -188,7 +188,7 @@ Arguments: false (31) VeloxResizeBatches Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X] 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 77441777bbf..49e72eca8a8 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 @@ -61,7 +61,7 @@ Arguments: false (7) VeloxResizeBatches Input [2]: [sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (8) ColumnarExchange Input [2]: [sum#X, isEmpty#X] 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 88d48cf5dfa..287299ec877 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 @@ -142,7 +142,7 @@ Arguments: false (14) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_orderkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [4]: [hash_partition_key#X, l_orderkey#X, sum#X, isEmpty#X] @@ -278,7 +278,7 @@ Arguments: false (47) VeloxResizeBatches Input [8]: [hash_partition_key#X, c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (48) ColumnarExchange Input [8]: [hash_partition_key#X, c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum#X, isEmpty#X] 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 3928ab2a3be..0013dfba841 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 @@ -98,7 +98,7 @@ Arguments: false (15) VeloxResizeBatches Input [2]: [sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (16) ColumnarExchange Input [2]: [sum#X, isEmpty#X] 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 92488e17c76..0d735f24cb0 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 @@ -120,7 +120,7 @@ Arguments: false (5) VeloxResizeBatches Input [5]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_address#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [5]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_address#X, s_nationkey#X] @@ -257,7 +257,7 @@ Arguments: false (38) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_partkey#X, l_suppkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (39) ColumnarExchange Input [5]: [hash_partition_key#X, l_partkey#X, l_suppkey#X, sum#X, isEmpty#X] @@ -372,7 +372,7 @@ Arguments: false (66) VeloxResizeBatches Input [2]: [s_name#X, s_address#X] -Arguments: X, X +Arguments: X, X, X (67) ColumnarExchange Input [2]: [s_name#X, s_address#X] 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 a1adaf31bf2..94350ffc3ee 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 @@ -304,7 +304,7 @@ Arguments: false (52) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_name#X, count#X] -Arguments: X, X +Arguments: X, X, X (53) ColumnarExchange Input [3]: [hash_partition_key#X, s_name#X, count#X] 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 afb719f1990..783bf11d3ab 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 @@ -97,7 +97,7 @@ Arguments: false (14) VeloxResizeBatches Input [5]: [hash_partition_key#X, cntrycode#X, count#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [5]: [hash_partition_key#X, cntrycode#X, count#X, sum#X, isEmpty#X] @@ -126,7 +126,7 @@ Arguments: false (21) VeloxResizeBatches Input [3]: [cntrycode#X, numcust#X, totacctbal#X] -Arguments: X, X +Arguments: X, X, X (22) ColumnarExchange Input [3]: [cntrycode#X, numcust#X, totacctbal#X] 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 16e87a6af76..b0abb0be00c 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 @@ -162,7 +162,7 @@ Arguments: false (26) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_orderkey#X, o_orderdate#X, o_shippriority#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (27) ColumnarExchange Input [6]: [hash_partition_key#X, l_orderkey#X, o_orderdate#X, o_shippriority#X, sum#X, isEmpty#X] 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 9ff9aba0a98..522357d9d1e 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 @@ -116,7 +116,7 @@ Arguments: false (17) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderpriority#X, count#X] -Arguments: X, X +Arguments: X, X, X (18) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderpriority#X, count#X] @@ -145,7 +145,7 @@ Arguments: false (24) VeloxResizeBatches Input [2]: [o_orderpriority#X, order_count#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [2]: [o_orderpriority#X, order_count#X] 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 6a8c9be97b5..2b3e7bd0dbb 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 @@ -316,7 +316,7 @@ Arguments: false (53) VeloxResizeBatches Input [4]: [hash_partition_key#X, n_name#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (54) ColumnarExchange Input [4]: [hash_partition_key#X, n_name#X, sum#X, isEmpty#X] @@ -345,7 +345,7 @@ Arguments: false (60) VeloxResizeBatches Input [2]: [n_name#X, revenue#X] -Arguments: X, X +Arguments: X, X, X (61) ColumnarExchange Input [2]: [n_name#X, revenue#X] 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 f5ca77c73ed..4b72ce731f1 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 @@ -48,7 +48,7 @@ Arguments: false (6) VeloxResizeBatches Input [2]: [sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (7) ColumnarExchange Input [2]: [sum#X, isEmpty#X] 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 88f83c467e8..76a6f149eac 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 @@ -286,7 +286,7 @@ Arguments: false (48) VeloxResizeBatches Input [6]: [hash_partition_key#X, supp_nation#X, cust_nation#X, l_year#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [6]: [hash_partition_key#X, supp_nation#X, cust_nation#X, l_year#X, sum#X, isEmpty#X] @@ -315,7 +315,7 @@ Arguments: false (55) VeloxResizeBatches Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X] -Arguments: X, X +Arguments: X, X, X (56) ColumnarExchange Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X] 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 680adf98378..acf0c114119 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 @@ -417,7 +417,7 @@ Arguments: false (71) VeloxResizeBatches Input [6]: [hash_partition_key#X, o_year#X, sum#X, isEmpty#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (72) ColumnarExchange Input [6]: [hash_partition_key#X, o_year#X, sum#X, isEmpty#X, sum#X, isEmpty#X] @@ -450,7 +450,7 @@ Arguments: false (79) VeloxResizeBatches Input [2]: [o_year#X, mkt_share#X] -Arguments: X, X +Arguments: X, X, X (80) ColumnarExchange Input [2]: [o_year#X, mkt_share#X] 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 830259ba82b..36028f97c69 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 @@ -310,7 +310,7 @@ Arguments: false (52) VeloxResizeBatches Input [5]: [hash_partition_key#X, nation#X, o_year#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (53) ColumnarExchange Input [5]: [hash_partition_key#X, nation#X, o_year#X, sum#X, isEmpty#X] @@ -339,7 +339,7 @@ Arguments: false (59) VeloxResizeBatches Input [3]: [nation#X, o_year#X, sum_profit#X] -Arguments: X, X +Arguments: X, X, X (60) ColumnarExchange Input [3]: [nation#X, o_year#X, sum_profit#X] 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 9c144ceed8a..06cd41c4878 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 @@ -60,7 +60,7 @@ Arguments: false (7) VeloxResizeBatches Input [18]: [hash_partition_key#X, l_returnflag#X, l_linestatus#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, count#X, sum#X, count#X, sum#X, count#X, count#X] -Arguments: X, X +Arguments: X, X, X (8) ColumnarExchange Input [18]: [hash_partition_key#X, l_returnflag#X, l_linestatus#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, count#X, sum#X, count#X, sum#X, count#X, count#X] @@ -89,7 +89,7 @@ Arguments: false (14) VeloxResizeBatches 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: X, X +Arguments: X, X, X (15) ColumnarExchange 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] 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 f6adf829144..b17f41e02c1 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 @@ -212,7 +212,7 @@ Arguments: false (35) VeloxResizeBatches Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_acctbal#X, c_phone#X, n_name#X, c_address#X, c_comment#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (36) ColumnarExchange Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_acctbal#X, c_phone#X, n_name#X, c_address#X, c_comment#X, sum#X, isEmpty#X] 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 f7b5363ce46..35451c64b79 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 @@ -162,7 +162,7 @@ Arguments: false (25) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_partkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (26) ColumnarExchange Input [4]: [hash_partition_key#X, ps_partkey#X, sum#X, isEmpty#X] @@ -195,7 +195,7 @@ Arguments: false (33) VeloxResizeBatches Input [2]: [ps_partkey#X, value#X] -Arguments: X, X +Arguments: X, X, X (34) ColumnarExchange Input [2]: [ps_partkey#X, value#X] @@ -431,7 +431,7 @@ Arguments: false (77) VeloxResizeBatches Input [2]: [sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (78) ColumnarExchange Input [2]: [sum#X, isEmpty#X] 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 032e0a7a81e..3952a39f70d 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 @@ -110,7 +110,7 @@ Arguments: false (16) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_shipmode#X, sum#X, sum#X] -Arguments: X, X +Arguments: X, X, X (17) ColumnarExchange Input [4]: [hash_partition_key#X, l_shipmode#X, sum#X, sum#X] @@ -139,7 +139,7 @@ Arguments: false (23) VeloxResizeBatches Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X] -Arguments: X, X +Arguments: X, X, X (24) ColumnarExchange Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X] 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 42f913eef2a..9925a325288 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 @@ -114,7 +114,7 @@ Arguments: false (15) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_custkey#X, count#X] -Arguments: X, X +Arguments: X, X, X (16) ColumnarExchange Input [3]: [hash_partition_key#X, c_custkey#X, count#X] @@ -158,7 +158,7 @@ Arguments: false (25) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_count#X, count#X] -Arguments: X, X +Arguments: X, X, X (26) ColumnarExchange Input [3]: [hash_partition_key#X, c_count#X, count#X] @@ -187,7 +187,7 @@ Arguments: false (32) VeloxResizeBatches Input [2]: [c_count#X, custdist#X] -Arguments: X, X +Arguments: X, X, X (33) ColumnarExchange Input [2]: [c_count#X, custdist#X] 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 5095f92eb6d..50d14949be6 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 @@ -99,7 +99,7 @@ Arguments: false (15) VeloxResizeBatches Input [4]: [sum#X, isEmpty#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (16) ColumnarExchange Input [4]: [sum#X, isEmpty#X, sum#X, isEmpty#X] 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 fc7c207f2f1..cb7006d4daa 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 @@ -102,7 +102,7 @@ Arguments: false (14) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] @@ -144,7 +144,7 @@ Arguments: false (24) VeloxResizeBatches Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X] @@ -295,7 +295,7 @@ Arguments: false (50) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (51) ColumnarExchange Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] 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 8cc2b417eb3..41e730d4933 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 @@ -119,7 +119,7 @@ Arguments: false (15) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, ps_suppkey#X] -Arguments: X, X +Arguments: X, X, X (16) ColumnarExchange Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, ps_suppkey#X] @@ -159,7 +159,7 @@ Arguments: false (24) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, count#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, count#X] @@ -188,7 +188,7 @@ Arguments: false (31) VeloxResizeBatches Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X] 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 372d6bc719c..21265ab560d 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 @@ -61,7 +61,7 @@ Arguments: false (7) VeloxResizeBatches Input [2]: [sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (8) ColumnarExchange Input [2]: [sum#X, isEmpty#X] 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 8fd71a81a26..4f2a50b62cb 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 @@ -142,7 +142,7 @@ Arguments: false (14) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_orderkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [4]: [hash_partition_key#X, l_orderkey#X, sum#X, isEmpty#X] @@ -278,7 +278,7 @@ Arguments: false (47) VeloxResizeBatches Input [8]: [hash_partition_key#X, c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (48) ColumnarExchange Input [8]: [hash_partition_key#X, c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum#X, isEmpty#X] 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 bf99a30faff..2c992cad794 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 @@ -98,7 +98,7 @@ Arguments: false (15) VeloxResizeBatches Input [2]: [sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (16) ColumnarExchange Input [2]: [sum#X, isEmpty#X] 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 9d98c96dbd0..643a655b565 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 @@ -119,7 +119,7 @@ Arguments: false (5) VeloxResizeBatches Input [5]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_address#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [5]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_address#X, s_nationkey#X] @@ -256,7 +256,7 @@ Arguments: false (38) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_partkey#X, l_suppkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (39) ColumnarExchange Input [5]: [hash_partition_key#X, l_partkey#X, l_suppkey#X, sum#X, isEmpty#X] @@ -371,7 +371,7 @@ Arguments: false (66) VeloxResizeBatches Input [2]: [s_name#X, s_address#X] -Arguments: X, X +Arguments: X, X, X (67) ColumnarExchange Input [2]: [s_name#X, s_address#X] 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 505dc59dc4c..10e727eab03 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 @@ -303,7 +303,7 @@ Arguments: false (52) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_name#X, count#X] -Arguments: X, X +Arguments: X, X, X (53) ColumnarExchange Input [3]: [hash_partition_key#X, s_name#X, count#X] 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 9113355acbd..bb301416595 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 @@ -97,7 +97,7 @@ Arguments: false (14) VeloxResizeBatches Input [5]: [hash_partition_key#X, cntrycode#X, count#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [5]: [hash_partition_key#X, cntrycode#X, count#X, sum#X, isEmpty#X] @@ -126,7 +126,7 @@ Arguments: false (21) VeloxResizeBatches Input [3]: [cntrycode#X, numcust#X, totacctbal#X] -Arguments: X, X +Arguments: X, X, X (22) ColumnarExchange Input [3]: [cntrycode#X, numcust#X, totacctbal#X] @@ -265,7 +265,7 @@ Arguments: false (46) VeloxResizeBatches Input [2]: [sum#X, count#X] -Arguments: X, X +Arguments: X, X, X (47) ColumnarExchange Input [2]: [sum#X, count#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 11188b22569..c75a5c71afe 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 @@ -162,7 +162,7 @@ Arguments: false (26) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_orderkey#X, o_orderdate#X, o_shippriority#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (27) ColumnarExchange Input [6]: [hash_partition_key#X, l_orderkey#X, o_orderdate#X, o_shippriority#X, sum#X, isEmpty#X] 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 52c99692cf4..35609235b75 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 @@ -116,7 +116,7 @@ Arguments: false (17) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderpriority#X, count#X] -Arguments: X, X +Arguments: X, X, X (18) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderpriority#X, count#X] @@ -145,7 +145,7 @@ Arguments: false (24) VeloxResizeBatches Input [2]: [o_orderpriority#X, order_count#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [2]: [o_orderpriority#X, order_count#X] 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 3bee6a399f3..4e747d16700 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 @@ -316,7 +316,7 @@ Arguments: false (53) VeloxResizeBatches Input [4]: [hash_partition_key#X, n_name#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (54) ColumnarExchange Input [4]: [hash_partition_key#X, n_name#X, sum#X, isEmpty#X] @@ -345,7 +345,7 @@ Arguments: false (60) VeloxResizeBatches Input [2]: [n_name#X, revenue#X] -Arguments: X, X +Arguments: X, X, X (61) ColumnarExchange Input [2]: [n_name#X, revenue#X] 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 ba50cb13105..9ba7f5c7293 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 @@ -48,7 +48,7 @@ Arguments: false (6) VeloxResizeBatches Input [2]: [sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (7) ColumnarExchange Input [2]: [sum#X, isEmpty#X] 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 5fdae3d7334..80aba104a09 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 @@ -286,7 +286,7 @@ Arguments: false (48) VeloxResizeBatches Input [6]: [hash_partition_key#X, supp_nation#X, cust_nation#X, l_year#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [6]: [hash_partition_key#X, supp_nation#X, cust_nation#X, l_year#X, sum#X, isEmpty#X] @@ -315,7 +315,7 @@ Arguments: false (55) VeloxResizeBatches Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X] -Arguments: X, X +Arguments: X, X, X (56) ColumnarExchange Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X] 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 23f58dc4346..468ef60af7f 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 @@ -417,7 +417,7 @@ Arguments: false (71) VeloxResizeBatches Input [6]: [hash_partition_key#X, o_year#X, sum#X, isEmpty#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (72) ColumnarExchange Input [6]: [hash_partition_key#X, o_year#X, sum#X, isEmpty#X, sum#X, isEmpty#X] @@ -450,7 +450,7 @@ Arguments: false (79) VeloxResizeBatches Input [2]: [o_year#X, mkt_share#X] -Arguments: X, X +Arguments: X, X, X (80) ColumnarExchange Input [2]: [o_year#X, mkt_share#X] 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 8c1db077485..f9bde8feb76 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 @@ -310,7 +310,7 @@ Arguments: false (52) VeloxResizeBatches Input [5]: [hash_partition_key#X, nation#X, o_year#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (53) ColumnarExchange Input [5]: [hash_partition_key#X, nation#X, o_year#X, sum#X, isEmpty#X] @@ -339,7 +339,7 @@ Arguments: false (59) VeloxResizeBatches Input [3]: [nation#X, o_year#X, sum_profit#X] -Arguments: X, X +Arguments: X, X, X (60) ColumnarExchange Input [3]: [nation#X, o_year#X, sum_profit#X] 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 fce60c054ea..c02e2a48cfc 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 @@ -60,7 +60,7 @@ Arguments: false (7) VeloxResizeBatches Input [18]: [hash_partition_key#X, l_returnflag#X, l_linestatus#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, count#X, sum#X, count#X, sum#X, count#X, count#X] -Arguments: X, X +Arguments: X, X, X (8) ColumnarExchange Input [18]: [hash_partition_key#X, l_returnflag#X, l_linestatus#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, count#X, sum#X, count#X, sum#X, count#X, count#X] @@ -89,7 +89,7 @@ Arguments: false (14) VeloxResizeBatches 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: X, X +Arguments: X, X, X (15) ColumnarExchange 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] 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 8154ff50d7e..5890cbc6680 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 @@ -215,7 +215,7 @@ Arguments: false (35) VeloxResizeBatches Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_acctbal#X, c_phone#X, n_name#X, c_address#X, c_comment#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (36) ColumnarExchange Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_acctbal#X, c_phone#X, n_name#X, c_address#X, c_comment#X, sum#X, isEmpty#X] 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 1ae5e4c4fa4..c00f14e7976 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 @@ -164,7 +164,7 @@ Arguments: false (25) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_partkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (26) ColumnarExchange Input [4]: [hash_partition_key#X, ps_partkey#X, sum#X, isEmpty#X] @@ -197,7 +197,7 @@ Arguments: false (33) VeloxResizeBatches Input [2]: [ps_partkey#X, value#X] -Arguments: X, X +Arguments: X, X, X (34) ColumnarExchange Input [2]: [ps_partkey#X, value#X] @@ -437,7 +437,7 @@ Arguments: false (77) VeloxResizeBatches Input [2]: [sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (78) ColumnarExchange Input [2]: [sum#X, isEmpty#X] 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 d5dc00e6dc4..39b3eabe3f5 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 @@ -111,7 +111,7 @@ Arguments: false (16) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_shipmode#X, sum#X, sum#X] -Arguments: X, X +Arguments: X, X, X (17) ColumnarExchange Input [4]: [hash_partition_key#X, l_shipmode#X, sum#X, sum#X] @@ -140,7 +140,7 @@ Arguments: false (23) VeloxResizeBatches Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X] -Arguments: X, X +Arguments: X, X, X (24) ColumnarExchange Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X] 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 8848ac70c05..ef137943b56 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 @@ -115,7 +115,7 @@ Arguments: false (15) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_custkey#X, count#X] -Arguments: X, X +Arguments: X, X, X (16) ColumnarExchange Input [3]: [hash_partition_key#X, c_custkey#X, count#X] @@ -159,7 +159,7 @@ Arguments: false (25) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_count#X, count#X] -Arguments: X, X +Arguments: X, X, X (26) ColumnarExchange Input [3]: [hash_partition_key#X, c_count#X, count#X] @@ -188,7 +188,7 @@ Arguments: false (32) VeloxResizeBatches Input [2]: [c_count#X, custdist#X] -Arguments: X, X +Arguments: X, X, X (33) ColumnarExchange Input [2]: [c_count#X, custdist#X] 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 17ce5be290b..9daa590d3e6 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 @@ -100,7 +100,7 @@ Arguments: false (15) VeloxResizeBatches Input [4]: [sum#X, isEmpty#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (16) ColumnarExchange Input [4]: [sum#X, isEmpty#X, sum#X, isEmpty#X] 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 ad3c0445bde..52e6b69a649 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 @@ -102,7 +102,7 @@ Arguments: false (14) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] @@ -145,7 +145,7 @@ Arguments: false (24) VeloxResizeBatches Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X] @@ -297,7 +297,7 @@ Arguments: false (50) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (51) ColumnarExchange Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] 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 3a9b17afd60..b1a109bffae 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 @@ -120,7 +120,7 @@ Arguments: false (15) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, ps_suppkey#X] -Arguments: X, X +Arguments: X, X, X (16) ColumnarExchange Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, ps_suppkey#X] @@ -160,7 +160,7 @@ Arguments: false (24) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, count#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, count#X] @@ -189,7 +189,7 @@ Arguments: false (31) VeloxResizeBatches Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X] 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 b66a80731b7..ebcb8f8b169 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 @@ -61,7 +61,7 @@ Arguments: false (7) VeloxResizeBatches Input [2]: [sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (8) ColumnarExchange Input [2]: [sum#X, isEmpty#X] 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 c3ab86e5acf..67cba428677 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 @@ -142,7 +142,7 @@ Arguments: false (14) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_orderkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [4]: [hash_partition_key#X, l_orderkey#X, sum#X, isEmpty#X] @@ -282,7 +282,7 @@ Arguments: false (47) VeloxResizeBatches Input [8]: [hash_partition_key#X, c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (48) ColumnarExchange Input [8]: [hash_partition_key#X, c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum#X, isEmpty#X] 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 a93b6458dc6..2e596563726 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 @@ -99,7 +99,7 @@ Arguments: false (15) VeloxResizeBatches Input [2]: [sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (16) ColumnarExchange Input [2]: [sum#X, isEmpty#X] 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 ff8473e56f0..fc0ab3578b5 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 @@ -219,7 +219,7 @@ Arguments: false (30) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_partkey#X, l_suppkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (31) ColumnarExchange Input [5]: [hash_partition_key#X, l_partkey#X, l_suppkey#X, sum#X, isEmpty#X] @@ -337,7 +337,7 @@ Arguments: false (58) VeloxResizeBatches Input [2]: [s_name#X, s_address#X] -Arguments: X, X +Arguments: X, X, X (59) ColumnarExchange Input [2]: [s_name#X, s_address#X] 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 5fab9fa9da4..53149849146 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 @@ -308,7 +308,7 @@ Arguments: false (52) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_name#X, count#X] -Arguments: X, X +Arguments: X, X, X (53) ColumnarExchange Input [3]: [hash_partition_key#X, s_name#X, count#X] 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 0c2ce3c56b5..b4bdb60fc9f 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 @@ -98,7 +98,7 @@ Arguments: false (14) VeloxResizeBatches Input [5]: [hash_partition_key#X, cntrycode#X, count#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [5]: [hash_partition_key#X, cntrycode#X, count#X, sum#X, isEmpty#X] @@ -127,7 +127,7 @@ Arguments: false (21) VeloxResizeBatches Input [3]: [cntrycode#X, numcust#X, totacctbal#X] -Arguments: X, X +Arguments: X, X, X (22) ColumnarExchange Input [3]: [cntrycode#X, numcust#X, totacctbal#X] @@ -267,7 +267,7 @@ Arguments: false (46) VeloxResizeBatches Input [2]: [sum#X, count#X] -Arguments: X, X +Arguments: X, X, X (47) ColumnarExchange Input [2]: [sum#X, count#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 26db3004e2e..bf135386897 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 @@ -164,7 +164,7 @@ Arguments: false (26) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_orderkey#X, o_orderdate#X, o_shippriority#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (27) ColumnarExchange Input [6]: [hash_partition_key#X, l_orderkey#X, o_orderdate#X, o_shippriority#X, sum#X, isEmpty#X] 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 a77b48298d3..5059ce985e9 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 @@ -117,7 +117,7 @@ Arguments: false (17) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderpriority#X, count#X] -Arguments: X, X +Arguments: X, X, X (18) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderpriority#X, count#X] @@ -146,7 +146,7 @@ Arguments: false (24) VeloxResizeBatches Input [2]: [o_orderpriority#X, order_count#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [2]: [o_orderpriority#X, order_count#X] 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 60f009173f6..d331a14e487 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 @@ -321,7 +321,7 @@ Arguments: false (53) VeloxResizeBatches Input [4]: [hash_partition_key#X, n_name#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (54) ColumnarExchange Input [4]: [hash_partition_key#X, n_name#X, sum#X, isEmpty#X] @@ -350,7 +350,7 @@ Arguments: false (60) VeloxResizeBatches Input [2]: [n_name#X, revenue#X] -Arguments: X, X +Arguments: X, X, X (61) ColumnarExchange Input [2]: [n_name#X, revenue#X] 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 b85e63e1065..1e1d87db4b2 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 @@ -48,7 +48,7 @@ Arguments: false (6) VeloxResizeBatches Input [2]: [sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (7) ColumnarExchange Input [2]: [sum#X, isEmpty#X] 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 eaa84cfa46c..ea00d75f20d 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 @@ -291,7 +291,7 @@ Arguments: false (48) VeloxResizeBatches Input [6]: [hash_partition_key#X, supp_nation#X, cust_nation#X, l_year#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [6]: [hash_partition_key#X, supp_nation#X, cust_nation#X, l_year#X, sum#X, isEmpty#X] @@ -320,7 +320,7 @@ Arguments: false (55) VeloxResizeBatches Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X] -Arguments: X, X +Arguments: X, X, X (56) ColumnarExchange Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X] 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 1e76f5d7254..f89b2022250 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 @@ -424,7 +424,7 @@ Arguments: false (71) VeloxResizeBatches Input [6]: [hash_partition_key#X, o_year#X, sum#X, isEmpty#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (72) ColumnarExchange Input [6]: [hash_partition_key#X, o_year#X, sum#X, isEmpty#X, sum#X, isEmpty#X] @@ -457,7 +457,7 @@ Arguments: false (79) VeloxResizeBatches Input [2]: [o_year#X, mkt_share#X] -Arguments: X, X +Arguments: X, X, X (80) ColumnarExchange Input [2]: [o_year#X, mkt_share#X] 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 8baec4075ad..1e69b1425a3 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 @@ -315,7 +315,7 @@ Arguments: false (52) VeloxResizeBatches Input [5]: [hash_partition_key#X, nation#X, o_year#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (53) ColumnarExchange Input [5]: [hash_partition_key#X, nation#X, o_year#X, sum#X, isEmpty#X] @@ -344,7 +344,7 @@ Arguments: false (59) VeloxResizeBatches Input [3]: [nation#X, o_year#X, sum_profit#X] -Arguments: X, X +Arguments: X, X, X (60) ColumnarExchange Input [3]: [nation#X, o_year#X, sum_profit#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/1.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/1.txt index fce60c054ea..c02e2a48cfc 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/1.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/1.txt @@ -60,7 +60,7 @@ Arguments: false (7) VeloxResizeBatches Input [18]: [hash_partition_key#X, l_returnflag#X, l_linestatus#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, count#X, sum#X, count#X, sum#X, count#X, count#X] -Arguments: X, X +Arguments: X, X, X (8) ColumnarExchange Input [18]: [hash_partition_key#X, l_returnflag#X, l_linestatus#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, count#X, sum#X, count#X, sum#X, count#X, count#X] @@ -89,7 +89,7 @@ Arguments: false (14) VeloxResizeBatches 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: X, X +Arguments: X, X, X (15) ColumnarExchange 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] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/10.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/10.txt index 8154ff50d7e..5890cbc6680 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/10.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/10.txt @@ -215,7 +215,7 @@ Arguments: false (35) VeloxResizeBatches Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_acctbal#X, c_phone#X, n_name#X, c_address#X, c_comment#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (36) ColumnarExchange Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_acctbal#X, c_phone#X, n_name#X, c_address#X, c_comment#X, sum#X, isEmpty#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/11.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/11.txt index 1ae5e4c4fa4..c00f14e7976 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/11.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/11.txt @@ -164,7 +164,7 @@ Arguments: false (25) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_partkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (26) ColumnarExchange Input [4]: [hash_partition_key#X, ps_partkey#X, sum#X, isEmpty#X] @@ -197,7 +197,7 @@ Arguments: false (33) VeloxResizeBatches Input [2]: [ps_partkey#X, value#X] -Arguments: X, X +Arguments: X, X, X (34) ColumnarExchange Input [2]: [ps_partkey#X, value#X] @@ -437,7 +437,7 @@ Arguments: false (77) VeloxResizeBatches Input [2]: [sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (78) ColumnarExchange Input [2]: [sum#X, isEmpty#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/12.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/12.txt index d5dc00e6dc4..39b3eabe3f5 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/12.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/12.txt @@ -111,7 +111,7 @@ Arguments: false (16) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_shipmode#X, sum#X, sum#X] -Arguments: X, X +Arguments: X, X, X (17) ColumnarExchange Input [4]: [hash_partition_key#X, l_shipmode#X, sum#X, sum#X] @@ -140,7 +140,7 @@ Arguments: false (23) VeloxResizeBatches Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X] -Arguments: X, X +Arguments: X, X, X (24) ColumnarExchange Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/13.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/13.txt index 8848ac70c05..ef137943b56 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/13.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/13.txt @@ -115,7 +115,7 @@ Arguments: false (15) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_custkey#X, count#X] -Arguments: X, X +Arguments: X, X, X (16) ColumnarExchange Input [3]: [hash_partition_key#X, c_custkey#X, count#X] @@ -159,7 +159,7 @@ Arguments: false (25) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_count#X, count#X] -Arguments: X, X +Arguments: X, X, X (26) ColumnarExchange Input [3]: [hash_partition_key#X, c_count#X, count#X] @@ -188,7 +188,7 @@ Arguments: false (32) VeloxResizeBatches Input [2]: [c_count#X, custdist#X] -Arguments: X, X +Arguments: X, X, X (33) ColumnarExchange Input [2]: [c_count#X, custdist#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/14.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/14.txt index 17ce5be290b..9daa590d3e6 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/14.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/14.txt @@ -100,7 +100,7 @@ Arguments: false (15) VeloxResizeBatches Input [4]: [sum#X, isEmpty#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (16) ColumnarExchange Input [4]: [sum#X, isEmpty#X, sum#X, isEmpty#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/15.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/15.txt index ad3c0445bde..52e6b69a649 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/15.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/15.txt @@ -102,7 +102,7 @@ Arguments: false (14) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] @@ -145,7 +145,7 @@ Arguments: false (24) VeloxResizeBatches Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X] @@ -297,7 +297,7 @@ Arguments: false (50) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (51) ColumnarExchange Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/16.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/16.txt index 3a9b17afd60..b1a109bffae 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/16.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/16.txt @@ -120,7 +120,7 @@ Arguments: false (15) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, ps_suppkey#X] -Arguments: X, X +Arguments: X, X, X (16) ColumnarExchange Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, ps_suppkey#X] @@ -160,7 +160,7 @@ Arguments: false (24) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, count#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, count#X] @@ -189,7 +189,7 @@ Arguments: false (31) VeloxResizeBatches Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/17.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/17.txt index b66a80731b7..ebcb8f8b169 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/17.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/17.txt @@ -61,7 +61,7 @@ Arguments: false (7) VeloxResizeBatches Input [2]: [sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (8) ColumnarExchange Input [2]: [sum#X, isEmpty#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/18.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/18.txt index c3ab86e5acf..67cba428677 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/18.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/18.txt @@ -142,7 +142,7 @@ Arguments: false (14) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_orderkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [4]: [hash_partition_key#X, l_orderkey#X, sum#X, isEmpty#X] @@ -282,7 +282,7 @@ Arguments: false (47) VeloxResizeBatches Input [8]: [hash_partition_key#X, c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (48) ColumnarExchange Input [8]: [hash_partition_key#X, c_name#X, c_custkey#X, o_orderkey#X, o_orderdate#X, o_totalprice#X, sum#X, isEmpty#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/19.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/19.txt index a93b6458dc6..2e596563726 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/19.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/19.txt @@ -99,7 +99,7 @@ Arguments: false (15) VeloxResizeBatches Input [2]: [sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (16) ColumnarExchange Input [2]: [sum#X, isEmpty#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/20.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/20.txt index ff8473e56f0..fc0ab3578b5 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/20.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/20.txt @@ -219,7 +219,7 @@ Arguments: false (30) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_partkey#X, l_suppkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (31) ColumnarExchange Input [5]: [hash_partition_key#X, l_partkey#X, l_suppkey#X, sum#X, isEmpty#X] @@ -337,7 +337,7 @@ Arguments: false (58) VeloxResizeBatches Input [2]: [s_name#X, s_address#X] -Arguments: X, X +Arguments: X, X, X (59) ColumnarExchange Input [2]: [s_name#X, s_address#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/21.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/21.txt index 5fab9fa9da4..53149849146 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/21.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/21.txt @@ -308,7 +308,7 @@ Arguments: false (52) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_name#X, count#X] -Arguments: X, X +Arguments: X, X, X (53) ColumnarExchange Input [3]: [hash_partition_key#X, s_name#X, count#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/22.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/22.txt index 0c2ce3c56b5..b4bdb60fc9f 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/22.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/22.txt @@ -98,7 +98,7 @@ Arguments: false (14) VeloxResizeBatches Input [5]: [hash_partition_key#X, cntrycode#X, count#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [5]: [hash_partition_key#X, cntrycode#X, count#X, sum#X, isEmpty#X] @@ -127,7 +127,7 @@ Arguments: false (21) VeloxResizeBatches Input [3]: [cntrycode#X, numcust#X, totacctbal#X] -Arguments: X, X +Arguments: X, X, X (22) ColumnarExchange Input [3]: [cntrycode#X, numcust#X, totacctbal#X] @@ -267,7 +267,7 @@ Arguments: false (46) VeloxResizeBatches Input [2]: [sum#X, count#X] -Arguments: X, X +Arguments: X, X, X (47) ColumnarExchange Input [2]: [sum#X, count#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/3.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/3.txt index 26db3004e2e..bf135386897 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/3.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/3.txt @@ -164,7 +164,7 @@ Arguments: false (26) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_orderkey#X, o_orderdate#X, o_shippriority#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (27) ColumnarExchange Input [6]: [hash_partition_key#X, l_orderkey#X, o_orderdate#X, o_shippriority#X, sum#X, isEmpty#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/4.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/4.txt index a77b48298d3..5059ce985e9 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/4.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/4.txt @@ -117,7 +117,7 @@ Arguments: false (17) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderpriority#X, count#X] -Arguments: X, X +Arguments: X, X, X (18) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderpriority#X, count#X] @@ -146,7 +146,7 @@ Arguments: false (24) VeloxResizeBatches Input [2]: [o_orderpriority#X, order_count#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [2]: [o_orderpriority#X, order_count#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/5.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/5.txt index 60f009173f6..d331a14e487 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/5.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/5.txt @@ -321,7 +321,7 @@ Arguments: false (53) VeloxResizeBatches Input [4]: [hash_partition_key#X, n_name#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (54) ColumnarExchange Input [4]: [hash_partition_key#X, n_name#X, sum#X, isEmpty#X] @@ -350,7 +350,7 @@ Arguments: false (60) VeloxResizeBatches Input [2]: [n_name#X, revenue#X] -Arguments: X, X +Arguments: X, X, X (61) ColumnarExchange Input [2]: [n_name#X, revenue#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/6.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/6.txt index b85e63e1065..1e1d87db4b2 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/6.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/6.txt @@ -48,7 +48,7 @@ Arguments: false (6) VeloxResizeBatches Input [2]: [sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (7) ColumnarExchange Input [2]: [sum#X, isEmpty#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/7.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/7.txt index eaa84cfa46c..ea00d75f20d 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/7.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/7.txt @@ -291,7 +291,7 @@ Arguments: false (48) VeloxResizeBatches Input [6]: [hash_partition_key#X, supp_nation#X, cust_nation#X, l_year#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [6]: [hash_partition_key#X, supp_nation#X, cust_nation#X, l_year#X, sum#X, isEmpty#X] @@ -320,7 +320,7 @@ Arguments: false (55) VeloxResizeBatches Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X] -Arguments: X, X +Arguments: X, X, X (56) ColumnarExchange Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/8.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/8.txt index 1e76f5d7254..f89b2022250 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/8.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/8.txt @@ -424,7 +424,7 @@ Arguments: false (71) VeloxResizeBatches Input [6]: [hash_partition_key#X, o_year#X, sum#X, isEmpty#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (72) ColumnarExchange Input [6]: [hash_partition_key#X, o_year#X, sum#X, isEmpty#X, sum#X, isEmpty#X] @@ -457,7 +457,7 @@ Arguments: false (79) VeloxResizeBatches Input [2]: [o_year#X, mkt_share#X] -Arguments: X, X +Arguments: X, X, X (80) ColumnarExchange Input [2]: [o_year#X, mkt_share#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/9.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/9.txt index 8baec4075ad..1e69b1425a3 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/9.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-bhj/spark35/9.txt @@ -315,7 +315,7 @@ Arguments: false (52) VeloxResizeBatches Input [5]: [hash_partition_key#X, nation#X, o_year#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (53) ColumnarExchange Input [5]: [hash_partition_key#X, nation#X, o_year#X, sum#X, isEmpty#X] @@ -344,7 +344,7 @@ Arguments: false (59) VeloxResizeBatches Input [3]: [nation#X, o_year#X, sum_profit#X] -Arguments: X, X +Arguments: X, X, X (60) ColumnarExchange Input [3]: [nation#X, o_year#X, sum_profit#X] 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 83b14670666..036f344fa36 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 @@ -60,7 +60,7 @@ Arguments: false (7) VeloxResizeBatches Input [18]: [hash_partition_key#X, l_returnflag#X, l_linestatus#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, count#X, sum#X, count#X, sum#X, count#X, count#X] -Arguments: X, X +Arguments: X, X, X (8) ColumnarExchange Input [18]: [hash_partition_key#X, l_returnflag#X, l_linestatus#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, count#X, sum#X, count#X, sum#X, count#X, count#X] @@ -89,7 +89,7 @@ Arguments: false (14) VeloxResizeBatches 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: X, X +Arguments: X, X, X (15) ColumnarExchange 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] 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 eda09c55988..f505de81a95 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 @@ -109,7 +109,7 @@ Arguments: false (5) VeloxResizeBatches Input [8]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [8]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X] @@ -146,7 +146,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] @@ -177,7 +177,7 @@ Arguments: false (22) VeloxResizeBatches Input [9]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X, o_orderkey#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [9]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X, o_orderkey#X] @@ -214,7 +214,7 @@ Arguments: false (31) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [4]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X] @@ -245,7 +245,7 @@ Arguments: false (39) VeloxResizeBatches Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (40) ColumnarExchange Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X, l_extendedprice#X, l_discount#X] @@ -282,7 +282,7 @@ Arguments: false (48) VeloxResizeBatches Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] @@ -324,7 +324,7 @@ Arguments: false (58) VeloxResizeBatches Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_acctbal#X, c_phone#X, n_name#X, c_address#X, c_comment#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (59) ColumnarExchange Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_acctbal#X, c_phone#X, n_name#X, c_address#X, c_comment#X, sum#X, isEmpty#X] 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 3d0aaf9aed7..1a017476e5b 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 @@ -93,7 +93,7 @@ Arguments: false (5) VeloxResizeBatches Input [5]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X, ps_supplycost#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [5]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X, ps_supplycost#X] @@ -130,7 +130,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] @@ -161,7 +161,7 @@ Arguments: false (22) VeloxResizeBatches Input [5]: [hash_partition_key#X, ps_partkey#X, ps_availqty#X, ps_supplycost#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [5]: [hash_partition_key#X, ps_partkey#X, ps_availqty#X, ps_supplycost#X, s_nationkey#X] @@ -198,7 +198,7 @@ Arguments: false (31) VeloxResizeBatches Input [2]: [hash_partition_key#X, n_nationkey#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [2]: [hash_partition_key#X, n_nationkey#X] @@ -240,7 +240,7 @@ Arguments: false (41) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_partkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (42) ColumnarExchange Input [4]: [hash_partition_key#X, ps_partkey#X, sum#X, isEmpty#X] @@ -273,7 +273,7 @@ Arguments: false (49) VeloxResizeBatches Input [2]: [ps_partkey#X, value#X] -Arguments: X, X +Arguments: X, X, X (50) ColumnarExchange Input [2]: [ps_partkey#X, value#X] 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 431e17fd4dd..911b4019937 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 @@ -70,7 +70,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderpriority#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderpriority#X] @@ -107,7 +107,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_shipmode#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_shipmode#X] @@ -149,7 +149,7 @@ Arguments: false (24) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_shipmode#X, sum#X, sum#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [4]: [hash_partition_key#X, l_shipmode#X, sum#X, sum#X] @@ -178,7 +178,7 @@ Arguments: false (31) VeloxResizeBatches Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X] 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 c8ddb543700..45744bb0731 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 @@ -67,7 +67,7 @@ Arguments: false (4) VeloxResizeBatches Input [2]: [hash_partition_key#X, c_custkey#X] -Arguments: X, X +Arguments: X, X, X (5) ColumnarExchange Input [2]: [hash_partition_key#X, c_custkey#X] @@ -104,7 +104,7 @@ Arguments: false (13) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (14) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] @@ -157,7 +157,7 @@ Arguments: false (25) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_count#X, count#X] -Arguments: X, X +Arguments: X, X, X (26) ColumnarExchange Input [3]: [hash_partition_key#X, c_count#X, count#X] @@ -186,7 +186,7 @@ Arguments: false (32) VeloxResizeBatches Input [2]: [c_count#X, custdist#X] -Arguments: X, X +Arguments: X, X, X (33) ColumnarExchange Input [2]: [c_count#X, custdist#X] 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 c54c630e2f1..0f0d8a458c2 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 @@ -57,7 +57,7 @@ Arguments: false (5) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_partkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [4]: [hash_partition_key#X, l_partkey#X, l_extendedprice#X, l_discount#X] @@ -94,7 +94,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, p_partkey#X, p_type#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, p_partkey#X, p_type#X] 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 72522b71eb6..b68b33f2718 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 @@ -67,7 +67,7 @@ Arguments: false (5) VeloxResizeBatches Input [5]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_address#X, s_phone#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [5]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_address#X, s_phone#X] @@ -115,7 +115,7 @@ Arguments: false (16) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (17) ColumnarExchange Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] @@ -157,7 +157,7 @@ Arguments: false (26) VeloxResizeBatches Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X] -Arguments: X, X +Arguments: X, X, X (27) ColumnarExchange Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X] 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 2c41822beee..34aff1782ef 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 @@ -84,7 +84,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X] @@ -121,7 +121,7 @@ Arguments: false (14) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_partkey#X, p_brand#X, p_type#X, p_size#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [5]: [hash_partition_key#X, p_partkey#X, p_brand#X, p_type#X, p_size#X] @@ -163,7 +163,7 @@ Arguments: false (24) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, ps_suppkey#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, ps_suppkey#X] @@ -203,7 +203,7 @@ Arguments: false (33) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, count#X] -Arguments: X, X +Arguments: X, X, X (34) ColumnarExchange Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, count#X] @@ -232,7 +232,7 @@ Arguments: false (40) VeloxResizeBatches Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X] -Arguments: X, X +Arguments: X, X, X (41) ColumnarExchange Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X] 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 30fd4b0b112..5fbc2db77ad 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 @@ -79,7 +79,7 @@ Arguments: false (5) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_partkey#X, l_quantity#X, l_extendedprice#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [4]: [hash_partition_key#X, l_partkey#X, l_quantity#X, l_extendedprice#X] @@ -116,7 +116,7 @@ Arguments: false (14) VeloxResizeBatches Input [2]: [hash_partition_key#X, p_partkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [2]: [hash_partition_key#X, p_partkey#X] @@ -169,7 +169,7 @@ Arguments: false (26) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_partkey#X, sum#X, count#X] -Arguments: X, X +Arguments: X, X, X (27) ColumnarExchange Input [4]: [hash_partition_key#X, l_partkey#X, sum#X, count#X] 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 dd4cad538e2..cbc770042b0 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 @@ -119,7 +119,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_custkey#X, c_name#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, c_custkey#X, c_name#X] @@ -156,7 +156,7 @@ Arguments: false (14) VeloxResizeBatches Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_totalprice#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_totalprice#X, o_orderdate#X] @@ -195,7 +195,7 @@ Arguments: false (23) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_orderkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (24) ColumnarExchange Input [4]: [hash_partition_key#X, l_orderkey#X, sum#X, isEmpty#X] @@ -241,7 +241,7 @@ Arguments: false (34) VeloxResizeBatches Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_totalprice#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (35) ColumnarExchange Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_totalprice#X, o_orderdate#X] @@ -272,7 +272,7 @@ Arguments: false (42) VeloxResizeBatches Input [6]: [hash_partition_key#X, c_custkey#X, c_name#X, o_orderkey#X, o_totalprice#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (43) ColumnarExchange Input [6]: [hash_partition_key#X, c_custkey#X, c_name#X, o_orderkey#X, o_totalprice#X, o_orderdate#X] @@ -309,7 +309,7 @@ Arguments: false (51) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_quantity#X] -Arguments: X, X +Arguments: X, X, X (52) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_quantity#X] 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 c494adafc57..df31b88fb4a 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 @@ -56,7 +56,7 @@ Arguments: false (5) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_partkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [5]: [hash_partition_key#X, l_partkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] @@ -93,7 +93,7 @@ Arguments: false (14) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_partkey#X, p_brand#X, p_size#X, p_container#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [5]: [hash_partition_key#X, p_partkey#X, p_brand#X, p_size#X, p_container#X] 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 13c10a7bba2..9865eab3eef 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 @@ -147,7 +147,7 @@ Arguments: false (5) VeloxResizeBatches Input [5]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_address#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [5]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_address#X, s_nationkey#X] @@ -184,7 +184,7 @@ Arguments: false (14) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X] @@ -221,7 +221,7 @@ Arguments: false (23) VeloxResizeBatches Input [2]: [hash_partition_key#X, p_partkey#X] -Arguments: X, X +Arguments: X, X, X (24) ColumnarExchange Input [2]: [hash_partition_key#X, p_partkey#X] @@ -252,7 +252,7 @@ Arguments: false (31) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X] @@ -289,7 +289,7 @@ Arguments: false (40) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_partkey#X, l_suppkey#X, l_quantity#X] -Arguments: X, X +Arguments: X, X, X (41) ColumnarExchange Input [4]: [hash_partition_key#X, l_partkey#X, l_suppkey#X, l_quantity#X] @@ -348,7 +348,7 @@ Arguments: false (55) VeloxResizeBatches Input [4]: [hash_partition_key#X, (0.5 * sum(l_quantity))#X, l_partkey#X, l_suppkey#X] -Arguments: X, X +Arguments: X, X, X (56) ColumnarExchange Input [4]: [hash_partition_key#X, (0.5 * sum(l_quantity))#X, l_partkey#X, l_suppkey#X] @@ -379,7 +379,7 @@ Arguments: false (63) VeloxResizeBatches Input [2]: [hash_partition_key#X, ps_suppkey#X] -Arguments: X, X +Arguments: X, X, X (64) ColumnarExchange Input [2]: [hash_partition_key#X, ps_suppkey#X] @@ -410,7 +410,7 @@ Arguments: false (71) VeloxResizeBatches Input [4]: [hash_partition_key#X, s_name#X, s_address#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (72) ColumnarExchange Input [4]: [hash_partition_key#X, s_name#X, s_address#X, s_nationkey#X] @@ -447,7 +447,7 @@ Arguments: false (80) VeloxResizeBatches Input [2]: [hash_partition_key#X, n_nationkey#X] -Arguments: X, X +Arguments: X, X, X (81) ColumnarExchange Input [2]: [hash_partition_key#X, n_nationkey#X] @@ -478,7 +478,7 @@ Arguments: false (88) VeloxResizeBatches Input [2]: [s_name#X, s_address#X] -Arguments: X, X +Arguments: X, X, X (89) ColumnarExchange Input [2]: [s_name#X, s_address#X] 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 e72762dd9bf..99bd2d0b536 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 @@ -141,7 +141,7 @@ Arguments: false (5) VeloxResizeBatches Input [4]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [4]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_nationkey#X] @@ -178,7 +178,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] @@ -210,7 +210,7 @@ Arguments: false (22) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] @@ -252,7 +252,7 @@ Arguments: false (32) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] -Arguments: X, X +Arguments: X, X, X (33) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] @@ -283,7 +283,7 @@ Arguments: false (40) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] -Arguments: X, X +Arguments: X, X, X (41) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] @@ -314,7 +314,7 @@ Arguments: false (48) VeloxResizeBatches Input [4]: [hash_partition_key#X, s_name#X, s_nationkey#X, l_orderkey#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [4]: [hash_partition_key#X, s_name#X, s_nationkey#X, l_orderkey#X] @@ -351,7 +351,7 @@ Arguments: false (57) VeloxResizeBatches Input [2]: [hash_partition_key#X, o_orderkey#X] -Arguments: X, X +Arguments: X, X, X (58) ColumnarExchange Input [2]: [hash_partition_key#X, o_orderkey#X] @@ -382,7 +382,7 @@ Arguments: false (65) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_name#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (66) ColumnarExchange Input [3]: [hash_partition_key#X, s_name#X, s_nationkey#X] @@ -419,7 +419,7 @@ Arguments: false (74) VeloxResizeBatches Input [2]: [hash_partition_key#X, n_nationkey#X] -Arguments: X, X +Arguments: X, X, X (75) ColumnarExchange Input [2]: [hash_partition_key#X, n_nationkey#X] @@ -461,7 +461,7 @@ Arguments: false (84) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_name#X, count#X] -Arguments: X, X +Arguments: X, X, X (85) ColumnarExchange Input [3]: [hash_partition_key#X, s_name#X, count#X] 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 81af91c0ee2..506454ed247 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 @@ -67,7 +67,7 @@ Arguments: false (5) VeloxResizeBatches Input [4]: [hash_partition_key#X, c_custkey#X, c_phone#X, c_acctbal#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [4]: [hash_partition_key#X, c_custkey#X, c_phone#X, c_acctbal#X] @@ -99,7 +99,7 @@ Arguments: false (13) VeloxResizeBatches Input [2]: [hash_partition_key#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (14) ColumnarExchange Input [2]: [hash_partition_key#X, o_custkey#X] @@ -141,7 +141,7 @@ Arguments: false (23) VeloxResizeBatches Input [5]: [hash_partition_key#X, cntrycode#X, count#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (24) ColumnarExchange Input [5]: [hash_partition_key#X, cntrycode#X, count#X, sum#X, isEmpty#X] @@ -170,7 +170,7 @@ Arguments: false (30) VeloxResizeBatches Input [3]: [cntrycode#X, numcust#X, totacctbal#X] -Arguments: X, X +Arguments: X, X, X (31) ColumnarExchange Input [3]: [cntrycode#X, numcust#X, totacctbal#X] 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 c633118a762..06480cda6f5 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 @@ -81,7 +81,7 @@ Arguments: false (5) VeloxResizeBatches Input [2]: [hash_partition_key#X, c_custkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [2]: [hash_partition_key#X, c_custkey#X] @@ -118,7 +118,7 @@ Arguments: false (14) VeloxResizeBatches Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_orderdate#X, o_shippriority#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_orderdate#X, o_shippriority#X] @@ -149,7 +149,7 @@ Arguments: false (22) VeloxResizeBatches Input [4]: [hash_partition_key#X, o_orderkey#X, o_orderdate#X, o_shippriority#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [4]: [hash_partition_key#X, o_orderkey#X, o_orderdate#X, o_shippriority#X] @@ -186,7 +186,7 @@ Arguments: false (31) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [4]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X] 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 40cfa020ce7..63e7c260c19 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 @@ -71,7 +71,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderpriority#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderpriority#X] @@ -108,7 +108,7 @@ Arguments: false (14) VeloxResizeBatches Input [2]: [hash_partition_key#X, l_orderkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [2]: [hash_partition_key#X, l_orderkey#X] @@ -150,7 +150,7 @@ Arguments: false (24) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderpriority#X, count#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderpriority#X, count#X] @@ -179,7 +179,7 @@ Arguments: false (31) VeloxResizeBatches Input [2]: [o_orderpriority#X, order_count#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [2]: [o_orderpriority#X, order_count#X] 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 17629cc3463..ee30bc5f1f0 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 @@ -155,7 +155,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] @@ -192,7 +192,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] @@ -223,7 +223,7 @@ Arguments: false (22) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_nationkey#X, o_orderkey#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [3]: [hash_partition_key#X, c_nationkey#X, o_orderkey#X] @@ -260,7 +260,7 @@ Arguments: false (31) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [5]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] @@ -291,7 +291,7 @@ Arguments: false (39) VeloxResizeBatches Input [5]: [hash_partition_key#X, c_nationkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (40) ColumnarExchange Input [5]: [hash_partition_key#X, c_nationkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] @@ -328,7 +328,7 @@ Arguments: false (48) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] @@ -359,7 +359,7 @@ Arguments: false (56) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (57) ColumnarExchange Input [4]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X] @@ -396,7 +396,7 @@ Arguments: false (65) VeloxResizeBatches Input [4]: [hash_partition_key#X, n_nationkey#X, n_name#X, n_regionkey#X] -Arguments: X, X +Arguments: X, X, X (66) ColumnarExchange Input [4]: [hash_partition_key#X, n_nationkey#X, n_name#X, n_regionkey#X] @@ -427,7 +427,7 @@ Arguments: false (73) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, n_name#X, n_regionkey#X] -Arguments: X, X +Arguments: X, X, X (74) ColumnarExchange Input [5]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, n_name#X, n_regionkey#X] @@ -464,7 +464,7 @@ Arguments: false (82) VeloxResizeBatches Input [2]: [hash_partition_key#X, r_regionkey#X] -Arguments: X, X +Arguments: X, X, X (83) ColumnarExchange Input [2]: [hash_partition_key#X, r_regionkey#X] @@ -506,7 +506,7 @@ Arguments: false (92) VeloxResizeBatches Input [4]: [hash_partition_key#X, n_name#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (93) ColumnarExchange Input [4]: [hash_partition_key#X, n_name#X, sum#X, isEmpty#X] @@ -535,7 +535,7 @@ Arguments: false (99) VeloxResizeBatches Input [2]: [n_name#X, revenue#X] -Arguments: X, X +Arguments: X, X, X (100) ColumnarExchange Input [2]: [n_name#X, revenue#X] 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 f5ca77c73ed..4b72ce731f1 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 @@ -48,7 +48,7 @@ Arguments: false (6) VeloxResizeBatches Input [2]: [sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (7) ColumnarExchange Input [2]: [sum#X, isEmpty#X] 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 f3ec7ef3a62..0ecd3761dfc 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 @@ -149,7 +149,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] @@ -186,7 +186,7 @@ Arguments: false (14) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [6]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X] @@ -217,7 +217,7 @@ Arguments: false (22) VeloxResizeBatches Input [6]: [hash_partition_key#X, s_nationkey#X, l_orderkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [6]: [hash_partition_key#X, s_nationkey#X, l_orderkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X] @@ -254,7 +254,7 @@ Arguments: false (31) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] @@ -285,7 +285,7 @@ Arguments: false (39) VeloxResizeBatches Input [6]: [hash_partition_key#X, s_nationkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (40) ColumnarExchange Input [6]: [hash_partition_key#X, s_nationkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X, o_custkey#X] @@ -322,7 +322,7 @@ Arguments: false (48) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] @@ -353,7 +353,7 @@ Arguments: false (56) VeloxResizeBatches Input [6]: [hash_partition_key#X, s_nationkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X, c_nationkey#X] -Arguments: X, X +Arguments: X, X, X (57) ColumnarExchange Input [6]: [hash_partition_key#X, s_nationkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X, c_nationkey#X] @@ -390,7 +390,7 @@ Arguments: false (65) VeloxResizeBatches Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (66) ColumnarExchange Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] @@ -421,7 +421,7 @@ Arguments: false (73) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, l_shipdate#X, c_nationkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (74) ColumnarExchange Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, l_shipdate#X, c_nationkey#X, n_name#X] @@ -476,7 +476,7 @@ Arguments: false (87) VeloxResizeBatches Input [6]: [hash_partition_key#X, supp_nation#X, cust_nation#X, l_year#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (88) ColumnarExchange Input [6]: [hash_partition_key#X, supp_nation#X, cust_nation#X, l_year#X, sum#X, isEmpty#X] @@ -505,7 +505,7 @@ Arguments: false (94) VeloxResizeBatches Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X] -Arguments: X, X +Arguments: X, X, X (95) ColumnarExchange Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X] 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 53c58577592..746f2ef7d79 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 @@ -198,7 +198,7 @@ Arguments: false (5) VeloxResizeBatches Input [2]: [hash_partition_key#X, p_partkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [2]: [hash_partition_key#X, p_partkey#X] @@ -235,7 +235,7 @@ Arguments: false (14) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [6]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] @@ -266,7 +266,7 @@ Arguments: false (22) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [5]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] @@ -303,7 +303,7 @@ Arguments: false (31) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] @@ -334,7 +334,7 @@ Arguments: false (39) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (40) ColumnarExchange Input [5]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X, s_nationkey#X] @@ -371,7 +371,7 @@ Arguments: false (48) VeloxResizeBatches Input [4]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [4]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_orderdate#X] @@ -402,7 +402,7 @@ Arguments: false (56) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_custkey#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (57) ColumnarExchange Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_custkey#X, o_orderdate#X] @@ -439,7 +439,7 @@ Arguments: false (65) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] -Arguments: X, X +Arguments: X, X, X (66) ColumnarExchange Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] @@ -470,7 +470,7 @@ Arguments: false (73) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_orderdate#X, c_nationkey#X] -Arguments: X, X +Arguments: X, X, X (74) ColumnarExchange Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_orderdate#X, c_nationkey#X] @@ -507,7 +507,7 @@ Arguments: false (82) VeloxResizeBatches Input [3]: [hash_partition_key#X, n_nationkey#X, n_regionkey#X] -Arguments: X, X +Arguments: X, X, X (83) ColumnarExchange Input [3]: [hash_partition_key#X, n_nationkey#X, n_regionkey#X] @@ -538,7 +538,7 @@ Arguments: false (90) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_orderdate#X, n_regionkey#X] -Arguments: X, X +Arguments: X, X, X (91) ColumnarExchange Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_orderdate#X, n_regionkey#X] @@ -575,7 +575,7 @@ Arguments: false (99) VeloxResizeBatches Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (100) ColumnarExchange Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] @@ -606,7 +606,7 @@ Arguments: false (107) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, o_orderdate#X, n_regionkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (108) ColumnarExchange Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, o_orderdate#X, n_regionkey#X, n_name#X] @@ -643,7 +643,7 @@ Arguments: false (116) VeloxResizeBatches Input [2]: [hash_partition_key#X, r_regionkey#X] -Arguments: X, X +Arguments: X, X, X (117) ColumnarExchange Input [2]: [hash_partition_key#X, r_regionkey#X] @@ -685,7 +685,7 @@ Arguments: false (126) VeloxResizeBatches Input [6]: [hash_partition_key#X, o_year#X, sum#X, isEmpty#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (127) ColumnarExchange Input [6]: [hash_partition_key#X, o_year#X, sum#X, isEmpty#X, sum#X, isEmpty#X] @@ -718,7 +718,7 @@ Arguments: false (134) VeloxResizeBatches Input [2]: [o_year#X, mkt_share#X] -Arguments: X, X +Arguments: X, X, X (135) ColumnarExchange Input [2]: [o_year#X, mkt_share#X] 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 6cca8ba5a47..732fd8428ce 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 @@ -154,7 +154,7 @@ Arguments: false (5) VeloxResizeBatches Input [2]: [hash_partition_key#X, p_partkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [2]: [hash_partition_key#X, p_partkey#X] @@ -191,7 +191,7 @@ Arguments: false (14) VeloxResizeBatches Input [7]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [7]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] @@ -222,7 +222,7 @@ Arguments: false (22) VeloxResizeBatches Input [7]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [7]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] @@ -259,7 +259,7 @@ Arguments: false (31) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] @@ -290,7 +290,7 @@ Arguments: false (39) VeloxResizeBatches Input [8]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (40) ColumnarExchange Input [8]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X] @@ -327,7 +327,7 @@ Arguments: false (48) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_supplycost#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_supplycost#X] @@ -358,7 +358,7 @@ Arguments: false (56) VeloxResizeBatches Input [7]: [hash_partition_key#X, l_orderkey#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X, ps_supplycost#X] -Arguments: X, X +Arguments: X, X, X (57) ColumnarExchange Input [7]: [hash_partition_key#X, l_orderkey#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X, ps_supplycost#X] @@ -395,7 +395,7 @@ Arguments: false (65) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (66) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderdate#X] @@ -426,7 +426,7 @@ Arguments: false (73) VeloxResizeBatches Input [7]: [hash_partition_key#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X, ps_supplycost#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (74) ColumnarExchange Input [7]: [hash_partition_key#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X, ps_supplycost#X, o_orderdate#X] @@ -463,7 +463,7 @@ Arguments: false (82) VeloxResizeBatches Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (83) ColumnarExchange Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] @@ -505,7 +505,7 @@ Arguments: false (92) VeloxResizeBatches Input [5]: [hash_partition_key#X, nation#X, o_year#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (93) ColumnarExchange Input [5]: [hash_partition_key#X, nation#X, o_year#X, sum#X, isEmpty#X] @@ -534,7 +534,7 @@ Arguments: false (99) VeloxResizeBatches Input [3]: [nation#X, o_year#X, sum_profit#X] -Arguments: X, X +Arguments: X, X, X (100) ColumnarExchange Input [3]: [nation#X, o_year#X, sum_profit#X] 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 9c144ceed8a..06cd41c4878 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 @@ -60,7 +60,7 @@ Arguments: false (7) VeloxResizeBatches Input [18]: [hash_partition_key#X, l_returnflag#X, l_linestatus#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, count#X, sum#X, count#X, sum#X, count#X, count#X] -Arguments: X, X +Arguments: X, X, X (8) ColumnarExchange Input [18]: [hash_partition_key#X, l_returnflag#X, l_linestatus#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, count#X, sum#X, count#X, sum#X, count#X, count#X] @@ -89,7 +89,7 @@ Arguments: false (14) VeloxResizeBatches 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: X, X +Arguments: X, X, X (15) ColumnarExchange 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] 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 4d00178618b..538fd7cf4fa 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 @@ -109,7 +109,7 @@ Arguments: false (5) VeloxResizeBatches Input [8]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [8]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X] @@ -146,7 +146,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] @@ -177,7 +177,7 @@ Arguments: false (22) VeloxResizeBatches Input [9]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X, o_orderkey#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [9]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X, o_orderkey#X] @@ -214,7 +214,7 @@ Arguments: false (31) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [4]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X] @@ -245,7 +245,7 @@ Arguments: false (39) VeloxResizeBatches Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (40) ColumnarExchange Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X, l_extendedprice#X, l_discount#X] @@ -282,7 +282,7 @@ Arguments: false (48) VeloxResizeBatches Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] @@ -324,7 +324,7 @@ Arguments: false (58) VeloxResizeBatches Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_acctbal#X, c_phone#X, n_name#X, c_address#X, c_comment#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (59) ColumnarExchange Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_acctbal#X, c_phone#X, n_name#X, c_address#X, c_comment#X, sum#X, isEmpty#X] 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 69dc6a18b16..1b84f9dca48 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 @@ -93,7 +93,7 @@ Arguments: false (5) VeloxResizeBatches Input [5]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X, ps_supplycost#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [5]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X, ps_supplycost#X] @@ -130,7 +130,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] @@ -161,7 +161,7 @@ Arguments: false (22) VeloxResizeBatches Input [5]: [hash_partition_key#X, ps_partkey#X, ps_availqty#X, ps_supplycost#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [5]: [hash_partition_key#X, ps_partkey#X, ps_availqty#X, ps_supplycost#X, s_nationkey#X] @@ -198,7 +198,7 @@ Arguments: false (31) VeloxResizeBatches Input [2]: [hash_partition_key#X, n_nationkey#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [2]: [hash_partition_key#X, n_nationkey#X] @@ -240,7 +240,7 @@ Arguments: false (41) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_partkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (42) ColumnarExchange Input [4]: [hash_partition_key#X, ps_partkey#X, sum#X, isEmpty#X] @@ -273,7 +273,7 @@ Arguments: false (49) VeloxResizeBatches Input [2]: [ps_partkey#X, value#X] -Arguments: X, X +Arguments: X, X, X (50) ColumnarExchange Input [2]: [ps_partkey#X, value#X] @@ -495,7 +495,7 @@ Arguments: false (87) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_suppkey#X, ps_availqty#X, ps_supplycost#X] -Arguments: X, X +Arguments: X, X, X (88) ColumnarExchange Input [4]: [hash_partition_key#X, ps_suppkey#X, ps_availqty#X, ps_supplycost#X] @@ -539,7 +539,7 @@ Arguments: false (99) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_availqty#X, ps_supplycost#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (100) ColumnarExchange Input [4]: [hash_partition_key#X, ps_availqty#X, ps_supplycost#X, s_nationkey#X] 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 0db41527d8e..d403753fed1 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 @@ -70,7 +70,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderpriority#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderpriority#X] @@ -107,7 +107,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_shipmode#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_shipmode#X] @@ -149,7 +149,7 @@ Arguments: false (24) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_shipmode#X, sum#X, sum#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [4]: [hash_partition_key#X, l_shipmode#X, sum#X, sum#X] @@ -178,7 +178,7 @@ Arguments: false (31) VeloxResizeBatches Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X] 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 7c3509c3e72..15583a25718 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 @@ -67,7 +67,7 @@ Arguments: false (4) VeloxResizeBatches Input [2]: [hash_partition_key#X, c_custkey#X] -Arguments: X, X +Arguments: X, X, X (5) ColumnarExchange Input [2]: [hash_partition_key#X, c_custkey#X] @@ -104,7 +104,7 @@ Arguments: false (13) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (14) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] @@ -157,7 +157,7 @@ Arguments: false (25) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_count#X, count#X] -Arguments: X, X +Arguments: X, X, X (26) ColumnarExchange Input [3]: [hash_partition_key#X, c_count#X, count#X] @@ -186,7 +186,7 @@ Arguments: false (32) VeloxResizeBatches Input [2]: [c_count#X, custdist#X] -Arguments: X, X +Arguments: X, X, X (33) ColumnarExchange Input [2]: [c_count#X, custdist#X] 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 f9b6d7180ea..93eef0dced8 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 @@ -57,7 +57,7 @@ Arguments: false (5) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_partkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [4]: [hash_partition_key#X, l_partkey#X, l_extendedprice#X, l_discount#X] @@ -94,7 +94,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, p_partkey#X, p_type#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, p_partkey#X, p_type#X] 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 debde24c32d..b42bad54945 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 @@ -66,7 +66,7 @@ Arguments: false (5) VeloxResizeBatches Input [5]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_address#X, s_phone#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [5]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_address#X, s_phone#X] @@ -114,7 +114,7 @@ Arguments: false (16) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (17) ColumnarExchange Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] @@ -156,7 +156,7 @@ Arguments: false (26) VeloxResizeBatches Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X] -Arguments: X, X +Arguments: X, X, X (27) ColumnarExchange Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X] @@ -315,7 +315,7 @@ Arguments: false (54) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (55) ColumnarExchange Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] 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 cac61db4a6b..480ed4cc718 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 @@ -84,7 +84,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X] @@ -121,7 +121,7 @@ Arguments: false (14) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_partkey#X, p_brand#X, p_type#X, p_size#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [5]: [hash_partition_key#X, p_partkey#X, p_brand#X, p_type#X, p_size#X] @@ -163,7 +163,7 @@ Arguments: false (24) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, ps_suppkey#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, ps_suppkey#X] @@ -203,7 +203,7 @@ Arguments: false (33) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, count#X] -Arguments: X, X +Arguments: X, X, X (34) ColumnarExchange Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, count#X] @@ -232,7 +232,7 @@ Arguments: false (40) VeloxResizeBatches Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X] -Arguments: X, X +Arguments: X, X, X (41) ColumnarExchange Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X] 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 843ce9b39eb..5949193c840 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 @@ -79,7 +79,7 @@ Arguments: false (5) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_partkey#X, l_quantity#X, l_extendedprice#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [4]: [hash_partition_key#X, l_partkey#X, l_quantity#X, l_extendedprice#X] @@ -116,7 +116,7 @@ Arguments: false (14) VeloxResizeBatches Input [2]: [hash_partition_key#X, p_partkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [2]: [hash_partition_key#X, p_partkey#X] @@ -169,7 +169,7 @@ Arguments: false (26) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_partkey#X, sum#X, count#X] -Arguments: X, X +Arguments: X, X, X (27) ColumnarExchange Input [4]: [hash_partition_key#X, l_partkey#X, sum#X, count#X] 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 1119ddcf80b..61232450cc4 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 @@ -119,7 +119,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_custkey#X, c_name#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, c_custkey#X, c_name#X] @@ -156,7 +156,7 @@ Arguments: false (14) VeloxResizeBatches Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_totalprice#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_totalprice#X, o_orderdate#X] @@ -195,7 +195,7 @@ Arguments: false (23) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_orderkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (24) ColumnarExchange Input [4]: [hash_partition_key#X, l_orderkey#X, sum#X, isEmpty#X] @@ -241,7 +241,7 @@ Arguments: false (34) VeloxResizeBatches Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_totalprice#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (35) ColumnarExchange Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_totalprice#X, o_orderdate#X] @@ -272,7 +272,7 @@ Arguments: false (42) VeloxResizeBatches Input [6]: [hash_partition_key#X, c_custkey#X, c_name#X, o_orderkey#X, o_totalprice#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (43) ColumnarExchange Input [6]: [hash_partition_key#X, c_custkey#X, c_name#X, o_orderkey#X, o_totalprice#X, o_orderdate#X] @@ -309,7 +309,7 @@ Arguments: false (51) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_quantity#X] -Arguments: X, X +Arguments: X, X, X (52) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_quantity#X] 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 d0e514af013..c1d60b54d8a 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 @@ -56,7 +56,7 @@ Arguments: false (5) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_partkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [5]: [hash_partition_key#X, l_partkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] @@ -93,7 +93,7 @@ Arguments: false (14) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_partkey#X, p_brand#X, p_size#X, p_container#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [5]: [hash_partition_key#X, p_partkey#X, p_brand#X, p_size#X, p_container#X] 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 9a2c56040b3..607b1f46c0d 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 @@ -146,7 +146,7 @@ Arguments: false (5) VeloxResizeBatches Input [5]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_address#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [5]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_address#X, s_nationkey#X] @@ -183,7 +183,7 @@ Arguments: false (14) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X] @@ -220,7 +220,7 @@ Arguments: false (23) VeloxResizeBatches Input [2]: [hash_partition_key#X, p_partkey#X] -Arguments: X, X +Arguments: X, X, X (24) ColumnarExchange Input [2]: [hash_partition_key#X, p_partkey#X] @@ -251,7 +251,7 @@ Arguments: false (31) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X] @@ -288,7 +288,7 @@ Arguments: false (40) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_partkey#X, l_suppkey#X, l_quantity#X] -Arguments: X, X +Arguments: X, X, X (41) ColumnarExchange Input [4]: [hash_partition_key#X, l_partkey#X, l_suppkey#X, l_quantity#X] @@ -347,7 +347,7 @@ Arguments: false (55) VeloxResizeBatches Input [4]: [hash_partition_key#X, (0.5 * sum(l_quantity))#X, l_partkey#X, l_suppkey#X] -Arguments: X, X +Arguments: X, X, X (56) ColumnarExchange Input [4]: [hash_partition_key#X, (0.5 * sum(l_quantity))#X, l_partkey#X, l_suppkey#X] @@ -378,7 +378,7 @@ Arguments: false (63) VeloxResizeBatches Input [2]: [hash_partition_key#X, ps_suppkey#X] -Arguments: X, X +Arguments: X, X, X (64) ColumnarExchange Input [2]: [hash_partition_key#X, ps_suppkey#X] @@ -409,7 +409,7 @@ Arguments: false (71) VeloxResizeBatches Input [4]: [hash_partition_key#X, s_name#X, s_address#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (72) ColumnarExchange Input [4]: [hash_partition_key#X, s_name#X, s_address#X, s_nationkey#X] @@ -446,7 +446,7 @@ Arguments: false (80) VeloxResizeBatches Input [2]: [hash_partition_key#X, n_nationkey#X] -Arguments: X, X +Arguments: X, X, X (81) ColumnarExchange Input [2]: [hash_partition_key#X, n_nationkey#X] @@ -477,7 +477,7 @@ Arguments: false (88) VeloxResizeBatches Input [2]: [s_name#X, s_address#X] -Arguments: X, X +Arguments: X, X, X (89) ColumnarExchange Input [2]: [s_name#X, s_address#X] 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 a675841a475..448c9817d27 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 @@ -140,7 +140,7 @@ Arguments: false (5) VeloxResizeBatches Input [4]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [4]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_nationkey#X] @@ -177,7 +177,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] @@ -209,7 +209,7 @@ Arguments: false (22) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] @@ -251,7 +251,7 @@ Arguments: false (32) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] -Arguments: X, X +Arguments: X, X, X (33) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] @@ -282,7 +282,7 @@ Arguments: false (40) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] -Arguments: X, X +Arguments: X, X, X (41) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] @@ -313,7 +313,7 @@ Arguments: false (48) VeloxResizeBatches Input [4]: [hash_partition_key#X, s_name#X, s_nationkey#X, l_orderkey#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [4]: [hash_partition_key#X, s_name#X, s_nationkey#X, l_orderkey#X] @@ -350,7 +350,7 @@ Arguments: false (57) VeloxResizeBatches Input [2]: [hash_partition_key#X, o_orderkey#X] -Arguments: X, X +Arguments: X, X, X (58) ColumnarExchange Input [2]: [hash_partition_key#X, o_orderkey#X] @@ -381,7 +381,7 @@ Arguments: false (65) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_name#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (66) ColumnarExchange Input [3]: [hash_partition_key#X, s_name#X, s_nationkey#X] @@ -418,7 +418,7 @@ Arguments: false (74) VeloxResizeBatches Input [2]: [hash_partition_key#X, n_nationkey#X] -Arguments: X, X +Arguments: X, X, X (75) ColumnarExchange Input [2]: [hash_partition_key#X, n_nationkey#X] @@ -460,7 +460,7 @@ Arguments: false (84) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_name#X, count#X] -Arguments: X, X +Arguments: X, X, X (85) ColumnarExchange Input [3]: [hash_partition_key#X, s_name#X, count#X] 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 c48c13779d6..9d4c4ea0f99 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 @@ -67,7 +67,7 @@ Arguments: false (5) VeloxResizeBatches Input [4]: [hash_partition_key#X, c_custkey#X, c_phone#X, c_acctbal#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [4]: [hash_partition_key#X, c_custkey#X, c_phone#X, c_acctbal#X] @@ -99,7 +99,7 @@ Arguments: false (13) VeloxResizeBatches Input [2]: [hash_partition_key#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (14) ColumnarExchange Input [2]: [hash_partition_key#X, o_custkey#X] @@ -141,7 +141,7 @@ Arguments: false (23) VeloxResizeBatches Input [5]: [hash_partition_key#X, cntrycode#X, count#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (24) ColumnarExchange Input [5]: [hash_partition_key#X, cntrycode#X, count#X, sum#X, isEmpty#X] @@ -170,7 +170,7 @@ Arguments: false (30) VeloxResizeBatches Input [3]: [cntrycode#X, numcust#X, totacctbal#X] -Arguments: X, X +Arguments: X, X, X (31) ColumnarExchange Input [3]: [cntrycode#X, numcust#X, totacctbal#X] @@ -321,7 +321,7 @@ Arguments: false (58) VeloxResizeBatches Input [2]: [sum#X, count#X] -Arguments: X, X +Arguments: X, X, X (59) ColumnarExchange Input [2]: [sum#X, count#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 ae8f0749119..79465ef3d71 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 @@ -81,7 +81,7 @@ Arguments: false (5) VeloxResizeBatches Input [2]: [hash_partition_key#X, c_custkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [2]: [hash_partition_key#X, c_custkey#X] @@ -118,7 +118,7 @@ Arguments: false (14) VeloxResizeBatches Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_orderdate#X, o_shippriority#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_orderdate#X, o_shippriority#X] @@ -149,7 +149,7 @@ Arguments: false (22) VeloxResizeBatches Input [4]: [hash_partition_key#X, o_orderkey#X, o_orderdate#X, o_shippriority#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [4]: [hash_partition_key#X, o_orderkey#X, o_orderdate#X, o_shippriority#X] @@ -186,7 +186,7 @@ Arguments: false (31) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [4]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X] 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 23fb123956d..d85d589a868 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 @@ -71,7 +71,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderpriority#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderpriority#X] @@ -108,7 +108,7 @@ Arguments: false (14) VeloxResizeBatches Input [2]: [hash_partition_key#X, l_orderkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [2]: [hash_partition_key#X, l_orderkey#X] @@ -150,7 +150,7 @@ Arguments: false (24) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderpriority#X, count#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderpriority#X, count#X] @@ -179,7 +179,7 @@ Arguments: false (31) VeloxResizeBatches Input [2]: [o_orderpriority#X, order_count#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [2]: [o_orderpriority#X, order_count#X] 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 16ed688f0be..64529ccecaa 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 @@ -155,7 +155,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] @@ -192,7 +192,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] @@ -223,7 +223,7 @@ Arguments: false (22) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_nationkey#X, o_orderkey#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [3]: [hash_partition_key#X, c_nationkey#X, o_orderkey#X] @@ -260,7 +260,7 @@ Arguments: false (31) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [5]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] @@ -291,7 +291,7 @@ Arguments: false (39) VeloxResizeBatches Input [5]: [hash_partition_key#X, c_nationkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (40) ColumnarExchange Input [5]: [hash_partition_key#X, c_nationkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] @@ -328,7 +328,7 @@ Arguments: false (48) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] @@ -359,7 +359,7 @@ Arguments: false (56) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (57) ColumnarExchange Input [4]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X] @@ -396,7 +396,7 @@ Arguments: false (65) VeloxResizeBatches Input [4]: [hash_partition_key#X, n_nationkey#X, n_name#X, n_regionkey#X] -Arguments: X, X +Arguments: X, X, X (66) ColumnarExchange Input [4]: [hash_partition_key#X, n_nationkey#X, n_name#X, n_regionkey#X] @@ -427,7 +427,7 @@ Arguments: false (73) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, n_name#X, n_regionkey#X] -Arguments: X, X +Arguments: X, X, X (74) ColumnarExchange Input [5]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, n_name#X, n_regionkey#X] @@ -464,7 +464,7 @@ Arguments: false (82) VeloxResizeBatches Input [2]: [hash_partition_key#X, r_regionkey#X] -Arguments: X, X +Arguments: X, X, X (83) ColumnarExchange Input [2]: [hash_partition_key#X, r_regionkey#X] @@ -506,7 +506,7 @@ Arguments: false (92) VeloxResizeBatches Input [4]: [hash_partition_key#X, n_name#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (93) ColumnarExchange Input [4]: [hash_partition_key#X, n_name#X, sum#X, isEmpty#X] @@ -535,7 +535,7 @@ Arguments: false (99) VeloxResizeBatches Input [2]: [n_name#X, revenue#X] -Arguments: X, X +Arguments: X, X, X (100) ColumnarExchange Input [2]: [n_name#X, revenue#X] 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 ba50cb13105..9ba7f5c7293 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 @@ -48,7 +48,7 @@ Arguments: false (6) VeloxResizeBatches Input [2]: [sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (7) ColumnarExchange Input [2]: [sum#X, isEmpty#X] 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 ccf77e181d7..0c03319b01d 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 @@ -149,7 +149,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] @@ -186,7 +186,7 @@ Arguments: false (14) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [6]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X] @@ -217,7 +217,7 @@ Arguments: false (22) VeloxResizeBatches Input [6]: [hash_partition_key#X, s_nationkey#X, l_orderkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [6]: [hash_partition_key#X, s_nationkey#X, l_orderkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X] @@ -254,7 +254,7 @@ Arguments: false (31) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] @@ -285,7 +285,7 @@ Arguments: false (39) VeloxResizeBatches Input [6]: [hash_partition_key#X, s_nationkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (40) ColumnarExchange Input [6]: [hash_partition_key#X, s_nationkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X, o_custkey#X] @@ -322,7 +322,7 @@ Arguments: false (48) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] @@ -353,7 +353,7 @@ Arguments: false (56) VeloxResizeBatches Input [6]: [hash_partition_key#X, s_nationkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X, c_nationkey#X] -Arguments: X, X +Arguments: X, X, X (57) ColumnarExchange Input [6]: [hash_partition_key#X, s_nationkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X, c_nationkey#X] @@ -390,7 +390,7 @@ Arguments: false (65) VeloxResizeBatches Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (66) ColumnarExchange Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] @@ -421,7 +421,7 @@ Arguments: false (73) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, l_shipdate#X, c_nationkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (74) ColumnarExchange Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, l_shipdate#X, c_nationkey#X, n_name#X] @@ -476,7 +476,7 @@ Arguments: false (87) VeloxResizeBatches Input [6]: [hash_partition_key#X, supp_nation#X, cust_nation#X, l_year#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (88) ColumnarExchange Input [6]: [hash_partition_key#X, supp_nation#X, cust_nation#X, l_year#X, sum#X, isEmpty#X] @@ -505,7 +505,7 @@ Arguments: false (94) VeloxResizeBatches Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X] -Arguments: X, X +Arguments: X, X, X (95) ColumnarExchange Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X] 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 64e985256c5..2cab3c6836e 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 @@ -198,7 +198,7 @@ Arguments: false (5) VeloxResizeBatches Input [2]: [hash_partition_key#X, p_partkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [2]: [hash_partition_key#X, p_partkey#X] @@ -235,7 +235,7 @@ Arguments: false (14) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [6]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] @@ -266,7 +266,7 @@ Arguments: false (22) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [5]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] @@ -303,7 +303,7 @@ Arguments: false (31) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] @@ -334,7 +334,7 @@ Arguments: false (39) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (40) ColumnarExchange Input [5]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X, s_nationkey#X] @@ -371,7 +371,7 @@ Arguments: false (48) VeloxResizeBatches Input [4]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [4]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_orderdate#X] @@ -402,7 +402,7 @@ Arguments: false (56) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_custkey#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (57) ColumnarExchange Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_custkey#X, o_orderdate#X] @@ -439,7 +439,7 @@ Arguments: false (65) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] -Arguments: X, X +Arguments: X, X, X (66) ColumnarExchange Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] @@ -470,7 +470,7 @@ Arguments: false (73) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_orderdate#X, c_nationkey#X] -Arguments: X, X +Arguments: X, X, X (74) ColumnarExchange Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_orderdate#X, c_nationkey#X] @@ -507,7 +507,7 @@ Arguments: false (82) VeloxResizeBatches Input [3]: [hash_partition_key#X, n_nationkey#X, n_regionkey#X] -Arguments: X, X +Arguments: X, X, X (83) ColumnarExchange Input [3]: [hash_partition_key#X, n_nationkey#X, n_regionkey#X] @@ -538,7 +538,7 @@ Arguments: false (90) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_orderdate#X, n_regionkey#X] -Arguments: X, X +Arguments: X, X, X (91) ColumnarExchange Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_orderdate#X, n_regionkey#X] @@ -575,7 +575,7 @@ Arguments: false (99) VeloxResizeBatches Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (100) ColumnarExchange Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] @@ -606,7 +606,7 @@ Arguments: false (107) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, o_orderdate#X, n_regionkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (108) ColumnarExchange Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, o_orderdate#X, n_regionkey#X, n_name#X] @@ -643,7 +643,7 @@ Arguments: false (116) VeloxResizeBatches Input [2]: [hash_partition_key#X, r_regionkey#X] -Arguments: X, X +Arguments: X, X, X (117) ColumnarExchange Input [2]: [hash_partition_key#X, r_regionkey#X] @@ -685,7 +685,7 @@ Arguments: false (126) VeloxResizeBatches Input [6]: [hash_partition_key#X, o_year#X, sum#X, isEmpty#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (127) ColumnarExchange Input [6]: [hash_partition_key#X, o_year#X, sum#X, isEmpty#X, sum#X, isEmpty#X] @@ -718,7 +718,7 @@ Arguments: false (134) VeloxResizeBatches Input [2]: [o_year#X, mkt_share#X] -Arguments: X, X +Arguments: X, X, X (135) ColumnarExchange Input [2]: [o_year#X, mkt_share#X] 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 3c152f56567..3fcc34dcb8e 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 @@ -154,7 +154,7 @@ Arguments: false (5) VeloxResizeBatches Input [2]: [hash_partition_key#X, p_partkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [2]: [hash_partition_key#X, p_partkey#X] @@ -191,7 +191,7 @@ Arguments: false (14) VeloxResizeBatches Input [7]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [7]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] @@ -222,7 +222,7 @@ Arguments: false (22) VeloxResizeBatches Input [7]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [7]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] @@ -259,7 +259,7 @@ Arguments: false (31) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] @@ -290,7 +290,7 @@ Arguments: false (39) VeloxResizeBatches Input [8]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (40) ColumnarExchange Input [8]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X] @@ -327,7 +327,7 @@ Arguments: false (48) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_supplycost#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_supplycost#X] @@ -358,7 +358,7 @@ Arguments: false (56) VeloxResizeBatches Input [7]: [hash_partition_key#X, l_orderkey#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X, ps_supplycost#X] -Arguments: X, X +Arguments: X, X, X (57) ColumnarExchange Input [7]: [hash_partition_key#X, l_orderkey#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X, ps_supplycost#X] @@ -395,7 +395,7 @@ Arguments: false (65) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (66) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderdate#X] @@ -426,7 +426,7 @@ Arguments: false (73) VeloxResizeBatches Input [7]: [hash_partition_key#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X, ps_supplycost#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (74) ColumnarExchange Input [7]: [hash_partition_key#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X, ps_supplycost#X, o_orderdate#X] @@ -463,7 +463,7 @@ Arguments: false (82) VeloxResizeBatches Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (83) ColumnarExchange Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] @@ -505,7 +505,7 @@ Arguments: false (92) VeloxResizeBatches Input [5]: [hash_partition_key#X, nation#X, o_year#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (93) ColumnarExchange Input [5]: [hash_partition_key#X, nation#X, o_year#X, sum#X, isEmpty#X] @@ -534,7 +534,7 @@ Arguments: false (99) VeloxResizeBatches Input [3]: [nation#X, o_year#X, sum_profit#X] -Arguments: X, X +Arguments: X, X, X (100) ColumnarExchange Input [3]: [nation#X, o_year#X, sum_profit#X] 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 fce60c054ea..c02e2a48cfc 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 @@ -60,7 +60,7 @@ Arguments: false (7) VeloxResizeBatches Input [18]: [hash_partition_key#X, l_returnflag#X, l_linestatus#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, count#X, sum#X, count#X, sum#X, count#X, count#X] -Arguments: X, X +Arguments: X, X, X (8) ColumnarExchange Input [18]: [hash_partition_key#X, l_returnflag#X, l_linestatus#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, count#X, sum#X, count#X, sum#X, count#X, count#X] @@ -89,7 +89,7 @@ Arguments: false (14) VeloxResizeBatches 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: X, X +Arguments: X, X, X (15) ColumnarExchange 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] 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 855ddf39113..fc0fbcc1ea4 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 @@ -109,7 +109,7 @@ Arguments: false (5) VeloxResizeBatches Input [8]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [8]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X] @@ -146,7 +146,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] @@ -178,7 +178,7 @@ Arguments: false (22) VeloxResizeBatches Input [9]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X, o_orderkey#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [9]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X, o_orderkey#X] @@ -215,7 +215,7 @@ Arguments: false (31) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [4]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X] @@ -247,7 +247,7 @@ Arguments: false (39) VeloxResizeBatches Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (40) ColumnarExchange Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X, l_extendedprice#X, l_discount#X] @@ -284,7 +284,7 @@ Arguments: false (48) VeloxResizeBatches Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] @@ -327,7 +327,7 @@ Arguments: false (58) VeloxResizeBatches Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_acctbal#X, c_phone#X, n_name#X, c_address#X, c_comment#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (59) ColumnarExchange Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_acctbal#X, c_phone#X, n_name#X, c_address#X, c_comment#X, sum#X, isEmpty#X] 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 99539cde1a7..022da868a7b 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 @@ -93,7 +93,7 @@ Arguments: false (5) VeloxResizeBatches Input [5]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X, ps_supplycost#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [5]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X, ps_supplycost#X] @@ -130,7 +130,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] @@ -162,7 +162,7 @@ Arguments: false (22) VeloxResizeBatches Input [5]: [hash_partition_key#X, ps_partkey#X, ps_availqty#X, ps_supplycost#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [5]: [hash_partition_key#X, ps_partkey#X, ps_availqty#X, ps_supplycost#X, s_nationkey#X] @@ -199,7 +199,7 @@ Arguments: false (31) VeloxResizeBatches Input [2]: [hash_partition_key#X, n_nationkey#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [2]: [hash_partition_key#X, n_nationkey#X] @@ -242,7 +242,7 @@ Arguments: false (41) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_partkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (42) ColumnarExchange Input [4]: [hash_partition_key#X, ps_partkey#X, sum#X, isEmpty#X] @@ -275,7 +275,7 @@ Arguments: false (49) VeloxResizeBatches Input [2]: [ps_partkey#X, value#X] -Arguments: X, X +Arguments: X, X, X (50) ColumnarExchange Input [2]: [ps_partkey#X, value#X] @@ -499,7 +499,7 @@ Arguments: false (87) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_suppkey#X, ps_availqty#X, ps_supplycost#X] -Arguments: X, X +Arguments: X, X, X (88) ColumnarExchange Input [4]: [hash_partition_key#X, ps_suppkey#X, ps_availqty#X, ps_supplycost#X] @@ -544,7 +544,7 @@ Arguments: false (99) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_availqty#X, ps_supplycost#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (100) ColumnarExchange Input [4]: [hash_partition_key#X, ps_availqty#X, ps_supplycost#X, s_nationkey#X] 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 9cb9c145f1b..28339dcd039 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 @@ -70,7 +70,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderpriority#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderpriority#X] @@ -107,7 +107,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_shipmode#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_shipmode#X] @@ -150,7 +150,7 @@ Arguments: false (24) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_shipmode#X, sum#X, sum#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [4]: [hash_partition_key#X, l_shipmode#X, sum#X, sum#X] @@ -179,7 +179,7 @@ Arguments: false (31) VeloxResizeBatches Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X] 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 59abfb682c4..000adc4ec09 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 @@ -67,7 +67,7 @@ Arguments: false (4) VeloxResizeBatches Input [2]: [hash_partition_key#X, c_custkey#X] -Arguments: X, X +Arguments: X, X, X (5) ColumnarExchange Input [2]: [hash_partition_key#X, c_custkey#X] @@ -104,7 +104,7 @@ Arguments: false (13) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (14) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] @@ -158,7 +158,7 @@ Arguments: false (25) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_count#X, count#X] -Arguments: X, X +Arguments: X, X, X (26) ColumnarExchange Input [3]: [hash_partition_key#X, c_count#X, count#X] @@ -187,7 +187,7 @@ Arguments: false (32) VeloxResizeBatches Input [2]: [c_count#X, custdist#X] -Arguments: X, X +Arguments: X, X, X (33) ColumnarExchange Input [2]: [c_count#X, custdist#X] 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 058ec94ab09..a6b53027cf1 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 @@ -57,7 +57,7 @@ Arguments: false (5) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_partkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [4]: [hash_partition_key#X, l_partkey#X, l_extendedprice#X, l_discount#X] @@ -94,7 +94,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, p_partkey#X, p_type#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, p_partkey#X, p_type#X] 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 e0c0204c0b8..6c92020d4fe 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 @@ -66,7 +66,7 @@ Arguments: false (5) VeloxResizeBatches Input [5]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_address#X, s_phone#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [5]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_address#X, s_phone#X] @@ -114,7 +114,7 @@ Arguments: false (16) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (17) ColumnarExchange Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] @@ -157,7 +157,7 @@ Arguments: false (26) VeloxResizeBatches Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X] -Arguments: X, X +Arguments: X, X, X (27) ColumnarExchange Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X] @@ -317,7 +317,7 @@ Arguments: false (54) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (55) ColumnarExchange Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] 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 3441216f140..64015145b5c 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 @@ -84,7 +84,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X] @@ -121,7 +121,7 @@ Arguments: false (14) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_partkey#X, p_brand#X, p_type#X, p_size#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [5]: [hash_partition_key#X, p_partkey#X, p_brand#X, p_type#X, p_size#X] @@ -164,7 +164,7 @@ Arguments: false (24) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, ps_suppkey#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, ps_suppkey#X] @@ -204,7 +204,7 @@ Arguments: false (33) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, count#X] -Arguments: X, X +Arguments: X, X, X (34) ColumnarExchange Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, count#X] @@ -233,7 +233,7 @@ Arguments: false (40) VeloxResizeBatches Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X] -Arguments: X, X +Arguments: X, X, X (41) ColumnarExchange Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X] 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 c1b43b7fc42..1bbcd5fbb0a 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 @@ -79,7 +79,7 @@ Arguments: false (5) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_partkey#X, l_quantity#X, l_extendedprice#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [4]: [hash_partition_key#X, l_partkey#X, l_quantity#X, l_extendedprice#X] @@ -116,7 +116,7 @@ Arguments: false (14) VeloxResizeBatches Input [2]: [hash_partition_key#X, p_partkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [2]: [hash_partition_key#X, p_partkey#X] @@ -170,7 +170,7 @@ Arguments: false (26) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_partkey#X, sum#X, count#X] -Arguments: X, X +Arguments: X, X, X (27) ColumnarExchange Input [4]: [hash_partition_key#X, l_partkey#X, sum#X, count#X] 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 c1a6b181bb3..748f8c59df4 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 @@ -119,7 +119,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_custkey#X, c_name#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, c_custkey#X, c_name#X] @@ -156,7 +156,7 @@ Arguments: false (14) VeloxResizeBatches Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_totalprice#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_totalprice#X, o_orderdate#X] @@ -195,7 +195,7 @@ Arguments: false (23) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_orderkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (24) ColumnarExchange Input [4]: [hash_partition_key#X, l_orderkey#X, sum#X, isEmpty#X] @@ -242,7 +242,7 @@ Arguments: false (34) VeloxResizeBatches Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_totalprice#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (35) ColumnarExchange Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_totalprice#X, o_orderdate#X] @@ -274,7 +274,7 @@ Arguments: false (42) VeloxResizeBatches Input [6]: [hash_partition_key#X, c_custkey#X, c_name#X, o_orderkey#X, o_totalprice#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (43) ColumnarExchange Input [6]: [hash_partition_key#X, c_custkey#X, c_name#X, o_orderkey#X, o_totalprice#X, o_orderdate#X] @@ -311,7 +311,7 @@ Arguments: false (51) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_quantity#X] -Arguments: X, X +Arguments: X, X, X (52) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_quantity#X] 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 420c980f327..019cee8dbf4 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 @@ -56,7 +56,7 @@ Arguments: false (5) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_partkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [5]: [hash_partition_key#X, l_partkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] @@ -93,7 +93,7 @@ Arguments: false (14) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_partkey#X, p_brand#X, p_size#X, p_container#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [5]: [hash_partition_key#X, p_partkey#X, p_brand#X, p_size#X, p_container#X] 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 4d8eee1f1fb..1565a9ea077 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 @@ -146,7 +146,7 @@ Arguments: false (5) VeloxResizeBatches Input [5]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_address#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [5]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_address#X, s_nationkey#X] @@ -183,7 +183,7 @@ Arguments: false (14) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X] @@ -220,7 +220,7 @@ Arguments: false (23) VeloxResizeBatches Input [2]: [hash_partition_key#X, p_partkey#X] -Arguments: X, X +Arguments: X, X, X (24) ColumnarExchange Input [2]: [hash_partition_key#X, p_partkey#X] @@ -252,7 +252,7 @@ Arguments: false (31) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X] @@ -289,7 +289,7 @@ Arguments: false (40) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_partkey#X, l_suppkey#X, l_quantity#X] -Arguments: X, X +Arguments: X, X, X (41) ColumnarExchange Input [4]: [hash_partition_key#X, l_partkey#X, l_suppkey#X, l_quantity#X] @@ -349,7 +349,7 @@ Arguments: false (55) VeloxResizeBatches Input [4]: [hash_partition_key#X, (0.5 * sum(l_quantity))#X, l_partkey#X, l_suppkey#X] -Arguments: X, X +Arguments: X, X, X (56) ColumnarExchange Input [4]: [hash_partition_key#X, (0.5 * sum(l_quantity))#X, l_partkey#X, l_suppkey#X] @@ -381,7 +381,7 @@ Arguments: false (63) VeloxResizeBatches Input [2]: [hash_partition_key#X, ps_suppkey#X] -Arguments: X, X +Arguments: X, X, X (64) ColumnarExchange Input [2]: [hash_partition_key#X, ps_suppkey#X] @@ -413,7 +413,7 @@ Arguments: false (71) VeloxResizeBatches Input [4]: [hash_partition_key#X, s_name#X, s_address#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (72) ColumnarExchange Input [4]: [hash_partition_key#X, s_name#X, s_address#X, s_nationkey#X] @@ -450,7 +450,7 @@ Arguments: false (80) VeloxResizeBatches Input [2]: [hash_partition_key#X, n_nationkey#X] -Arguments: X, X +Arguments: X, X, X (81) ColumnarExchange Input [2]: [hash_partition_key#X, n_nationkey#X] @@ -482,7 +482,7 @@ Arguments: false (88) VeloxResizeBatches Input [2]: [s_name#X, s_address#X] -Arguments: X, X +Arguments: X, X, X (89) ColumnarExchange Input [2]: [s_name#X, s_address#X] 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 96750b2b3ec..4a28c777ae2 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 @@ -140,7 +140,7 @@ Arguments: false (5) VeloxResizeBatches Input [4]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [4]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_nationkey#X] @@ -177,7 +177,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] @@ -209,7 +209,7 @@ Arguments: false (22) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] @@ -252,7 +252,7 @@ Arguments: false (32) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] -Arguments: X, X +Arguments: X, X, X (33) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] @@ -284,7 +284,7 @@ Arguments: false (40) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] -Arguments: X, X +Arguments: X, X, X (41) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] @@ -316,7 +316,7 @@ Arguments: false (48) VeloxResizeBatches Input [4]: [hash_partition_key#X, s_name#X, s_nationkey#X, l_orderkey#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [4]: [hash_partition_key#X, s_name#X, s_nationkey#X, l_orderkey#X] @@ -353,7 +353,7 @@ Arguments: false (57) VeloxResizeBatches Input [2]: [hash_partition_key#X, o_orderkey#X] -Arguments: X, X +Arguments: X, X, X (58) ColumnarExchange Input [2]: [hash_partition_key#X, o_orderkey#X] @@ -385,7 +385,7 @@ Arguments: false (65) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_name#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (66) ColumnarExchange Input [3]: [hash_partition_key#X, s_name#X, s_nationkey#X] @@ -422,7 +422,7 @@ Arguments: false (74) VeloxResizeBatches Input [2]: [hash_partition_key#X, n_nationkey#X] -Arguments: X, X +Arguments: X, X, X (75) ColumnarExchange Input [2]: [hash_partition_key#X, n_nationkey#X] @@ -465,7 +465,7 @@ Arguments: false (84) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_name#X, count#X] -Arguments: X, X +Arguments: X, X, X (85) ColumnarExchange Input [3]: [hash_partition_key#X, s_name#X, count#X] 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 c6e147da04d..21f890c49ee 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 @@ -67,7 +67,7 @@ Arguments: false (5) VeloxResizeBatches Input [4]: [hash_partition_key#X, c_custkey#X, c_phone#X, c_acctbal#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [4]: [hash_partition_key#X, c_custkey#X, c_phone#X, c_acctbal#X] @@ -99,7 +99,7 @@ Arguments: false (13) VeloxResizeBatches Input [2]: [hash_partition_key#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (14) ColumnarExchange Input [2]: [hash_partition_key#X, o_custkey#X] @@ -142,7 +142,7 @@ Arguments: false (23) VeloxResizeBatches Input [5]: [hash_partition_key#X, cntrycode#X, count#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (24) ColumnarExchange Input [5]: [hash_partition_key#X, cntrycode#X, count#X, sum#X, isEmpty#X] @@ -171,7 +171,7 @@ Arguments: false (30) VeloxResizeBatches Input [3]: [cntrycode#X, numcust#X, totacctbal#X] -Arguments: X, X +Arguments: X, X, X (31) ColumnarExchange Input [3]: [cntrycode#X, numcust#X, totacctbal#X] @@ -323,7 +323,7 @@ Arguments: false (58) VeloxResizeBatches Input [2]: [sum#X, count#X] -Arguments: X, X +Arguments: X, X, X (59) ColumnarExchange Input [2]: [sum#X, count#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 d6573f7483b..4a669b95ca6 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 @@ -81,7 +81,7 @@ Arguments: false (5) VeloxResizeBatches Input [2]: [hash_partition_key#X, c_custkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [2]: [hash_partition_key#X, c_custkey#X] @@ -118,7 +118,7 @@ Arguments: false (14) VeloxResizeBatches Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_orderdate#X, o_shippriority#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_orderdate#X, o_shippriority#X] @@ -150,7 +150,7 @@ Arguments: false (22) VeloxResizeBatches Input [4]: [hash_partition_key#X, o_orderkey#X, o_orderdate#X, o_shippriority#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [4]: [hash_partition_key#X, o_orderkey#X, o_orderdate#X, o_shippriority#X] @@ -187,7 +187,7 @@ Arguments: false (31) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [4]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X] 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 71a8f6974ed..0f5c41de5be 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 @@ -71,7 +71,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderpriority#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderpriority#X] @@ -108,7 +108,7 @@ Arguments: false (14) VeloxResizeBatches Input [2]: [hash_partition_key#X, l_orderkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [2]: [hash_partition_key#X, l_orderkey#X] @@ -151,7 +151,7 @@ Arguments: false (24) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderpriority#X, count#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderpriority#X, count#X] @@ -180,7 +180,7 @@ Arguments: false (31) VeloxResizeBatches Input [2]: [o_orderpriority#X, order_count#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [2]: [o_orderpriority#X, order_count#X] 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 a78e477ace2..223fb133386 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 @@ -155,7 +155,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] @@ -192,7 +192,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] @@ -224,7 +224,7 @@ Arguments: false (22) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_nationkey#X, o_orderkey#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [3]: [hash_partition_key#X, c_nationkey#X, o_orderkey#X] @@ -261,7 +261,7 @@ Arguments: false (31) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [5]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] @@ -293,7 +293,7 @@ Arguments: false (39) VeloxResizeBatches Input [5]: [hash_partition_key#X, c_nationkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (40) ColumnarExchange Input [5]: [hash_partition_key#X, c_nationkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] @@ -330,7 +330,7 @@ Arguments: false (48) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] @@ -362,7 +362,7 @@ Arguments: false (56) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (57) ColumnarExchange Input [4]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X] @@ -399,7 +399,7 @@ Arguments: false (65) VeloxResizeBatches Input [4]: [hash_partition_key#X, n_nationkey#X, n_name#X, n_regionkey#X] -Arguments: X, X +Arguments: X, X, X (66) ColumnarExchange Input [4]: [hash_partition_key#X, n_nationkey#X, n_name#X, n_regionkey#X] @@ -431,7 +431,7 @@ Arguments: false (73) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, n_name#X, n_regionkey#X] -Arguments: X, X +Arguments: X, X, X (74) ColumnarExchange Input [5]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, n_name#X, n_regionkey#X] @@ -468,7 +468,7 @@ Arguments: false (82) VeloxResizeBatches Input [2]: [hash_partition_key#X, r_regionkey#X] -Arguments: X, X +Arguments: X, X, X (83) ColumnarExchange Input [2]: [hash_partition_key#X, r_regionkey#X] @@ -511,7 +511,7 @@ Arguments: false (92) VeloxResizeBatches Input [4]: [hash_partition_key#X, n_name#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (93) ColumnarExchange Input [4]: [hash_partition_key#X, n_name#X, sum#X, isEmpty#X] @@ -540,7 +540,7 @@ Arguments: false (99) VeloxResizeBatches Input [2]: [n_name#X, revenue#X] -Arguments: X, X +Arguments: X, X, X (100) ColumnarExchange Input [2]: [n_name#X, revenue#X] 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 b85e63e1065..1e1d87db4b2 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 @@ -48,7 +48,7 @@ Arguments: false (6) VeloxResizeBatches Input [2]: [sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (7) ColumnarExchange Input [2]: [sum#X, isEmpty#X] 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 a0894489f0a..43f5a9823ab 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 @@ -149,7 +149,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] @@ -186,7 +186,7 @@ Arguments: false (14) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [6]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X] @@ -218,7 +218,7 @@ Arguments: false (22) VeloxResizeBatches Input [6]: [hash_partition_key#X, s_nationkey#X, l_orderkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [6]: [hash_partition_key#X, s_nationkey#X, l_orderkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X] @@ -255,7 +255,7 @@ Arguments: false (31) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] @@ -287,7 +287,7 @@ Arguments: false (39) VeloxResizeBatches Input [6]: [hash_partition_key#X, s_nationkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (40) ColumnarExchange Input [6]: [hash_partition_key#X, s_nationkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X, o_custkey#X] @@ -324,7 +324,7 @@ Arguments: false (48) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] @@ -356,7 +356,7 @@ Arguments: false (56) VeloxResizeBatches Input [6]: [hash_partition_key#X, s_nationkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X, c_nationkey#X] -Arguments: X, X +Arguments: X, X, X (57) ColumnarExchange Input [6]: [hash_partition_key#X, s_nationkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X, c_nationkey#X] @@ -393,7 +393,7 @@ Arguments: false (65) VeloxResizeBatches Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (66) ColumnarExchange Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] @@ -425,7 +425,7 @@ Arguments: false (73) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, l_shipdate#X, c_nationkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (74) ColumnarExchange Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, l_shipdate#X, c_nationkey#X, n_name#X] @@ -481,7 +481,7 @@ Arguments: false (87) VeloxResizeBatches Input [6]: [hash_partition_key#X, supp_nation#X, cust_nation#X, l_year#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (88) ColumnarExchange Input [6]: [hash_partition_key#X, supp_nation#X, cust_nation#X, l_year#X, sum#X, isEmpty#X] @@ -510,7 +510,7 @@ Arguments: false (94) VeloxResizeBatches Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X] -Arguments: X, X +Arguments: X, X, X (95) ColumnarExchange Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X] 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 88a6a79e074..284a5c88dfd 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 @@ -198,7 +198,7 @@ Arguments: false (5) VeloxResizeBatches Input [2]: [hash_partition_key#X, p_partkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [2]: [hash_partition_key#X, p_partkey#X] @@ -235,7 +235,7 @@ Arguments: false (14) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [6]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] @@ -267,7 +267,7 @@ Arguments: false (22) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [5]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] @@ -304,7 +304,7 @@ Arguments: false (31) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] @@ -336,7 +336,7 @@ Arguments: false (39) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (40) ColumnarExchange Input [5]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X, s_nationkey#X] @@ -373,7 +373,7 @@ Arguments: false (48) VeloxResizeBatches Input [4]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [4]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_orderdate#X] @@ -405,7 +405,7 @@ Arguments: false (56) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_custkey#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (57) ColumnarExchange Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_custkey#X, o_orderdate#X] @@ -442,7 +442,7 @@ Arguments: false (65) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] -Arguments: X, X +Arguments: X, X, X (66) ColumnarExchange Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] @@ -474,7 +474,7 @@ Arguments: false (73) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_orderdate#X, c_nationkey#X] -Arguments: X, X +Arguments: X, X, X (74) ColumnarExchange Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_orderdate#X, c_nationkey#X] @@ -511,7 +511,7 @@ Arguments: false (82) VeloxResizeBatches Input [3]: [hash_partition_key#X, n_nationkey#X, n_regionkey#X] -Arguments: X, X +Arguments: X, X, X (83) ColumnarExchange Input [3]: [hash_partition_key#X, n_nationkey#X, n_regionkey#X] @@ -543,7 +543,7 @@ Arguments: false (90) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_orderdate#X, n_regionkey#X] -Arguments: X, X +Arguments: X, X, X (91) ColumnarExchange Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_orderdate#X, n_regionkey#X] @@ -580,7 +580,7 @@ Arguments: false (99) VeloxResizeBatches Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (100) ColumnarExchange Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] @@ -612,7 +612,7 @@ Arguments: false (107) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, o_orderdate#X, n_regionkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (108) ColumnarExchange Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, o_orderdate#X, n_regionkey#X, n_name#X] @@ -649,7 +649,7 @@ Arguments: false (116) VeloxResizeBatches Input [2]: [hash_partition_key#X, r_regionkey#X] -Arguments: X, X +Arguments: X, X, X (117) ColumnarExchange Input [2]: [hash_partition_key#X, r_regionkey#X] @@ -692,7 +692,7 @@ Arguments: false (126) VeloxResizeBatches Input [6]: [hash_partition_key#X, o_year#X, sum#X, isEmpty#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (127) ColumnarExchange Input [6]: [hash_partition_key#X, o_year#X, sum#X, isEmpty#X, sum#X, isEmpty#X] @@ -725,7 +725,7 @@ Arguments: false (134) VeloxResizeBatches Input [2]: [o_year#X, mkt_share#X] -Arguments: X, X +Arguments: X, X, X (135) ColumnarExchange Input [2]: [o_year#X, mkt_share#X] 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 4f537e91e13..6819628a002 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 @@ -154,7 +154,7 @@ Arguments: false (5) VeloxResizeBatches Input [2]: [hash_partition_key#X, p_partkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [2]: [hash_partition_key#X, p_partkey#X] @@ -191,7 +191,7 @@ Arguments: false (14) VeloxResizeBatches Input [7]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [7]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] @@ -223,7 +223,7 @@ Arguments: false (22) VeloxResizeBatches Input [7]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [7]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] @@ -260,7 +260,7 @@ Arguments: false (31) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] @@ -292,7 +292,7 @@ Arguments: false (39) VeloxResizeBatches Input [8]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (40) ColumnarExchange Input [8]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X] @@ -329,7 +329,7 @@ Arguments: false (48) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_supplycost#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_supplycost#X] @@ -361,7 +361,7 @@ Arguments: false (56) VeloxResizeBatches Input [7]: [hash_partition_key#X, l_orderkey#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X, ps_supplycost#X] -Arguments: X, X +Arguments: X, X, X (57) ColumnarExchange Input [7]: [hash_partition_key#X, l_orderkey#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X, ps_supplycost#X] @@ -398,7 +398,7 @@ Arguments: false (65) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (66) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderdate#X] @@ -430,7 +430,7 @@ Arguments: false (73) VeloxResizeBatches Input [7]: [hash_partition_key#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X, ps_supplycost#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (74) ColumnarExchange Input [7]: [hash_partition_key#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X, ps_supplycost#X, o_orderdate#X] @@ -467,7 +467,7 @@ Arguments: false (82) VeloxResizeBatches Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (83) ColumnarExchange Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] @@ -510,7 +510,7 @@ Arguments: false (92) VeloxResizeBatches Input [5]: [hash_partition_key#X, nation#X, o_year#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (93) ColumnarExchange Input [5]: [hash_partition_key#X, nation#X, o_year#X, sum#X, isEmpty#X] @@ -539,7 +539,7 @@ Arguments: false (99) VeloxResizeBatches Input [3]: [nation#X, o_year#X, sum_profit#X] -Arguments: X, X +Arguments: X, X, X (100) ColumnarExchange Input [3]: [nation#X, o_year#X, sum_profit#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/1.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/1.txt index fce60c054ea..c02e2a48cfc 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/1.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/1.txt @@ -60,7 +60,7 @@ Arguments: false (7) VeloxResizeBatches Input [18]: [hash_partition_key#X, l_returnflag#X, l_linestatus#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, count#X, sum#X, count#X, sum#X, count#X, count#X] -Arguments: X, X +Arguments: X, X, X (8) ColumnarExchange Input [18]: [hash_partition_key#X, l_returnflag#X, l_linestatus#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, count#X, sum#X, count#X, sum#X, count#X, count#X] @@ -89,7 +89,7 @@ Arguments: false (14) VeloxResizeBatches 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: X, X +Arguments: X, X, X (15) ColumnarExchange 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] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/10.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/10.txt index 855ddf39113..fc0fbcc1ea4 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/10.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/10.txt @@ -109,7 +109,7 @@ Arguments: false (5) VeloxResizeBatches Input [8]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [8]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X] @@ -146,7 +146,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] @@ -178,7 +178,7 @@ Arguments: false (22) VeloxResizeBatches Input [9]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X, o_orderkey#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [9]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X, o_orderkey#X] @@ -215,7 +215,7 @@ Arguments: false (31) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [4]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X] @@ -247,7 +247,7 @@ Arguments: false (39) VeloxResizeBatches Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (40) ColumnarExchange Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X, l_extendedprice#X, l_discount#X] @@ -284,7 +284,7 @@ Arguments: false (48) VeloxResizeBatches Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] @@ -327,7 +327,7 @@ Arguments: false (58) VeloxResizeBatches Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_acctbal#X, c_phone#X, n_name#X, c_address#X, c_comment#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (59) ColumnarExchange Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_acctbal#X, c_phone#X, n_name#X, c_address#X, c_comment#X, sum#X, isEmpty#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/11.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/11.txt index 99539cde1a7..022da868a7b 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/11.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/11.txt @@ -93,7 +93,7 @@ Arguments: false (5) VeloxResizeBatches Input [5]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X, ps_supplycost#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [5]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X, ps_supplycost#X] @@ -130,7 +130,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] @@ -162,7 +162,7 @@ Arguments: false (22) VeloxResizeBatches Input [5]: [hash_partition_key#X, ps_partkey#X, ps_availqty#X, ps_supplycost#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [5]: [hash_partition_key#X, ps_partkey#X, ps_availqty#X, ps_supplycost#X, s_nationkey#X] @@ -199,7 +199,7 @@ Arguments: false (31) VeloxResizeBatches Input [2]: [hash_partition_key#X, n_nationkey#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [2]: [hash_partition_key#X, n_nationkey#X] @@ -242,7 +242,7 @@ Arguments: false (41) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_partkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (42) ColumnarExchange Input [4]: [hash_partition_key#X, ps_partkey#X, sum#X, isEmpty#X] @@ -275,7 +275,7 @@ Arguments: false (49) VeloxResizeBatches Input [2]: [ps_partkey#X, value#X] -Arguments: X, X +Arguments: X, X, X (50) ColumnarExchange Input [2]: [ps_partkey#X, value#X] @@ -499,7 +499,7 @@ Arguments: false (87) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_suppkey#X, ps_availqty#X, ps_supplycost#X] -Arguments: X, X +Arguments: X, X, X (88) ColumnarExchange Input [4]: [hash_partition_key#X, ps_suppkey#X, ps_availqty#X, ps_supplycost#X] @@ -544,7 +544,7 @@ Arguments: false (99) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_availqty#X, ps_supplycost#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (100) ColumnarExchange Input [4]: [hash_partition_key#X, ps_availqty#X, ps_supplycost#X, s_nationkey#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/12.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/12.txt index 9cb9c145f1b..28339dcd039 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/12.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/12.txt @@ -70,7 +70,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderpriority#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderpriority#X] @@ -107,7 +107,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_shipmode#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_shipmode#X] @@ -150,7 +150,7 @@ Arguments: false (24) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_shipmode#X, sum#X, sum#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [4]: [hash_partition_key#X, l_shipmode#X, sum#X, sum#X] @@ -179,7 +179,7 @@ Arguments: false (31) VeloxResizeBatches Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/13.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/13.txt index 59abfb682c4..000adc4ec09 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/13.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/13.txt @@ -67,7 +67,7 @@ Arguments: false (4) VeloxResizeBatches Input [2]: [hash_partition_key#X, c_custkey#X] -Arguments: X, X +Arguments: X, X, X (5) ColumnarExchange Input [2]: [hash_partition_key#X, c_custkey#X] @@ -104,7 +104,7 @@ Arguments: false (13) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (14) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] @@ -158,7 +158,7 @@ Arguments: false (25) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_count#X, count#X] -Arguments: X, X +Arguments: X, X, X (26) ColumnarExchange Input [3]: [hash_partition_key#X, c_count#X, count#X] @@ -187,7 +187,7 @@ Arguments: false (32) VeloxResizeBatches Input [2]: [c_count#X, custdist#X] -Arguments: X, X +Arguments: X, X, X (33) ColumnarExchange Input [2]: [c_count#X, custdist#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/14.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/14.txt index 058ec94ab09..a6b53027cf1 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/14.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/14.txt @@ -57,7 +57,7 @@ Arguments: false (5) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_partkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [4]: [hash_partition_key#X, l_partkey#X, l_extendedprice#X, l_discount#X] @@ -94,7 +94,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, p_partkey#X, p_type#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, p_partkey#X, p_type#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/15.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/15.txt index e0c0204c0b8..6c92020d4fe 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/15.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/15.txt @@ -66,7 +66,7 @@ Arguments: false (5) VeloxResizeBatches Input [5]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_address#X, s_phone#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [5]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_address#X, s_phone#X] @@ -114,7 +114,7 @@ Arguments: false (16) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (17) ColumnarExchange Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] @@ -157,7 +157,7 @@ Arguments: false (26) VeloxResizeBatches Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X] -Arguments: X, X +Arguments: X, X, X (27) ColumnarExchange Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X] @@ -317,7 +317,7 @@ Arguments: false (54) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (55) ColumnarExchange Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/16.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/16.txt index 3441216f140..64015145b5c 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/16.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/16.txt @@ -84,7 +84,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X] @@ -121,7 +121,7 @@ Arguments: false (14) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_partkey#X, p_brand#X, p_type#X, p_size#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [5]: [hash_partition_key#X, p_partkey#X, p_brand#X, p_type#X, p_size#X] @@ -164,7 +164,7 @@ Arguments: false (24) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, ps_suppkey#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, ps_suppkey#X] @@ -204,7 +204,7 @@ Arguments: false (33) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, count#X] -Arguments: X, X +Arguments: X, X, X (34) ColumnarExchange Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, count#X] @@ -233,7 +233,7 @@ Arguments: false (40) VeloxResizeBatches Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X] -Arguments: X, X +Arguments: X, X, X (41) ColumnarExchange Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/17.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/17.txt index c1b43b7fc42..1bbcd5fbb0a 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/17.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/17.txt @@ -79,7 +79,7 @@ Arguments: false (5) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_partkey#X, l_quantity#X, l_extendedprice#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [4]: [hash_partition_key#X, l_partkey#X, l_quantity#X, l_extendedprice#X] @@ -116,7 +116,7 @@ Arguments: false (14) VeloxResizeBatches Input [2]: [hash_partition_key#X, p_partkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [2]: [hash_partition_key#X, p_partkey#X] @@ -170,7 +170,7 @@ Arguments: false (26) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_partkey#X, sum#X, count#X] -Arguments: X, X +Arguments: X, X, X (27) ColumnarExchange Input [4]: [hash_partition_key#X, l_partkey#X, sum#X, count#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/18.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/18.txt index c1a6b181bb3..748f8c59df4 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/18.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/18.txt @@ -119,7 +119,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_custkey#X, c_name#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, c_custkey#X, c_name#X] @@ -156,7 +156,7 @@ Arguments: false (14) VeloxResizeBatches Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_totalprice#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_totalprice#X, o_orderdate#X] @@ -195,7 +195,7 @@ Arguments: false (23) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_orderkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (24) ColumnarExchange Input [4]: [hash_partition_key#X, l_orderkey#X, sum#X, isEmpty#X] @@ -242,7 +242,7 @@ Arguments: false (34) VeloxResizeBatches Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_totalprice#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (35) ColumnarExchange Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_totalprice#X, o_orderdate#X] @@ -274,7 +274,7 @@ Arguments: false (42) VeloxResizeBatches Input [6]: [hash_partition_key#X, c_custkey#X, c_name#X, o_orderkey#X, o_totalprice#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (43) ColumnarExchange Input [6]: [hash_partition_key#X, c_custkey#X, c_name#X, o_orderkey#X, o_totalprice#X, o_orderdate#X] @@ -311,7 +311,7 @@ Arguments: false (51) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_quantity#X] -Arguments: X, X +Arguments: X, X, X (52) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_quantity#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/19.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/19.txt index 420c980f327..019cee8dbf4 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/19.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/19.txt @@ -56,7 +56,7 @@ Arguments: false (5) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_partkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [5]: [hash_partition_key#X, l_partkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] @@ -93,7 +93,7 @@ Arguments: false (14) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_partkey#X, p_brand#X, p_size#X, p_container#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [5]: [hash_partition_key#X, p_partkey#X, p_brand#X, p_size#X, p_container#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/20.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/20.txt index 4d8eee1f1fb..1565a9ea077 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/20.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/20.txt @@ -146,7 +146,7 @@ Arguments: false (5) VeloxResizeBatches Input [5]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_address#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [5]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_address#X, s_nationkey#X] @@ -183,7 +183,7 @@ Arguments: false (14) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X] @@ -220,7 +220,7 @@ Arguments: false (23) VeloxResizeBatches Input [2]: [hash_partition_key#X, p_partkey#X] -Arguments: X, X +Arguments: X, X, X (24) ColumnarExchange Input [2]: [hash_partition_key#X, p_partkey#X] @@ -252,7 +252,7 @@ Arguments: false (31) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X] @@ -289,7 +289,7 @@ Arguments: false (40) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_partkey#X, l_suppkey#X, l_quantity#X] -Arguments: X, X +Arguments: X, X, X (41) ColumnarExchange Input [4]: [hash_partition_key#X, l_partkey#X, l_suppkey#X, l_quantity#X] @@ -349,7 +349,7 @@ Arguments: false (55) VeloxResizeBatches Input [4]: [hash_partition_key#X, (0.5 * sum(l_quantity))#X, l_partkey#X, l_suppkey#X] -Arguments: X, X +Arguments: X, X, X (56) ColumnarExchange Input [4]: [hash_partition_key#X, (0.5 * sum(l_quantity))#X, l_partkey#X, l_suppkey#X] @@ -381,7 +381,7 @@ Arguments: false (63) VeloxResizeBatches Input [2]: [hash_partition_key#X, ps_suppkey#X] -Arguments: X, X +Arguments: X, X, X (64) ColumnarExchange Input [2]: [hash_partition_key#X, ps_suppkey#X] @@ -413,7 +413,7 @@ Arguments: false (71) VeloxResizeBatches Input [4]: [hash_partition_key#X, s_name#X, s_address#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (72) ColumnarExchange Input [4]: [hash_partition_key#X, s_name#X, s_address#X, s_nationkey#X] @@ -450,7 +450,7 @@ Arguments: false (80) VeloxResizeBatches Input [2]: [hash_partition_key#X, n_nationkey#X] -Arguments: X, X +Arguments: X, X, X (81) ColumnarExchange Input [2]: [hash_partition_key#X, n_nationkey#X] @@ -482,7 +482,7 @@ Arguments: false (88) VeloxResizeBatches Input [2]: [s_name#X, s_address#X] -Arguments: X, X +Arguments: X, X, X (89) ColumnarExchange Input [2]: [s_name#X, s_address#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/21.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/21.txt index 96750b2b3ec..4a28c777ae2 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/21.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/21.txt @@ -140,7 +140,7 @@ Arguments: false (5) VeloxResizeBatches Input [4]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [4]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_nationkey#X] @@ -177,7 +177,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] @@ -209,7 +209,7 @@ Arguments: false (22) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] @@ -252,7 +252,7 @@ Arguments: false (32) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] -Arguments: X, X +Arguments: X, X, X (33) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] @@ -284,7 +284,7 @@ Arguments: false (40) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] -Arguments: X, X +Arguments: X, X, X (41) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] @@ -316,7 +316,7 @@ Arguments: false (48) VeloxResizeBatches Input [4]: [hash_partition_key#X, s_name#X, s_nationkey#X, l_orderkey#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [4]: [hash_partition_key#X, s_name#X, s_nationkey#X, l_orderkey#X] @@ -353,7 +353,7 @@ Arguments: false (57) VeloxResizeBatches Input [2]: [hash_partition_key#X, o_orderkey#X] -Arguments: X, X +Arguments: X, X, X (58) ColumnarExchange Input [2]: [hash_partition_key#X, o_orderkey#X] @@ -385,7 +385,7 @@ Arguments: false (65) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_name#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (66) ColumnarExchange Input [3]: [hash_partition_key#X, s_name#X, s_nationkey#X] @@ -422,7 +422,7 @@ Arguments: false (74) VeloxResizeBatches Input [2]: [hash_partition_key#X, n_nationkey#X] -Arguments: X, X +Arguments: X, X, X (75) ColumnarExchange Input [2]: [hash_partition_key#X, n_nationkey#X] @@ -465,7 +465,7 @@ Arguments: false (84) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_name#X, count#X] -Arguments: X, X +Arguments: X, X, X (85) ColumnarExchange Input [3]: [hash_partition_key#X, s_name#X, count#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/22.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/22.txt index c6e147da04d..21f890c49ee 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/22.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/22.txt @@ -67,7 +67,7 @@ Arguments: false (5) VeloxResizeBatches Input [4]: [hash_partition_key#X, c_custkey#X, c_phone#X, c_acctbal#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [4]: [hash_partition_key#X, c_custkey#X, c_phone#X, c_acctbal#X] @@ -99,7 +99,7 @@ Arguments: false (13) VeloxResizeBatches Input [2]: [hash_partition_key#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (14) ColumnarExchange Input [2]: [hash_partition_key#X, o_custkey#X] @@ -142,7 +142,7 @@ Arguments: false (23) VeloxResizeBatches Input [5]: [hash_partition_key#X, cntrycode#X, count#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (24) ColumnarExchange Input [5]: [hash_partition_key#X, cntrycode#X, count#X, sum#X, isEmpty#X] @@ -171,7 +171,7 @@ Arguments: false (30) VeloxResizeBatches Input [3]: [cntrycode#X, numcust#X, totacctbal#X] -Arguments: X, X +Arguments: X, X, X (31) ColumnarExchange Input [3]: [cntrycode#X, numcust#X, totacctbal#X] @@ -323,7 +323,7 @@ Arguments: false (58) VeloxResizeBatches Input [2]: [sum#X, count#X] -Arguments: X, X +Arguments: X, X, X (59) ColumnarExchange Input [2]: [sum#X, count#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/3.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/3.txt index d6573f7483b..4a669b95ca6 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/3.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/3.txt @@ -81,7 +81,7 @@ Arguments: false (5) VeloxResizeBatches Input [2]: [hash_partition_key#X, c_custkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [2]: [hash_partition_key#X, c_custkey#X] @@ -118,7 +118,7 @@ Arguments: false (14) VeloxResizeBatches Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_orderdate#X, o_shippriority#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_orderdate#X, o_shippriority#X] @@ -150,7 +150,7 @@ Arguments: false (22) VeloxResizeBatches Input [4]: [hash_partition_key#X, o_orderkey#X, o_orderdate#X, o_shippriority#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [4]: [hash_partition_key#X, o_orderkey#X, o_orderdate#X, o_shippriority#X] @@ -187,7 +187,7 @@ Arguments: false (31) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [4]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/4.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/4.txt index 71a8f6974ed..0f5c41de5be 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/4.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/4.txt @@ -71,7 +71,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderpriority#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderpriority#X] @@ -108,7 +108,7 @@ Arguments: false (14) VeloxResizeBatches Input [2]: [hash_partition_key#X, l_orderkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [2]: [hash_partition_key#X, l_orderkey#X] @@ -151,7 +151,7 @@ Arguments: false (24) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderpriority#X, count#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderpriority#X, count#X] @@ -180,7 +180,7 @@ Arguments: false (31) VeloxResizeBatches Input [2]: [o_orderpriority#X, order_count#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [2]: [o_orderpriority#X, order_count#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/5.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/5.txt index a78e477ace2..223fb133386 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/5.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/5.txt @@ -155,7 +155,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] @@ -192,7 +192,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] @@ -224,7 +224,7 @@ Arguments: false (22) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_nationkey#X, o_orderkey#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [3]: [hash_partition_key#X, c_nationkey#X, o_orderkey#X] @@ -261,7 +261,7 @@ Arguments: false (31) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [5]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] @@ -293,7 +293,7 @@ Arguments: false (39) VeloxResizeBatches Input [5]: [hash_partition_key#X, c_nationkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (40) ColumnarExchange Input [5]: [hash_partition_key#X, c_nationkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] @@ -330,7 +330,7 @@ Arguments: false (48) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] @@ -362,7 +362,7 @@ Arguments: false (56) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (57) ColumnarExchange Input [4]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X] @@ -399,7 +399,7 @@ Arguments: false (65) VeloxResizeBatches Input [4]: [hash_partition_key#X, n_nationkey#X, n_name#X, n_regionkey#X] -Arguments: X, X +Arguments: X, X, X (66) ColumnarExchange Input [4]: [hash_partition_key#X, n_nationkey#X, n_name#X, n_regionkey#X] @@ -431,7 +431,7 @@ Arguments: false (73) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, n_name#X, n_regionkey#X] -Arguments: X, X +Arguments: X, X, X (74) ColumnarExchange Input [5]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, n_name#X, n_regionkey#X] @@ -468,7 +468,7 @@ Arguments: false (82) VeloxResizeBatches Input [2]: [hash_partition_key#X, r_regionkey#X] -Arguments: X, X +Arguments: X, X, X (83) ColumnarExchange Input [2]: [hash_partition_key#X, r_regionkey#X] @@ -511,7 +511,7 @@ Arguments: false (92) VeloxResizeBatches Input [4]: [hash_partition_key#X, n_name#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (93) ColumnarExchange Input [4]: [hash_partition_key#X, n_name#X, sum#X, isEmpty#X] @@ -540,7 +540,7 @@ Arguments: false (99) VeloxResizeBatches Input [2]: [n_name#X, revenue#X] -Arguments: X, X +Arguments: X, X, X (100) ColumnarExchange Input [2]: [n_name#X, revenue#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/6.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/6.txt index b85e63e1065..1e1d87db4b2 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/6.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/6.txt @@ -48,7 +48,7 @@ Arguments: false (6) VeloxResizeBatches Input [2]: [sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (7) ColumnarExchange Input [2]: [sum#X, isEmpty#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/7.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/7.txt index a0894489f0a..43f5a9823ab 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/7.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/7.txt @@ -149,7 +149,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] @@ -186,7 +186,7 @@ Arguments: false (14) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [6]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X] @@ -218,7 +218,7 @@ Arguments: false (22) VeloxResizeBatches Input [6]: [hash_partition_key#X, s_nationkey#X, l_orderkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [6]: [hash_partition_key#X, s_nationkey#X, l_orderkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X] @@ -255,7 +255,7 @@ Arguments: false (31) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] @@ -287,7 +287,7 @@ Arguments: false (39) VeloxResizeBatches Input [6]: [hash_partition_key#X, s_nationkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (40) ColumnarExchange Input [6]: [hash_partition_key#X, s_nationkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X, o_custkey#X] @@ -324,7 +324,7 @@ Arguments: false (48) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] @@ -356,7 +356,7 @@ Arguments: false (56) VeloxResizeBatches Input [6]: [hash_partition_key#X, s_nationkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X, c_nationkey#X] -Arguments: X, X +Arguments: X, X, X (57) ColumnarExchange Input [6]: [hash_partition_key#X, s_nationkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X, c_nationkey#X] @@ -393,7 +393,7 @@ Arguments: false (65) VeloxResizeBatches Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (66) ColumnarExchange Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] @@ -425,7 +425,7 @@ Arguments: false (73) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, l_shipdate#X, c_nationkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (74) ColumnarExchange Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, l_shipdate#X, c_nationkey#X, n_name#X] @@ -481,7 +481,7 @@ Arguments: false (87) VeloxResizeBatches Input [6]: [hash_partition_key#X, supp_nation#X, cust_nation#X, l_year#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (88) ColumnarExchange Input [6]: [hash_partition_key#X, supp_nation#X, cust_nation#X, l_year#X, sum#X, isEmpty#X] @@ -510,7 +510,7 @@ Arguments: false (94) VeloxResizeBatches Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X] -Arguments: X, X +Arguments: X, X, X (95) ColumnarExchange Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/8.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/8.txt index 88a6a79e074..284a5c88dfd 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/8.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/8.txt @@ -198,7 +198,7 @@ Arguments: false (5) VeloxResizeBatches Input [2]: [hash_partition_key#X, p_partkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [2]: [hash_partition_key#X, p_partkey#X] @@ -235,7 +235,7 @@ Arguments: false (14) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [6]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] @@ -267,7 +267,7 @@ Arguments: false (22) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [5]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] @@ -304,7 +304,7 @@ Arguments: false (31) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] @@ -336,7 +336,7 @@ Arguments: false (39) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (40) ColumnarExchange Input [5]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X, s_nationkey#X] @@ -373,7 +373,7 @@ Arguments: false (48) VeloxResizeBatches Input [4]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [4]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_orderdate#X] @@ -405,7 +405,7 @@ Arguments: false (56) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_custkey#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (57) ColumnarExchange Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_custkey#X, o_orderdate#X] @@ -442,7 +442,7 @@ Arguments: false (65) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] -Arguments: X, X +Arguments: X, X, X (66) ColumnarExchange Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] @@ -474,7 +474,7 @@ Arguments: false (73) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_orderdate#X, c_nationkey#X] -Arguments: X, X +Arguments: X, X, X (74) ColumnarExchange Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_orderdate#X, c_nationkey#X] @@ -511,7 +511,7 @@ Arguments: false (82) VeloxResizeBatches Input [3]: [hash_partition_key#X, n_nationkey#X, n_regionkey#X] -Arguments: X, X +Arguments: X, X, X (83) ColumnarExchange Input [3]: [hash_partition_key#X, n_nationkey#X, n_regionkey#X] @@ -543,7 +543,7 @@ Arguments: false (90) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_orderdate#X, n_regionkey#X] -Arguments: X, X +Arguments: X, X, X (91) ColumnarExchange Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_orderdate#X, n_regionkey#X] @@ -580,7 +580,7 @@ Arguments: false (99) VeloxResizeBatches Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (100) ColumnarExchange Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] @@ -612,7 +612,7 @@ Arguments: false (107) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, o_orderdate#X, n_regionkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (108) ColumnarExchange Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, o_orderdate#X, n_regionkey#X, n_name#X] @@ -649,7 +649,7 @@ Arguments: false (116) VeloxResizeBatches Input [2]: [hash_partition_key#X, r_regionkey#X] -Arguments: X, X +Arguments: X, X, X (117) ColumnarExchange Input [2]: [hash_partition_key#X, r_regionkey#X] @@ -692,7 +692,7 @@ Arguments: false (126) VeloxResizeBatches Input [6]: [hash_partition_key#X, o_year#X, sum#X, isEmpty#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (127) ColumnarExchange Input [6]: [hash_partition_key#X, o_year#X, sum#X, isEmpty#X, sum#X, isEmpty#X] @@ -725,7 +725,7 @@ Arguments: false (134) VeloxResizeBatches Input [2]: [o_year#X, mkt_share#X] -Arguments: X, X +Arguments: X, X, X (135) ColumnarExchange Input [2]: [o_year#X, mkt_share#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/9.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/9.txt index 4f537e91e13..6819628a002 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/9.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1-ras/spark35/9.txt @@ -154,7 +154,7 @@ Arguments: false (5) VeloxResizeBatches Input [2]: [hash_partition_key#X, p_partkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [2]: [hash_partition_key#X, p_partkey#X] @@ -191,7 +191,7 @@ Arguments: false (14) VeloxResizeBatches Input [7]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [7]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] @@ -223,7 +223,7 @@ Arguments: false (22) VeloxResizeBatches Input [7]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [7]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] @@ -260,7 +260,7 @@ Arguments: false (31) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] @@ -292,7 +292,7 @@ Arguments: false (39) VeloxResizeBatches Input [8]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (40) ColumnarExchange Input [8]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X] @@ -329,7 +329,7 @@ Arguments: false (48) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_supplycost#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_supplycost#X] @@ -361,7 +361,7 @@ Arguments: false (56) VeloxResizeBatches Input [7]: [hash_partition_key#X, l_orderkey#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X, ps_supplycost#X] -Arguments: X, X +Arguments: X, X, X (57) ColumnarExchange Input [7]: [hash_partition_key#X, l_orderkey#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X, ps_supplycost#X] @@ -398,7 +398,7 @@ Arguments: false (65) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (66) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderdate#X] @@ -430,7 +430,7 @@ Arguments: false (73) VeloxResizeBatches Input [7]: [hash_partition_key#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X, ps_supplycost#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (74) ColumnarExchange Input [7]: [hash_partition_key#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X, ps_supplycost#X, o_orderdate#X] @@ -467,7 +467,7 @@ Arguments: false (82) VeloxResizeBatches Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (83) ColumnarExchange Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] @@ -510,7 +510,7 @@ Arguments: false (92) VeloxResizeBatches Input [5]: [hash_partition_key#X, nation#X, o_year#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (93) ColumnarExchange Input [5]: [hash_partition_key#X, nation#X, o_year#X, sum#X, isEmpty#X] @@ -539,7 +539,7 @@ Arguments: false (99) VeloxResizeBatches Input [3]: [nation#X, o_year#X, sum_profit#X] -Arguments: X, X +Arguments: X, X, X (100) ColumnarExchange Input [3]: [nation#X, o_year#X, sum_profit#X] 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 83b14670666..036f344fa36 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 @@ -60,7 +60,7 @@ Arguments: false (7) VeloxResizeBatches Input [18]: [hash_partition_key#X, l_returnflag#X, l_linestatus#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, count#X, sum#X, count#X, sum#X, count#X, count#X] -Arguments: X, X +Arguments: X, X, X (8) ColumnarExchange Input [18]: [hash_partition_key#X, l_returnflag#X, l_linestatus#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, count#X, sum#X, count#X, sum#X, count#X, count#X] @@ -89,7 +89,7 @@ Arguments: false (14) VeloxResizeBatches 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: X, X +Arguments: X, X, X (15) ColumnarExchange 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] 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 eda09c55988..f505de81a95 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 @@ -109,7 +109,7 @@ Arguments: false (5) VeloxResizeBatches Input [8]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [8]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X] @@ -146,7 +146,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] @@ -177,7 +177,7 @@ Arguments: false (22) VeloxResizeBatches Input [9]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X, o_orderkey#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [9]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X, o_orderkey#X] @@ -214,7 +214,7 @@ Arguments: false (31) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [4]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X] @@ -245,7 +245,7 @@ Arguments: false (39) VeloxResizeBatches Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (40) ColumnarExchange Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X, l_extendedprice#X, l_discount#X] @@ -282,7 +282,7 @@ Arguments: false (48) VeloxResizeBatches Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] @@ -324,7 +324,7 @@ Arguments: false (58) VeloxResizeBatches Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_acctbal#X, c_phone#X, n_name#X, c_address#X, c_comment#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (59) ColumnarExchange Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_acctbal#X, c_phone#X, n_name#X, c_address#X, c_comment#X, sum#X, isEmpty#X] 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 3d0aaf9aed7..1a017476e5b 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 @@ -93,7 +93,7 @@ Arguments: false (5) VeloxResizeBatches Input [5]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X, ps_supplycost#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [5]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X, ps_supplycost#X] @@ -130,7 +130,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] @@ -161,7 +161,7 @@ Arguments: false (22) VeloxResizeBatches Input [5]: [hash_partition_key#X, ps_partkey#X, ps_availqty#X, ps_supplycost#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [5]: [hash_partition_key#X, ps_partkey#X, ps_availqty#X, ps_supplycost#X, s_nationkey#X] @@ -198,7 +198,7 @@ Arguments: false (31) VeloxResizeBatches Input [2]: [hash_partition_key#X, n_nationkey#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [2]: [hash_partition_key#X, n_nationkey#X] @@ -240,7 +240,7 @@ Arguments: false (41) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_partkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (42) ColumnarExchange Input [4]: [hash_partition_key#X, ps_partkey#X, sum#X, isEmpty#X] @@ -273,7 +273,7 @@ Arguments: false (49) VeloxResizeBatches Input [2]: [ps_partkey#X, value#X] -Arguments: X, X +Arguments: X, X, X (50) ColumnarExchange Input [2]: [ps_partkey#X, value#X] 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 431e17fd4dd..911b4019937 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 @@ -70,7 +70,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderpriority#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderpriority#X] @@ -107,7 +107,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_shipmode#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_shipmode#X] @@ -149,7 +149,7 @@ Arguments: false (24) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_shipmode#X, sum#X, sum#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [4]: [hash_partition_key#X, l_shipmode#X, sum#X, sum#X] @@ -178,7 +178,7 @@ Arguments: false (31) VeloxResizeBatches Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X] 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 c8ddb543700..45744bb0731 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 @@ -67,7 +67,7 @@ Arguments: false (4) VeloxResizeBatches Input [2]: [hash_partition_key#X, c_custkey#X] -Arguments: X, X +Arguments: X, X, X (5) ColumnarExchange Input [2]: [hash_partition_key#X, c_custkey#X] @@ -104,7 +104,7 @@ Arguments: false (13) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (14) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] @@ -157,7 +157,7 @@ Arguments: false (25) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_count#X, count#X] -Arguments: X, X +Arguments: X, X, X (26) ColumnarExchange Input [3]: [hash_partition_key#X, c_count#X, count#X] @@ -186,7 +186,7 @@ Arguments: false (32) VeloxResizeBatches Input [2]: [c_count#X, custdist#X] -Arguments: X, X +Arguments: X, X, X (33) ColumnarExchange Input [2]: [c_count#X, custdist#X] 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 c54c630e2f1..0f0d8a458c2 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 @@ -57,7 +57,7 @@ Arguments: false (5) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_partkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [4]: [hash_partition_key#X, l_partkey#X, l_extendedprice#X, l_discount#X] @@ -94,7 +94,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, p_partkey#X, p_type#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, p_partkey#X, p_type#X] 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 72522b71eb6..b68b33f2718 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 @@ -67,7 +67,7 @@ Arguments: false (5) VeloxResizeBatches Input [5]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_address#X, s_phone#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [5]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_address#X, s_phone#X] @@ -115,7 +115,7 @@ Arguments: false (16) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (17) ColumnarExchange Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] @@ -157,7 +157,7 @@ Arguments: false (26) VeloxResizeBatches Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X] -Arguments: X, X +Arguments: X, X, X (27) ColumnarExchange Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X] 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 2c41822beee..34aff1782ef 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 @@ -84,7 +84,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X] @@ -121,7 +121,7 @@ Arguments: false (14) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_partkey#X, p_brand#X, p_type#X, p_size#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [5]: [hash_partition_key#X, p_partkey#X, p_brand#X, p_type#X, p_size#X] @@ -163,7 +163,7 @@ Arguments: false (24) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, ps_suppkey#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, ps_suppkey#X] @@ -203,7 +203,7 @@ Arguments: false (33) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, count#X] -Arguments: X, X +Arguments: X, X, X (34) ColumnarExchange Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, count#X] @@ -232,7 +232,7 @@ Arguments: false (40) VeloxResizeBatches Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X] -Arguments: X, X +Arguments: X, X, X (41) ColumnarExchange Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X] 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 30fd4b0b112..5fbc2db77ad 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 @@ -79,7 +79,7 @@ Arguments: false (5) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_partkey#X, l_quantity#X, l_extendedprice#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [4]: [hash_partition_key#X, l_partkey#X, l_quantity#X, l_extendedprice#X] @@ -116,7 +116,7 @@ Arguments: false (14) VeloxResizeBatches Input [2]: [hash_partition_key#X, p_partkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [2]: [hash_partition_key#X, p_partkey#X] @@ -169,7 +169,7 @@ Arguments: false (26) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_partkey#X, sum#X, count#X] -Arguments: X, X +Arguments: X, X, X (27) ColumnarExchange Input [4]: [hash_partition_key#X, l_partkey#X, sum#X, count#X] 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 dd4cad538e2..cbc770042b0 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 @@ -119,7 +119,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_custkey#X, c_name#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, c_custkey#X, c_name#X] @@ -156,7 +156,7 @@ Arguments: false (14) VeloxResizeBatches Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_totalprice#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_totalprice#X, o_orderdate#X] @@ -195,7 +195,7 @@ Arguments: false (23) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_orderkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (24) ColumnarExchange Input [4]: [hash_partition_key#X, l_orderkey#X, sum#X, isEmpty#X] @@ -241,7 +241,7 @@ Arguments: false (34) VeloxResizeBatches Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_totalprice#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (35) ColumnarExchange Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_totalprice#X, o_orderdate#X] @@ -272,7 +272,7 @@ Arguments: false (42) VeloxResizeBatches Input [6]: [hash_partition_key#X, c_custkey#X, c_name#X, o_orderkey#X, o_totalprice#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (43) ColumnarExchange Input [6]: [hash_partition_key#X, c_custkey#X, c_name#X, o_orderkey#X, o_totalprice#X, o_orderdate#X] @@ -309,7 +309,7 @@ Arguments: false (51) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_quantity#X] -Arguments: X, X +Arguments: X, X, X (52) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_quantity#X] 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 c494adafc57..df31b88fb4a 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 @@ -56,7 +56,7 @@ Arguments: false (5) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_partkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [5]: [hash_partition_key#X, l_partkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] @@ -93,7 +93,7 @@ Arguments: false (14) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_partkey#X, p_brand#X, p_size#X, p_container#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [5]: [hash_partition_key#X, p_partkey#X, p_brand#X, p_size#X, p_container#X] 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 13c10a7bba2..9865eab3eef 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 @@ -147,7 +147,7 @@ Arguments: false (5) VeloxResizeBatches Input [5]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_address#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [5]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_address#X, s_nationkey#X] @@ -184,7 +184,7 @@ Arguments: false (14) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X] @@ -221,7 +221,7 @@ Arguments: false (23) VeloxResizeBatches Input [2]: [hash_partition_key#X, p_partkey#X] -Arguments: X, X +Arguments: X, X, X (24) ColumnarExchange Input [2]: [hash_partition_key#X, p_partkey#X] @@ -252,7 +252,7 @@ Arguments: false (31) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X] @@ -289,7 +289,7 @@ Arguments: false (40) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_partkey#X, l_suppkey#X, l_quantity#X] -Arguments: X, X +Arguments: X, X, X (41) ColumnarExchange Input [4]: [hash_partition_key#X, l_partkey#X, l_suppkey#X, l_quantity#X] @@ -348,7 +348,7 @@ Arguments: false (55) VeloxResizeBatches Input [4]: [hash_partition_key#X, (0.5 * sum(l_quantity))#X, l_partkey#X, l_suppkey#X] -Arguments: X, X +Arguments: X, X, X (56) ColumnarExchange Input [4]: [hash_partition_key#X, (0.5 * sum(l_quantity))#X, l_partkey#X, l_suppkey#X] @@ -379,7 +379,7 @@ Arguments: false (63) VeloxResizeBatches Input [2]: [hash_partition_key#X, ps_suppkey#X] -Arguments: X, X +Arguments: X, X, X (64) ColumnarExchange Input [2]: [hash_partition_key#X, ps_suppkey#X] @@ -410,7 +410,7 @@ Arguments: false (71) VeloxResizeBatches Input [4]: [hash_partition_key#X, s_name#X, s_address#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (72) ColumnarExchange Input [4]: [hash_partition_key#X, s_name#X, s_address#X, s_nationkey#X] @@ -447,7 +447,7 @@ Arguments: false (80) VeloxResizeBatches Input [2]: [hash_partition_key#X, n_nationkey#X] -Arguments: X, X +Arguments: X, X, X (81) ColumnarExchange Input [2]: [hash_partition_key#X, n_nationkey#X] @@ -478,7 +478,7 @@ Arguments: false (88) VeloxResizeBatches Input [2]: [s_name#X, s_address#X] -Arguments: X, X +Arguments: X, X, X (89) ColumnarExchange Input [2]: [s_name#X, s_address#X] 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 e72762dd9bf..99bd2d0b536 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 @@ -141,7 +141,7 @@ Arguments: false (5) VeloxResizeBatches Input [4]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [4]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_nationkey#X] @@ -178,7 +178,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] @@ -210,7 +210,7 @@ Arguments: false (22) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] @@ -252,7 +252,7 @@ Arguments: false (32) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] -Arguments: X, X +Arguments: X, X, X (33) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] @@ -283,7 +283,7 @@ Arguments: false (40) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] -Arguments: X, X +Arguments: X, X, X (41) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] @@ -314,7 +314,7 @@ Arguments: false (48) VeloxResizeBatches Input [4]: [hash_partition_key#X, s_name#X, s_nationkey#X, l_orderkey#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [4]: [hash_partition_key#X, s_name#X, s_nationkey#X, l_orderkey#X] @@ -351,7 +351,7 @@ Arguments: false (57) VeloxResizeBatches Input [2]: [hash_partition_key#X, o_orderkey#X] -Arguments: X, X +Arguments: X, X, X (58) ColumnarExchange Input [2]: [hash_partition_key#X, o_orderkey#X] @@ -382,7 +382,7 @@ Arguments: false (65) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_name#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (66) ColumnarExchange Input [3]: [hash_partition_key#X, s_name#X, s_nationkey#X] @@ -419,7 +419,7 @@ Arguments: false (74) VeloxResizeBatches Input [2]: [hash_partition_key#X, n_nationkey#X] -Arguments: X, X +Arguments: X, X, X (75) ColumnarExchange Input [2]: [hash_partition_key#X, n_nationkey#X] @@ -461,7 +461,7 @@ Arguments: false (84) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_name#X, count#X] -Arguments: X, X +Arguments: X, X, X (85) ColumnarExchange Input [3]: [hash_partition_key#X, s_name#X, count#X] 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 81af91c0ee2..506454ed247 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 @@ -67,7 +67,7 @@ Arguments: false (5) VeloxResizeBatches Input [4]: [hash_partition_key#X, c_custkey#X, c_phone#X, c_acctbal#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [4]: [hash_partition_key#X, c_custkey#X, c_phone#X, c_acctbal#X] @@ -99,7 +99,7 @@ Arguments: false (13) VeloxResizeBatches Input [2]: [hash_partition_key#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (14) ColumnarExchange Input [2]: [hash_partition_key#X, o_custkey#X] @@ -141,7 +141,7 @@ Arguments: false (23) VeloxResizeBatches Input [5]: [hash_partition_key#X, cntrycode#X, count#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (24) ColumnarExchange Input [5]: [hash_partition_key#X, cntrycode#X, count#X, sum#X, isEmpty#X] @@ -170,7 +170,7 @@ Arguments: false (30) VeloxResizeBatches Input [3]: [cntrycode#X, numcust#X, totacctbal#X] -Arguments: X, X +Arguments: X, X, X (31) ColumnarExchange Input [3]: [cntrycode#X, numcust#X, totacctbal#X] 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 c633118a762..06480cda6f5 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 @@ -81,7 +81,7 @@ Arguments: false (5) VeloxResizeBatches Input [2]: [hash_partition_key#X, c_custkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [2]: [hash_partition_key#X, c_custkey#X] @@ -118,7 +118,7 @@ Arguments: false (14) VeloxResizeBatches Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_orderdate#X, o_shippriority#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_orderdate#X, o_shippriority#X] @@ -149,7 +149,7 @@ Arguments: false (22) VeloxResizeBatches Input [4]: [hash_partition_key#X, o_orderkey#X, o_orderdate#X, o_shippriority#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [4]: [hash_partition_key#X, o_orderkey#X, o_orderdate#X, o_shippriority#X] @@ -186,7 +186,7 @@ Arguments: false (31) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [4]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X] 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 40cfa020ce7..63e7c260c19 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 @@ -71,7 +71,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderpriority#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderpriority#X] @@ -108,7 +108,7 @@ Arguments: false (14) VeloxResizeBatches Input [2]: [hash_partition_key#X, l_orderkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [2]: [hash_partition_key#X, l_orderkey#X] @@ -150,7 +150,7 @@ Arguments: false (24) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderpriority#X, count#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderpriority#X, count#X] @@ -179,7 +179,7 @@ Arguments: false (31) VeloxResizeBatches Input [2]: [o_orderpriority#X, order_count#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [2]: [o_orderpriority#X, order_count#X] 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 17629cc3463..ee30bc5f1f0 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 @@ -155,7 +155,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] @@ -192,7 +192,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] @@ -223,7 +223,7 @@ Arguments: false (22) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_nationkey#X, o_orderkey#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [3]: [hash_partition_key#X, c_nationkey#X, o_orderkey#X] @@ -260,7 +260,7 @@ Arguments: false (31) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [5]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] @@ -291,7 +291,7 @@ Arguments: false (39) VeloxResizeBatches Input [5]: [hash_partition_key#X, c_nationkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (40) ColumnarExchange Input [5]: [hash_partition_key#X, c_nationkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] @@ -328,7 +328,7 @@ Arguments: false (48) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] @@ -359,7 +359,7 @@ Arguments: false (56) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (57) ColumnarExchange Input [4]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X] @@ -396,7 +396,7 @@ Arguments: false (65) VeloxResizeBatches Input [4]: [hash_partition_key#X, n_nationkey#X, n_name#X, n_regionkey#X] -Arguments: X, X +Arguments: X, X, X (66) ColumnarExchange Input [4]: [hash_partition_key#X, n_nationkey#X, n_name#X, n_regionkey#X] @@ -427,7 +427,7 @@ Arguments: false (73) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, n_name#X, n_regionkey#X] -Arguments: X, X +Arguments: X, X, X (74) ColumnarExchange Input [5]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, n_name#X, n_regionkey#X] @@ -464,7 +464,7 @@ Arguments: false (82) VeloxResizeBatches Input [2]: [hash_partition_key#X, r_regionkey#X] -Arguments: X, X +Arguments: X, X, X (83) ColumnarExchange Input [2]: [hash_partition_key#X, r_regionkey#X] @@ -506,7 +506,7 @@ Arguments: false (92) VeloxResizeBatches Input [4]: [hash_partition_key#X, n_name#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (93) ColumnarExchange Input [4]: [hash_partition_key#X, n_name#X, sum#X, isEmpty#X] @@ -535,7 +535,7 @@ Arguments: false (99) VeloxResizeBatches Input [2]: [n_name#X, revenue#X] -Arguments: X, X +Arguments: X, X, X (100) ColumnarExchange Input [2]: [n_name#X, revenue#X] 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 f5ca77c73ed..4b72ce731f1 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 @@ -48,7 +48,7 @@ Arguments: false (6) VeloxResizeBatches Input [2]: [sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (7) ColumnarExchange Input [2]: [sum#X, isEmpty#X] 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 f3ec7ef3a62..0ecd3761dfc 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 @@ -149,7 +149,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] @@ -186,7 +186,7 @@ Arguments: false (14) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [6]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X] @@ -217,7 +217,7 @@ Arguments: false (22) VeloxResizeBatches Input [6]: [hash_partition_key#X, s_nationkey#X, l_orderkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [6]: [hash_partition_key#X, s_nationkey#X, l_orderkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X] @@ -254,7 +254,7 @@ Arguments: false (31) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] @@ -285,7 +285,7 @@ Arguments: false (39) VeloxResizeBatches Input [6]: [hash_partition_key#X, s_nationkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (40) ColumnarExchange Input [6]: [hash_partition_key#X, s_nationkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X, o_custkey#X] @@ -322,7 +322,7 @@ Arguments: false (48) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] @@ -353,7 +353,7 @@ Arguments: false (56) VeloxResizeBatches Input [6]: [hash_partition_key#X, s_nationkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X, c_nationkey#X] -Arguments: X, X +Arguments: X, X, X (57) ColumnarExchange Input [6]: [hash_partition_key#X, s_nationkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X, c_nationkey#X] @@ -390,7 +390,7 @@ Arguments: false (65) VeloxResizeBatches Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (66) ColumnarExchange Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] @@ -421,7 +421,7 @@ Arguments: false (73) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, l_shipdate#X, c_nationkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (74) ColumnarExchange Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, l_shipdate#X, c_nationkey#X, n_name#X] @@ -476,7 +476,7 @@ Arguments: false (87) VeloxResizeBatches Input [6]: [hash_partition_key#X, supp_nation#X, cust_nation#X, l_year#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (88) ColumnarExchange Input [6]: [hash_partition_key#X, supp_nation#X, cust_nation#X, l_year#X, sum#X, isEmpty#X] @@ -505,7 +505,7 @@ Arguments: false (94) VeloxResizeBatches Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X] -Arguments: X, X +Arguments: X, X, X (95) ColumnarExchange Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X] 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 53c58577592..746f2ef7d79 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 @@ -198,7 +198,7 @@ Arguments: false (5) VeloxResizeBatches Input [2]: [hash_partition_key#X, p_partkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [2]: [hash_partition_key#X, p_partkey#X] @@ -235,7 +235,7 @@ Arguments: false (14) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [6]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] @@ -266,7 +266,7 @@ Arguments: false (22) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [5]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] @@ -303,7 +303,7 @@ Arguments: false (31) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] @@ -334,7 +334,7 @@ Arguments: false (39) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (40) ColumnarExchange Input [5]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X, s_nationkey#X] @@ -371,7 +371,7 @@ Arguments: false (48) VeloxResizeBatches Input [4]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [4]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_orderdate#X] @@ -402,7 +402,7 @@ Arguments: false (56) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_custkey#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (57) ColumnarExchange Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_custkey#X, o_orderdate#X] @@ -439,7 +439,7 @@ Arguments: false (65) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] -Arguments: X, X +Arguments: X, X, X (66) ColumnarExchange Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] @@ -470,7 +470,7 @@ Arguments: false (73) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_orderdate#X, c_nationkey#X] -Arguments: X, X +Arguments: X, X, X (74) ColumnarExchange Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_orderdate#X, c_nationkey#X] @@ -507,7 +507,7 @@ Arguments: false (82) VeloxResizeBatches Input [3]: [hash_partition_key#X, n_nationkey#X, n_regionkey#X] -Arguments: X, X +Arguments: X, X, X (83) ColumnarExchange Input [3]: [hash_partition_key#X, n_nationkey#X, n_regionkey#X] @@ -538,7 +538,7 @@ Arguments: false (90) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_orderdate#X, n_regionkey#X] -Arguments: X, X +Arguments: X, X, X (91) ColumnarExchange Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_orderdate#X, n_regionkey#X] @@ -575,7 +575,7 @@ Arguments: false (99) VeloxResizeBatches Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (100) ColumnarExchange Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] @@ -606,7 +606,7 @@ Arguments: false (107) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, o_orderdate#X, n_regionkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (108) ColumnarExchange Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, o_orderdate#X, n_regionkey#X, n_name#X] @@ -643,7 +643,7 @@ Arguments: false (116) VeloxResizeBatches Input [2]: [hash_partition_key#X, r_regionkey#X] -Arguments: X, X +Arguments: X, X, X (117) ColumnarExchange Input [2]: [hash_partition_key#X, r_regionkey#X] @@ -685,7 +685,7 @@ Arguments: false (126) VeloxResizeBatches Input [6]: [hash_partition_key#X, o_year#X, sum#X, isEmpty#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (127) ColumnarExchange Input [6]: [hash_partition_key#X, o_year#X, sum#X, isEmpty#X, sum#X, isEmpty#X] @@ -718,7 +718,7 @@ Arguments: false (134) VeloxResizeBatches Input [2]: [o_year#X, mkt_share#X] -Arguments: X, X +Arguments: X, X, X (135) ColumnarExchange Input [2]: [o_year#X, mkt_share#X] 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 6cca8ba5a47..732fd8428ce 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 @@ -154,7 +154,7 @@ Arguments: false (5) VeloxResizeBatches Input [2]: [hash_partition_key#X, p_partkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [2]: [hash_partition_key#X, p_partkey#X] @@ -191,7 +191,7 @@ Arguments: false (14) VeloxResizeBatches Input [7]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [7]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] @@ -222,7 +222,7 @@ Arguments: false (22) VeloxResizeBatches Input [7]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [7]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] @@ -259,7 +259,7 @@ Arguments: false (31) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] @@ -290,7 +290,7 @@ Arguments: false (39) VeloxResizeBatches Input [8]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (40) ColumnarExchange Input [8]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X] @@ -327,7 +327,7 @@ Arguments: false (48) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_supplycost#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_supplycost#X] @@ -358,7 +358,7 @@ Arguments: false (56) VeloxResizeBatches Input [7]: [hash_partition_key#X, l_orderkey#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X, ps_supplycost#X] -Arguments: X, X +Arguments: X, X, X (57) ColumnarExchange Input [7]: [hash_partition_key#X, l_orderkey#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X, ps_supplycost#X] @@ -395,7 +395,7 @@ Arguments: false (65) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (66) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderdate#X] @@ -426,7 +426,7 @@ Arguments: false (73) VeloxResizeBatches Input [7]: [hash_partition_key#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X, ps_supplycost#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (74) ColumnarExchange Input [7]: [hash_partition_key#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X, ps_supplycost#X, o_orderdate#X] @@ -463,7 +463,7 @@ Arguments: false (82) VeloxResizeBatches Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (83) ColumnarExchange Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] @@ -505,7 +505,7 @@ Arguments: false (92) VeloxResizeBatches Input [5]: [hash_partition_key#X, nation#X, o_year#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (93) ColumnarExchange Input [5]: [hash_partition_key#X, nation#X, o_year#X, sum#X, isEmpty#X] @@ -534,7 +534,7 @@ Arguments: false (99) VeloxResizeBatches Input [3]: [nation#X, o_year#X, sum_profit#X] -Arguments: X, X +Arguments: X, X, X (100) ColumnarExchange Input [3]: [nation#X, o_year#X, sum_profit#X] 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 9c144ceed8a..06cd41c4878 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 @@ -60,7 +60,7 @@ Arguments: false (7) VeloxResizeBatches Input [18]: [hash_partition_key#X, l_returnflag#X, l_linestatus#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, count#X, sum#X, count#X, sum#X, count#X, count#X] -Arguments: X, X +Arguments: X, X, X (8) ColumnarExchange Input [18]: [hash_partition_key#X, l_returnflag#X, l_linestatus#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, count#X, sum#X, count#X, sum#X, count#X, count#X] @@ -89,7 +89,7 @@ Arguments: false (14) VeloxResizeBatches 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: X, X +Arguments: X, X, X (15) ColumnarExchange 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] 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 4d00178618b..538fd7cf4fa 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 @@ -109,7 +109,7 @@ Arguments: false (5) VeloxResizeBatches Input [8]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [8]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X] @@ -146,7 +146,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] @@ -177,7 +177,7 @@ Arguments: false (22) VeloxResizeBatches Input [9]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X, o_orderkey#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [9]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X, o_orderkey#X] @@ -214,7 +214,7 @@ Arguments: false (31) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [4]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X] @@ -245,7 +245,7 @@ Arguments: false (39) VeloxResizeBatches Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (40) ColumnarExchange Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X, l_extendedprice#X, l_discount#X] @@ -282,7 +282,7 @@ Arguments: false (48) VeloxResizeBatches Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] @@ -324,7 +324,7 @@ Arguments: false (58) VeloxResizeBatches Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_acctbal#X, c_phone#X, n_name#X, c_address#X, c_comment#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (59) ColumnarExchange Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_acctbal#X, c_phone#X, n_name#X, c_address#X, c_comment#X, sum#X, isEmpty#X] 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 69dc6a18b16..1b84f9dca48 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 @@ -93,7 +93,7 @@ Arguments: false (5) VeloxResizeBatches Input [5]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X, ps_supplycost#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [5]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X, ps_supplycost#X] @@ -130,7 +130,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] @@ -161,7 +161,7 @@ Arguments: false (22) VeloxResizeBatches Input [5]: [hash_partition_key#X, ps_partkey#X, ps_availqty#X, ps_supplycost#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [5]: [hash_partition_key#X, ps_partkey#X, ps_availqty#X, ps_supplycost#X, s_nationkey#X] @@ -198,7 +198,7 @@ Arguments: false (31) VeloxResizeBatches Input [2]: [hash_partition_key#X, n_nationkey#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [2]: [hash_partition_key#X, n_nationkey#X] @@ -240,7 +240,7 @@ Arguments: false (41) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_partkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (42) ColumnarExchange Input [4]: [hash_partition_key#X, ps_partkey#X, sum#X, isEmpty#X] @@ -273,7 +273,7 @@ Arguments: false (49) VeloxResizeBatches Input [2]: [ps_partkey#X, value#X] -Arguments: X, X +Arguments: X, X, X (50) ColumnarExchange Input [2]: [ps_partkey#X, value#X] @@ -495,7 +495,7 @@ Arguments: false (87) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_suppkey#X, ps_availqty#X, ps_supplycost#X] -Arguments: X, X +Arguments: X, X, X (88) ColumnarExchange Input [4]: [hash_partition_key#X, ps_suppkey#X, ps_availqty#X, ps_supplycost#X] @@ -539,7 +539,7 @@ Arguments: false (99) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_availqty#X, ps_supplycost#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (100) ColumnarExchange Input [4]: [hash_partition_key#X, ps_availqty#X, ps_supplycost#X, s_nationkey#X] 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 0db41527d8e..d403753fed1 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 @@ -70,7 +70,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderpriority#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderpriority#X] @@ -107,7 +107,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_shipmode#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_shipmode#X] @@ -149,7 +149,7 @@ Arguments: false (24) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_shipmode#X, sum#X, sum#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [4]: [hash_partition_key#X, l_shipmode#X, sum#X, sum#X] @@ -178,7 +178,7 @@ Arguments: false (31) VeloxResizeBatches Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X] 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 7c3509c3e72..15583a25718 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 @@ -67,7 +67,7 @@ Arguments: false (4) VeloxResizeBatches Input [2]: [hash_partition_key#X, c_custkey#X] -Arguments: X, X +Arguments: X, X, X (5) ColumnarExchange Input [2]: [hash_partition_key#X, c_custkey#X] @@ -104,7 +104,7 @@ Arguments: false (13) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (14) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] @@ -157,7 +157,7 @@ Arguments: false (25) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_count#X, count#X] -Arguments: X, X +Arguments: X, X, X (26) ColumnarExchange Input [3]: [hash_partition_key#X, c_count#X, count#X] @@ -186,7 +186,7 @@ Arguments: false (32) VeloxResizeBatches Input [2]: [c_count#X, custdist#X] -Arguments: X, X +Arguments: X, X, X (33) ColumnarExchange Input [2]: [c_count#X, custdist#X] 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 f9b6d7180ea..93eef0dced8 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 @@ -57,7 +57,7 @@ Arguments: false (5) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_partkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [4]: [hash_partition_key#X, l_partkey#X, l_extendedprice#X, l_discount#X] @@ -94,7 +94,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, p_partkey#X, p_type#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, p_partkey#X, p_type#X] 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 debde24c32d..b42bad54945 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 @@ -66,7 +66,7 @@ Arguments: false (5) VeloxResizeBatches Input [5]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_address#X, s_phone#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [5]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_address#X, s_phone#X] @@ -114,7 +114,7 @@ Arguments: false (16) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (17) ColumnarExchange Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] @@ -156,7 +156,7 @@ Arguments: false (26) VeloxResizeBatches Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X] -Arguments: X, X +Arguments: X, X, X (27) ColumnarExchange Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X] @@ -315,7 +315,7 @@ Arguments: false (54) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (55) ColumnarExchange Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] 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 cac61db4a6b..480ed4cc718 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 @@ -84,7 +84,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X] @@ -121,7 +121,7 @@ Arguments: false (14) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_partkey#X, p_brand#X, p_type#X, p_size#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [5]: [hash_partition_key#X, p_partkey#X, p_brand#X, p_type#X, p_size#X] @@ -163,7 +163,7 @@ Arguments: false (24) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, ps_suppkey#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, ps_suppkey#X] @@ -203,7 +203,7 @@ Arguments: false (33) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, count#X] -Arguments: X, X +Arguments: X, X, X (34) ColumnarExchange Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, count#X] @@ -232,7 +232,7 @@ Arguments: false (40) VeloxResizeBatches Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X] -Arguments: X, X +Arguments: X, X, X (41) ColumnarExchange Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X] 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 843ce9b39eb..5949193c840 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 @@ -79,7 +79,7 @@ Arguments: false (5) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_partkey#X, l_quantity#X, l_extendedprice#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [4]: [hash_partition_key#X, l_partkey#X, l_quantity#X, l_extendedprice#X] @@ -116,7 +116,7 @@ Arguments: false (14) VeloxResizeBatches Input [2]: [hash_partition_key#X, p_partkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [2]: [hash_partition_key#X, p_partkey#X] @@ -169,7 +169,7 @@ Arguments: false (26) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_partkey#X, sum#X, count#X] -Arguments: X, X +Arguments: X, X, X (27) ColumnarExchange Input [4]: [hash_partition_key#X, l_partkey#X, sum#X, count#X] 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 1119ddcf80b..61232450cc4 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 @@ -119,7 +119,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_custkey#X, c_name#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, c_custkey#X, c_name#X] @@ -156,7 +156,7 @@ Arguments: false (14) VeloxResizeBatches Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_totalprice#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_totalprice#X, o_orderdate#X] @@ -195,7 +195,7 @@ Arguments: false (23) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_orderkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (24) ColumnarExchange Input [4]: [hash_partition_key#X, l_orderkey#X, sum#X, isEmpty#X] @@ -241,7 +241,7 @@ Arguments: false (34) VeloxResizeBatches Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_totalprice#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (35) ColumnarExchange Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_totalprice#X, o_orderdate#X] @@ -272,7 +272,7 @@ Arguments: false (42) VeloxResizeBatches Input [6]: [hash_partition_key#X, c_custkey#X, c_name#X, o_orderkey#X, o_totalprice#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (43) ColumnarExchange Input [6]: [hash_partition_key#X, c_custkey#X, c_name#X, o_orderkey#X, o_totalprice#X, o_orderdate#X] @@ -309,7 +309,7 @@ Arguments: false (51) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_quantity#X] -Arguments: X, X +Arguments: X, X, X (52) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_quantity#X] 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 d0e514af013..c1d60b54d8a 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 @@ -56,7 +56,7 @@ Arguments: false (5) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_partkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [5]: [hash_partition_key#X, l_partkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] @@ -93,7 +93,7 @@ Arguments: false (14) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_partkey#X, p_brand#X, p_size#X, p_container#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [5]: [hash_partition_key#X, p_partkey#X, p_brand#X, p_size#X, p_container#X] 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 9a2c56040b3..607b1f46c0d 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 @@ -146,7 +146,7 @@ Arguments: false (5) VeloxResizeBatches Input [5]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_address#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [5]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_address#X, s_nationkey#X] @@ -183,7 +183,7 @@ Arguments: false (14) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X] @@ -220,7 +220,7 @@ Arguments: false (23) VeloxResizeBatches Input [2]: [hash_partition_key#X, p_partkey#X] -Arguments: X, X +Arguments: X, X, X (24) ColumnarExchange Input [2]: [hash_partition_key#X, p_partkey#X] @@ -251,7 +251,7 @@ Arguments: false (31) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X] @@ -288,7 +288,7 @@ Arguments: false (40) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_partkey#X, l_suppkey#X, l_quantity#X] -Arguments: X, X +Arguments: X, X, X (41) ColumnarExchange Input [4]: [hash_partition_key#X, l_partkey#X, l_suppkey#X, l_quantity#X] @@ -347,7 +347,7 @@ Arguments: false (55) VeloxResizeBatches Input [4]: [hash_partition_key#X, (0.5 * sum(l_quantity))#X, l_partkey#X, l_suppkey#X] -Arguments: X, X +Arguments: X, X, X (56) ColumnarExchange Input [4]: [hash_partition_key#X, (0.5 * sum(l_quantity))#X, l_partkey#X, l_suppkey#X] @@ -378,7 +378,7 @@ Arguments: false (63) VeloxResizeBatches Input [2]: [hash_partition_key#X, ps_suppkey#X] -Arguments: X, X +Arguments: X, X, X (64) ColumnarExchange Input [2]: [hash_partition_key#X, ps_suppkey#X] @@ -409,7 +409,7 @@ Arguments: false (71) VeloxResizeBatches Input [4]: [hash_partition_key#X, s_name#X, s_address#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (72) ColumnarExchange Input [4]: [hash_partition_key#X, s_name#X, s_address#X, s_nationkey#X] @@ -446,7 +446,7 @@ Arguments: false (80) VeloxResizeBatches Input [2]: [hash_partition_key#X, n_nationkey#X] -Arguments: X, X +Arguments: X, X, X (81) ColumnarExchange Input [2]: [hash_partition_key#X, n_nationkey#X] @@ -477,7 +477,7 @@ Arguments: false (88) VeloxResizeBatches Input [2]: [s_name#X, s_address#X] -Arguments: X, X +Arguments: X, X, X (89) ColumnarExchange Input [2]: [s_name#X, s_address#X] 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 a675841a475..448c9817d27 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 @@ -140,7 +140,7 @@ Arguments: false (5) VeloxResizeBatches Input [4]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [4]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_nationkey#X] @@ -177,7 +177,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] @@ -209,7 +209,7 @@ Arguments: false (22) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] @@ -251,7 +251,7 @@ Arguments: false (32) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] -Arguments: X, X +Arguments: X, X, X (33) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] @@ -282,7 +282,7 @@ Arguments: false (40) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] -Arguments: X, X +Arguments: X, X, X (41) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] @@ -313,7 +313,7 @@ Arguments: false (48) VeloxResizeBatches Input [4]: [hash_partition_key#X, s_name#X, s_nationkey#X, l_orderkey#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [4]: [hash_partition_key#X, s_name#X, s_nationkey#X, l_orderkey#X] @@ -350,7 +350,7 @@ Arguments: false (57) VeloxResizeBatches Input [2]: [hash_partition_key#X, o_orderkey#X] -Arguments: X, X +Arguments: X, X, X (58) ColumnarExchange Input [2]: [hash_partition_key#X, o_orderkey#X] @@ -381,7 +381,7 @@ Arguments: false (65) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_name#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (66) ColumnarExchange Input [3]: [hash_partition_key#X, s_name#X, s_nationkey#X] @@ -418,7 +418,7 @@ Arguments: false (74) VeloxResizeBatches Input [2]: [hash_partition_key#X, n_nationkey#X] -Arguments: X, X +Arguments: X, X, X (75) ColumnarExchange Input [2]: [hash_partition_key#X, n_nationkey#X] @@ -460,7 +460,7 @@ Arguments: false (84) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_name#X, count#X] -Arguments: X, X +Arguments: X, X, X (85) ColumnarExchange Input [3]: [hash_partition_key#X, s_name#X, count#X] 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 c48c13779d6..9d4c4ea0f99 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 @@ -67,7 +67,7 @@ Arguments: false (5) VeloxResizeBatches Input [4]: [hash_partition_key#X, c_custkey#X, c_phone#X, c_acctbal#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [4]: [hash_partition_key#X, c_custkey#X, c_phone#X, c_acctbal#X] @@ -99,7 +99,7 @@ Arguments: false (13) VeloxResizeBatches Input [2]: [hash_partition_key#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (14) ColumnarExchange Input [2]: [hash_partition_key#X, o_custkey#X] @@ -141,7 +141,7 @@ Arguments: false (23) VeloxResizeBatches Input [5]: [hash_partition_key#X, cntrycode#X, count#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (24) ColumnarExchange Input [5]: [hash_partition_key#X, cntrycode#X, count#X, sum#X, isEmpty#X] @@ -170,7 +170,7 @@ Arguments: false (30) VeloxResizeBatches Input [3]: [cntrycode#X, numcust#X, totacctbal#X] -Arguments: X, X +Arguments: X, X, X (31) ColumnarExchange Input [3]: [cntrycode#X, numcust#X, totacctbal#X] @@ -321,7 +321,7 @@ Arguments: false (58) VeloxResizeBatches Input [2]: [sum#X, count#X] -Arguments: X, X +Arguments: X, X, X (59) ColumnarExchange Input [2]: [sum#X, count#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 ae8f0749119..79465ef3d71 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 @@ -81,7 +81,7 @@ Arguments: false (5) VeloxResizeBatches Input [2]: [hash_partition_key#X, c_custkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [2]: [hash_partition_key#X, c_custkey#X] @@ -118,7 +118,7 @@ Arguments: false (14) VeloxResizeBatches Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_orderdate#X, o_shippriority#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_orderdate#X, o_shippriority#X] @@ -149,7 +149,7 @@ Arguments: false (22) VeloxResizeBatches Input [4]: [hash_partition_key#X, o_orderkey#X, o_orderdate#X, o_shippriority#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [4]: [hash_partition_key#X, o_orderkey#X, o_orderdate#X, o_shippriority#X] @@ -186,7 +186,7 @@ Arguments: false (31) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [4]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X] 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 23fb123956d..d85d589a868 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 @@ -71,7 +71,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderpriority#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderpriority#X] @@ -108,7 +108,7 @@ Arguments: false (14) VeloxResizeBatches Input [2]: [hash_partition_key#X, l_orderkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [2]: [hash_partition_key#X, l_orderkey#X] @@ -150,7 +150,7 @@ Arguments: false (24) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderpriority#X, count#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderpriority#X, count#X] @@ -179,7 +179,7 @@ Arguments: false (31) VeloxResizeBatches Input [2]: [o_orderpriority#X, order_count#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [2]: [o_orderpriority#X, order_count#X] 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 16ed688f0be..64529ccecaa 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 @@ -155,7 +155,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] @@ -192,7 +192,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] @@ -223,7 +223,7 @@ Arguments: false (22) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_nationkey#X, o_orderkey#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [3]: [hash_partition_key#X, c_nationkey#X, o_orderkey#X] @@ -260,7 +260,7 @@ Arguments: false (31) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [5]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] @@ -291,7 +291,7 @@ Arguments: false (39) VeloxResizeBatches Input [5]: [hash_partition_key#X, c_nationkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (40) ColumnarExchange Input [5]: [hash_partition_key#X, c_nationkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] @@ -328,7 +328,7 @@ Arguments: false (48) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] @@ -359,7 +359,7 @@ Arguments: false (56) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (57) ColumnarExchange Input [4]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X] @@ -396,7 +396,7 @@ Arguments: false (65) VeloxResizeBatches Input [4]: [hash_partition_key#X, n_nationkey#X, n_name#X, n_regionkey#X] -Arguments: X, X +Arguments: X, X, X (66) ColumnarExchange Input [4]: [hash_partition_key#X, n_nationkey#X, n_name#X, n_regionkey#X] @@ -427,7 +427,7 @@ Arguments: false (73) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, n_name#X, n_regionkey#X] -Arguments: X, X +Arguments: X, X, X (74) ColumnarExchange Input [5]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, n_name#X, n_regionkey#X] @@ -464,7 +464,7 @@ Arguments: false (82) VeloxResizeBatches Input [2]: [hash_partition_key#X, r_regionkey#X] -Arguments: X, X +Arguments: X, X, X (83) ColumnarExchange Input [2]: [hash_partition_key#X, r_regionkey#X] @@ -506,7 +506,7 @@ Arguments: false (92) VeloxResizeBatches Input [4]: [hash_partition_key#X, n_name#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (93) ColumnarExchange Input [4]: [hash_partition_key#X, n_name#X, sum#X, isEmpty#X] @@ -535,7 +535,7 @@ Arguments: false (99) VeloxResizeBatches Input [2]: [n_name#X, revenue#X] -Arguments: X, X +Arguments: X, X, X (100) ColumnarExchange Input [2]: [n_name#X, revenue#X] 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 ba50cb13105..9ba7f5c7293 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 @@ -48,7 +48,7 @@ Arguments: false (6) VeloxResizeBatches Input [2]: [sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (7) ColumnarExchange Input [2]: [sum#X, isEmpty#X] 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 ccf77e181d7..0c03319b01d 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 @@ -149,7 +149,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] @@ -186,7 +186,7 @@ Arguments: false (14) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [6]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X] @@ -217,7 +217,7 @@ Arguments: false (22) VeloxResizeBatches Input [6]: [hash_partition_key#X, s_nationkey#X, l_orderkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [6]: [hash_partition_key#X, s_nationkey#X, l_orderkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X] @@ -254,7 +254,7 @@ Arguments: false (31) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] @@ -285,7 +285,7 @@ Arguments: false (39) VeloxResizeBatches Input [6]: [hash_partition_key#X, s_nationkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (40) ColumnarExchange Input [6]: [hash_partition_key#X, s_nationkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X, o_custkey#X] @@ -322,7 +322,7 @@ Arguments: false (48) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] @@ -353,7 +353,7 @@ Arguments: false (56) VeloxResizeBatches Input [6]: [hash_partition_key#X, s_nationkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X, c_nationkey#X] -Arguments: X, X +Arguments: X, X, X (57) ColumnarExchange Input [6]: [hash_partition_key#X, s_nationkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X, c_nationkey#X] @@ -390,7 +390,7 @@ Arguments: false (65) VeloxResizeBatches Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (66) ColumnarExchange Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] @@ -421,7 +421,7 @@ Arguments: false (73) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, l_shipdate#X, c_nationkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (74) ColumnarExchange Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, l_shipdate#X, c_nationkey#X, n_name#X] @@ -476,7 +476,7 @@ Arguments: false (87) VeloxResizeBatches Input [6]: [hash_partition_key#X, supp_nation#X, cust_nation#X, l_year#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (88) ColumnarExchange Input [6]: [hash_partition_key#X, supp_nation#X, cust_nation#X, l_year#X, sum#X, isEmpty#X] @@ -505,7 +505,7 @@ Arguments: false (94) VeloxResizeBatches Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X] -Arguments: X, X +Arguments: X, X, X (95) ColumnarExchange Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X] 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 64e985256c5..2cab3c6836e 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 @@ -198,7 +198,7 @@ Arguments: false (5) VeloxResizeBatches Input [2]: [hash_partition_key#X, p_partkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [2]: [hash_partition_key#X, p_partkey#X] @@ -235,7 +235,7 @@ Arguments: false (14) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [6]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] @@ -266,7 +266,7 @@ Arguments: false (22) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [5]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] @@ -303,7 +303,7 @@ Arguments: false (31) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] @@ -334,7 +334,7 @@ Arguments: false (39) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (40) ColumnarExchange Input [5]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X, s_nationkey#X] @@ -371,7 +371,7 @@ Arguments: false (48) VeloxResizeBatches Input [4]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [4]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_orderdate#X] @@ -402,7 +402,7 @@ Arguments: false (56) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_custkey#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (57) ColumnarExchange Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_custkey#X, o_orderdate#X] @@ -439,7 +439,7 @@ Arguments: false (65) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] -Arguments: X, X +Arguments: X, X, X (66) ColumnarExchange Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] @@ -470,7 +470,7 @@ Arguments: false (73) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_orderdate#X, c_nationkey#X] -Arguments: X, X +Arguments: X, X, X (74) ColumnarExchange Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_orderdate#X, c_nationkey#X] @@ -507,7 +507,7 @@ Arguments: false (82) VeloxResizeBatches Input [3]: [hash_partition_key#X, n_nationkey#X, n_regionkey#X] -Arguments: X, X +Arguments: X, X, X (83) ColumnarExchange Input [3]: [hash_partition_key#X, n_nationkey#X, n_regionkey#X] @@ -538,7 +538,7 @@ Arguments: false (90) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_orderdate#X, n_regionkey#X] -Arguments: X, X +Arguments: X, X, X (91) ColumnarExchange Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_orderdate#X, n_regionkey#X] @@ -575,7 +575,7 @@ Arguments: false (99) VeloxResizeBatches Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (100) ColumnarExchange Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] @@ -606,7 +606,7 @@ Arguments: false (107) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, o_orderdate#X, n_regionkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (108) ColumnarExchange Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, o_orderdate#X, n_regionkey#X, n_name#X] @@ -643,7 +643,7 @@ Arguments: false (116) VeloxResizeBatches Input [2]: [hash_partition_key#X, r_regionkey#X] -Arguments: X, X +Arguments: X, X, X (117) ColumnarExchange Input [2]: [hash_partition_key#X, r_regionkey#X] @@ -685,7 +685,7 @@ Arguments: false (126) VeloxResizeBatches Input [6]: [hash_partition_key#X, o_year#X, sum#X, isEmpty#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (127) ColumnarExchange Input [6]: [hash_partition_key#X, o_year#X, sum#X, isEmpty#X, sum#X, isEmpty#X] @@ -718,7 +718,7 @@ Arguments: false (134) VeloxResizeBatches Input [2]: [o_year#X, mkt_share#X] -Arguments: X, X +Arguments: X, X, X (135) ColumnarExchange Input [2]: [o_year#X, mkt_share#X] 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 3c152f56567..3fcc34dcb8e 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 @@ -154,7 +154,7 @@ Arguments: false (5) VeloxResizeBatches Input [2]: [hash_partition_key#X, p_partkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [2]: [hash_partition_key#X, p_partkey#X] @@ -191,7 +191,7 @@ Arguments: false (14) VeloxResizeBatches Input [7]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [7]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] @@ -222,7 +222,7 @@ Arguments: false (22) VeloxResizeBatches Input [7]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [7]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] @@ -259,7 +259,7 @@ Arguments: false (31) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] @@ -290,7 +290,7 @@ Arguments: false (39) VeloxResizeBatches Input [8]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (40) ColumnarExchange Input [8]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X] @@ -327,7 +327,7 @@ Arguments: false (48) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_supplycost#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_supplycost#X] @@ -358,7 +358,7 @@ Arguments: false (56) VeloxResizeBatches Input [7]: [hash_partition_key#X, l_orderkey#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X, ps_supplycost#X] -Arguments: X, X +Arguments: X, X, X (57) ColumnarExchange Input [7]: [hash_partition_key#X, l_orderkey#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X, ps_supplycost#X] @@ -395,7 +395,7 @@ Arguments: false (65) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (66) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderdate#X] @@ -426,7 +426,7 @@ Arguments: false (73) VeloxResizeBatches Input [7]: [hash_partition_key#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X, ps_supplycost#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (74) ColumnarExchange Input [7]: [hash_partition_key#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X, ps_supplycost#X, o_orderdate#X] @@ -463,7 +463,7 @@ Arguments: false (82) VeloxResizeBatches Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (83) ColumnarExchange Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] @@ -505,7 +505,7 @@ Arguments: false (92) VeloxResizeBatches Input [5]: [hash_partition_key#X, nation#X, o_year#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (93) ColumnarExchange Input [5]: [hash_partition_key#X, nation#X, o_year#X, sum#X, isEmpty#X] @@ -534,7 +534,7 @@ Arguments: false (99) VeloxResizeBatches Input [3]: [nation#X, o_year#X, sum_profit#X] -Arguments: X, X +Arguments: X, X, X (100) ColumnarExchange Input [3]: [nation#X, o_year#X, sum_profit#X] 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 fce60c054ea..c02e2a48cfc 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 @@ -60,7 +60,7 @@ Arguments: false (7) VeloxResizeBatches Input [18]: [hash_partition_key#X, l_returnflag#X, l_linestatus#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, count#X, sum#X, count#X, sum#X, count#X, count#X] -Arguments: X, X +Arguments: X, X, X (8) ColumnarExchange Input [18]: [hash_partition_key#X, l_returnflag#X, l_linestatus#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, count#X, sum#X, count#X, sum#X, count#X, count#X] @@ -89,7 +89,7 @@ Arguments: false (14) VeloxResizeBatches 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: X, X +Arguments: X, X, X (15) ColumnarExchange 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] 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 855ddf39113..fc0fbcc1ea4 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 @@ -109,7 +109,7 @@ Arguments: false (5) VeloxResizeBatches Input [8]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [8]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X] @@ -146,7 +146,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] @@ -178,7 +178,7 @@ Arguments: false (22) VeloxResizeBatches Input [9]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X, o_orderkey#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [9]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X, o_orderkey#X] @@ -215,7 +215,7 @@ Arguments: false (31) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [4]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X] @@ -247,7 +247,7 @@ Arguments: false (39) VeloxResizeBatches Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (40) ColumnarExchange Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X, l_extendedprice#X, l_discount#X] @@ -284,7 +284,7 @@ Arguments: false (48) VeloxResizeBatches Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] @@ -327,7 +327,7 @@ Arguments: false (58) VeloxResizeBatches Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_acctbal#X, c_phone#X, n_name#X, c_address#X, c_comment#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (59) ColumnarExchange Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_acctbal#X, c_phone#X, n_name#X, c_address#X, c_comment#X, sum#X, isEmpty#X] 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 99539cde1a7..022da868a7b 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 @@ -93,7 +93,7 @@ Arguments: false (5) VeloxResizeBatches Input [5]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X, ps_supplycost#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [5]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X, ps_supplycost#X] @@ -130,7 +130,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] @@ -162,7 +162,7 @@ Arguments: false (22) VeloxResizeBatches Input [5]: [hash_partition_key#X, ps_partkey#X, ps_availqty#X, ps_supplycost#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [5]: [hash_partition_key#X, ps_partkey#X, ps_availqty#X, ps_supplycost#X, s_nationkey#X] @@ -199,7 +199,7 @@ Arguments: false (31) VeloxResizeBatches Input [2]: [hash_partition_key#X, n_nationkey#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [2]: [hash_partition_key#X, n_nationkey#X] @@ -242,7 +242,7 @@ Arguments: false (41) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_partkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (42) ColumnarExchange Input [4]: [hash_partition_key#X, ps_partkey#X, sum#X, isEmpty#X] @@ -275,7 +275,7 @@ Arguments: false (49) VeloxResizeBatches Input [2]: [ps_partkey#X, value#X] -Arguments: X, X +Arguments: X, X, X (50) ColumnarExchange Input [2]: [ps_partkey#X, value#X] @@ -499,7 +499,7 @@ Arguments: false (87) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_suppkey#X, ps_availqty#X, ps_supplycost#X] -Arguments: X, X +Arguments: X, X, X (88) ColumnarExchange Input [4]: [hash_partition_key#X, ps_suppkey#X, ps_availqty#X, ps_supplycost#X] @@ -544,7 +544,7 @@ Arguments: false (99) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_availqty#X, ps_supplycost#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (100) ColumnarExchange Input [4]: [hash_partition_key#X, ps_availqty#X, ps_supplycost#X, s_nationkey#X] 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 9cb9c145f1b..28339dcd039 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 @@ -70,7 +70,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderpriority#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderpriority#X] @@ -107,7 +107,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_shipmode#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_shipmode#X] @@ -150,7 +150,7 @@ Arguments: false (24) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_shipmode#X, sum#X, sum#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [4]: [hash_partition_key#X, l_shipmode#X, sum#X, sum#X] @@ -179,7 +179,7 @@ Arguments: false (31) VeloxResizeBatches Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X] 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 59abfb682c4..000adc4ec09 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 @@ -67,7 +67,7 @@ Arguments: false (4) VeloxResizeBatches Input [2]: [hash_partition_key#X, c_custkey#X] -Arguments: X, X +Arguments: X, X, X (5) ColumnarExchange Input [2]: [hash_partition_key#X, c_custkey#X] @@ -104,7 +104,7 @@ Arguments: false (13) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (14) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] @@ -158,7 +158,7 @@ Arguments: false (25) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_count#X, count#X] -Arguments: X, X +Arguments: X, X, X (26) ColumnarExchange Input [3]: [hash_partition_key#X, c_count#X, count#X] @@ -187,7 +187,7 @@ Arguments: false (32) VeloxResizeBatches Input [2]: [c_count#X, custdist#X] -Arguments: X, X +Arguments: X, X, X (33) ColumnarExchange Input [2]: [c_count#X, custdist#X] 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 058ec94ab09..a6b53027cf1 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 @@ -57,7 +57,7 @@ Arguments: false (5) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_partkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [4]: [hash_partition_key#X, l_partkey#X, l_extendedprice#X, l_discount#X] @@ -94,7 +94,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, p_partkey#X, p_type#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, p_partkey#X, p_type#X] 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 e0c0204c0b8..6c92020d4fe 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 @@ -66,7 +66,7 @@ Arguments: false (5) VeloxResizeBatches Input [5]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_address#X, s_phone#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [5]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_address#X, s_phone#X] @@ -114,7 +114,7 @@ Arguments: false (16) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (17) ColumnarExchange Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] @@ -157,7 +157,7 @@ Arguments: false (26) VeloxResizeBatches Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X] -Arguments: X, X +Arguments: X, X, X (27) ColumnarExchange Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X] @@ -317,7 +317,7 @@ Arguments: false (54) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (55) ColumnarExchange Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] 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 3441216f140..64015145b5c 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 @@ -84,7 +84,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X] @@ -121,7 +121,7 @@ Arguments: false (14) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_partkey#X, p_brand#X, p_type#X, p_size#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [5]: [hash_partition_key#X, p_partkey#X, p_brand#X, p_type#X, p_size#X] @@ -164,7 +164,7 @@ Arguments: false (24) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, ps_suppkey#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, ps_suppkey#X] @@ -204,7 +204,7 @@ Arguments: false (33) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, count#X] -Arguments: X, X +Arguments: X, X, X (34) ColumnarExchange Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, count#X] @@ -233,7 +233,7 @@ Arguments: false (40) VeloxResizeBatches Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X] -Arguments: X, X +Arguments: X, X, X (41) ColumnarExchange Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X] 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 c1b43b7fc42..1bbcd5fbb0a 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 @@ -79,7 +79,7 @@ Arguments: false (5) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_partkey#X, l_quantity#X, l_extendedprice#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [4]: [hash_partition_key#X, l_partkey#X, l_quantity#X, l_extendedprice#X] @@ -116,7 +116,7 @@ Arguments: false (14) VeloxResizeBatches Input [2]: [hash_partition_key#X, p_partkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [2]: [hash_partition_key#X, p_partkey#X] @@ -170,7 +170,7 @@ Arguments: false (26) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_partkey#X, sum#X, count#X] -Arguments: X, X +Arguments: X, X, X (27) ColumnarExchange Input [4]: [hash_partition_key#X, l_partkey#X, sum#X, count#X] 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 c1a6b181bb3..748f8c59df4 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 @@ -119,7 +119,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_custkey#X, c_name#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, c_custkey#X, c_name#X] @@ -156,7 +156,7 @@ Arguments: false (14) VeloxResizeBatches Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_totalprice#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_totalprice#X, o_orderdate#X] @@ -195,7 +195,7 @@ Arguments: false (23) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_orderkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (24) ColumnarExchange Input [4]: [hash_partition_key#X, l_orderkey#X, sum#X, isEmpty#X] @@ -242,7 +242,7 @@ Arguments: false (34) VeloxResizeBatches Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_totalprice#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (35) ColumnarExchange Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_totalprice#X, o_orderdate#X] @@ -274,7 +274,7 @@ Arguments: false (42) VeloxResizeBatches Input [6]: [hash_partition_key#X, c_custkey#X, c_name#X, o_orderkey#X, o_totalprice#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (43) ColumnarExchange Input [6]: [hash_partition_key#X, c_custkey#X, c_name#X, o_orderkey#X, o_totalprice#X, o_orderdate#X] @@ -311,7 +311,7 @@ Arguments: false (51) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_quantity#X] -Arguments: X, X +Arguments: X, X, X (52) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_quantity#X] 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 420c980f327..019cee8dbf4 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 @@ -56,7 +56,7 @@ Arguments: false (5) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_partkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [5]: [hash_partition_key#X, l_partkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] @@ -93,7 +93,7 @@ Arguments: false (14) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_partkey#X, p_brand#X, p_size#X, p_container#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [5]: [hash_partition_key#X, p_partkey#X, p_brand#X, p_size#X, p_container#X] 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 4d8eee1f1fb..1565a9ea077 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 @@ -146,7 +146,7 @@ Arguments: false (5) VeloxResizeBatches Input [5]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_address#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [5]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_address#X, s_nationkey#X] @@ -183,7 +183,7 @@ Arguments: false (14) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X] @@ -220,7 +220,7 @@ Arguments: false (23) VeloxResizeBatches Input [2]: [hash_partition_key#X, p_partkey#X] -Arguments: X, X +Arguments: X, X, X (24) ColumnarExchange Input [2]: [hash_partition_key#X, p_partkey#X] @@ -252,7 +252,7 @@ Arguments: false (31) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X] @@ -289,7 +289,7 @@ Arguments: false (40) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_partkey#X, l_suppkey#X, l_quantity#X] -Arguments: X, X +Arguments: X, X, X (41) ColumnarExchange Input [4]: [hash_partition_key#X, l_partkey#X, l_suppkey#X, l_quantity#X] @@ -349,7 +349,7 @@ Arguments: false (55) VeloxResizeBatches Input [4]: [hash_partition_key#X, (0.5 * sum(l_quantity))#X, l_partkey#X, l_suppkey#X] -Arguments: X, X +Arguments: X, X, X (56) ColumnarExchange Input [4]: [hash_partition_key#X, (0.5 * sum(l_quantity))#X, l_partkey#X, l_suppkey#X] @@ -381,7 +381,7 @@ Arguments: false (63) VeloxResizeBatches Input [2]: [hash_partition_key#X, ps_suppkey#X] -Arguments: X, X +Arguments: X, X, X (64) ColumnarExchange Input [2]: [hash_partition_key#X, ps_suppkey#X] @@ -413,7 +413,7 @@ Arguments: false (71) VeloxResizeBatches Input [4]: [hash_partition_key#X, s_name#X, s_address#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (72) ColumnarExchange Input [4]: [hash_partition_key#X, s_name#X, s_address#X, s_nationkey#X] @@ -450,7 +450,7 @@ Arguments: false (80) VeloxResizeBatches Input [2]: [hash_partition_key#X, n_nationkey#X] -Arguments: X, X +Arguments: X, X, X (81) ColumnarExchange Input [2]: [hash_partition_key#X, n_nationkey#X] @@ -482,7 +482,7 @@ Arguments: false (88) VeloxResizeBatches Input [2]: [s_name#X, s_address#X] -Arguments: X, X +Arguments: X, X, X (89) ColumnarExchange Input [2]: [s_name#X, s_address#X] 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 96750b2b3ec..4a28c777ae2 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 @@ -140,7 +140,7 @@ Arguments: false (5) VeloxResizeBatches Input [4]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [4]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_nationkey#X] @@ -177,7 +177,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] @@ -209,7 +209,7 @@ Arguments: false (22) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] @@ -252,7 +252,7 @@ Arguments: false (32) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] -Arguments: X, X +Arguments: X, X, X (33) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] @@ -284,7 +284,7 @@ Arguments: false (40) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] -Arguments: X, X +Arguments: X, X, X (41) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] @@ -316,7 +316,7 @@ Arguments: false (48) VeloxResizeBatches Input [4]: [hash_partition_key#X, s_name#X, s_nationkey#X, l_orderkey#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [4]: [hash_partition_key#X, s_name#X, s_nationkey#X, l_orderkey#X] @@ -353,7 +353,7 @@ Arguments: false (57) VeloxResizeBatches Input [2]: [hash_partition_key#X, o_orderkey#X] -Arguments: X, X +Arguments: X, X, X (58) ColumnarExchange Input [2]: [hash_partition_key#X, o_orderkey#X] @@ -385,7 +385,7 @@ Arguments: false (65) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_name#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (66) ColumnarExchange Input [3]: [hash_partition_key#X, s_name#X, s_nationkey#X] @@ -422,7 +422,7 @@ Arguments: false (74) VeloxResizeBatches Input [2]: [hash_partition_key#X, n_nationkey#X] -Arguments: X, X +Arguments: X, X, X (75) ColumnarExchange Input [2]: [hash_partition_key#X, n_nationkey#X] @@ -465,7 +465,7 @@ Arguments: false (84) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_name#X, count#X] -Arguments: X, X +Arguments: X, X, X (85) ColumnarExchange Input [3]: [hash_partition_key#X, s_name#X, count#X] 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 c6e147da04d..21f890c49ee 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 @@ -67,7 +67,7 @@ Arguments: false (5) VeloxResizeBatches Input [4]: [hash_partition_key#X, c_custkey#X, c_phone#X, c_acctbal#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [4]: [hash_partition_key#X, c_custkey#X, c_phone#X, c_acctbal#X] @@ -99,7 +99,7 @@ Arguments: false (13) VeloxResizeBatches Input [2]: [hash_partition_key#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (14) ColumnarExchange Input [2]: [hash_partition_key#X, o_custkey#X] @@ -142,7 +142,7 @@ Arguments: false (23) VeloxResizeBatches Input [5]: [hash_partition_key#X, cntrycode#X, count#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (24) ColumnarExchange Input [5]: [hash_partition_key#X, cntrycode#X, count#X, sum#X, isEmpty#X] @@ -171,7 +171,7 @@ Arguments: false (30) VeloxResizeBatches Input [3]: [cntrycode#X, numcust#X, totacctbal#X] -Arguments: X, X +Arguments: X, X, X (31) ColumnarExchange Input [3]: [cntrycode#X, numcust#X, totacctbal#X] @@ -323,7 +323,7 @@ Arguments: false (58) VeloxResizeBatches Input [2]: [sum#X, count#X] -Arguments: X, X +Arguments: X, X, X (59) ColumnarExchange Input [2]: [sum#X, count#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 d6573f7483b..4a669b95ca6 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 @@ -81,7 +81,7 @@ Arguments: false (5) VeloxResizeBatches Input [2]: [hash_partition_key#X, c_custkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [2]: [hash_partition_key#X, c_custkey#X] @@ -118,7 +118,7 @@ Arguments: false (14) VeloxResizeBatches Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_orderdate#X, o_shippriority#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_orderdate#X, o_shippriority#X] @@ -150,7 +150,7 @@ Arguments: false (22) VeloxResizeBatches Input [4]: [hash_partition_key#X, o_orderkey#X, o_orderdate#X, o_shippriority#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [4]: [hash_partition_key#X, o_orderkey#X, o_orderdate#X, o_shippriority#X] @@ -187,7 +187,7 @@ Arguments: false (31) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [4]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X] 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 71a8f6974ed..0f5c41de5be 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 @@ -71,7 +71,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderpriority#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderpriority#X] @@ -108,7 +108,7 @@ Arguments: false (14) VeloxResizeBatches Input [2]: [hash_partition_key#X, l_orderkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [2]: [hash_partition_key#X, l_orderkey#X] @@ -151,7 +151,7 @@ Arguments: false (24) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderpriority#X, count#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderpriority#X, count#X] @@ -180,7 +180,7 @@ Arguments: false (31) VeloxResizeBatches Input [2]: [o_orderpriority#X, order_count#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [2]: [o_orderpriority#X, order_count#X] 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 a78e477ace2..223fb133386 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 @@ -155,7 +155,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] @@ -192,7 +192,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] @@ -224,7 +224,7 @@ Arguments: false (22) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_nationkey#X, o_orderkey#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [3]: [hash_partition_key#X, c_nationkey#X, o_orderkey#X] @@ -261,7 +261,7 @@ Arguments: false (31) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [5]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] @@ -293,7 +293,7 @@ Arguments: false (39) VeloxResizeBatches Input [5]: [hash_partition_key#X, c_nationkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (40) ColumnarExchange Input [5]: [hash_partition_key#X, c_nationkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] @@ -330,7 +330,7 @@ Arguments: false (48) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] @@ -362,7 +362,7 @@ Arguments: false (56) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (57) ColumnarExchange Input [4]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X] @@ -399,7 +399,7 @@ Arguments: false (65) VeloxResizeBatches Input [4]: [hash_partition_key#X, n_nationkey#X, n_name#X, n_regionkey#X] -Arguments: X, X +Arguments: X, X, X (66) ColumnarExchange Input [4]: [hash_partition_key#X, n_nationkey#X, n_name#X, n_regionkey#X] @@ -431,7 +431,7 @@ Arguments: false (73) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, n_name#X, n_regionkey#X] -Arguments: X, X +Arguments: X, X, X (74) ColumnarExchange Input [5]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, n_name#X, n_regionkey#X] @@ -468,7 +468,7 @@ Arguments: false (82) VeloxResizeBatches Input [2]: [hash_partition_key#X, r_regionkey#X] -Arguments: X, X +Arguments: X, X, X (83) ColumnarExchange Input [2]: [hash_partition_key#X, r_regionkey#X] @@ -511,7 +511,7 @@ Arguments: false (92) VeloxResizeBatches Input [4]: [hash_partition_key#X, n_name#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (93) ColumnarExchange Input [4]: [hash_partition_key#X, n_name#X, sum#X, isEmpty#X] @@ -540,7 +540,7 @@ Arguments: false (99) VeloxResizeBatches Input [2]: [n_name#X, revenue#X] -Arguments: X, X +Arguments: X, X, X (100) ColumnarExchange Input [2]: [n_name#X, revenue#X] 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 b85e63e1065..1e1d87db4b2 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 @@ -48,7 +48,7 @@ Arguments: false (6) VeloxResizeBatches Input [2]: [sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (7) ColumnarExchange Input [2]: [sum#X, isEmpty#X] 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 a0894489f0a..43f5a9823ab 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 @@ -149,7 +149,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] @@ -186,7 +186,7 @@ Arguments: false (14) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [6]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X] @@ -218,7 +218,7 @@ Arguments: false (22) VeloxResizeBatches Input [6]: [hash_partition_key#X, s_nationkey#X, l_orderkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [6]: [hash_partition_key#X, s_nationkey#X, l_orderkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X] @@ -255,7 +255,7 @@ Arguments: false (31) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] @@ -287,7 +287,7 @@ Arguments: false (39) VeloxResizeBatches Input [6]: [hash_partition_key#X, s_nationkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (40) ColumnarExchange Input [6]: [hash_partition_key#X, s_nationkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X, o_custkey#X] @@ -324,7 +324,7 @@ Arguments: false (48) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] @@ -356,7 +356,7 @@ Arguments: false (56) VeloxResizeBatches Input [6]: [hash_partition_key#X, s_nationkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X, c_nationkey#X] -Arguments: X, X +Arguments: X, X, X (57) ColumnarExchange Input [6]: [hash_partition_key#X, s_nationkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X, c_nationkey#X] @@ -393,7 +393,7 @@ Arguments: false (65) VeloxResizeBatches Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (66) ColumnarExchange Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] @@ -425,7 +425,7 @@ Arguments: false (73) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, l_shipdate#X, c_nationkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (74) ColumnarExchange Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, l_shipdate#X, c_nationkey#X, n_name#X] @@ -481,7 +481,7 @@ Arguments: false (87) VeloxResizeBatches Input [6]: [hash_partition_key#X, supp_nation#X, cust_nation#X, l_year#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (88) ColumnarExchange Input [6]: [hash_partition_key#X, supp_nation#X, cust_nation#X, l_year#X, sum#X, isEmpty#X] @@ -510,7 +510,7 @@ Arguments: false (94) VeloxResizeBatches Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X] -Arguments: X, X +Arguments: X, X, X (95) ColumnarExchange Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X] 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 88a6a79e074..284a5c88dfd 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 @@ -198,7 +198,7 @@ Arguments: false (5) VeloxResizeBatches Input [2]: [hash_partition_key#X, p_partkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [2]: [hash_partition_key#X, p_partkey#X] @@ -235,7 +235,7 @@ Arguments: false (14) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [6]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] @@ -267,7 +267,7 @@ Arguments: false (22) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [5]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] @@ -304,7 +304,7 @@ Arguments: false (31) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] @@ -336,7 +336,7 @@ Arguments: false (39) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (40) ColumnarExchange Input [5]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X, s_nationkey#X] @@ -373,7 +373,7 @@ Arguments: false (48) VeloxResizeBatches Input [4]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [4]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_orderdate#X] @@ -405,7 +405,7 @@ Arguments: false (56) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_custkey#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (57) ColumnarExchange Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_custkey#X, o_orderdate#X] @@ -442,7 +442,7 @@ Arguments: false (65) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] -Arguments: X, X +Arguments: X, X, X (66) ColumnarExchange Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] @@ -474,7 +474,7 @@ Arguments: false (73) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_orderdate#X, c_nationkey#X] -Arguments: X, X +Arguments: X, X, X (74) ColumnarExchange Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_orderdate#X, c_nationkey#X] @@ -511,7 +511,7 @@ Arguments: false (82) VeloxResizeBatches Input [3]: [hash_partition_key#X, n_nationkey#X, n_regionkey#X] -Arguments: X, X +Arguments: X, X, X (83) ColumnarExchange Input [3]: [hash_partition_key#X, n_nationkey#X, n_regionkey#X] @@ -543,7 +543,7 @@ Arguments: false (90) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_orderdate#X, n_regionkey#X] -Arguments: X, X +Arguments: X, X, X (91) ColumnarExchange Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_orderdate#X, n_regionkey#X] @@ -580,7 +580,7 @@ Arguments: false (99) VeloxResizeBatches Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (100) ColumnarExchange Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] @@ -612,7 +612,7 @@ Arguments: false (107) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, o_orderdate#X, n_regionkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (108) ColumnarExchange Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, o_orderdate#X, n_regionkey#X, n_name#X] @@ -649,7 +649,7 @@ Arguments: false (116) VeloxResizeBatches Input [2]: [hash_partition_key#X, r_regionkey#X] -Arguments: X, X +Arguments: X, X, X (117) ColumnarExchange Input [2]: [hash_partition_key#X, r_regionkey#X] @@ -692,7 +692,7 @@ Arguments: false (126) VeloxResizeBatches Input [6]: [hash_partition_key#X, o_year#X, sum#X, isEmpty#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (127) ColumnarExchange Input [6]: [hash_partition_key#X, o_year#X, sum#X, isEmpty#X, sum#X, isEmpty#X] @@ -725,7 +725,7 @@ Arguments: false (134) VeloxResizeBatches Input [2]: [o_year#X, mkt_share#X] -Arguments: X, X +Arguments: X, X, X (135) ColumnarExchange Input [2]: [o_year#X, mkt_share#X] 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 4f537e91e13..6819628a002 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 @@ -154,7 +154,7 @@ Arguments: false (5) VeloxResizeBatches Input [2]: [hash_partition_key#X, p_partkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [2]: [hash_partition_key#X, p_partkey#X] @@ -191,7 +191,7 @@ Arguments: false (14) VeloxResizeBatches Input [7]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [7]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] @@ -223,7 +223,7 @@ Arguments: false (22) VeloxResizeBatches Input [7]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [7]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] @@ -260,7 +260,7 @@ Arguments: false (31) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] @@ -292,7 +292,7 @@ Arguments: false (39) VeloxResizeBatches Input [8]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (40) ColumnarExchange Input [8]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X] @@ -329,7 +329,7 @@ Arguments: false (48) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_supplycost#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_supplycost#X] @@ -361,7 +361,7 @@ Arguments: false (56) VeloxResizeBatches Input [7]: [hash_partition_key#X, l_orderkey#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X, ps_supplycost#X] -Arguments: X, X +Arguments: X, X, X (57) ColumnarExchange Input [7]: [hash_partition_key#X, l_orderkey#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X, ps_supplycost#X] @@ -398,7 +398,7 @@ Arguments: false (65) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (66) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderdate#X] @@ -430,7 +430,7 @@ Arguments: false (73) VeloxResizeBatches Input [7]: [hash_partition_key#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X, ps_supplycost#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (74) ColumnarExchange Input [7]: [hash_partition_key#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X, ps_supplycost#X, o_orderdate#X] @@ -467,7 +467,7 @@ Arguments: false (82) VeloxResizeBatches Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (83) ColumnarExchange Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] @@ -510,7 +510,7 @@ Arguments: false (92) VeloxResizeBatches Input [5]: [hash_partition_key#X, nation#X, o_year#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (93) ColumnarExchange Input [5]: [hash_partition_key#X, nation#X, o_year#X, sum#X, isEmpty#X] @@ -539,7 +539,7 @@ Arguments: false (99) VeloxResizeBatches Input [3]: [nation#X, o_year#X, sum_profit#X] -Arguments: X, X +Arguments: X, X, X (100) ColumnarExchange Input [3]: [nation#X, o_year#X, sum_profit#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/1.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/1.txt index fce60c054ea..c02e2a48cfc 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/1.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/1.txt @@ -60,7 +60,7 @@ Arguments: false (7) VeloxResizeBatches Input [18]: [hash_partition_key#X, l_returnflag#X, l_linestatus#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, count#X, sum#X, count#X, sum#X, count#X, count#X] -Arguments: X, X +Arguments: X, X, X (8) ColumnarExchange Input [18]: [hash_partition_key#X, l_returnflag#X, l_linestatus#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, isEmpty#X, sum#X, count#X, sum#X, count#X, sum#X, count#X, count#X] @@ -89,7 +89,7 @@ Arguments: false (14) VeloxResizeBatches 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: X, X +Arguments: X, X, X (15) ColumnarExchange 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] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/10.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/10.txt index 855ddf39113..fc0fbcc1ea4 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/10.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/10.txt @@ -109,7 +109,7 @@ Arguments: false (5) VeloxResizeBatches Input [8]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [8]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X] @@ -146,7 +146,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] @@ -178,7 +178,7 @@ Arguments: false (22) VeloxResizeBatches Input [9]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X, o_orderkey#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [9]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X, o_orderkey#X] @@ -215,7 +215,7 @@ Arguments: false (31) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [4]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X] @@ -247,7 +247,7 @@ Arguments: false (39) VeloxResizeBatches Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (40) ColumnarExchange Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_address#X, c_nationkey#X, c_phone#X, c_acctbal#X, c_comment#X, l_extendedprice#X, l_discount#X] @@ -284,7 +284,7 @@ Arguments: false (48) VeloxResizeBatches Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] @@ -327,7 +327,7 @@ Arguments: false (58) VeloxResizeBatches Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_acctbal#X, c_phone#X, n_name#X, c_address#X, c_comment#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (59) ColumnarExchange Input [10]: [hash_partition_key#X, c_custkey#X, c_name#X, c_acctbal#X, c_phone#X, n_name#X, c_address#X, c_comment#X, sum#X, isEmpty#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/11.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/11.txt index 99539cde1a7..022da868a7b 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/11.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/11.txt @@ -93,7 +93,7 @@ Arguments: false (5) VeloxResizeBatches Input [5]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X, ps_supplycost#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [5]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X, ps_supplycost#X] @@ -130,7 +130,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] @@ -162,7 +162,7 @@ Arguments: false (22) VeloxResizeBatches Input [5]: [hash_partition_key#X, ps_partkey#X, ps_availqty#X, ps_supplycost#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [5]: [hash_partition_key#X, ps_partkey#X, ps_availqty#X, ps_supplycost#X, s_nationkey#X] @@ -199,7 +199,7 @@ Arguments: false (31) VeloxResizeBatches Input [2]: [hash_partition_key#X, n_nationkey#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [2]: [hash_partition_key#X, n_nationkey#X] @@ -242,7 +242,7 @@ Arguments: false (41) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_partkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (42) ColumnarExchange Input [4]: [hash_partition_key#X, ps_partkey#X, sum#X, isEmpty#X] @@ -275,7 +275,7 @@ Arguments: false (49) VeloxResizeBatches Input [2]: [ps_partkey#X, value#X] -Arguments: X, X +Arguments: X, X, X (50) ColumnarExchange Input [2]: [ps_partkey#X, value#X] @@ -499,7 +499,7 @@ Arguments: false (87) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_suppkey#X, ps_availqty#X, ps_supplycost#X] -Arguments: X, X +Arguments: X, X, X (88) ColumnarExchange Input [4]: [hash_partition_key#X, ps_suppkey#X, ps_availqty#X, ps_supplycost#X] @@ -544,7 +544,7 @@ Arguments: false (99) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_availqty#X, ps_supplycost#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (100) ColumnarExchange Input [4]: [hash_partition_key#X, ps_availqty#X, ps_supplycost#X, s_nationkey#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/12.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/12.txt index 9cb9c145f1b..28339dcd039 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/12.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/12.txt @@ -70,7 +70,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderpriority#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderpriority#X] @@ -107,7 +107,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_shipmode#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_shipmode#X] @@ -150,7 +150,7 @@ Arguments: false (24) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_shipmode#X, sum#X, sum#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [4]: [hash_partition_key#X, l_shipmode#X, sum#X, sum#X] @@ -179,7 +179,7 @@ Arguments: false (31) VeloxResizeBatches Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [3]: [l_shipmode#X, high_line_count#X, low_line_count#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/13.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/13.txt index 59abfb682c4..000adc4ec09 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/13.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/13.txt @@ -67,7 +67,7 @@ Arguments: false (4) VeloxResizeBatches Input [2]: [hash_partition_key#X, c_custkey#X] -Arguments: X, X +Arguments: X, X, X (5) ColumnarExchange Input [2]: [hash_partition_key#X, c_custkey#X] @@ -104,7 +104,7 @@ Arguments: false (13) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (14) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] @@ -158,7 +158,7 @@ Arguments: false (25) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_count#X, count#X] -Arguments: X, X +Arguments: X, X, X (26) ColumnarExchange Input [3]: [hash_partition_key#X, c_count#X, count#X] @@ -187,7 +187,7 @@ Arguments: false (32) VeloxResizeBatches Input [2]: [c_count#X, custdist#X] -Arguments: X, X +Arguments: X, X, X (33) ColumnarExchange Input [2]: [c_count#X, custdist#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/14.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/14.txt index 058ec94ab09..a6b53027cf1 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/14.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/14.txt @@ -57,7 +57,7 @@ Arguments: false (5) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_partkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [4]: [hash_partition_key#X, l_partkey#X, l_extendedprice#X, l_discount#X] @@ -94,7 +94,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, p_partkey#X, p_type#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, p_partkey#X, p_type#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/15.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/15.txt index e0c0204c0b8..6c92020d4fe 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/15.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/15.txt @@ -66,7 +66,7 @@ Arguments: false (5) VeloxResizeBatches Input [5]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_address#X, s_phone#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [5]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_address#X, s_phone#X] @@ -114,7 +114,7 @@ Arguments: false (16) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (17) ColumnarExchange Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] @@ -157,7 +157,7 @@ Arguments: false (26) VeloxResizeBatches Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X] -Arguments: X, X +Arguments: X, X, X (27) ColumnarExchange Input [5]: [s_suppkey#X, s_name#X, s_address#X, s_phone#X, total_revenue#X] @@ -317,7 +317,7 @@ Arguments: false (54) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (55) ColumnarExchange Input [4]: [hash_partition_key#X, l_suppkey#X, sum#X, isEmpty#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/16.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/16.txt index 3441216f140..64015145b5c 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/16.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/16.txt @@ -84,7 +84,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X] @@ -121,7 +121,7 @@ Arguments: false (14) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_partkey#X, p_brand#X, p_type#X, p_size#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [5]: [hash_partition_key#X, p_partkey#X, p_brand#X, p_type#X, p_size#X] @@ -164,7 +164,7 @@ Arguments: false (24) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, ps_suppkey#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, ps_suppkey#X] @@ -204,7 +204,7 @@ Arguments: false (33) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, count#X] -Arguments: X, X +Arguments: X, X, X (34) ColumnarExchange Input [5]: [hash_partition_key#X, p_brand#X, p_type#X, p_size#X, count#X] @@ -233,7 +233,7 @@ Arguments: false (40) VeloxResizeBatches Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X] -Arguments: X, X +Arguments: X, X, X (41) ColumnarExchange Input [4]: [p_brand#X, p_type#X, p_size#X, supplier_cnt#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/17.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/17.txt index c1b43b7fc42..1bbcd5fbb0a 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/17.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/17.txt @@ -79,7 +79,7 @@ Arguments: false (5) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_partkey#X, l_quantity#X, l_extendedprice#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [4]: [hash_partition_key#X, l_partkey#X, l_quantity#X, l_extendedprice#X] @@ -116,7 +116,7 @@ Arguments: false (14) VeloxResizeBatches Input [2]: [hash_partition_key#X, p_partkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [2]: [hash_partition_key#X, p_partkey#X] @@ -170,7 +170,7 @@ Arguments: false (26) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_partkey#X, sum#X, count#X] -Arguments: X, X +Arguments: X, X, X (27) ColumnarExchange Input [4]: [hash_partition_key#X, l_partkey#X, sum#X, count#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/18.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/18.txt index c1a6b181bb3..748f8c59df4 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/18.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/18.txt @@ -119,7 +119,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_custkey#X, c_name#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, c_custkey#X, c_name#X] @@ -156,7 +156,7 @@ Arguments: false (14) VeloxResizeBatches Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_totalprice#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_totalprice#X, o_orderdate#X] @@ -195,7 +195,7 @@ Arguments: false (23) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_orderkey#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (24) ColumnarExchange Input [4]: [hash_partition_key#X, l_orderkey#X, sum#X, isEmpty#X] @@ -242,7 +242,7 @@ Arguments: false (34) VeloxResizeBatches Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_totalprice#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (35) ColumnarExchange Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_totalprice#X, o_orderdate#X] @@ -274,7 +274,7 @@ Arguments: false (42) VeloxResizeBatches Input [6]: [hash_partition_key#X, c_custkey#X, c_name#X, o_orderkey#X, o_totalprice#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (43) ColumnarExchange Input [6]: [hash_partition_key#X, c_custkey#X, c_name#X, o_orderkey#X, o_totalprice#X, o_orderdate#X] @@ -311,7 +311,7 @@ Arguments: false (51) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_quantity#X] -Arguments: X, X +Arguments: X, X, X (52) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_quantity#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/19.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/19.txt index 420c980f327..019cee8dbf4 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/19.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/19.txt @@ -56,7 +56,7 @@ Arguments: false (5) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_partkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [5]: [hash_partition_key#X, l_partkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] @@ -93,7 +93,7 @@ Arguments: false (14) VeloxResizeBatches Input [5]: [hash_partition_key#X, p_partkey#X, p_brand#X, p_size#X, p_container#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [5]: [hash_partition_key#X, p_partkey#X, p_brand#X, p_size#X, p_container#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/20.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/20.txt index 4d8eee1f1fb..1565a9ea077 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/20.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/20.txt @@ -146,7 +146,7 @@ Arguments: false (5) VeloxResizeBatches Input [5]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_address#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [5]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_address#X, s_nationkey#X] @@ -183,7 +183,7 @@ Arguments: false (14) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X] @@ -220,7 +220,7 @@ Arguments: false (23) VeloxResizeBatches Input [2]: [hash_partition_key#X, p_partkey#X] -Arguments: X, X +Arguments: X, X, X (24) ColumnarExchange Input [2]: [hash_partition_key#X, p_partkey#X] @@ -252,7 +252,7 @@ Arguments: false (31) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_availqty#X] @@ -289,7 +289,7 @@ Arguments: false (40) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_partkey#X, l_suppkey#X, l_quantity#X] -Arguments: X, X +Arguments: X, X, X (41) ColumnarExchange Input [4]: [hash_partition_key#X, l_partkey#X, l_suppkey#X, l_quantity#X] @@ -349,7 +349,7 @@ Arguments: false (55) VeloxResizeBatches Input [4]: [hash_partition_key#X, (0.5 * sum(l_quantity))#X, l_partkey#X, l_suppkey#X] -Arguments: X, X +Arguments: X, X, X (56) ColumnarExchange Input [4]: [hash_partition_key#X, (0.5 * sum(l_quantity))#X, l_partkey#X, l_suppkey#X] @@ -381,7 +381,7 @@ Arguments: false (63) VeloxResizeBatches Input [2]: [hash_partition_key#X, ps_suppkey#X] -Arguments: X, X +Arguments: X, X, X (64) ColumnarExchange Input [2]: [hash_partition_key#X, ps_suppkey#X] @@ -413,7 +413,7 @@ Arguments: false (71) VeloxResizeBatches Input [4]: [hash_partition_key#X, s_name#X, s_address#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (72) ColumnarExchange Input [4]: [hash_partition_key#X, s_name#X, s_address#X, s_nationkey#X] @@ -450,7 +450,7 @@ Arguments: false (80) VeloxResizeBatches Input [2]: [hash_partition_key#X, n_nationkey#X] -Arguments: X, X +Arguments: X, X, X (81) ColumnarExchange Input [2]: [hash_partition_key#X, n_nationkey#X] @@ -482,7 +482,7 @@ Arguments: false (88) VeloxResizeBatches Input [2]: [s_name#X, s_address#X] -Arguments: X, X +Arguments: X, X, X (89) ColumnarExchange Input [2]: [s_name#X, s_address#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/21.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/21.txt index 96750b2b3ec..4a28c777ae2 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/21.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/21.txt @@ -140,7 +140,7 @@ Arguments: false (5) VeloxResizeBatches Input [4]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [4]: [hash_partition_key#X, s_suppkey#X, s_name#X, s_nationkey#X] @@ -177,7 +177,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] @@ -209,7 +209,7 @@ Arguments: false (22) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] @@ -252,7 +252,7 @@ Arguments: false (32) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] -Arguments: X, X +Arguments: X, X, X (33) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] @@ -284,7 +284,7 @@ Arguments: false (40) VeloxResizeBatches Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] -Arguments: X, X +Arguments: X, X, X (41) ColumnarExchange Input [3]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X] @@ -316,7 +316,7 @@ Arguments: false (48) VeloxResizeBatches Input [4]: [hash_partition_key#X, s_name#X, s_nationkey#X, l_orderkey#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [4]: [hash_partition_key#X, s_name#X, s_nationkey#X, l_orderkey#X] @@ -353,7 +353,7 @@ Arguments: false (57) VeloxResizeBatches Input [2]: [hash_partition_key#X, o_orderkey#X] -Arguments: X, X +Arguments: X, X, X (58) ColumnarExchange Input [2]: [hash_partition_key#X, o_orderkey#X] @@ -385,7 +385,7 @@ Arguments: false (65) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_name#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (66) ColumnarExchange Input [3]: [hash_partition_key#X, s_name#X, s_nationkey#X] @@ -422,7 +422,7 @@ Arguments: false (74) VeloxResizeBatches Input [2]: [hash_partition_key#X, n_nationkey#X] -Arguments: X, X +Arguments: X, X, X (75) ColumnarExchange Input [2]: [hash_partition_key#X, n_nationkey#X] @@ -465,7 +465,7 @@ Arguments: false (84) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_name#X, count#X] -Arguments: X, X +Arguments: X, X, X (85) ColumnarExchange Input [3]: [hash_partition_key#X, s_name#X, count#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/22.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/22.txt index c6e147da04d..21f890c49ee 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/22.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/22.txt @@ -67,7 +67,7 @@ Arguments: false (5) VeloxResizeBatches Input [4]: [hash_partition_key#X, c_custkey#X, c_phone#X, c_acctbal#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [4]: [hash_partition_key#X, c_custkey#X, c_phone#X, c_acctbal#X] @@ -99,7 +99,7 @@ Arguments: false (13) VeloxResizeBatches Input [2]: [hash_partition_key#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (14) ColumnarExchange Input [2]: [hash_partition_key#X, o_custkey#X] @@ -142,7 +142,7 @@ Arguments: false (23) VeloxResizeBatches Input [5]: [hash_partition_key#X, cntrycode#X, count#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (24) ColumnarExchange Input [5]: [hash_partition_key#X, cntrycode#X, count#X, sum#X, isEmpty#X] @@ -171,7 +171,7 @@ Arguments: false (30) VeloxResizeBatches Input [3]: [cntrycode#X, numcust#X, totacctbal#X] -Arguments: X, X +Arguments: X, X, X (31) ColumnarExchange Input [3]: [cntrycode#X, numcust#X, totacctbal#X] @@ -323,7 +323,7 @@ Arguments: false (58) VeloxResizeBatches Input [2]: [sum#X, count#X] -Arguments: X, X +Arguments: X, X, X (59) ColumnarExchange Input [2]: [sum#X, count#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/3.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/3.txt index d6573f7483b..4a669b95ca6 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/3.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/3.txt @@ -81,7 +81,7 @@ Arguments: false (5) VeloxResizeBatches Input [2]: [hash_partition_key#X, c_custkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [2]: [hash_partition_key#X, c_custkey#X] @@ -118,7 +118,7 @@ Arguments: false (14) VeloxResizeBatches Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_orderdate#X, o_shippriority#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [5]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_orderdate#X, o_shippriority#X] @@ -150,7 +150,7 @@ Arguments: false (22) VeloxResizeBatches Input [4]: [hash_partition_key#X, o_orderkey#X, o_orderdate#X, o_shippriority#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [4]: [hash_partition_key#X, o_orderkey#X, o_orderdate#X, o_shippriority#X] @@ -187,7 +187,7 @@ Arguments: false (31) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [4]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/4.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/4.txt index 71a8f6974ed..0f5c41de5be 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/4.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/4.txt @@ -71,7 +71,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderpriority#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderpriority#X] @@ -108,7 +108,7 @@ Arguments: false (14) VeloxResizeBatches Input [2]: [hash_partition_key#X, l_orderkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [2]: [hash_partition_key#X, l_orderkey#X] @@ -151,7 +151,7 @@ Arguments: false (24) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderpriority#X, count#X] -Arguments: X, X +Arguments: X, X, X (25) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderpriority#X, count#X] @@ -180,7 +180,7 @@ Arguments: false (31) VeloxResizeBatches Input [2]: [o_orderpriority#X, order_count#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [2]: [o_orderpriority#X, order_count#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/5.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/5.txt index a78e477ace2..223fb133386 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/5.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/5.txt @@ -155,7 +155,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] @@ -192,7 +192,7 @@ Arguments: false (14) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] @@ -224,7 +224,7 @@ Arguments: false (22) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_nationkey#X, o_orderkey#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [3]: [hash_partition_key#X, c_nationkey#X, o_orderkey#X] @@ -261,7 +261,7 @@ Arguments: false (31) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [5]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] @@ -293,7 +293,7 @@ Arguments: false (39) VeloxResizeBatches Input [5]: [hash_partition_key#X, c_nationkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (40) ColumnarExchange Input [5]: [hash_partition_key#X, c_nationkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] @@ -330,7 +330,7 @@ Arguments: false (48) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] @@ -362,7 +362,7 @@ Arguments: false (56) VeloxResizeBatches Input [4]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (57) ColumnarExchange Input [4]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X] @@ -399,7 +399,7 @@ Arguments: false (65) VeloxResizeBatches Input [4]: [hash_partition_key#X, n_nationkey#X, n_name#X, n_regionkey#X] -Arguments: X, X +Arguments: X, X, X (66) ColumnarExchange Input [4]: [hash_partition_key#X, n_nationkey#X, n_name#X, n_regionkey#X] @@ -431,7 +431,7 @@ Arguments: false (73) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, n_name#X, n_regionkey#X] -Arguments: X, X +Arguments: X, X, X (74) ColumnarExchange Input [5]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, n_name#X, n_regionkey#X] @@ -468,7 +468,7 @@ Arguments: false (82) VeloxResizeBatches Input [2]: [hash_partition_key#X, r_regionkey#X] -Arguments: X, X +Arguments: X, X, X (83) ColumnarExchange Input [2]: [hash_partition_key#X, r_regionkey#X] @@ -511,7 +511,7 @@ Arguments: false (92) VeloxResizeBatches Input [4]: [hash_partition_key#X, n_name#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (93) ColumnarExchange Input [4]: [hash_partition_key#X, n_name#X, sum#X, isEmpty#X] @@ -540,7 +540,7 @@ Arguments: false (99) VeloxResizeBatches Input [2]: [n_name#X, revenue#X] -Arguments: X, X +Arguments: X, X, X (100) ColumnarExchange Input [2]: [n_name#X, revenue#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/6.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/6.txt index b85e63e1065..1e1d87db4b2 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/6.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/6.txt @@ -48,7 +48,7 @@ Arguments: false (6) VeloxResizeBatches Input [2]: [sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (7) ColumnarExchange Input [2]: [sum#X, isEmpty#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/7.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/7.txt index a0894489f0a..43f5a9823ab 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/7.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/7.txt @@ -149,7 +149,7 @@ Arguments: false (5) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] @@ -186,7 +186,7 @@ Arguments: false (14) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [6]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X] @@ -218,7 +218,7 @@ Arguments: false (22) VeloxResizeBatches Input [6]: [hash_partition_key#X, s_nationkey#X, l_orderkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [6]: [hash_partition_key#X, s_nationkey#X, l_orderkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X] @@ -255,7 +255,7 @@ Arguments: false (31) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_custkey#X] @@ -287,7 +287,7 @@ Arguments: false (39) VeloxResizeBatches Input [6]: [hash_partition_key#X, s_nationkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X, o_custkey#X] -Arguments: X, X +Arguments: X, X, X (40) ColumnarExchange Input [6]: [hash_partition_key#X, s_nationkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X, o_custkey#X] @@ -324,7 +324,7 @@ Arguments: false (48) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] @@ -356,7 +356,7 @@ Arguments: false (56) VeloxResizeBatches Input [6]: [hash_partition_key#X, s_nationkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X, c_nationkey#X] -Arguments: X, X +Arguments: X, X, X (57) ColumnarExchange Input [6]: [hash_partition_key#X, s_nationkey#X, l_extendedprice#X, l_discount#X, l_shipdate#X, c_nationkey#X] @@ -393,7 +393,7 @@ Arguments: false (65) VeloxResizeBatches Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (66) ColumnarExchange Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] @@ -425,7 +425,7 @@ Arguments: false (73) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, l_shipdate#X, c_nationkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (74) ColumnarExchange Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, l_shipdate#X, c_nationkey#X, n_name#X] @@ -481,7 +481,7 @@ Arguments: false (87) VeloxResizeBatches Input [6]: [hash_partition_key#X, supp_nation#X, cust_nation#X, l_year#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (88) ColumnarExchange Input [6]: [hash_partition_key#X, supp_nation#X, cust_nation#X, l_year#X, sum#X, isEmpty#X] @@ -510,7 +510,7 @@ Arguments: false (94) VeloxResizeBatches Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X] -Arguments: X, X +Arguments: X, X, X (95) ColumnarExchange Input [4]: [supp_nation#X, cust_nation#X, l_year#X, revenue#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/8.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/8.txt index 88a6a79e074..284a5c88dfd 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/8.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/8.txt @@ -198,7 +198,7 @@ Arguments: false (5) VeloxResizeBatches Input [2]: [hash_partition_key#X, p_partkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [2]: [hash_partition_key#X, p_partkey#X] @@ -235,7 +235,7 @@ Arguments: false (14) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [6]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] @@ -267,7 +267,7 @@ Arguments: false (22) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [5]: [hash_partition_key#X, l_orderkey#X, l_suppkey#X, l_extendedprice#X, l_discount#X] @@ -304,7 +304,7 @@ Arguments: false (31) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] @@ -336,7 +336,7 @@ Arguments: false (39) VeloxResizeBatches Input [5]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (40) ColumnarExchange Input [5]: [hash_partition_key#X, l_orderkey#X, l_extendedprice#X, l_discount#X, s_nationkey#X] @@ -373,7 +373,7 @@ Arguments: false (48) VeloxResizeBatches Input [4]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [4]: [hash_partition_key#X, o_orderkey#X, o_custkey#X, o_orderdate#X] @@ -405,7 +405,7 @@ Arguments: false (56) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_custkey#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (57) ColumnarExchange Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_custkey#X, o_orderdate#X] @@ -442,7 +442,7 @@ Arguments: false (65) VeloxResizeBatches Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] -Arguments: X, X +Arguments: X, X, X (66) ColumnarExchange Input [3]: [hash_partition_key#X, c_custkey#X, c_nationkey#X] @@ -474,7 +474,7 @@ Arguments: false (73) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_orderdate#X, c_nationkey#X] -Arguments: X, X +Arguments: X, X, X (74) ColumnarExchange Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_orderdate#X, c_nationkey#X] @@ -511,7 +511,7 @@ Arguments: false (82) VeloxResizeBatches Input [3]: [hash_partition_key#X, n_nationkey#X, n_regionkey#X] -Arguments: X, X +Arguments: X, X, X (83) ColumnarExchange Input [3]: [hash_partition_key#X, n_nationkey#X, n_regionkey#X] @@ -543,7 +543,7 @@ Arguments: false (90) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_orderdate#X, n_regionkey#X] -Arguments: X, X +Arguments: X, X, X (91) ColumnarExchange Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, s_nationkey#X, o_orderdate#X, n_regionkey#X] @@ -580,7 +580,7 @@ Arguments: false (99) VeloxResizeBatches Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (100) ColumnarExchange Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] @@ -612,7 +612,7 @@ Arguments: false (107) VeloxResizeBatches Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, o_orderdate#X, n_regionkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (108) ColumnarExchange Input [6]: [hash_partition_key#X, l_extendedprice#X, l_discount#X, o_orderdate#X, n_regionkey#X, n_name#X] @@ -649,7 +649,7 @@ Arguments: false (116) VeloxResizeBatches Input [2]: [hash_partition_key#X, r_regionkey#X] -Arguments: X, X +Arguments: X, X, X (117) ColumnarExchange Input [2]: [hash_partition_key#X, r_regionkey#X] @@ -692,7 +692,7 @@ Arguments: false (126) VeloxResizeBatches Input [6]: [hash_partition_key#X, o_year#X, sum#X, isEmpty#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (127) ColumnarExchange Input [6]: [hash_partition_key#X, o_year#X, sum#X, isEmpty#X, sum#X, isEmpty#X] @@ -725,7 +725,7 @@ Arguments: false (134) VeloxResizeBatches Input [2]: [o_year#X, mkt_share#X] -Arguments: X, X +Arguments: X, X, X (135) ColumnarExchange Input [2]: [o_year#X, mkt_share#X] diff --git a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/9.txt b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/9.txt index 4f537e91e13..6819628a002 100644 --- a/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/9.txt +++ b/backends-velox/src/test/resources/tpch-approved-plan/v1/spark35/9.txt @@ -154,7 +154,7 @@ Arguments: false (5) VeloxResizeBatches Input [2]: [hash_partition_key#X, p_partkey#X] -Arguments: X, X +Arguments: X, X, X (6) ColumnarExchange Input [2]: [hash_partition_key#X, p_partkey#X] @@ -191,7 +191,7 @@ Arguments: false (14) VeloxResizeBatches Input [7]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (15) ColumnarExchange Input [7]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] @@ -223,7 +223,7 @@ Arguments: false (22) VeloxResizeBatches Input [7]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] -Arguments: X, X +Arguments: X, X, X (23) ColumnarExchange Input [7]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X] @@ -260,7 +260,7 @@ Arguments: false (31) VeloxResizeBatches Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (32) ColumnarExchange Input [3]: [hash_partition_key#X, s_suppkey#X, s_nationkey#X] @@ -292,7 +292,7 @@ Arguments: false (39) VeloxResizeBatches Input [8]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X] -Arguments: X, X +Arguments: X, X, X (40) ColumnarExchange Input [8]: [hash_partition_key#X, l_orderkey#X, l_partkey#X, l_suppkey#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X] @@ -329,7 +329,7 @@ Arguments: false (48) VeloxResizeBatches Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_supplycost#X] -Arguments: X, X +Arguments: X, X, X (49) ColumnarExchange Input [4]: [hash_partition_key#X, ps_partkey#X, ps_suppkey#X, ps_supplycost#X] @@ -361,7 +361,7 @@ Arguments: false (56) VeloxResizeBatches Input [7]: [hash_partition_key#X, l_orderkey#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X, ps_supplycost#X] -Arguments: X, X +Arguments: X, X, X (57) ColumnarExchange Input [7]: [hash_partition_key#X, l_orderkey#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X, ps_supplycost#X] @@ -398,7 +398,7 @@ Arguments: false (65) VeloxResizeBatches Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (66) ColumnarExchange Input [3]: [hash_partition_key#X, o_orderkey#X, o_orderdate#X] @@ -430,7 +430,7 @@ Arguments: false (73) VeloxResizeBatches Input [7]: [hash_partition_key#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X, ps_supplycost#X, o_orderdate#X] -Arguments: X, X +Arguments: X, X, X (74) ColumnarExchange Input [7]: [hash_partition_key#X, l_quantity#X, l_extendedprice#X, l_discount#X, s_nationkey#X, ps_supplycost#X, o_orderdate#X] @@ -467,7 +467,7 @@ Arguments: false (82) VeloxResizeBatches Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] -Arguments: X, X +Arguments: X, X, X (83) ColumnarExchange Input [3]: [hash_partition_key#X, n_nationkey#X, n_name#X] @@ -510,7 +510,7 @@ Arguments: false (92) VeloxResizeBatches Input [5]: [hash_partition_key#X, nation#X, o_year#X, sum#X, isEmpty#X] -Arguments: X, X +Arguments: X, X, X (93) ColumnarExchange Input [5]: [hash_partition_key#X, nation#X, o_year#X, sum#X, isEmpty#X] @@ -539,7 +539,7 @@ Arguments: false (99) VeloxResizeBatches Input [3]: [nation#X, o_year#X, sum_profit#X] -Arguments: X, X +Arguments: X, X, X (100) ColumnarExchange Input [3]: [nation#X, o_year#X, sum_profit#X] diff --git a/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxTPCHSuite.scala b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxTPCHSuite.scala index 1fbb3644c47..81bf28a9903 100644 --- a/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxTPCHSuite.scala +++ b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxTPCHSuite.scala @@ -73,6 +73,7 @@ abstract class VeloxTPCHSuite extends VeloxTPCHTableSupport { // for unexpected blank .replaceAll("Scan parquet ", "Scan parquet") // Spark QueryStageExec will take it's id as argument, replace it with X + .replaceAll("Arguments: [0-9]+, [0-9]+, [0-9]+", "Arguments: X, X, X") .replaceAll("Arguments: [0-9]+, [0-9]+", "Arguments: X, X") .replaceAll("Arguments: [0-9]+", "Arguments: X") // mask PullOutPostProject and PullOutPreProject id diff --git a/cpp/velox/jni/VeloxJniWrapper.cc b/cpp/velox/jni/VeloxJniWrapper.cc index 3993eeecdd4..f44fed08882 100644 --- a/cpp/velox/jni/VeloxJniWrapper.cc +++ b/cpp/velox/jni/VeloxJniWrapper.cc @@ -431,13 +431,14 @@ JNIEXPORT jlong JNICALL Java_org_apache_gluten_utils_VeloxBatchResizerJniWrapper jobject wrapper, jint minOutputBatchSize, jint maxOutputBatchSize, + jlong preferredBatchBytes, jobject jIter) { JNI_METHOD_START auto ctx = getRuntime(env, wrapper); auto pool = dynamic_cast(ctx->memoryManager())->getLeafMemoryPool(); auto iter = makeJniColumnarBatchIterator(env, jIter, ctx); auto appender = std::make_shared( - std::make_unique(pool.get(), minOutputBatchSize, maxOutputBatchSize, std::move(iter))); + std::make_unique(pool.get(), minOutputBatchSize, maxOutputBatchSize, preferredBatchBytes, std::move(iter))); return ctx->saveObject(appender); JNI_METHOD_END(kInvalidObjectHandle) } diff --git a/cpp/velox/memory/VeloxColumnarBatch.cc b/cpp/velox/memory/VeloxColumnarBatch.cc index d6e66b94a37..038bd9f798f 100644 --- a/cpp/velox/memory/VeloxColumnarBatch.cc +++ b/cpp/velox/memory/VeloxColumnarBatch.cc @@ -79,7 +79,7 @@ std::shared_ptr VeloxColumnarBatch::exportArrowArray() { } int64_t VeloxColumnarBatch::numBytes() { - ensureFlattened(); + BaseVector::loadedVectorShared(rowVector_); return rowVector_->estimateFlatSize(); } diff --git a/cpp/velox/tests/VeloxBatchResizerTest.cc b/cpp/velox/tests/VeloxBatchResizerTest.cc index fb829a24b60..f1157991e54 100644 --- a/cpp/velox/tests/VeloxBatchResizerTest.cc +++ b/cpp/velox/tests/VeloxBatchResizerTest.cc @@ -53,12 +53,12 @@ class VeloxBatchResizerTest : public ::testing::Test, public test::VectorTestBas return out; } - void checkResize(int32_t min, int32_t max, std::vector inSizes, std::vector outSizes) { + void checkResize(int32_t min, int32_t max, int64_t preferredBatchBytes, std::vector inSizes, std::vector outSizes) { auto inBatches = std::vector>(); for (const auto& size : inSizes) { inBatches.push_back(std::make_shared(newVector(size))); } - VeloxBatchResizer resizer(pool(), min, max, std::make_unique(std::move(inBatches))); + VeloxBatchResizer resizer(pool(), min, max, preferredBatchBytes, std::make_unique(std::move(inBatches))); auto actualOutSizes = std::vector(); while (true) { auto next = resizer.next(); @@ -72,15 +72,25 @@ class VeloxBatchResizerTest : public ::testing::Test, public test::VectorTestBas }; TEST_F(VeloxBatchResizerTest, sanity) { - checkResize(100, std::numeric_limits::max(), {30, 50, 30, 40, 30}, {110, 70}); - checkResize(1, 40, {10, 20, 50, 30, 40, 30}, {10, 20, 40, 10, 30, 40, 30}); - checkResize(1, 39, {10, 20, 50, 30, 40, 30}, {10, 20, 39, 11, 30, 39, 1, 30}); - checkResize(40, 40, {10, 20, 50, 30, 40, 30}, {30, 40, 10, 30, 40, 30}); - checkResize(39, 39, {10, 20, 50, 30, 40, 30}, {30, 39, 11, 30, 39, 1, 30}); - checkResize(100, 200, {5, 900, 50}, {5, 200, 200, 200, 200, 100, 50}); - checkResize(100, 200, {5, 900, 30, 80}, {5, 200, 200, 200, 200, 100, 110}); - checkResize(100, 200, {5, 900, 700}, {5, 200, 200, 200, 200, 100, 200, 200, 200, 100}); - ASSERT_ANY_THROW(checkResize(0, 0, {}, {})); + checkResize(100, std::numeric_limits::max(), (10L << 20), {30, 50, 30, 40, 30}, {110, 70}); + checkResize(1, 40, (10L << 20), {10, 20, 50, 30, 40, 30}, {10, 20, 40, 10, 30, 40, 30}); + checkResize(1, 39, (10L << 20), {10, 20, 50, 30, 40, 30}, {10, 20, 39, 11, 30, 39, 1, 30}); + checkResize(40, 40, (10L << 20), {10, 20, 50, 30, 40, 30}, {30, 40, 10, 30, 40, 30}); + checkResize(39, 39, (10L << 20), {10, 20, 50, 30, 40, 30}, {30, 39, 11, 30, 39, 1, 30}); + checkResize(100, 200, (10L << 20), {5, 900, 50}, {5, 200, 200, 200, 200, 100, 50}); + checkResize(100, 200, (10L << 20), {5, 900, 30, 80}, {5, 200, 200, 200, 200, 100, 110}); + checkResize(100, 200, (10L << 20), {5, 900, 700}, {5, 200, 200, 200, 200, 100, 200, 200, 200, 100}); + ASSERT_ANY_THROW(checkResize(0, 0, (10L << 20), {}, {})); +} + +TEST_F(VeloxBatchResizerTest, preferredBatchBytesTest) { + checkResize(100, std::numeric_limits::max(), 0, {30, 50, 30, 40, 30}, {30, 50, 30, 40, 30}); + checkResize(40, 40, 0, {10, 20, 50, 30, 40, 30}, {10, 20, 40, 10, 30, 40, 30}); + checkResize(39, 39, 0, {10, 20, 50, 30, 40, 30}, {10, 20, 39, 11, 30, 39, 1, 30}); + checkResize(100, 200, 0, {5, 900, 50}, {5, 200, 200, 200, 200, 100, 50}); + checkResize(100, 200, 0, {5, 900, 30, 80}, {5, 200, 200, 200, 200, 100, 30, 80}); + checkResize(100, 200, 0, {5, 900, 700}, {5, 200, 200, 200, 200, 100, 200, 200, 200, 100}); + ASSERT_ANY_THROW(checkResize(0, 0, 0, {}, {})); } } // namespace gluten diff --git a/cpp/velox/utils/VeloxBatchResizer.cc b/cpp/velox/utils/VeloxBatchResizer.cc index 851af9c83cd..a9196a46719 100644 --- a/cpp/velox/utils/VeloxBatchResizer.cc +++ b/cpp/velox/utils/VeloxBatchResizer.cc @@ -49,10 +49,12 @@ gluten::VeloxBatchResizer::VeloxBatchResizer( facebook::velox::memory::MemoryPool* pool, int32_t minOutputBatchSize, int32_t maxOutputBatchSize, + int64_t preferredBatchBytes, std::unique_ptr in) : pool_(pool), minOutputBatchSize_(minOutputBatchSize), maxOutputBatchSize_(maxOutputBatchSize), + preferredBatchBytes_(static_cast(preferredBatchBytes)), in_(std::move(in)) { GLUTEN_CHECK( minOutputBatchSize_ > 0 && maxOutputBatchSize_ > 0, @@ -75,25 +77,33 @@ std::shared_ptr VeloxBatchResizer::next() { return nullptr; } - if (cb->numRows() < minOutputBatchSize_) { + uint64_t numBytes = cb->numBytes(); + if (cb->numRows() < minOutputBatchSize_ && numBytes <= preferredBatchBytes_) { auto vb = VeloxColumnarBatch::from(pool_, cb); auto rv = vb->getRowVector(); auto buffer = facebook::velox::RowVector::createEmpty(rv->type(), pool_); buffer->append(rv.get()); - for (auto nextCb = in_->next(); nextCb != nullptr; nextCb = in_->next()) { - auto nextVb = VeloxColumnarBatch::from(pool_, nextCb); - auto nextRv = nextVb->getRowVector(); - if (buffer->size() + nextRv->size() > maxOutputBatchSize_) { + for (cb = in_->next(); cb != nullptr; cb = in_->next()) { + vb = VeloxColumnarBatch::from(pool_, cb); + rv = vb->getRowVector(); + uint64_t addedBytes = cb->numBytes(); + if (buffer->size() + rv->size() > maxOutputBatchSize_ || + numBytes + addedBytes > static_cast(preferredBatchBytes_)) { GLUTEN_CHECK(next_ == nullptr, "Invalid state"); - next_ = std::make_unique(maxOutputBatchSize_, nextRv); + next_ = std::make_unique(maxOutputBatchSize_, rv); return std::make_shared(buffer); } - buffer->append(nextRv.get()); + numBytes += addedBytes; + buffer->append(rv.get()); if (buffer->size() >= minOutputBatchSize_) { // Buffer is full. break; } + // Call reset manully to potentially release memory + rv.reset(); + vb.reset(); + cb.reset(); } return std::make_shared(buffer); } diff --git a/cpp/velox/utils/VeloxBatchResizer.h b/cpp/velox/utils/VeloxBatchResizer.h index d3d1539dd7f..8afd191dca4 100644 --- a/cpp/velox/utils/VeloxBatchResizer.h +++ b/cpp/velox/utils/VeloxBatchResizer.h @@ -29,6 +29,7 @@ class VeloxBatchResizer : public ColumnarBatchIterator { facebook::velox::memory::MemoryPool* pool, int32_t minOutputBatchSize, int32_t maxOutputBatchSize, + int64_t preferredBatchBytes, std::unique_ptr in); std::shared_ptr next() override; @@ -39,6 +40,7 @@ class VeloxBatchResizer : public ColumnarBatchIterator { facebook::velox::memory::MemoryPool* pool_; const int32_t minOutputBatchSize_; const int32_t maxOutputBatchSize_; + const uint64_t preferredBatchBytes_; std::unique_ptr in_; std::unique_ptr next_ = nullptr;