Skip to content

[SPARK-9050] [SQL] Remove unused newOrdering argument from Exchange (cleanup after SPARK-8317) #7407

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
JoshRosen wants to merge 3 commits into from
Closed

[SPARK-9050] [SQL] Remove unused newOrdering argument from Exchange (cleanup after SPARK-8317) #7407

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2e467da
Remove `newOrdering` from Exchange.
JoshRosen Jul 14, 2015
e866494
Refactor addOperatorsIfNecessary to make code clearer
JoshRosen Jul 14, 2015
e70be50
No need to wrap line
JoshRosen Jul 14, 2015
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
Prev Previous commit
Next Next commit
Refactor addOperatorsIfNecessary to make code clearer
  • Loading branch information
@JoshRosen
JoshRosen committed Jul 14, 2015
commit e86649489158eeb30ce09f10a78663f0a438a4ae
26 changes: 14 additions & 12 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/Exchange.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,23 +271,25 @@ private[sql] case class EnsureRequirements(sqlContext: SQLContext) extends Rule[
partitioning: Partitioning,
rowOrdering: Seq[SortOrder],
child: SparkPlan): SparkPlan = {
val needSort = rowOrdering.nonEmpty && child.outputOrdering != rowOrdering
val needsShuffle = child.outputPartitioning != partitioning

val withShuffle = if (needsShuffle) {
Exchange(partitioning, child)
} else {
child
def addShuffleIfNecessary(child: SparkPlan): SparkPlan = {
if (child.outputPartitioning != partitioning) {
Exchange(partitioning, child)
} else {
child
}
}

val withSort = if (needSort) {
sqlContext.planner.BasicOperators.getSortOperator(
rowOrdering, global = false, withShuffle)
} else {
withShuffle
def addSortIfNecessary(child: SparkPlan): SparkPlan = {
if (rowOrdering.nonEmpty && child.outputOrdering != rowOrdering) {
sqlContext.planner.BasicOperators.getSortOperator(
rowOrdering, global = false, child)
} else {
child
}
}

withSort
addSortIfNecessary(addShuffleIfNecessary(child))
}

if (meetsRequirements && compatible && !needsAnySort) {
Expand Down