Stop copying LogicalPlan and Exprs in RewriteDisjunctivePredicate
#10305
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
rohitrastogi
changed the title
RewriteDisjunctivePredicate
rohitrastogi
commented
Apr 30, 2024
| @@ -56,29 +58,34 @@ use datafusion_expr::{Expr, LogicalPlan, Operator}; | |||
| /// | |||
| /// ```sql | |||
| /// where | |||
| /// p_partkey = l_partkey | |||
There was a problem hiding this comment.
Fixed typo - first SQL block did not show original query before expressions were simplified.
rohitrastogi
commented
Apr 30, 2024
| args.retain(|expr| !exist_exprs.contains(expr)); | ||
| if !args.is_empty() { | ||
| if args.len() == 1 { | ||
| new_or_predicates.push(args.remove(0)); |
There was a problem hiding this comment.
I believe remove() should be O(1) here and below as there's just one item in the vector.
rohitrastogi
commented
Apr 30, 2024
| @@ -239,8 +252,7 @@ fn flatten_and_predicates( | |||
| for predicate in and_predicates { | |||
| match predicate { | |||
| Predicate::And { args } => { | |||
| flattened_predicates | |||
| .extend_from_slice(flatten_and_predicates(args).as_slice()); | |||
| flattened_predicates.append(&mut flatten_and_predicates(args)); | |||
There was a problem hiding this comment.
Append should move the predicates instead of cloning them.
rohitrastogi
commented
Apr 30, 2024
| @@ -305,31 +316,30 @@ fn delete_duplicate_predicates(or_predicates: &[Predicate]) -> Predicate { | |||
| } | |||
| if exist_exprs.is_empty() { | |||
| return Predicate::Or { | |||
| args: or_predicates.to_vec(), | |||
| args: or_predicates, | |||
There was a problem hiding this comment.
Should avoid some clones here by eliminating to_vec()
alamb
approved these changes
Apr 30, 2024
There was a problem hiding this comment.
This is great @rohitrastogi -- thank you. A very nice first contribution 🙏
comphead
approved these changes
May 1, 2024
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?
Part of #9637
Closes #10213
Rationale for this change
What changes are included in this PR?
Are these changes tested?
Are there any user-facing changes?