[SPARK-28560][SQL][followup] change the local shuffle reader from leaf node to unary node #26250
Conversation
This file contains 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
|
@cloud-fan @maryannxue Please help me review. Thanks. |
|
Test build #112645 has finished for PR 26250 at commit
|
|
The failed test may be not related. Please help to re-test. Thanks. |
|
retest it please |
cloud-fan
reviewed
Oct 25, 2019
| @@ -129,7 +129,8 @@ abstract class QueryStageExec extends LeafExecNode { | |||
| */ | |||
| case class ShuffleQueryStageExec( | |||
| override val id: Int, | |||
| override val plan: ShuffleExchangeExec) extends QueryStageExec { | |||
| override val plan: ShuffleExchangeExec, | |||
| var isLocalShuffle: Boolean = false) extends QueryStageExec { | |||
There was a problem hiding this comment.
let's avoid using mutable states when not necessary.
cloud-fan
reviewed
Oct 25, 2019
| @@ -70,7 +70,8 @@ case class ReduceNumShufflePartitions(conf: SQLConf) extends Rule[SparkPlan] { | |||
| } | |||
| // ShuffleExchanges introduced by repartition do not support changing the number of partitions. | |||
| // We change the number of partitions in the stage only if all the ShuffleExchanges support it. | |||
| if (!shuffleStages.forall(_.plan.canChangeNumPartitions)) { | |||
There was a problem hiding this comment.
We can change the logic of collecting shuffle stages:
def collectShuffleStages(plan: SparkPlan): Seq[ShuffleQueryStageExec] = plan match {
case _: LocalShuffleReaderExec = Nil
case stage: ShuffleQueryStageExec => Seq(stage)
case ReusedQueryStageExec(_, stage: ShuffleQueryStageExec, _) => Seq(stage)
case _ => plan.children.flatMap(collectShuffleStages)
}
val shuffleStages = collectShuffleStages(plan)
|
We should also remove the changes to |
|
@cloud-fan @maryannxue update the coments. Please help me review. Thanks. |
|
Test build #112748 has finished for PR 26250 at commit
|
|
thanks, merging to master! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What changes were proposed in this pull request?
Why are the changes needed?
When make the
LocalShuffleReaderExecto leaf node, there exists a potential issue: the leaf node will hide the running query stage and make the unfinished query stage as finished query stage when creating its parent query stage.This PR make the leaf node to unary node.
Does this PR introduce any user-facing change?
No
How was this patch tested?
Existing tests