cloud-fan commented on a change in pull request #29349:
URL: https://github.com/apache/spark/pull/29349#discussion_r466839267
##########
File path:
sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/FilterPushdownSuite.scala
##########
@@ -1149,75 +1149,60 @@ class FilterPushdownSuite extends PlanTest {
comparePlans(Optimize.execute(originalQuery.analyze), correctAnswer)
}
- test("join condition pushdown: deterministic and non-deterministic") {
- val x = testRelation.subquery('x)
- val y = testRelation.subquery('y)
-
- // Verify that all conditions except the watermark touching condition are
pushed down
- // by the optimizer and others are not.
- val originalQuery = x.join(y, condition = Some("x.a".attr === 5 &&
"y.a".attr === 5 &&
- "x.a".attr === Rand(10) && "y.b".attr === 5))
- val correctAnswer =
- x.where("x.a".attr === 5).join(y.where("y.a".attr === 5 && "y.b".attr
=== 5),
- condition = Some("x.a".attr === Rand(10)))
-
- // CheckAnalysis will ensure nondeterministic expressions not appear in
join condition.
- // TODO support nondeterministic expressions in join condition.
- comparePlans(Optimize.execute(originalQuery.analyze),
correctAnswer.analyze,
- checkAnalysis = false)
- }
-
test("watermark pushdown: no pushdown on watermark attribute #1") {
val interval = new CalendarInterval(2, 2, 2000L)
+ val relation = LocalRelation(attrA, 'b.timestamp, attrC)
// Verify that all conditions except the watermark touching condition are
pushed down
// by the optimizer and others are not.
- val originalQuery = EventTimeWatermark('b, interval, testRelation)
- .where('a === 5 && 'b === 10 && 'c === 5)
+ val originalQuery = EventTimeWatermark('b, interval, relation)
+ .where('a === 5 && 'b === new java.sql.Timestamp(0) && 'c === 5)
val correctAnswer = EventTimeWatermark(
- 'b, interval, testRelation.where('a === 5 && 'c === 5))
- .where('b === 10)
+ 'b, interval, relation.where('a === 5 && 'c === 5))
+ .where('b === new java.sql.Timestamp(0))
- comparePlans(Optimize.execute(originalQuery.analyze),
correctAnswer.analyze,
- checkAnalysis = false)
Review comment:
Yes. It's true that sometimes we need to construct a special unresolved
plan to test some special branches of the optimizer rule. But it's not the case
here.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
