Skip to content

[SPARK-39911][SQL] Optimize global Sort to RepartitionByExpression #37330

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
ulysses-you wants to merge 1 commit into from
Closed

[SPARK-39911][SQL] Optimize global Sort to RepartitionByExpression #37330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1549,6 +1549,12 @@ object EliminateSorts extends Rule[LogicalPlan] {
plan match {
case Sort(_, global, child) if canRemoveGlobalSort || !global =>
recursiveRemoveSort(child, canRemoveGlobalSort)
case Sort(sortOrder, true, child) =>
// For this case, the upper sort is local so the ordering of present sort is unnecessary,
// so here we only preserve its output partitioning using `RepartitionByExpression`.
// We should use `None` as the optNumPartitions so AQE can coalesce shuffle partitions.
// This behavior is same with original global sort.
RepartitionByExpression(sortOrder, recursiveRemoveSort(child, true), None)
case other if canEliminateSort(other) =>
other.withNewChildren(other.children.map(c => recursiveRemoveSort(c, canRemoveGlobalSort)))
case other if canEliminateGlobalSort(other) =>
Expand Down
10 changes: 7 additions & 3 deletions ...catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/EliminateSortsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,16 +428,20 @@ class EliminateSortsSuite extends AnalysisTest {
test("SPARK-39835: Fix EliminateSorts remove global sort below the local sort") {
// global -> local
val plan = testRelation.orderBy($"a".asc).sortBy($"c".asc).analyze
comparePlans(Optimize.execute(plan), plan)
val expect = RepartitionByExpression($"a".asc :: Nil, testRelation, None)
.sortBy($"c".asc).analyze
comparePlans(Optimize.execute(plan), expect)

// global -> global -> local
val plan2 = testRelation.orderBy($"a".asc).orderBy($"b".asc).sortBy($"c".asc).analyze
val expected2 = testRelation.orderBy($"b".asc).sortBy($"c".asc).analyze
val expected2 = RepartitionByExpression($"b".asc :: Nil, testRelation, None)
.sortBy($"c".asc).analyze
comparePlans(Optimize.execute(plan2), expected2)

// local -> global -> local
val plan3 = testRelation.sortBy($"a".asc).orderBy($"b".asc).sortBy($"c".asc).analyze
val expected3 = testRelation.orderBy($"b".asc).sortBy($"c".asc).analyze
val expected3 = RepartitionByExpression($"b".asc :: Nil, testRelation, None)
.sortBy($"c".asc).analyze
comparePlans(Optimize.execute(plan3), expected3)
}
}