Skip to content

[SPARK-31705][SQL] Push more possible predicates through Join via CNF conversion #28733

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

[SPARK-31705][SQL] Push more possible predicates through Join via CNF conversion #28733

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
054594f
add rule PushCNFPredicateThroughJoin
gengliangwang Jun 5, 2020
6591680
From Yuming:[SPARK-31705][SQL] Push predicate through join by rewriti…
wangyum Jun 5, 2020
3497b3c
fix test failure
gengliangwang Jun 5, 2020
ada4135
Add test rewrite complex join predicates to conjunctive normal form
wangyum Jun 5, 2020
7e4b019
increase threshold and test case
gengliangwang Jun 5, 2020
0c92c1c
fix test case; reduce threshold default value
gengliangwang Jun 6, 2020
7853f67
address comments and add test cases
gengliangwang Jun 8, 2020
84e89de
revise
gengliangwang Jun 8, 2020
0af4c48
lazy val
gengliangwang Jun 9, 2020
95ee45e
update doc
gengliangwang Jun 9, 2020
6bf4747
remove assert
gengliangwang Jun 9, 2020
fa03b00
add back warning
gengliangwang Jun 9, 2020
c225f74
address comments
gengliangwang Jun 10, 2020
296068c
address comments
gengliangwang Jun 10, 2020
377f9d8
address comments
gengliangwang Jun 10, 2020
be79ab7
update test case
gengliangwang Jun 10, 2020
af018be
address comments
gengliangwang Jun 10, 2020
b42ce1d
fix build
gengliangwang Jun 11, 2020
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
Prev Previous commit
Next Next commit
address comments
  • Loading branch information
@gengliangwang
gengliangwang committed Jun 10, 2020
commit 377f9d85809329974f5f349c155717f9cbd40da3
3 changes: 1 addition & 2 deletions .../src/main/scala/org/apache/spark/sql/catalyst/optimizer/PushCNFPredicateThroughJoin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import org.apache.spark.sql.catalyst.expressions.{And, PredicateHelper}
import org.apache.spark.sql.catalyst.plans._
import org.apache.spark.sql.catalyst.plans.logical.{Filter, Join, LogicalPlan}
import org.apache.spark.sql.catalyst.rules.Rule
import org.apache.spark.sql.internal.SQLConf

/**
* Try converting join condition to conjunctive normal form expression so that more predicates may
Expand All @@ -33,7 +32,7 @@ object PushCNFPredicateThroughJoin extends Rule[LogicalPlan] with PredicateHelpe
def apply(plan: LogicalPlan): LogicalPlan = plan transform {
case j @ Join(left, right, joinType, Some(joinCondition), hint) =>
val predicates = conjunctiveNormalForm(joinCondition)
if (predicates.isEmpty || predicates.size > SQLConf.get.maxCnfNodeCount) {
if (predicates.isEmpty) {
j
} else {
val pushDownCandidates = predicates.filter(_.deterministic)
Expand Down
8 changes: 4 additions & 4 deletions ...scala/org/apache/spark/sql/catalyst/expressions/ConjunctiveNormalFormPredicateSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ class ConjunctiveNormalFormPredicateSuite extends SparkFunSuite with PredicateHe
private val d = AttributeReference("D", BooleanType)(exprId = ExprId(4)).withQualifier(Seq("td"))
private val e = AttributeReference("E", BooleanType)(exprId = ExprId(5)).withQualifier(Seq("te"))
private val f = AttributeReference("F", BooleanType)(exprId = ExprId(6)).withQualifier(Seq("tf"))
private val g = AttributeReference("C", BooleanType)(exprId = ExprId(7)).withQualifier(Seq("tg"))
private val h = AttributeReference("D", BooleanType)(exprId = ExprId(8)).withQualifier(Seq("th"))
private val i = AttributeReference("E", BooleanType)(exprId = ExprId(9)).withQualifier(Seq("ti"))
private val j = AttributeReference("F", BooleanType)(exprId = ExprId(10)).withQualifier(Seq("tj"))
private val g = AttributeReference("G", BooleanType)(exprId = ExprId(7)).withQualifier(Seq("tg"))
private val h = AttributeReference("H", BooleanType)(exprId = ExprId(8)).withQualifier(Seq("th"))
private val i = AttributeReference("I", BooleanType)(exprId = ExprId(9)).withQualifier(Seq("ti"))
private val j = AttributeReference("J", BooleanType)(exprId = ExprId(10)).withQualifier(Seq("tj"))
private val a1 =
AttributeReference("a1", BooleanType)(exprId = ExprId(11)).withQualifier(Seq("ta"))
private val a2 =
Expand Down