Skip to content

fix: incorrectly remove mark index #10602

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

Merged
xudong963 merged 2 commits into from
Mar 16, 2023
Merged

fix: incorrectly remove mark index #10602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c5cc57
fix: incorrectly remove mark index
xudong963 Mar 16, 2023
88a1630
add test
xudong963 Mar 16, 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
7 changes: 7 additions & 0 deletions src/query/sql/src/planner/optimizer/rule/rewrite/filter_join/mark_join_to_semi_join.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,13 @@ pub fn convert_mark_to_semi_join(s_expr: &SExpr) -> Result<SExpr> {
}

let mark_index = join.marker_index.unwrap();
let mut find_mark_index = false;

// remove mark index filter
for (idx, predicate) in filter.predicates.iter().enumerate() {
if let ScalarExpr::BoundColumnRef(col) = predicate {
if col.column.index == mark_index {
find_mark_index = true;
filter.predicates.remove(idx);
break;
}
Expand All @@ -51,6 +53,11 @@ pub fn convert_mark_to_semi_join(s_expr: &SExpr) -> Result<SExpr> {
}
}

if !find_mark_index {
// To be conservative, we do not convert
return Ok(s_expr.clone());
}

join.join_type = match join.join_type {
JoinType::LeftMark => JoinType::RightSemi,
JoinType::RightMark => JoinType::LeftSemi,
Expand Down
13 changes: 13 additions & 0 deletions tests/sqllogictests/suites/query/subquery.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,19 @@ SELECT * FROM c WHERE EXISTS(SELECT * FROM o WHERE o.c_id=c.c_id) ORDER BY c_id
4 TX
6 FL

query IT
SELECT * FROM c, o WHERE c.c_id = o.c_id AND (EXISTS(SELECT * FROM o WHERE o.c_id=c.c_id) OR EXISTS(SELECT * FROM o where o.ship = c.bill)) ORDER BY c_id
----
1 CA 10 1 CA
1 CA 20 1 CA
1 CA 30 1 CA
2 TX 40 2 CA
2 TX 50 2 TX
2 TX 60 2 NULL
4 TX 70 4 WY
4 TX 80 4 NULL
6 FL 90 6 WA

query IT
SELECT * FROM c WHERE NOT EXISTS(SELECT * FROM o WHERE o.c_id=c.c_id) ORDER BY c_id
----
Expand Down