Skip to content

Replace &Option<T> with Option<&T> #5113

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
tustvold merged 6 commits into from
Jan 31, 2023
Merged

Replace &Option<T> with Option<&T> #5113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
43c6357
replace &Option<T> with Option<&T>
gaoxinge Jan 30, 2023
5de2534
fix fmt error
gaoxinge Jan 30, 2023
132c693
fix clippy error
gaoxinge Jan 30, 2023
8a7f044
fix fmt error
gaoxinge Jan 30, 2023
571e931
replace Option<&Box> with Option<&>
gaoxinge Jan 30, 2023
1900776
replace Option<&Box> with Option<&>
gaoxinge Jan 31, 2023
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
138 changes: 84 additions & 54 deletions datafusion/proto/src/logical_plan/from_proto.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -876,7 +876,7 @@ pub fn parse_expr(
.ok_or_else(|| Error::required("value"))?
.try_into()?;

let expr = parse_required_expr(&field.expr, registry, "expr")?;
let expr = parse_required_expr(field.expr.as_deref(), registry, "expr")?;

Ok(Expr::GetIndexedField(GetIndexedField::new(
Box::new(expr),
Expand Down Expand Up @@ -926,7 +926,7 @@ pub fn parse_expr(
datafusion_expr::window_function::WindowFunction::AggregateFunction(
aggr_function,
),
vec![parse_required_expr(&expr.expr, registry, "expr")?],
vec![parse_required_expr(expr.expr.as_deref(), registry, "expr")?],
partition_by,
order_by,
window_frame,
Expand All @@ -937,7 +937,7 @@ pub fn parse_expr(
.ok_or_else(|| Error::unknown("BuiltInWindowFunction", *i))?
.into();

let args = parse_optional_expr(&expr.expr, registry)?
let args = parse_optional_expr(expr.expr.as_deref(), registry)?
.map(|e| vec![e])
.unwrap_or_else(Vec::new);

Expand All @@ -963,110 +963,150 @@ pub fn parse_expr(
.map(|e| parse_expr(e, registry))
.collect::<Result<Vec<_>, _>>()?,
expr.distinct,
parse_optional_expr(&expr.filter, registry)?.map(Box::new),
parse_optional_expr(expr.filter.as_deref(), registry)?.map(Box::new),
)))
}
ExprType::Alias(alias) => Ok(Expr::Alias(
Box::new(parse_required_expr(&alias.expr, registry, "expr")?),
Box::new(parse_required_expr(
alias.expr.as_deref(),
registry,
"expr",
)?),
alias.alias.clone(),
)),
ExprType::IsNullExpr(is_null) => Ok(Expr::IsNull(Box::new(parse_required_expr(
&is_null.expr,
is_null.expr.as_deref(),
registry,
"expr",
)?))),
ExprType::IsNotNullExpr(is_not_null) => Ok(Expr::IsNotNull(Box::new(
parse_required_expr(&is_not_null.expr, registry, "expr")?,
parse_required_expr(is_not_null.expr.as_deref(), registry, "expr")?,
))),
ExprType::NotExpr(not) => Ok(Expr::Not(Box::new(parse_required_expr(
&not.expr, registry, "expr",
not.expr.as_deref(),
registry,
"expr",
)?))),
ExprType::IsTrue(msg) => Ok(Expr::IsTrue(Box::new(parse_required_expr(
&msg.expr, registry, "expr",
msg.expr.as_deref(),
registry,
"expr",
)?))),
ExprType::IsFalse(msg) => Ok(Expr::IsFalse(Box::new(parse_required_expr(
&msg.expr, registry, "expr",
msg.expr.as_deref(),
registry,
"expr",
)?))),
ExprType::IsUnknown(msg) => Ok(Expr::IsUnknown(Box::new(parse_required_expr(
&msg.expr, registry, "expr",
msg.expr.as_deref(),
registry,
"expr",
)?))),
ExprType::IsNotTrue(msg) => Ok(Expr::IsNotTrue(Box::new(parse_required_expr(
&msg.expr, registry, "expr",
msg.expr.as_deref(),
registry,
"expr",
)?))),
ExprType::IsNotFalse(msg) => Ok(Expr::IsNotFalse(Box::new(parse_required_expr(
&msg.expr, registry, "expr",
msg.expr.as_deref(),
registry,
"expr",
)?))),
ExprType::IsNotUnknown(msg) => Ok(Expr::IsNotUnknown(Box::new(
parse_required_expr(&msg.expr, registry, "expr")?,
parse_required_expr(msg.expr.as_deref(), registry, "expr")?,
))),
ExprType::Between(between) => Ok(Expr::Between(Between::new(
Box::new(parse_required_expr(&between.expr, registry, "expr")?),
Box::new(parse_required_expr(
between.expr.as_deref(),
registry,
"expr",
)?),
between.negated,
Box::new(parse_required_expr(&between.low, registry, "expr")?),
Box::new(parse_required_expr(&between.high, registry, "expr")?),
Box::new(parse_required_expr(
between.low.as_deref(),
registry,
"expr",
)?),
Box::new(parse_required_expr(
between.high.as_deref(),
registry,
"expr",
)?),
))),
ExprType::Like(like) => Ok(Expr::Like(Like::new(
like.negated,
Box::new(parse_required_expr(&like.expr, registry, "expr")?),
Box::new(parse_required_expr(&like.pattern, registry, "pattern")?),
Box::new(parse_required_expr(like.expr.as_deref(), registry, "expr")?),
Box::new(parse_required_expr(
like.pattern.as_deref(),
registry,
"pattern",
)?),
parse_escape_char(&like.escape_char)?,
))),
ExprType::Ilike(like) => Ok(Expr::ILike(Like::new(
like.negated,
Box::new(parse_required_expr(&like.expr, registry, "expr")?),
Box::new(parse_required_expr(&like.pattern, registry, "pattern")?),
Box::new(parse_required_expr(like.expr.as_deref(), registry, "expr")?),
Box::new(parse_required_expr(
like.pattern.as_deref(),
registry,
"pattern",
)?),
parse_escape_char(&like.escape_char)?,
))),
ExprType::SimilarTo(like) => Ok(Expr::SimilarTo(Like::new(
like.negated,
Box::new(parse_required_expr(&like.expr, registry, "expr")?),
Box::new(parse_required_expr(&like.pattern, registry, "pattern")?),
Box::new(parse_required_expr(like.expr.as_deref(), registry, "expr")?),
Box::new(parse_required_expr(
like.pattern.as_deref(),
registry,
"pattern",
)?),
parse_escape_char(&like.escape_char)?,
))),
ExprType::Case(case) => {
let when_then_expr = case
.when_then_expr
.iter()
.map(|e| {
let when_expr = parse_required_expr_inner(
e.when_expr.as_ref(),
registry,
"when_expr",
)?;
let then_expr = parse_required_expr_inner(
e.then_expr.as_ref(),
registry,
"then_expr",
)?;
let when_expr =
parse_required_expr(e.when_expr.as_ref(), registry, "when_expr")?;
let then_expr =
parse_required_expr(e.then_expr.as_ref(), registry, "then_expr")?;
Ok((Box::new(when_expr), Box::new(then_expr)))
})
.collect::<Result<Vec<(Box<Expr>, Box<Expr>)>, Error>>()?;
Ok(Expr::Case(Case::new(
parse_optional_expr(&case.expr, registry)?.map(Box::new),
parse_optional_expr(case.expr.as_deref(), registry)?.map(Box::new),
when_then_expr,
parse_optional_expr(&case.else_expr, registry)?.map(Box::new),
parse_optional_expr(case.else_expr.as_deref(), registry)?.map(Box::new),
)))
}
ExprType::Cast(cast) => {
let expr = Box::new(parse_required_expr(&cast.expr, registry, "expr")?);
let expr =
Box::new(parse_required_expr(cast.expr.as_deref(), registry, "expr")?);
let data_type = cast.arrow_type.as_ref().required("arrow_type")?;
Ok(Expr::Cast(Cast::new(expr, data_type)))
}
ExprType::TryCast(cast) => {
let expr = Box::new(parse_required_expr(&cast.expr, registry, "expr")?);
let expr =
Box::new(parse_required_expr(cast.expr.as_deref(), registry, "expr")?);
let data_type = cast.arrow_type.as_ref().required("arrow_type")?;
Ok(Expr::TryCast(TryCast::new(expr, data_type)))
}
ExprType::Sort(sort) => Ok(Expr::Sort(Sort::new(
Box::new(parse_required_expr(&sort.expr, registry, "expr")?),
Box::new(parse_required_expr(sort.expr.as_deref(), registry, "expr")?),
sort.asc,
sort.nulls_first,
))),
ExprType::Negative(negative) => Ok(Expr::Negative(Box::new(
parse_required_expr(&negative.expr, registry, "expr")?,
parse_required_expr(negative.expr.as_deref(), registry, "expr")?,
))),
ExprType::InList(in_list) => Ok(Expr::InList {
expr: Box::new(parse_required_expr(&in_list.expr, registry, "expr")?),
expr: Box::new(parse_required_expr(
in_list.expr.as_deref(),
registry,
"expr",
)?),
list: in_list
.list
.iter()
Expand Down Expand Up @@ -1295,7 +1335,8 @@ pub fn parse_expr(
.iter()
.map(|expr| parse_expr(expr, registry))
.collect::<Result<Vec<_>, Error>>()?,
filter: parse_optional_expr(&pb.filter, registry)?.map(Box::new),
filter: parse_optional_expr(pb.filter.as_deref(), registry)?
.map(Box::new),
})
}

Expand Down Expand Up @@ -1389,27 +1430,16 @@ pub fn from_proto_binary_op(op: &str) -> Result<Operator, Error> {
}

fn parse_optional_expr(
p: &Option<Box<protobuf::LogicalExprNode>>,
p: Option<&protobuf::LogicalExprNode>,
registry: &dyn FunctionRegistry,
) -> Result<Option<Expr>, Error> {
match p {
Some(expr) => parse_expr(expr.as_ref(), registry).map(Some),
Some(expr) => parse_expr(expr, registry).map(Some),
None => Ok(None),
}
}

fn parse_required_expr(
p: &Option<Box<protobuf::LogicalExprNode>>,
registry: &dyn FunctionRegistry,
field: impl Into<String>,
) -> Result<Expr, Error> {
match p {
Some(expr) => parse_expr(expr.as_ref(), registry),
None => Err(Error::required(field)),
}
}

fn parse_required_expr_inner(
p: Option<&protobuf::LogicalExprNode>,
registry: &dyn FunctionRegistry,
field: impl Into<String>,
Expand Down
Loading