Skip to content

Minor: Add default for Expr #10127

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
merged 1 commit into from
Apr 18, 2024
Merged

Minor: Add default for Expr #10127

Show file tree
Hide file tree
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
6 changes: 6 additions & 0 deletions datafusion/expr/src/expr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,12 @@ pub enum Expr {
Unnest(Unnest),
}

impl Default for Expr {
fn default() -> Self {
Expr::Literal(ScalarValue::Null)
}
}

#[derive(Clone, PartialEq, Eq, Hash, Debug)]
pub struct Unnest {
pub expr: Box<Expr>,
Expand Down
8 changes: 3 additions & 5 deletions datafusion/optimizer/src/unwrap_cast_in_comparison.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,7 @@ impl TreeNodeRewriter for UnwrapCastExprRewriter {
};
**left = lit(value);
// unwrap the cast/try_cast for the right expr
**right =
mem::replace(right_expr, Expr::Literal(ScalarValue::Null));
**right = mem::take(right_expr);
Ok(Transformed::yes(expr))
}
(
Expand All @@ -203,8 +202,7 @@ impl TreeNodeRewriter for UnwrapCastExprRewriter {
return Ok(Transformed::no(expr));
};
// unwrap the cast/try_cast for the left expr
**left =
mem::replace(left_expr, Expr::Literal(ScalarValue::Null));
**left = mem::take(left_expr);
**right = lit(value);
Ok(Transformed::yes(expr))
}
Expand Down Expand Up @@ -262,7 +260,7 @@ impl TreeNodeRewriter for UnwrapCastExprRewriter {
.collect::<Result<Vec<_>>>() else {
return Ok(Transformed::no(expr))
};
**left = mem::replace(left_expr, Expr::Literal(ScalarValue::Null));
**left = mem::take(left_expr);
*list = right_exprs;
Ok(Transformed::yes(expr))
}
Expand Down