Skip to content

[SPARK-28560][SQL][followup] resolve the remaining comments for PR#25295 #26157

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.

Sign up for GitHub

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

Closed
JkSelf wants to merge 2 commits into from
Closed

[SPARK-28560][SQL][followup] resolve the remaining comments for PR#25295 #26157

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f17db39
resolve the remaining comments in PR#25295
JkSelf Oct 18, 2019
8b47b7c
update the checkNumLocalShuffleReaders method to collect all the loca…
JkSelf Oct 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
resolve the remaining comments in PR#25295
  • Loading branch information
@JkSelf
JkSelf committed Oct 18, 2019
commit f17db393b778f8f79d9659627e94d960307cd2da
2 changes: 1 addition & 1 deletion ...e/src/main/scala/org/apache/spark/sql/execution/adaptive/OptimizeLocalShuffleReader.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ case class OptimizeLocalShuffleReader(conf: SQLConf) extends Rule[SparkPlan] {
val numExchangeAfter = numExchanges(EnsureRequirements(conf).apply(optimizedPlan))

if (numExchangeAfter > numExchangeBefore) {
logWarning("OptimizeLocalShuffleReader rule is not applied due" +
logDebug("OptimizeLocalShuffleReader rule is not applied due" +
" to additional shuffles will be introduced.")
plan
} else {
Expand Down
2 changes: 2 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/execution/adaptive/AdaptiveQueryExecSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,8 @@ class AdaptiveQueryExecSuite
assert(smj.size == 3)
val bhj = findTopLevelBroadcastHashJoin(adaptivePlan)
assert(bhj.size == 2)
checkNumLocalShuffleReaders(adaptivePlan, 1)
Copy link
Contributor

@cloud-fan cloud-fan Oct 18, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there are 2 broadcast joins, but we only have 1 local shuffle reader. Why is it?

Copy link
Contributor Author

@JkSelf JkSelf Oct 18, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

checkNumLocalShuffleReaders method should call collect(plan) not call plan.collect. I have updated and check all the local shuffle reader number in existing test methods. Thanks.

// Even with local shuffle reader, the query statge reuse can also work.
val ex = findReusedExchange(adaptivePlan)
assert(ex.size == 1)
}
Expand Down