alamb commented on code in PR #10016:
URL:
https://github.com/apache/arrow-datafusion/pull/10016#discussion_r1559488827
##########
datafusion/expr/src/logical_plan/plan.rs:
##########
@@ -1544,27 +1549,26 @@ impl LogicalPlan {
/// ...) replaced with corresponding values provided in
/// `params_values`
///
- /// See [`Self::with_param_values`] for examples and usage
+ /// See [`Self::with_param_values`] for examples and usage with an owned
+ /// `ParamValues`
pub fn replace_params_with_values(
- &self,
+ self,
param_values: &ParamValues,
) -> Result<LogicalPlan> {
- let new_exprs = self
- .expressions()
- .into_iter()
- .map(|e| {
- let e = e.infer_placeholder_types(self.schema())?;
- Self::replace_placeholders_with_values(e, param_values)
+ self.transform_up_with_subqueries(&|plan| {
+ let schema = plan.schema().clone();
+ plan.map_expressions(|e| {
+ e.infer_placeholder_types(&schema)?.transform_up(&|e| {
+ if let Expr::Placeholder(Placeholder { id, .. }) = e {
+ let value =
param_values.get_placeholders_with_values(&id)?;
+ Ok(Transformed::yes(Expr::Literal(value)))
+ } else {
+ Ok(Transformed::no(e))
+ }
+ })
})
- .collect::<Result<Vec<_>>>()?;
-
- let new_inputs_with_values = self
- .inputs()
- .into_iter()
- .map(|inp| inp.replace_params_with_values(param_values))
- .collect::<Result<Vec<_>>>()?;
-
- self.with_new_exprs(new_exprs, new_inputs_with_values)
Review Comment:
`new_with_exprs` also copies all the other fields of the plan, so removing
it results in fewer copies too
##########
datafusion/expr/src/logical_plan/plan.rs:
##########
@@ -1544,27 +1549,26 @@ impl LogicalPlan {
/// ...) replaced with corresponding values provided in
/// `params_values`
///
- /// See [`Self::with_param_values`] for examples and usage
+ /// See [`Self::with_param_values`] for examples and usage with an owned
+ /// `ParamValues`
pub fn replace_params_with_values(
- &self,
+ self,
param_values: &ParamValues,
) -> Result<LogicalPlan> {
- let new_exprs = self
- .expressions()
Review Comment:
expressions `clone`s Exprs
--
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]
