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

Remove panics from simplify_expressions optimizer rule #3343

Merged
merged 1 commit into from
Sep 2, 2022
Merged

Remove panics from simplify_expressions optimizer rule #3343

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 16 additions & 12 deletions datafusion/optimizer/src/simplify_expressions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,10 +166,13 @@ fn is_op_with(target_op: Operator, haystack: &Expr, needle: &Expr) -> bool {
/// `Expr::Literal(ScalarValue::Boolean(v))`.
///
/// panics if expr is not a literal boolean
fn as_bool_lit(expr: Expr) -> Option<bool> {
fn as_bool_lit(expr: Expr) -> Result<Option<bool>> {
match expr {
Expr::Literal(ScalarValue::Boolean(v)) => v,
_ => panic!("Expected boolean literal, got {:?}", expr),
Expr::Literal(ScalarValue::Boolean(v)) => Ok(v),
_ => Err(DataFusionError::Internal(format!(
"Expected boolean literal, got {:?}",
expr
))),
}
}

Expand Down Expand Up @@ -390,11 +393,12 @@ impl<'a> ExprRewriter for ConstEvaluator<'a> {
}

fn mutate(&mut self, expr: Expr) -> Result<Expr> {
if self.can_evaluate.pop().unwrap() {
let scalar = self.evaluate_to_scalar(expr)?;
Ok(Expr::Literal(scalar))
} else {
Ok(expr)
match self.can_evaluate.pop() {
Some(true) => Ok(Expr::Literal(self.evaluate_to_scalar(expr)?)),
Some(false) => Ok(expr),
_ => Err(DataFusionError::Internal(
"Failed to pop can_evaluate".to_string(),
)),
}
}
}
Expand Down Expand Up @@ -546,7 +550,7 @@ impl<'a, S: SimplifyInfo> ExprRewriter for Simplifier<'a, S> {
op: Eq,
right,
} if is_bool_lit(&left) && info.is_boolean_type(&right)? => {
match as_bool_lit(*left) {
match as_bool_lit(*left)? {
Some(true) => *right,
Some(false) => Not(right),
None => lit_bool_null(),
Expand All @@ -560,7 +564,7 @@ impl<'a, S: SimplifyInfo> ExprRewriter for Simplifier<'a, S> {
op: Eq,
right,
} if is_bool_lit(&right) && info.is_boolean_type(&left)? => {
match as_bool_lit(*right) {
match as_bool_lit(*right)? {
Some(true) => *left,
Some(false) => Not(left),
None => lit_bool_null(),
Expand All @@ -579,7 +583,7 @@ impl<'a, S: SimplifyInfo> ExprRewriter for Simplifier<'a, S> {
op: NotEq,
right,
} if is_bool_lit(&left) && info.is_boolean_type(&right)? => {
match as_bool_lit(*left) {
match as_bool_lit(*left)? {
Some(true) => Not(right),
Some(false) => *right,
None => lit_bool_null(),
Expand All @@ -593,7 +597,7 @@ impl<'a, S: SimplifyInfo> ExprRewriter for Simplifier<'a, S> {
op: NotEq,
right,
} if is_bool_lit(&right) && info.is_boolean_type(&left)? => {
match as_bool_lit(*right) {
match as_bool_lit(*right)? {
Some(true) => Not(left),
Some(false) => *left,
None => lit_bool_null(),
Expand Down