Skip to content
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

[fix](Nereids): NullSafeEqual should be in HashJoinCondition #27127

Merged
merged 2 commits into from
Nov 21, 2023
Merged

[fix](Nereids): NullSafeEqual should be in HashJoinCondition #27127

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2fedb01
EqualPredicate
jackwener Nov 16, 2023
9073686
add regression test
jackwener Nov 20, 2023
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
add regression test
  • Loading branch information
@jackwener
jackwener committed Nov 21, 2023
commit 90736869f16689b82c78a990c55fb5e6d8e9a053
2 changes: 1 addition & 1 deletion fe/fe-core/src/main/java/org/apache/doris/nereids/processor/post/RuntimeFilterGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ private void analyzeRuntimeFilterPushDownIntoCTEInfos(PhysicalHashJoin<? extends
|| !(join.getHashJoinConjuncts().get(0) instanceof EqualTo)) {
break;
} else {
EqualTo equalTo = (EqualTo) join.getEqualToConjuncts().get(0);
EqualTo equalTo = join.getEqualToConjuncts().get(0);
equalTos.add(equalTo);
equalCondToJoinMap.put(equalTo, join);
}
Expand Down
2 changes: 1 addition & 1 deletion fe/fe-core/src/main/java/org/apache/doris/nereids/processor/post/RuntimeFilterPruner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public PhysicalHashJoin visitPhysicalHashJoin(PhysicalHashJoin<? extends Plan, ?
List<ExprId> exprIds = ctx.getTargetExprIdByFilterJoin(join);
if (exprIds != null && !exprIds.isEmpty()) {
boolean isEffective = false;
for (Expression expr : join.getHashJoinConjuncts()) {
for (Expression expr : join.getEqualToConjuncts()) {
if (isEffectiveRuntimeFilter((EqualTo) expr, join)) {
isEffective = true;
}
Expand Down
60 changes: 54 additions & 6 deletions regression-test/data/nereids_p0/join/test_join_15.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,12 +172,20 @@ false true true false false
3 \N null 2019-09-09 \N 8.9 3 \N null 2019-09-09 \N 8.9
5 \N null \N 2019-09-09T00:00 8.9 5 \N null \N 2019-09-09T00:00 8.9

-- !hash_join --
-- !hash_right_join --
\N \N \N \N \N \N 1 \N null \N \N 8.9
\N \N \N \N \N \N 2 \N 2 \N \N 8.9
\N \N \N \N \N \N 3 \N null 2019-09-09 \N 8.9
\N \N \N \N \N \N 5 \N null \N 2019-09-09T00:00 8.9

-- !hash_left_join --
1 \N null \N \N 8.9 \N \N \N \N \N \N
2 \N 2 \N \N 8.9 \N \N \N \N \N \N
3 \N null 2019-09-09 \N 8.9 \N \N \N \N \N \N
5 \N null \N 2019-09-09T00:00 8.9 \N \N \N \N \N \N

-- !hash_inner_join --

-- !cross_join --
\N \N \N \N \N \N 1 \N null \N \N 8.9
\N \N \N \N \N \N 2 \N 2 \N \N 8.9
Expand Down Expand Up @@ -226,12 +234,20 @@ false true true false false
5 \N null \N 2019-09-09T00:00 8.9 3 \N null 2019-09-09 \N 8.9
5 \N null \N 2019-09-09T00:00 8.9 5 \N null \N 2019-09-09T00:00 8.9

-- !hash_join --
-- !hash_right_join --
\N \N \N \N \N \N 1 \N null \N \N 8.9
\N \N \N \N \N \N 2 \N 2 \N \N 8.9
\N \N \N \N \N \N 3 \N null 2019-09-09 \N 8.9
\N \N \N \N \N \N 5 \N null \N 2019-09-09T00:00 8.9

-- !hash_left_join --
1 \N null \N \N 8.9 \N \N \N \N \N \N
2 \N 2 \N \N 8.9 \N \N \N \N \N \N
3 \N null 2019-09-09 \N 8.9 \N \N \N \N \N \N
5 \N null \N 2019-09-09T00:00 8.9 \N \N \N \N \N \N

-- !hash_inner_join --

-- !cross_join --
\N \N \N \N \N \N 1 \N null \N \N 8.9
\N \N \N \N \N \N 2 \N 2 \N \N 8.9
Expand Down Expand Up @@ -271,12 +287,20 @@ false true true false false
5 \N null \N 2019-09-09T00:00 8.9 3 \N null 2019-09-09 \N 8.9
5 \N null \N 2019-09-09T00:00 8.9 5 \N null \N 2019-09-09T00:00 8.9

-- !hash_join --
-- !hash_right_join --
\N \N \N \N \N \N 1 \N null \N \N 8.9
\N \N \N \N \N \N 2 \N 2 \N \N 8.9
\N \N \N \N \N \N 3 \N null 2019-09-09 \N 8.9
\N \N \N \N \N \N 5 \N null \N 2019-09-09T00:00 8.9

-- !hash_left_join --
1 \N null \N \N 8.9 \N \N \N \N \N \N
2 \N 2 \N \N 8.9 \N \N \N \N \N \N
3 \N null 2019-09-09 \N 8.9 \N \N \N \N \N \N
5 \N null \N 2019-09-09T00:00 8.9 \N \N \N \N \N \N

-- !hash_inner_join --

-- !cross_join --
\N \N \N \N \N \N 1 \N null \N \N 8.9
\N \N \N \N \N \N 2 \N 2 \N \N 8.9
Expand Down Expand Up @@ -314,12 +338,20 @@ false true true false false
5 \N null \N 2019-09-09T00:00 8.9 2 \N 2 \N \N 8.9
5 \N null \N 2019-09-09T00:00 8.9 5 \N null \N 2019-09-09T00:00 8.9

-- !hash_join --
-- !hash_right_join --
\N \N \N \N \N \N 1 \N null \N \N 8.9
\N \N \N \N \N \N 2 \N 2 \N \N 8.9
\N \N \N \N \N \N 3 \N null 2019-09-09 \N 8.9
\N \N \N \N \N \N 5 \N null \N 2019-09-09T00:00 8.9

-- !hash_left_join --
1 \N null \N \N 8.9 \N \N \N \N \N \N
2 \N 2 \N \N 8.9 \N \N \N \N \N \N
3 \N null 2019-09-09 \N 8.9 \N \N \N \N \N \N
5 \N null \N 2019-09-09T00:00 8.9 \N \N \N \N \N \N

-- !hash_inner_join --

-- !cross_join --
\N \N \N \N \N \N 1 \N null \N \N 8.9
\N \N \N \N \N \N 2 \N 2 \N \N 8.9
Expand Down Expand Up @@ -357,12 +389,20 @@ false true true false false
3 \N null 2019-09-09 \N 8.9 3 \N null 2019-09-09 \N 8.9
5 \N null \N 2019-09-09T00:00 8.9 5 \N null \N 2019-09-09T00:00 8.9

-- !hash_join --
-- !hash_right_join --
\N \N \N \N \N \N 1 \N null \N \N 8.9
\N \N \N \N \N \N 2 \N 2 \N \N 8.9
\N \N \N \N \N \N 3 \N null 2019-09-09 \N 8.9
\N \N \N \N \N \N 5 \N null \N 2019-09-09T00:00 8.9

-- !hash_left_join --
1 \N null \N \N 8.9 \N \N \N \N \N \N
2 \N 2 \N \N 8.9 \N \N \N \N \N \N
3 \N null 2019-09-09 \N 8.9 \N \N \N \N \N \N
5 \N null \N 2019-09-09T00:00 8.9 \N \N \N \N \N \N

-- !hash_inner_join --

-- !cross_join --
\N \N \N \N \N \N 1 \N null \N \N 8.9
\N \N \N \N \N \N 2 \N 2 \N \N 8.9
Expand Down Expand Up @@ -412,12 +452,20 @@ false true true false false
5 \N null \N 2019-09-09T00:00 8.9 3 \N null 2019-09-09 \N 8.9
5 \N null \N 2019-09-09T00:00 8.9 5 \N null \N 2019-09-09T00:00 8.9

-- !hash_join --
-- !hash_right_join --
\N \N \N \N \N \N 1 \N null \N \N 8.9
\N \N \N \N \N \N 2 \N 2 \N \N 8.9
\N \N \N \N \N \N 3 \N null 2019-09-09 \N 8.9
\N \N \N \N \N \N 5 \N null \N 2019-09-09T00:00 8.9

-- !hash_left_join --
1 \N null \N \N 8.9 \N \N \N \N \N \N
2 \N 2 \N \N 8.9 \N \N \N \N \N \N
3 \N null 2019-09-09 \N 8.9 \N \N \N \N \N \N
5 \N null \N 2019-09-09T00:00 8.9 \N \N \N \N \N \N

-- !hash_inner_join --

-- !cross_join --
\N \N \N \N \N \N 1 \N null \N \N 8.9
\N \N \N \N \N \N 2 \N 2 \N \N 8.9
Expand Down
6 changes: 5 additions & 1 deletion regression-test/suites/nereids_p0/join/test_join_15.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,11 @@ suite("test_join_15", "nereids_p0") {
order by a.k1, b.k1"""
qt_right_join"""select * from ${null_table_1} a right join ${null_table_1} b on a.k${index}<=>b.k${index}
order by a.k1, b.k1"""
qt_hash_join"""select * from ${null_table_1} a right join ${null_table_1} b on a.k${index}<=>b.k${index} and a.k2=b.k2
qt_hash_right_join"""select * from ${null_table_1} a right join ${null_table_1} b on a.k${index}<=>b.k${index} and a.k2=b.k2
order by a.k1, b.k1"""
qt_hash_left_join"""select * from ${null_table_1} a left join ${null_table_1} b on a.k${index}<=>b.k${index} and a.k2=b.k2
order by a.k1, b.k1"""
qt_hash_inner_join"""select * from ${null_table_1} a inner join ${null_table_1} b on a.k${index}<=>b.k${index} and a.k2=b.k2
order by a.k1, b.k1"""
qt_cross_join"""select * from ${null_table_1} a right join ${null_table_1} b on a.k${index}<=>b.k${index} and a.k2 !=b.k2
order by a.k1, b.k1"""
Expand Down