Skip to content

support OR operator in binary evaluate_bounds #15716

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.

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion datafusion/expr-common/src/interval_arithmetic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,7 @@ impl Interval {
upper: ScalarValue::Boolean(Some(upper)),
})
}
_ => internal_err!("Incompatible data types for logical conjunction"),
_ => internal_err!("Incompatible data types for logical disjunction"),
}
}

Expand Down Expand Up @@ -959,6 +959,7 @@ pub fn apply_operator(op: &Operator, lhs: &Interval, rhs: &Interval) -> Result<I
Operator::Lt => lhs.lt(rhs),
Operator::LtEq => lhs.lt_eq(rhs),
Operator::And => lhs.and(rhs),
Operator::Or => lhs.or(rhs),
Operator::Plus => lhs.add(rhs),
Operator::Minus => lhs.sub(rhs),
Operator::Multiply => lhs.mul(rhs),
Expand Down
94 changes: 94 additions & 0 deletions datafusion/physical-expr/src/expressions/binary.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4927,4 +4927,98 @@ mod tests {
let left_value = left_expr.evaluate(&batch).unwrap();
assert!(!check_short_circuit(&left_value, &Operator::Or));
}

#[test]
fn test_evaluate_bounds_int32() {
let schema = Schema::new(vec![
Field::new("a", DataType::Int32, false),
Field::new("b", DataType::Int32, false),
]);

let a = Arc::new(Column::new("a", 0)) as _;
let b = Arc::new(Column::new("b", 1)) as _;

// Test addition bounds
let add_expr =
binary_expr(Arc::clone(&a), Operator::Plus, Arc::clone(&b), &schema).unwrap();
let add_bounds = add_expr
.evaluate_bounds(&[
&Interval::make(Some(1), Some(10)).unwrap(),
&Interval::make(Some(5), Some(15)).unwrap(),
])
.unwrap();
assert_eq!(add_bounds, Interval::make(Some(6), Some(25)).unwrap());

// Test subtraction bounds
let sub_expr =
binary_expr(Arc::clone(&a), Operator::Minus, Arc::clone(&b), &schema)
.unwrap();
let sub_bounds = sub_expr
.evaluate_bounds(&[
&Interval::make(Some(1), Some(10)).unwrap(),
&Interval::make(Some(5), Some(15)).unwrap(),
])
.unwrap();
assert_eq!(sub_bounds, Interval::make(Some(-14), Some(5)).unwrap());

// Test multiplication bounds
let mul_expr =
binary_expr(Arc::clone(&a), Operator::Multiply, Arc::clone(&b), &schema)
.unwrap();
let mul_bounds = mul_expr
.evaluate_bounds(&[
&Interval::make(Some(1), Some(10)).unwrap(),
&Interval::make(Some(5), Some(15)).unwrap(),
])
.unwrap();
assert_eq!(mul_bounds, Interval::make(Some(5), Some(150)).unwrap());

// Test division bounds
let div_expr =
binary_expr(Arc::clone(&a), Operator::Divide, Arc::clone(&b), &schema)
.unwrap();
let div_bounds = div_expr
.evaluate_bounds(&[
&Interval::make(Some(10), Some(20)).unwrap(),
&Interval::make(Some(2), Some(5)).unwrap(),
])
.unwrap();
assert_eq!(div_bounds, Interval::make(Some(2), Some(10)).unwrap());
}

#[test]
fn test_evaluate_bounds_bool() {
let schema = Schema::new(vec![
Field::new("a", DataType::Boolean, false),
Field::new("b", DataType::Boolean, false),
]);

let a = Arc::new(Column::new("a", 0)) as _;
let b = Arc::new(Column::new("b", 1)) as _;

// Test OR bounds
let or_expr =
binary_expr(Arc::clone(&a), Operator::Or, Arc::clone(&b), &schema).unwrap();
let or_bounds = or_expr
.evaluate_bounds(&[
&Interval::make(Some(true), Some(true)).unwrap(),
&Interval::make(Some(false), Some(false)).unwrap(),
])
.unwrap();
assert_eq!(or_bounds, Interval::make(Some(true), Some(true)).unwrap());

// Test AND bounds
let and_expr =
binary_expr(Arc::clone(&a), Operator::And, Arc::clone(&b), &schema).unwrap();
let and_bounds = and_expr
.evaluate_bounds(&[
&Interval::make(Some(true), Some(true)).unwrap(),
&Interval::make(Some(false), Some(false)).unwrap(),
])
.unwrap();
assert_eq!(
and_bounds,
Interval::make(Some(false), Some(false)).unwrap()
);
}
}
Loading