You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by GitBox <gi...@apache.org> on 2022/08/23 09:05:26 UTC
[GitHub] [spark] ayushi-agarwal opened a new pull request, #37625: [SPARK-40177][SQL] Simplify join condition of form (a==b) || (a==null&&b==null) to a<=>b
ayushi-agarwal opened a new pull request, #37625:
URL: https://github.com/apache/spark/pull/37625
<!--
Thanks for sending a pull request! Here are some tips for you:
1. If this is your first time, please read our contributor guidelines: https://spark.apache.org/contributing.html
2. Ensure you have added or run the appropriate tests for your PR: https://spark.apache.org/developer-tools.html
3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][SPARK-XXXX] Your PR title ...'.
4. Be sure to keep the PR description updated to reflect all changes.
5. Please write your PR title to summarize what this PR proposes.
6. If possible, provide a concise example to reproduce the issue for a faster review.
7. If you want to add a new configuration, please read the guideline first for naming configurations in
'core/src/main/scala/org/apache/spark/internal/config/ConfigEntry.scala'.
8. If you want to add or modify an error type or message, please read the guideline first in
'core/src/main/resources/error/README.md'.
-->
### What changes were proposed in this pull request?
<!--
Please clarify what changes you are proposing. The purpose of this section is to outline the changes and how this PR fixes the issue.
If possible, please consider writing useful notes for better and faster reviews in your PR. See the examples below.
1. If you refactor some codes with changing classes, showing the class hierarchy will help reviewers.
2. If you fix some SQL features, you can provide some references of other DBMSes.
3. If there is design documentation, please add the link.
4. If there is a discussion in the mailing list, please add the link.
-->
New rule named Simplify Join Condition is added to convert join condition of form (a==b) || (a==null&&b==null) to a<=>b.
### Why are the changes needed?
<!--
Please clarify why the changes are needed. For instance,
1. If you propose a new API, clarify the use case for a new API.
2. If you fix a bug, you can clarify why it is a bug.
-->
If the join condition is like key1==key2 || (key1==null && key2==null), join is executed as Broadcast Nested Loop Join as this condition doesn't satisfy equi join condition. BNLJ takes more time as compared to Sort merge or broadcast hash join. This condition can be converted to key1<=>key2 to make the join execute as Broadcast or sort merge join. It will improve the performance of queries which have join with condition which matches this pattern.
### Does this PR introduce _any_ user-facing change?
<!--
Note that it means *any* user-facing change including all aspects such as the documentation fix.
If yes, please clarify the previous behavior and the change this PR proposes - provide the console output, description and/or an example to show the behavior difference if possible.
If possible, please also clarify if this is a user-facing change compared to the released Spark versions or within the unreleased branches such as master.
If no, write 'No'.
-->
No
### How was this patch tested?
<!--
If tests were added, say they were added here. Please make sure to add some test cases that check the changes thoroughly including negative and positive cases if possible.
If it was tested in a way different from regular unit tests, please clarify how you tested step by step, ideally copy and paste-able, so that other reviewers can test and check, and descendants can verify in the future.
If tests were not added, please describe why they were not added and/or why it was difficult to add.
If benchmark tests were added, please run the benchmarks in GitHub Actions for the consistent environment, and the instructions could accord to: https://spark.apache.org/developer-tools.html#github-workflow-benchmarks.
-->
Unit test run
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] ayushi-agarwal commented on pull request #37625: [SPARK-40177][SQL] Simplify join condition of form (a==b) || (a==null&&b==null) to a<=>b
Posted by GitBox <gi...@apache.org>.
ayushi-agarwal commented on PR #37625:
URL: https://github.com/apache/spark/pull/37625#issuecomment-1225333237
gently ping @cloud-fan @srowen
Can you please help to verify this patch?
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] wangyum commented on a diff in pull request #37625: [SPARK-40177][SQL] Simplify join condition of form (a==b) || (a==null&&b==null) to a<=>b
Posted by GitBox <gi...@apache.org>.
wangyum commented on code in PR #37625:
URL: https://github.com/apache/spark/pull/37625#discussion_r953788784
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/expressions.scala:
##########
@@ -306,6 +306,47 @@ object OptimizeIn extends Rule[LogicalPlan] {
}
}
+/**
+ * SimplifyJoinCondition:
+ * Changes the join condition of type (key1=key2) || (isnull(key1)&&isnull(key2))
+ * to key1 <=> key2 to prevent join from converting to BNLJ in physical planning
+ * which is costly implementation of join.
+ */
+object SimplifyJoinCondition extends Rule[LogicalPlan] with PredicateHelper {
+ override def apply(plan: LogicalPlan): LogicalPlan = plan.transformWithPruning(
+ _.containsPattern(JOIN), ruleId) {
+ case join@Join(_, _, _, Some(joinCondition), _) =>
Review Comment:
Could we update `SimplifyConditionalsInPredicate` to optimize this condition?
```scala
case Or(EqualTo(l, r), And(IsNull(c1), IsNull(c2)))
if (l.semanticEquals(c1) && r.semanticEquals(c2)) ||
(l.semanticEquals(c2) && r.semanticEquals(c1)) =>
EqualNullSafe(simplifyConditional(l), simplifyConditional(r))
```
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on a diff in pull request #37625: [SPARK-40177][SQL] Simplify join condition of form (a==b) || (a==null&&b==null) to a<=>b
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on code in PR #37625:
URL: https://github.com/apache/spark/pull/37625#discussion_r953590635
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/expressions.scala:
##########
@@ -306,6 +306,47 @@ object OptimizeIn extends Rule[LogicalPlan] {
}
}
+/**
+ * SimplifyJoinCondition:
+ * Changes the join condition of type (key1=key2) || (isnull(key1)&&isnull(key2))
+ * to key1 <=> key2 to prevent join from converting to BNLJ in physical planning
+ * which is costly implementation of join.
+ */
+object SimplifyJoinCondition extends Rule[LogicalPlan] with PredicateHelper {
+ override def apply(plan: LogicalPlan): LogicalPlan = plan.transformWithPruning(
+ _.containsPattern(JOIN), ruleId) {
+ case join@Join(_, _, _, Some(joinCondition), _) =>
Review Comment:
I think it's beneficial for `Filter` as well?
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] wangyum commented on a diff in pull request #37625: [SPARK-40177][SQL] Simplify join condition of form (a==b) || (a==null&&b==null) to a<=>b
Posted by GitBox <gi...@apache.org>.
wangyum commented on code in PR #37625:
URL: https://github.com/apache/spark/pull/37625#discussion_r953788784
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/expressions.scala:
##########
@@ -306,6 +306,47 @@ object OptimizeIn extends Rule[LogicalPlan] {
}
}
+/**
+ * SimplifyJoinCondition:
+ * Changes the join condition of type (key1=key2) || (isnull(key1)&&isnull(key2))
+ * to key1 <=> key2 to prevent join from converting to BNLJ in physical planning
+ * which is costly implementation of join.
+ */
+object SimplifyJoinCondition extends Rule[LogicalPlan] with PredicateHelper {
+ override def apply(plan: LogicalPlan): LogicalPlan = plan.transformWithPruning(
+ _.containsPattern(JOIN), ruleId) {
+ case join@Join(_, _, _, Some(joinCondition), _) =>
Review Comment:
@ayushi-agarwal Could we update `SimplifyConditionalsInPredicate` to optimize this condition?
```scala
case Or(EqualTo(l, r), And(IsNull(c1), IsNull(c2)))
if (l.semanticEquals(c1) && r.semanticEquals(c2)) ||
(l.semanticEquals(c2) && r.semanticEquals(c1)) =>
EqualNullSafe(simplifyConditional(l), simplifyConditional(r))
```
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on pull request #37625: [SPARK-40177][SQL] Simplify join condition of form (a==b) || (a==null&&b==null) to a<=>b
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on PR #37625:
URL: https://github.com/apache/spark/pull/37625#issuecomment-1225490868
cc @sigmod @wangyum
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] ayushi-agarwal commented on pull request #37625: [SPARK-40177][SQL] Simplify condition of form (a==b) || (a==null&&b==null) to a<=>b
Posted by GitBox <gi...@apache.org>.
ayushi-agarwal commented on PR #37625:
URL: https://github.com/apache/spark/pull/37625#issuecomment-1246559113
> The optimization seems logically correct. I don't know a lot about this part of the code, to review the code change. My only question would be how common it is to find this type of join condition, but I could believe it for join conditions
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] github-actions[bot] commented on pull request #37625: [SPARK-40177][SQL] Simplify condition of form (a==b) || (a==null&&b==null) to a<=>b
Posted by GitBox <gi...@apache.org>.
github-actions[bot] commented on PR #37625:
URL: https://github.com/apache/spark/pull/37625#issuecomment-1365517972
We're closing this PR because it hasn't been updated in a while. This isn't a judgement on the merit of the PR in any way. It's just a way of keeping the PR queue manageable.
If you'd like to revive this PR, please reopen it and ask a committer to remove the Stale tag!
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] AmplabJenkins commented on pull request #37625: [SPARK-40177][SQL] Simplify join condition of form (a==b) || (a==null&&b==null) to a<=>b
Posted by GitBox <gi...@apache.org>.
AmplabJenkins commented on PR #37625:
URL: https://github.com/apache/spark/pull/37625#issuecomment-1224234142
Can one of the admins verify this patch?
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] ayushi-agarwal closed pull request #37625: [SPARK-40177][SQL] Simplify condition of form (a==b) || (a==null&&b==null) to a<=>b
Posted by GitBox <gi...@apache.org>.
ayushi-agarwal closed pull request #37625: [SPARK-40177][SQL] Simplify condition of form (a==b) || (a==null&&b==null) to a<=>b
URL: https://github.com/apache/spark/pull/37625
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] ayushi-agarwal commented on a diff in pull request #37625: [SPARK-40177][SQL] Simplify condition of form (a==b) || (a==null&&b==null) to a<=>b
Posted by GitBox <gi...@apache.org>.
ayushi-agarwal commented on code in PR #37625:
URL: https://github.com/apache/spark/pull/37625#discussion_r954603913
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/expressions.scala:
##########
@@ -306,6 +306,47 @@ object OptimizeIn extends Rule[LogicalPlan] {
}
}
+/**
+ * SimplifyJoinCondition:
+ * Changes the join condition of type (key1=key2) || (isnull(key1)&&isnull(key2))
+ * to key1 <=> key2 to prevent join from converting to BNLJ in physical planning
+ * which is costly implementation of join.
+ */
+object SimplifyJoinCondition extends Rule[LogicalPlan] with PredicateHelper {
+ override def apply(plan: LogicalPlan): LogicalPlan = plan.transformWithPruning(
+ _.containsPattern(JOIN), ruleId) {
+ case join@Join(_, _, _, Some(joinCondition), _) =>
Review Comment:
@wangyum Have updated boolean simplification to optimize this conditionn. SimplifyConditionalsInPredicate will work when Case When or If conditional expression is present in tree.
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] ayushi-agarwal commented on a diff in pull request #37625: [SPARK-40177][SQL] Simplify join condition of form (a==b) || (a==null&&b==null) to a<=>b
Posted by GitBox <gi...@apache.org>.
ayushi-agarwal commented on code in PR #37625:
URL: https://github.com/apache/spark/pull/37625#discussion_r954603913
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/expressions.scala:
##########
@@ -306,6 +306,47 @@ object OptimizeIn extends Rule[LogicalPlan] {
}
}
+/**
+ * SimplifyJoinCondition:
+ * Changes the join condition of type (key1=key2) || (isnull(key1)&&isnull(key2))
+ * to key1 <=> key2 to prevent join from converting to BNLJ in physical planning
+ * which is costly implementation of join.
+ */
+object SimplifyJoinCondition extends Rule[LogicalPlan] with PredicateHelper {
+ override def apply(plan: LogicalPlan): LogicalPlan = plan.transformWithPruning(
+ _.containsPattern(JOIN), ruleId) {
+ case join@Join(_, _, _, Some(joinCondition), _) =>
Review Comment:
Have updated boolean simplification to optimize this conditionn. SimplifyConditionalsInPredicate will work when Case When or If conditional expression is present in tree.
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on a diff in pull request #37625: [SPARK-40177][SQL] Simplify condition of form (a==b) || (a==null&&b==null) to a<=>b
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on code in PR #37625:
URL: https://github.com/apache/spark/pull/37625#discussion_r972659580
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/expressions.scala:
##########
@@ -412,6 +412,16 @@ object BooleanSimplification extends Rule[LogicalPlan] with PredicateHelper {
}
}
+ case Or(EqualTo(l, r), And(IsNull(c1), IsNull(c2)))
Review Comment:
Assume that we have a chain of predicates combined by OR `cond1 OR cond2 OR cond3 OR ... condN`. I think we can merge `condX` and `condY` if they are `EqualTo(l, r)` and `And(IsNull(l), isNull(r))`. This is more general than the current approach.
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] github-actions[bot] closed pull request #37625: [SPARK-40177][SQL] Simplify condition of form (a==b) || (a==null&&b==null) to a<=>b
Posted by GitBox <gi...@apache.org>.
github-actions[bot] closed pull request #37625: [SPARK-40177][SQL] Simplify condition of form (a==b) || (a==null&&b==null) to a<=>b
URL: https://github.com/apache/spark/pull/37625
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] ayushi-agarwal commented on a diff in pull request #37625: [SPARK-40177][SQL] Simplify condition of form (a==b) || (a==null&&b==null) to a<=>b
Posted by GitBox <gi...@apache.org>.
ayushi-agarwal commented on code in PR #37625:
URL: https://github.com/apache/spark/pull/37625#discussion_r973547764
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/expressions.scala:
##########
@@ -412,6 +412,16 @@ object BooleanSimplification extends Rule[LogicalPlan] with PredicateHelper {
}
}
+ case Or(EqualTo(l, r), And(IsNull(c1), IsNull(c2)))
Review Comment:
@cloud-fan I didn't generalize it because it would be tricky and will add complexity to code. Also it might be less common where these conditions are separated out with some other expressions in between.
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] ayushi-agarwal commented on a diff in pull request #37625: [SPARK-40177][SQL] Simplify join condition of form (a==b) || (a==null&&b==null) to a<=>b
Posted by GitBox <gi...@apache.org>.
ayushi-agarwal commented on code in PR #37625:
URL: https://github.com/apache/spark/pull/37625#discussion_r954603913
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/expressions.scala:
##########
@@ -306,6 +306,47 @@ object OptimizeIn extends Rule[LogicalPlan] {
}
}
+/**
+ * SimplifyJoinCondition:
+ * Changes the join condition of type (key1=key2) || (isnull(key1)&&isnull(key2))
+ * to key1 <=> key2 to prevent join from converting to BNLJ in physical planning
+ * which is costly implementation of join.
+ */
+object SimplifyJoinCondition extends Rule[LogicalPlan] with PredicateHelper {
+ override def apply(plan: LogicalPlan): LogicalPlan = plan.transformWithPruning(
+ _.containsPattern(JOIN), ruleId) {
+ case join@Join(_, _, _, Some(joinCondition), _) =>
Review Comment:
Sure. SimplifyConditionalsInPredicate will work when Case When or If conditional expression is present in tree.
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org