forked from apache/spark
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[SPARK-13527][SQL] Prune Filters based on Constraints
#### What changes were proposed in this pull request? Remove all the deterministic conditions in a [[Filter]] that are contained in the Child's Constraints. For example, the first query can be simplified to the second one. ```scala val queryWithUselessFilter = tr1 .where("tr1.a".attr > 10 || "tr1.c".attr < 10) .join(tr2.where('d.attr < 100), Inner, Some("tr1.a".attr === "tr2.a".attr)) .where( ("tr1.a".attr > 10 || "tr1.c".attr < 10) && 'd.attr < 100 && "tr2.a".attr === "tr1.a".attr) ``` ```scala val query = tr1 .where("tr1.a".attr > 10 || "tr1.c".attr < 10) .join(tr2.where('d.attr < 100), Inner, Some("tr1.a".attr === "tr2.a".attr)) ``` #### How was this patch tested? Six test cases are added. Author: gatorsmile <[email protected]> Closes apache#11406 from gatorsmile/FilterRemoval.
- Loading branch information
1 parent
3dc9ae2
commit c6aa356
Showing
5 changed files
with
160 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
136 changes: 136 additions & 0 deletions
136
sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/PruneFiltersSuite.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,136 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright ownership. | ||
* The ASF licenses this file to You under the Apache License, Version 2.0 | ||
* (the "License"); you may not use this file except in compliance with | ||
* the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.apache.spark.sql.catalyst.optimizer | ||
|
||
import org.apache.spark.sql.catalyst.analysis.EliminateSubqueryAliases | ||
import org.apache.spark.sql.catalyst.dsl.expressions._ | ||
import org.apache.spark.sql.catalyst.dsl.plans._ | ||
import org.apache.spark.sql.catalyst.expressions._ | ||
import org.apache.spark.sql.catalyst.plans._ | ||
import org.apache.spark.sql.catalyst.plans.logical._ | ||
import org.apache.spark.sql.catalyst.rules._ | ||
|
||
class PruneFiltersSuite extends PlanTest { | ||
|
||
object Optimize extends RuleExecutor[LogicalPlan] { | ||
val batches = | ||
Batch("Subqueries", Once, | ||
EliminateSubqueryAliases) :: | ||
Batch("Filter Pushdown and Pruning", Once, | ||
CombineFilters, | ||
PruneFilters, | ||
PushPredicateThroughProject, | ||
PushPredicateThroughJoin) :: Nil | ||
} | ||
|
||
val testRelation = LocalRelation('a.int, 'b.int, 'c.int) | ||
|
||
test("Constraints of isNull + LeftOuter") { | ||
val x = testRelation.subquery('x) | ||
val y = testRelation.subquery('y) | ||
|
||
val query = x.where("x.b".attr.isNull).join(y, LeftOuter) | ||
val queryWithUselessFilter = query.where("x.b".attr.isNull) | ||
|
||
val optimized = Optimize.execute(queryWithUselessFilter.analyze) | ||
val correctAnswer = query.analyze | ||
|
||
comparePlans(optimized, correctAnswer) | ||
} | ||
|
||
test("Constraints of unionall") { | ||
val tr1 = LocalRelation('a.int, 'b.int, 'c.int) | ||
val tr2 = LocalRelation('d.int, 'e.int, 'f.int) | ||
val tr3 = LocalRelation('g.int, 'h.int, 'i.int) | ||
|
||
val query = | ||
tr1.where('a.attr > 10) | ||
.unionAll(tr2.where('d.attr > 10) | ||
.unionAll(tr3.where('g.attr > 10))) | ||
val queryWithUselessFilter = query.where('a.attr > 10) | ||
|
||
val optimized = Optimize.execute(queryWithUselessFilter.analyze) | ||
val correctAnswer = query.analyze | ||
|
||
comparePlans(optimized, correctAnswer) | ||
} | ||
|
||
test("Pruning multiple constraints in the same run") { | ||
val tr1 = LocalRelation('a.int, 'b.int, 'c.int).subquery('tr1) | ||
val tr2 = LocalRelation('a.int, 'd.int, 'e.int).subquery('tr2) | ||
|
||
val query = tr1 | ||
.where("tr1.a".attr > 10 || "tr1.c".attr < 10) | ||
.join(tr2.where('d.attr < 100), Inner, Some("tr1.a".attr === "tr2.a".attr)) | ||
// different order of "tr2.a" and "tr1.a" | ||
val queryWithUselessFilter = | ||
query.where( | ||
("tr1.a".attr > 10 || "tr1.c".attr < 10) && | ||
'd.attr < 100 && | ||
"tr2.a".attr === "tr1.a".attr) | ||
|
||
val optimized = Optimize.execute(queryWithUselessFilter.analyze) | ||
val correctAnswer = query.analyze | ||
|
||
comparePlans(optimized, correctAnswer) | ||
} | ||
|
||
test("Partial pruning") { | ||
val tr1 = LocalRelation('a.int, 'b.int, 'c.int).subquery('tr1) | ||
val tr2 = LocalRelation('a.int, 'd.int, 'e.int).subquery('tr2) | ||
|
||
// One of the filter condition does not exist in the constraints of its child | ||
// Thus, the filter is not removed | ||
val query = tr1 | ||
.where("tr1.a".attr > 10) | ||
.join(tr2.where('d.attr < 100), Inner, Some("tr1.a".attr === "tr2.d".attr)) | ||
val queryWithExtraFilters = | ||
query.where("tr1.a".attr > 10 && 'd.attr < 100 && "tr1.a".attr === "tr2.a".attr) | ||
|
||
val optimized = Optimize.execute(queryWithExtraFilters.analyze) | ||
val correctAnswer = tr1 | ||
.where("tr1.a".attr > 10) | ||
.join(tr2.where('d.attr < 100), | ||
Inner, | ||
Some("tr1.a".attr === "tr2.a".attr && "tr1.a".attr === "tr2.d".attr)).analyze | ||
|
||
comparePlans(optimized, correctAnswer) | ||
} | ||
|
||
test("No predicate is pruned") { | ||
val x = testRelation.subquery('x) | ||
val y = testRelation.subquery('y) | ||
|
||
val query = x.where("x.b".attr.isNull).join(y, LeftOuter) | ||
val queryWithExtraFilters = query.where("x.b".attr.isNotNull) | ||
|
||
val optimized = Optimize.execute(queryWithExtraFilters.analyze) | ||
val correctAnswer = | ||
testRelation.where("b".attr.isNull).where("b".attr.isNotNull) | ||
.join(testRelation, LeftOuter).analyze | ||
|
||
comparePlans(optimized, correctAnswer) | ||
} | ||
|
||
test("Nondeterministic predicate is not pruned") { | ||
val originalQuery = testRelation.where(Rand(10) > 5).select('a).where(Rand(10) > 5).analyze | ||
val optimized = Optimize.execute(originalQuery) | ||
val correctAnswer = testRelation.where(Rand(10) > 5).where(Rand(10) > 5).select('a).analyze | ||
comparePlans(optimized, correctAnswer) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters