You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by al...@apache.org on 2022/05/16 12:23:35 UTC
[arrow-datafusion] branch master updated: split ON expressions only by AND operator (#2534)
This is an automated email from the ASF dual-hosted git repository.
alamb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow-datafusion.git
The following commit(s) were added to refs/heads/master by this push:
new ee945c3f0 split ON expressions only by AND operator (#2534)
ee945c3f0 is described below
commit ee945c3f0f7751416393746022f8243c87cdabec
Author: Eduard Karacharov <13...@users.noreply.github.com>
AuthorDate: Mon May 16 15:23:30 2022 +0300
split ON expressions only by AND operator (#2534)
---
datafusion/core/src/sql/planner.rs | 37 +++++++++++++++++++++++++++----------
1 file changed, 27 insertions(+), 10 deletions(-)
diff --git a/datafusion/core/src/sql/planner.rs b/datafusion/core/src/sql/planner.rs
index cc1a8c07c..b722de551 100644
--- a/datafusion/core/src/sql/planner.rs
+++ b/datafusion/core/src/sql/planner.rs
@@ -2526,17 +2526,8 @@ fn extract_join_keys(
extract_join_keys(*right, accum, accum_filter);
}
}
- _other
- if matches!(**left, Expr::Column(_))
- || matches!(**right, Expr::Column(_)) =>
- {
- accum_filter.push(expr);
- }
_other => {
- if let Expr::BinaryExpr { left, op: _, right } = expr {
- extract_join_keys(*left, accum, accum_filter);
- extract_join_keys(*right, accum, accum_filter);
- }
+ accum_filter.push(expr);
}
},
_other => {
@@ -4767,6 +4758,32 @@ mod tests {
quick_test(sql, expected);
}
+ #[test]
+ fn join_on_disjunction_condition() {
+ let sql = "SELECT id, order_id \
+ FROM person \
+ JOIN orders ON id = customer_id OR person.age > 30";
+ let expected = "Projection: #person.id, #orders.order_id\
+ \n Filter: #person.id = #orders.customer_id OR #person.age > Int64(30)\
+ \n CrossJoin:\
+ \n TableScan: person projection=None\
+ \n TableScan: orders projection=None";
+ quick_test(sql, expected);
+ }
+
+ #[test]
+ fn join_on_complex_condition() {
+ let sql = "SELECT id, order_id \
+ FROM person \
+ JOIN orders ON id = customer_id AND (person.age > 30 OR person.last_name = 'X')";
+ let expected = "Projection: #person.id, #orders.order_id\
+ \n Filter: #person.age > Int64(30) OR #person.last_name = Utf8(\"X\")\
+ \n Inner Join: #person.id = #orders.customer_id\
+ \n TableScan: person projection=None\
+ \n TableScan: orders projection=None";
+ quick_test(sql, expected);
+ }
+
fn assert_field_not_found(err: DataFusionError, name: &str) {
match err {
DataFusionError::SchemaError { .. } => {