Skip to content

[SPARK-38034][SQL] Optimize TransposeWindow rule #35334

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

[SPARK-38034][SQL] Optimize TransposeWindow rule #35334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c1c4dd
optimize TransposeWindow rule
Jan 26, 2022
0d8e472
modify UT description
Aug 4, 2022
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: 3 additions & 3 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 @@ -1257,9 +1257,9 @@ object CollapseWindow extends Rule[LogicalPlan] {
*/
object TransposeWindow extends Rule[LogicalPlan] {
private def compatiblePartitions(ps1 : Seq[Expression], ps2: Seq[Expression]): Boolean = {
ps1.length < ps2.length && ps2.take(ps1.length).permutations.exists(ps1.zip(_).forall {
Copy link
Contributor

@cloud-fan cloud-fan Aug 4, 2022

Choose a reason for hiding this comment

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

I'd consider this as a perf bug...

Copy link
Author

@constzhou constzhou Aug 4, 2022

Choose a reason for hiding this comment

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

You mean we should only optimize the performance without changing the logic？Maybe we could find a way to avoid the permutation

Copy link
Contributor

@cloud-fan cloud-fan Aug 5, 2022

Choose a reason for hiding this comment

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

I mean the previous code is kind of buggy. This PR is more like a bug fix instead of perf improvement and we should backport it.

case (l, r) => l.semanticEquals(r)
})
ps1.length < ps2.length && ps1.forall { expr1 =>
ps2.exists(expr1.semanticEquals)
}
}

private def windowsCompatible(w1: Window, w2: Window): Boolean = {
Expand Down
17 changes: 17 additions & 0 deletions ...atalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/TransposeWindowSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,4 +143,21 @@ class TransposeWindowSuite extends PlanTest {
comparePlans(optimized, analyzed)
}

test("SPARK-38034: transpose two adjacent windows with compatible partitions " +
"which is not a prefix") {
val query = testRelation
.window(Seq(sum(c).as('sum_a_2)), partitionSpec4, orderSpec2)
.window(Seq(sum(c).as('sum_a_1)), partitionSpec3, orderSpec1)

val analyzed = query.analyze
val optimized = Optimize.execute(analyzed)

val correctAnswer = testRelation
.window(Seq(sum(c).as('sum_a_1)), partitionSpec3, orderSpec1)
.window(Seq(sum(c).as('sum_a_2)), partitionSpec4, orderSpec2)
.select('a, 'b, 'c, 'd, 'sum_a_2, 'sum_a_1)

comparePlans(optimized, correctAnswer.analyze)
}

}