Github user gatorsmile commented on a diff in the pull request:
https://github.com/apache/spark/pull/11635#discussion_r60861439
--- Diff:
sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/FilterPushdownSuite.scala
---
@@ -758,4 +758,217 @@ class FilterPushdownSuite extends PlanTest {
val correctedAnswer = agg.copy(child = agg.child.where(a > 1 && b >
2)).analyze
comparePlans(optimized, correctedAnswer)
}
+
+ test("Window: predicate push down -- basic") {
+ val winExpr = windowExpr(count('b), windowSpec('a :: Nil, 'b.asc ::
Nil, UnspecifiedFrame))
+
+ val originalQuery = testRelation.select('a, 'b, 'c,
winExpr.as('window)).where('a > 1)
+ val correctAnswer = testRelation
+ .where('a > 1).select('a, 'b, 'c)
+ .window(winExpr.as('window) :: Nil, 'a :: Nil, 'b.asc :: Nil)
+ .select('a, 'b, 'c, 'window).analyze
+
+ comparePlans(Optimize.execute(originalQuery.analyze), correctAnswer)
+ }
+
+ test("Window: predicate push down -- predicates with compound predicate
using only one column") {
+ val winExpr =
+ windowExpr(count('b), windowSpec('a.attr :: 'b.attr :: Nil, 'b.asc
:: Nil, UnspecifiedFrame))
+
+ val originalQuery = testRelation.select('a, 'b, 'c,
winExpr.as('window)).where('a * 3 > 15)
+ val correctAnswer = testRelation
+ .where('a * 3 > 15).select('a, 'b, 'c)
+ .window(winExpr.as('window) :: Nil, 'a.attr :: 'b.attr :: Nil,
'b.asc :: Nil)
+ .select('a, 'b, 'c, 'window).analyze
+
+ comparePlans(Optimize.execute(originalQuery.analyze), correctAnswer)
+ }
+
+ test("Window: predicate push down -- multi window expressions with the
same window spec") {
+ val winSpec = windowSpec('a.attr :: 'b.attr :: Nil, 'b.asc :: Nil,
UnspecifiedFrame)
+ val winExpr1 = windowExpr(count('b), winSpec)
+ val winExpr2 = windowExpr(sum('b), winSpec)
+ val originalQuery = testRelation
+ .select('a, 'b, 'c, winExpr1.as('window1),
winExpr2.as('window2)).where('a > 1)
+
+ val correctAnswer = testRelation
+ .where('a > 1).select('a, 'b, 'c)
+ .window(winExpr1.as('window1) :: winExpr2.as('window2) :: Nil,
+ 'a.attr :: 'b.attr :: Nil, 'b.asc :: Nil)
+ .select('a, 'b, 'c, 'window1, 'window2).analyze
+
+ comparePlans(Optimize.execute(originalQuery.analyze), correctAnswer)
+ }
+
+ test("Window: predicate push down -- multi window specification - 1") {
+ // order by clauses are different between winSpec1 and winSpec2
+ val winSpec1 = windowSpec('a.attr :: 'b.attr :: Nil, 'b.asc :: Nil,
UnspecifiedFrame)
+ val winExpr1 = windowExpr(count('b), winSpec1)
+ val winSpec2 = windowSpec('a.attr :: 'b.attr :: Nil, 'a.asc :: Nil,
UnspecifiedFrame)
+ val winExpr2 = windowExpr(count('b), winSpec2)
+ val originalQuery = testRelation
+ .select('a, 'b, 'c, winExpr1.as('window1),
winExpr2.as('window2)).where('a > 1)
+
+ val correctAnswer1 = testRelation
+ .where('a > 1).select('a, 'b, 'c)
+ .window(winExpr1.as('window1) :: Nil, 'a.attr :: 'b.attr :: Nil,
'b.asc :: Nil)
+ .window(winExpr2.as('window2) :: Nil, 'a.attr :: 'b.attr :: Nil,
'a.asc :: Nil)
+ .select('a, 'b, 'c, 'window1, 'window2).analyze
+
+ val correctAnswer2 = testRelation
+ .where('a > 1).select('a, 'b, 'c)
+ .window(winExpr2.as('window2) :: Nil, 'a.attr :: 'b.attr :: Nil,
'a.asc :: Nil)
+ .window(winExpr1.as('window1) :: Nil, 'a.attr :: 'b.attr :: Nil,
'b.asc :: Nil)
+ .select('a, 'b, 'c, 'window1, 'window2).analyze
+
+ val optimizedQuery = Optimize.execute(originalQuery.analyze)
+ try {
+ comparePlans(optimizedQuery, correctAnswer1)
+ } catch {
+ case ae: Throwable => comparePlans(optimizedQuery, correctAnswer2)
+ }
+ }
+
+ test("Window: predicate push down -- multi window specification - 2") {
+ // partitioning clauses are different between winSpec1 and winSpec2
+ val winSpec1 = windowSpec('a.attr :: Nil, 'b.asc :: Nil,
UnspecifiedFrame)
+ val winExpr1 = windowExpr(count('b), winSpec1)
+ val winSpec2 = windowSpec('b.attr :: Nil, 'b.asc :: Nil,
UnspecifiedFrame)
+ val winExpr2 = windowExpr(count('a), winSpec2)
+ val originalQuery = testRelation
+ .select('a, winExpr1.as('window1), 'b, 'c,
winExpr2.as('window2)).where('b > 1)
+
+ val correctAnswer1 = testRelation.select('a, 'b, 'c)
+ .window(winExpr1.as('window1) :: Nil, 'a.attr :: Nil, 'b.asc :: Nil)
+ .where('b > 1)
+ .window(winExpr2.as('window2) :: Nil, 'b.attr :: Nil, 'b.asc :: Nil)
+ .select('a, 'window1, 'b, 'c, 'window2).analyze
+
+ val correctAnswer2 = testRelation.select('a, 'b, 'c)
+ .window(winExpr2.as('window2) :: Nil, 'b.attr :: Nil, 'b.asc :: Nil)
+ .window(winExpr1.as('window1) :: Nil, 'a.attr :: Nil, 'b.asc :: Nil)
+ .where('b > 1)
+ .select('a, 'window1, 'b, 'c, 'window2).analyze
+
+ val optimizedQuery = Optimize.execute(originalQuery.analyze)
+ try {
--- End diff --
Will do it.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
