cloud-fan commented on code in PR #46143:
URL: https://github.com/apache/spark/pull/46143#discussion_r2828801019
##########
sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/FilterPushdownSuite.scala:
##########
@@ -152,17 +156,137 @@ class FilterPushdownSuite extends PlanTest {
test("can't push without rewrite") {
val originalQuery =
testRelation
- .select($"a" + $"b" as "e")
+ .select($"a" + $"b" as "e", $"a" - $"b" as "f")
.where($"e" === 1)
.analyze
val optimized = Optimize.execute(originalQuery.analyze)
val correctAnswer =
testRelation
.where($"a" + $"b" === 1)
- .select($"a" + $"b" as "e")
+ .select($"a" + $"b" as "e", $"a" - $"b" as "f")
+ .analyze
+
+ comparePlans(optimized, correctAnswer)
+ }
+
+ test("SPARK-47672: Do double evaluation when configured") {
+ withSQLConf(SQLConf.AVOID_DOUBLE_FILTER_EVAL.key -> "false") {
+ val originalQuery = testStringRelation
+ .select($"a", $"e".rlike("magic") as "f", $"e".rlike("notmagic") as
"j", $"b")
+ .where($"a" > 5 && $"f")
+ .analyze
+
+ val optimized = Optimize.execute(originalQuery)
+
+ val correctAnswer = testStringRelation
+ .where($"a" > 5 && $"e".rlike("magic"))
+ .select($"a", $"e".rlike("magic") as "f", $"e".rlike("notmagic") as
"j", $"b")
.analyze
+ comparePlans(optimized, correctAnswer)
+ }
+ }
+
+ test("SPARK-47672: Make sure that we handle the case where everything is
expensive") {
+ val originalQuery = testStringRelation
+ .select($"e".rlike("magic") as "f")
+ .where($"f")
+ .analyze
+
+ val optimized = Optimize.execute(originalQuery)
+
+ val correctAnswer = testStringRelation
+ .select($"e".rlike("magic") as "f")
+ .where($"f")
+ .analyze
+
+ comparePlans(optimized, correctAnswer)
+ }
+
+ test("SPARK-47672: Ensure filter pushdown without alias reference does not
move a projection.") {
+ val originalQuery = testStringRelation
+ .select($"a", $"e".rlike("magic") as "f", $"b" + $"a")
+ .where($"a" > 5)
+ .analyze
+
+ val optimized = Optimize.execute(originalQuery)
+
+ val correctAnswer = testStringRelation
+ .where($"a" > 5)
+ .select($"a", $"e".rlike("magic") as "f", $"b" + $"a")
+ .analyze
+
+ comparePlans(optimized, correctAnswer)
+ }
+
+
+ test("SPARK-47672: Inexpensive filter pushdown should not move projections")
{
+ val originalQuery = testStringRelation
+ .select($"a" as "c", $"b" + $"a")
+ .where($"c" > 5)
+ .analyze
+
+ val optimized = Optimize.execute(originalQuery)
+
+ val correctAnswer = testStringRelation
+ .where($"a" > 5)
+ .select($"a" as "c", $"b" + $"a")
+ .analyze
+
+ comparePlans(optimized, correctAnswer)
+ }
+
+ test("SPARK-47672: Avoid double evaluation with projections can't push past
certain items") {
+ val originalQuery = testStringRelation
+ .select($"a", $"e".rlike("magic") as "f")
+ .where($"a" > 5 || $"f")
+ .analyze
+
+ val optimized = Optimize.execute(originalQuery)
+
+ val correctAnswer = testStringRelation
+ .select($"a", $"e".rlike("magic") as "f")
+ .where($"a" > 5 || $"f")
+ .analyze
+
+ comparePlans(optimized, correctAnswer)
+ }
+
+ // Case 1: Multiple filters that don't reference any projection aliases -
all should be pushed
+ test("SPARK-47672: Case 1 - multiple filters not referencing projection
aliases") {
+ val originalQuery = testStringRelation
+ .select($"a" as "c", $"e".rlike("magic") as "f", $"b" as "d")
+ .where($"c" > 5 && $"d" < 10)
+ .analyze
+
+ val optimized = Optimize.execute(originalQuery)
+
+ // Both filters on c and d should be pushed down since they just reference
+ // simple aliases (c->a, d->b) which are inexpensive
+ val correctAnswer = testStringRelation
+ .where($"a" > 5 && $"b" < 10)
+ .select($"a" as "c", $"e".rlike("magic") as "f", $"b" as "d")
+ .analyze
+
+ comparePlans(optimized, correctAnswer)
+ }
+
+ // Case 2: Multiple filters with inexpensive references - all should be
pushed
Review Comment:
do we have a test case for the mixed cases?
--
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.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
