joroKr21 commented on code in PR #17675:
URL: https://github.com/apache/datafusion/pull/17675#discussion_r2385160760
##########
datafusion/expr/src/expr_rewriter/mod.rs:
##########
@@ -214,26 +214,29 @@ pub fn strip_outer_reference(expr: Expr) -> Expr {
/// Returns plan with expressions coerced to types compatible with
/// schema types
pub fn coerce_plan_expr_for_schema(
- plan: LogicalPlan,
+ plan: Arc<LogicalPlan>,
schema: &DFSchema,
-) -> Result<LogicalPlan> {
- match plan {
+) -> Result<Arc<LogicalPlan>> {
+ if matches!(plan.as_ref(), LogicalPlan::Projection(_)) {
// special case Projection to avoid adding multiple projections
- LogicalPlan::Projection(Projection { expr, input, .. }) => {
- let new_exprs = coerce_exprs_for_schema(expr, input.schema(),
schema)?;
- let projection = Projection::try_new(new_exprs, input)?;
- Ok(LogicalPlan::Projection(projection))
- }
- _ => {
- let exprs: Vec<Expr> =
plan.schema().iter().map(Expr::from).collect();
- let new_exprs = coerce_exprs_for_schema(exprs, plan.schema(),
schema)?;
- let add_project = new_exprs.iter().any(|expr|
expr.try_as_col().is_none());
- if add_project {
- let projection = Projection::try_new(new_exprs,
Arc::new(plan))?;
- Ok(LogicalPlan::Projection(projection))
- } else {
- Ok(plan)
- }
+ let LogicalPlan::Projection(Projection { expr, input, .. }) =
+ Arc::unwrap_or_clone(plan)
+ else {
+ unreachable!()
+ };
Review Comment:
It's not that much more complicated - but yes, it is a bit annoying that you
can't first match and then unwrap or clone - I guess we could always clone the
inner `Projection` node instead of trying to `unwrap` - wdyt?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
