Minor: reduce cloning in infer_placeholder_types
#5638
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
alamb
commented
Mar 18, 2023
| @@ -78,7 +78,7 @@ impl<'a, S: ContextProvider> SqlToRel<'a, S> { | |||
| let mut expr = self.sql_expr_to_logical_expr(sql, schema, planner_context)?; | |||
| expr = self.rewrite_partial_qualifier(expr, schema); | |||
| self.validate_schema_satisfies_exprs(schema, &[expr.clone()])?; | |||
| let expr = infer_placeholder_types(expr, schema.clone())?; | |||
There was a problem hiding this comment.
This cloned the schema as well as cloning all BinaryExprs
comphead
reviewed
Mar 18, 2023
| // Default to assuming the arguments are the same type | ||
| if let Expr::BinaryExpr(BinaryExpr { left, op: _, right }) = &mut expr { | ||
| rewrite_placeholder(left.as_mut(), right.as_ref(), schema)?; | ||
| rewrite_placeholder(right.as_mut(), left.as_ref(), schema)?; |
avantgardnerio
approved these changes
Mar 19, 2023
| @@ -417,6 +414,11 @@ impl DataFusionError { | |||
| // return last checkpoint (which may be the original error) | |||
| last_datafusion_error | |||
| } | |||
|
|
|||
| /// wraps self in Self::Context with a description | |||
| pub fn context(self, description: impl Into<String>) -> Self { | |||
There was a problem hiding this comment.
Yay, thank you! I'm happy to see this being used and improved.
There was a problem hiding this comment.
Yeah, it is really nice -- thanks for adding it!
| // Default to assuming the arguments are the same type | ||
| if let Expr::BinaryExpr(BinaryExpr { left, op: _, right }) = &mut expr { | ||
| rewrite_placeholder(left.as_mut(), right.as_ref(), schema)?; | ||
| rewrite_placeholder(right.as_mut(), left.as_ref(), schema)?; |
Dandandan
approved these changes
Mar 19, 2023
alamb
changed the title
infer_placeholder_typesinfer_placeholder_types
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Which issue does this PR close?
related to faster planning: #5637
related to like inference: #5617
Rationale for this change
This function has a bunch of unecessary
clone()which likely means running parameter type inference would be bad to do for all queriesWhat changes are included in this PR?
Avoids a bunch of expr copies when inferring placeholder types
Are these changes tested?
Existing tests cover this functionality
Are there any user-facing changes?
No