Fix bug in remove_join_expressions
#11693
Merged
Conversation
This file contains hidden or 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
github-actions
bot
added
optimizer
jonahgao
commented
Jul 28, 2024
jonahgao
commented
Jul 28, 2024
| @@ -1046,6 +1046,19 @@ true false | |||
| true NULL | |||
| true NULL | |||
|
|
|||
| # Test issue: https://github.com/apache/datafusion/issues/11621 | |||
| query BB | |||
| SELECT * FROM t1 JOIN t2 ON t1.v1 = t2.v1 WHERE (t1.v1 == t2.v1) OR t1.v1; | |||
There was a problem hiding this comment.
This query returns an empty result on the current main.
jonahgao
commented
Jul 28, 2024
| @@ -1057,7 +1071,7 @@ mod tests { | |||
| "Filter: (t4.c < UInt32(15) OR t4.c = UInt32(688)) AND (t4.c < UInt32(15) OR t3.c = UInt32(688) OR t3.b = t4.b) [a:UInt32, b:UInt32, c:UInt32, a:UInt32, b:UInt32, c:UInt32, a:UInt32, b:UInt32, c:UInt32, a:UInt32, b:UInt32, c:UInt32]", | |||
| " Inner Join: t3.a = t4.a [a:UInt32, b:UInt32, c:UInt32, a:UInt32, b:UInt32, c:UInt32, a:UInt32, b:UInt32, c:UInt32, a:UInt32, b:UInt32, c:UInt32]", | |||
| " Inner Join: t1.a = t3.a [a:UInt32, b:UInt32, c:UInt32, a:UInt32, b:UInt32, c:UInt32, a:UInt32, b:UInt32, c:UInt32]", | |||
| " Filter: t2.c < UInt32(15) AND t2.c = UInt32(688) [a:UInt32, b:UInt32, c:UInt32, a:UInt32, b:UInt32, c:UInt32]", | |||
| " Filter: t2.c = UInt32(688) [a:UInt32, b:UInt32, c:UInt32, a:UInt32, b:UInt32, c:UInt32]", | |||
There was a problem hiding this comment.
Remove t1.a = t2.a from (t1.a = t2.a OR t2.c < 15) AND (t1.a = t2.a AND tc.2 = 688), and the result should be tc.2 = 688
This comment was marked as resolved.
This comment was marked as resolved.
alamb
approved these changes
Jul 29, 2024
There was a problem hiding this comment.
This makes sense to me. Thank you @jonahgao for the fix (and @2010YOUY01 for SQLancer that found it 🙏 )
Co-authored-by: Andrew Lamb <andrew@nerdnetworks.org>
|
Thanks for the review @alamb |
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Which issue does this PR close?
Closes #11621.
Rationale for this change
Given an example query:
When removing the join predicate
t1.v1 = t2.v1from the parent filter(t1.v1 == t2.v1) OR t1.v1, this process can be considered as replacing the join predicate withtrue. The result should beTRUE OR t1.v1and further simplified to empty, but currently, it ist1.v1. This will lead to incorrect join results.What changes are included in this PR?
Are these changes tested?
Yes
Are there any user-facing changes?
No