Skip to content
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

Jump to bottom

Consolidate expression manipulation functions into datafusion_optimizer #3809

Merged
merged 4 commits into from
Oct 12, 2022
Merged

Consolidate expression manipulation functions into datafusion_optimizer #3809

merged 4 commits into from
Oct 12, 2022

Conversation

alamb
Copy link
Contributor

@alamb alamb commented Oct 12, 2022

Which issue does this PR close?

re #3808

Rationale for this change

Putting similar code in the same place will make it easier to find and maintain

What changes are included in this PR?

Move functions for manipulating Exprs (like splitting conjunctions, etc) into optimizer/utils

Are there any user-facing changes?

import locations for some functions may change

alamb
alamb commented Oct 12, 2022
View reviewed changes
datafusion/core/src/logical_plan/mod.rs
};
pub use datafusion_optimizer::expr_simplifier::SimplifyInfo;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

as the datafusion_optimizer is publically exported there is no reason to also re-export it here as well

alamb
alamb commented Oct 12, 2022
View reviewed changes
datafusion/expr/src/expr_fn.rs
@@ -468,60 +468,6 @@ pub fn when(when: Expr, then: Expr) -> CaseBuilder {
CaseBuilder::new(None, vec![when], vec![then], None)
}

/// Combines an array of filter expressions into a single filter expression
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This code was moved

datafusion/optimizer/src/utils.rs
/// Combines an array of filter expressions into a single filter expression
/// consisting of the input filter expressions joined with logical AND.
/// Returns None if the filters array is empty.
pub fn combine_filters(filters: &[Expr]) -> Option<Expr> {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved from elsewhere

@github-actions github-actions bot added core Core DataFusion crate logical-expr Logical plan and expressions optimizer Optimizer rules labels Oct 12, 2022
@alamb alamb changed the title Consolidate expression manipulation functions into optimizer Consolidate expression manipulation functions into datafusion_optimizer Oct 12, 2022
@alamb alamb requested a review from andygrove October 12, 2022 13:51
@alamb alamb mentioned this pull request Oct 12, 2022
Merged
@alamb alamb merged commit b0f58dd into apache:master Oct 12, 2022
@alamb alamb deleted the alamb/conslidate_conjunction branch October 12, 2022 18:30
@ursabot
Copy link

ursabot commented Oct 12, 2022

Benchmark runs are scheduled for baseline = c27b56f and contender = b0f58dd. b0f58dd is a master commit associated with this PR. Results will be available as each benchmark for each run completes.
Conbench compare runs links:
[Skipped ⚠️ Benchmarking of arrow-datafusion-commits is not supported on ec2-t3-xlarge-us-east-2] ec2-t3-xlarge-us-east-2
[Skipped ⚠️ Benchmarking of arrow-datafusion-commits is not supported on test-mac-arm] test-mac-arm
[Skipped ⚠️ Benchmarking of arrow-datafusion-commits is not supported on ursa-i9-9960x] ursa-i9-9960x
[Skipped ⚠️ Benchmarking of arrow-datafusion-commits is not supported on ursa-thinkcentre-m75q] ursa-thinkcentre-m75q
Buildkite builds:
Supported benchmarks:
ec2-t3-xlarge-us-east-2: Supported benchmark langs: Python, R. Runs only benchmarks with cloud = True
test-mac-arm: Supported benchmark langs: C++, Python, R
ursa-i9-9960x: Supported benchmark langs: Python, R, JavaScript
ursa-thinkcentre-m75q: Supported benchmark langs: C++, Java

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thinkharderdev thinkharderdev thinkharderdev approved these changes

@andygrove andygrove andygrove approved these changes

Assignees
No one assigned
Labels
core Core DataFusion crate logical-expr Logical plan and expressions optimizer Optimizer rules
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@alamb @ursabot @andygrove @thinkharderdev