[SPARK-35378][SQL] Eagerly execute commands in QueryExecution instead of caller sides #32513
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.spark.sql.execution | ||
|
|
||
| import org.apache.spark.rdd.RDD | ||
| import org.apache.spark.sql.catalyst.InternalRow | ||
| import org.apache.spark.sql.catalyst.expressions.{Attribute, UnsafeProjection} | ||
| import org.apache.spark.sql.catalyst.plans.QueryPlan | ||
| import org.apache.spark.sql.execution.metric.SQLMetrics | ||
|
|
||
| /** | ||
| * Physical plan node for holding data from a command. | ||
| * | ||
| * `rows` may not be serializable and ideally we should not send `rows` to the executors. | ||
| * Thus marking it as transient. | ||
| */ | ||
| case class CommandResultExec( | ||
|
cloud-fan marked this conversation as resolved.
|
||
| output: Seq[Attribute], | ||
|
Member
There was a problem hiding this comment. override def output: Seq[Attribute] = commandPhysicalPlan.output?
Contributor
Author
There was a problem hiding this comment. Because we obtain the output in |
||
| commandPhysicalPlan: SparkPlan, | ||
| @transient rows: Seq[InternalRow]) extends LeafExecNode { | ||
|
|
||
| override lazy val metrics = Map( | ||
| "numOutputRows" -> SQLMetrics.createMetric(sparkContext, "number of output rows")) | ||
|
|
||
| override def innerChildren: Seq[QueryPlan[_]] = Seq(commandPhysicalPlan) | ||
|
|
||
| @transient private lazy val unsafeRows: Array[InternalRow] = { | ||
|
cloud-fan marked this conversation as resolved.
|
||
| if (rows.isEmpty) { | ||
| Array.empty | ||
| } else { | ||
| val proj = UnsafeProjection.create(output, output) | ||
| rows.map(r => proj(r).copy()).toArray | ||
| } | ||
| } | ||
|
|
||
| @transient private lazy val rdd: RDD[InternalRow] = { | ||
| if (rows.isEmpty) { | ||
| sqlContext.sparkContext.emptyRDD | ||
| } else { | ||
| val numSlices = math.min( | ||
| unsafeRows.length, sqlContext.sparkSession.leafNodeDefaultParallelism) | ||
| sqlContext.sparkContext.parallelize(unsafeRows, numSlices) | ||
| } | ||
| } | ||
|
|
||
| override def doExecute(): RDD[InternalRow] = { | ||
| val numOutputRows = longMetric("numOutputRows") | ||
| rdd.map { r => | ||
| numOutputRows += 1 | ||
| r | ||
| } | ||
| } | ||
|
|
||
| override protected def stringArgs: Iterator[Any] = { | ||
| if (unsafeRows.isEmpty) { | ||
| Iterator("<empty>", output) | ||
| } else { | ||
| Iterator(output) | ||
| } | ||
| } | ||
|
|
||
| override def executeCollect(): Array[InternalRow] = { | ||
| longMetric("numOutputRows").add(unsafeRows.size) | ||
| unsafeRows | ||
| } | ||
|
|
||
| override def executeTake(limit: Int): Array[InternalRow] = { | ||
| val taken = unsafeRows.take(limit) | ||
| longMetric("numOutputRows").add(taken.size) | ||
| taken | ||
| } | ||
|
|
||
| override def executeTail(limit: Int): Array[InternalRow] = { | ||
| val taken: Seq[InternalRow] = unsafeRows.takeRight(limit) | ||
| longMetric("numOutputRows").add(taken.size) | ||
| taken.toArray | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.spark.sql.expressions | ||
|
Contributor
There was a problem hiding this comment. This is a public package which makes |
||
|
|
||
| import org.apache.spark.sql.catalyst.InternalRow | ||
| import org.apache.spark.sql.catalyst.expressions.Attribute | ||
| import org.apache.spark.sql.catalyst.plans.QueryPlan | ||
| import org.apache.spark.sql.catalyst.plans.logical.{LeafNode, LogicalPlan} | ||
| import org.apache.spark.sql.execution.SparkPlan | ||
|
|
||
| /** | ||
| * Logical plan node for holding data from a command. | ||
| * | ||
| * `rows` may not be serializable and ideally we should not send `rows` to the executors. | ||
| * Thus marking it as transient. | ||
|
|
||
| */ | ||
| case class CommandResult( | ||
| output: Seq[Attribute], | ||
| commandLogicalPlan: LogicalPlan, | ||
| commandPhysicalPlan: SparkPlan, | ||
| @transient rows: Seq[InternalRow]) extends LeafNode { | ||
| override def innerChildren: Seq[QueryPlan[_]] = Seq(commandLogicalPlan) | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it -> them