Skip to content

Rewrite array @> array and array <@ array in sql_expr_to_logical_expr #11155

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
jayzhan211 merged 4 commits into from
Jun 29, 2024
Merged

Rewrite array @> array and array <@ array in sql_expr_to_logical_expr #11155

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
311b7aa
rewrite at arrow
jayzhan211 Jun 28, 2024
3fb5489
rm useless test
jayzhan211 Jun 28, 2024
0b8b3b4
add test
jayzhan211 Jun 29, 2024
9e80e61
rm test
jayzhan211 Jun 29, 2024
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
rm useless test 
Signed-off-by: jayzhan211 <[email protected]>
  • Loading branch information
@jayzhan211
jayzhan211 committed Jun 28, 2024
commit 3fb54895f32492769ebfd284572bc9db1374aeaa
4 changes: 2 additions & 2 deletions datafusion/sql/src/expr/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ impl<'a, S: ContextProvider> SqlToRel<'a, S> {
vec![left, right],
)));
} else {
return internal_err!("array_append not found");
return internal_err!("array_prepend not found");
}
}
} else if matches!(op, Operator::AtArrow | Operator::ArrowAt) {
Expand All @@ -177,7 +177,7 @@ impl<'a, S: ContextProvider> SqlToRel<'a, S> {
)));
}
} else {
return internal_err!("array_append not found");
return internal_err!("array_has_all not found");
}
}
}
Expand Down
16 changes: 0 additions & 16 deletions datafusion/sql/tests/sql_integration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1225,22 +1225,6 @@ fn select_binary_expr_nested() {
quick_test(sql, expected);
}

#[test]
fn select_at_arrow_operator() {
Copy link
Contributor

@alamb alamb Jun 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we add an explain test?

Copy link
Contributor Author

@jayzhan211 jayzhan211 Jun 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think it is needed since we don't really care about how it looks in plan.

Copy link
Contributor Author

@jayzhan211 jayzhan211 Jun 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we can make sure array_has_all is applied 🤔

let sql = "SELECT left @> right from array";
let expected = "Projection: array.left @> array.right\
\n TableScan: array";
quick_test(sql, expected);
}

#[test]
fn select_arrow_at_operator() {
let sql = "SELECT left <@ right from array";
let expected = "Projection: array.left <@ array.right\
\n TableScan: array";
quick_test(sql, expected);
}

#[test]
fn select_wildcard_with_groupby() {
quick_test(
Expand Down