forked from apache/spark
-
Notifications
You must be signed in to change notification settings - Fork 51
[AE2.3-02][SPARK-23128] Add QueryStage and the framework for adaptive execution (auto setting the number of reducer) #443
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
b3c7f3f
Add QueryStage and the framework for adaptive execution
carsonwang fff789a
update style
carsonwang f3b7dee
set correct execution Id for broadcast query stage (#50)
carsonwang 8377468
fix build
1369ff5
blah
5a4cc08
blah
710916c
blah
c89f03b
Simple unit test
563706e
more test fixes
f477a24
Propagate all local properties
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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
79 changes: 79 additions & 0 deletions
79
sql/core/src/main/scala/org/apache/spark/sql/execution/adaptive/PlanQueryStage.scala
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,79 @@ | ||
/* | ||
* 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.adaptive | ||
|
||
import scala.collection.mutable | ||
import scala.collection.mutable.ArrayBuffer | ||
|
||
import org.apache.spark.sql.catalyst.rules.Rule | ||
import org.apache.spark.sql.execution.SparkPlan | ||
import org.apache.spark.sql.execution.command.ExecutedCommandExec | ||
import org.apache.spark.sql.execution.exchange.{BroadcastExchangeExec, Exchange, ShuffleExchangeExec} | ||
import org.apache.spark.sql.internal.SQLConf | ||
import org.apache.spark.sql.types.StructType | ||
|
||
/** | ||
* Divide the spark plan into multiple QueryStages. For each Exchange in the plan, it adds a | ||
* QueryStage and a QueryStageInput. If reusing Exchange is enabled, it finds duplicated exchanges | ||
* and uses the same QueryStage for all the references. | ||
*/ | ||
case class PlanQueryStage(conf: SQLConf) extends Rule[SparkPlan] { | ||
|
||
def apply(plan: SparkPlan): SparkPlan = { | ||
|
||
val newPlan = if (!conf.exchangeReuseEnabled) { | ||
plan.transformUp { | ||
case e: ShuffleExchangeExec => | ||
ShuffleQueryStageInput(ShuffleQueryStage(e), e.output) | ||
case e: BroadcastExchangeExec => | ||
BroadcastQueryStageInput(BroadcastQueryStage(e), e.output) | ||
} | ||
} else { | ||
// Build a hash map using schema of exchanges to avoid O(N*N) sameResult calls. | ||
val stages = mutable.HashMap[StructType, ArrayBuffer[QueryStage]]() | ||
|
||
plan.transformUp { | ||
case exchange: Exchange => | ||
val sameSchema = stages.getOrElseUpdate(exchange.schema, ArrayBuffer[QueryStage]()) | ||
val samePlan = sameSchema.find { s => | ||
exchange.sameResult(s.child) | ||
} | ||
if (samePlan.isDefined) { | ||
// Keep the output of this exchange, the following plans require that to resolve | ||
// attributes. | ||
exchange match { | ||
case e: ShuffleExchangeExec => ShuffleQueryStageInput( | ||
samePlan.get.asInstanceOf[ShuffleQueryStage], exchange.output) | ||
case e: BroadcastExchangeExec => BroadcastQueryStageInput( | ||
samePlan.get.asInstanceOf[BroadcastQueryStage], exchange.output) | ||
} | ||
} else { | ||
val queryStageInput = exchange match { | ||
case e: ShuffleExchangeExec => | ||
ShuffleQueryStageInput(ShuffleQueryStage(e), e.output) | ||
case e: BroadcastExchangeExec => | ||
BroadcastQueryStageInput(BroadcastQueryStage(e), e.output) | ||
} | ||
sameSchema += queryStageInput.childStage | ||
queryStageInput | ||
} | ||
} | ||
} | ||
ResultQueryStage(newPlan) | ||
} | ||
} |
Oops, something went wrong.
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.
doesn't this need to be the superset of preparations list? Why there's no
CollapseCodegenStages
andReuseExchange
here?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 doesn't need to be because it happens in doExecute of adaptive query stage
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.
Reuse exchange isn't necessary because the logic is subsumed in PlanQueryStage#apply.
Currently trying to figure out why CollapseCodegenStages isn't there.
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.
I asked them https://github.com/Intel-bigdata/spark-adaptive/pull/43#discussion_r251937780
Lets merge without CollapseCodegenStages, when they respond we can add it back if necessary.
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.
Actually the answer is here: apache#20303 (comment)