refactor: Optimize required_columns from BTreeSet to Vec in struct PushdownChecker#19678
Merged
kosiew merged 3 commits intoapache:mainfrom Jan 14, 2026
Merged
Conversation
Contributor
Author
|
cc @kosiew |
kumarUjjawal
force-pushed
the
refactor/btree_to_vec
branch
from
9e5d7ba to
8c2462e
Compare
kosiew
reviewed
Jan 12, 2026
Contributor
kosiew
left a comment
kosiew
left a comment
There was a problem hiding this comment.
Thanks @kumarUjjawal for contributing.
I left some comments for your consideration.
Comment on lines
+310
to
+312
| if !self.required_columns.contains(&idx) { | ||
| self.required_columns.push(idx); | ||
| } |
Contributor
There was a problem hiding this comment.
I think it would help future contributors to
- Add comment explaining linear search is acceptable for small
n- OR switch to
HashSetfor O(1) deduplication ifnmight grow
- OR switch to
Comment on lines
+415
to
+418
| let prevents_pushdown = checker.prevents_pushdown(); | ||
| let nested = checker.nested_behavior; | ||
| let mut required_columns = checker.required_columns; | ||
| required_columns.sort_unstable(); |
Contributor
There was a problem hiding this comment.
how about adding:
impl PushdownChecker {
fn into_sorted_columns(mut self) -> PushdownColumns {
self.required_columns.sort_unstable();
self.required_columns.dedup(); // this removes the need for contains check
PushdownColumns {
required_columns: self.required_columns,
nested: self.nested_behavior,
}
}
Comment on lines
419
to
422
| Ok((!prevents_pushdown).then_some(PushdownColumns { | ||
| required_columns, | ||
| nested, | ||
| })) |
Contributor
There was a problem hiding this comment.
and then rewriting this to:
Ok((!checker.prevents_pushdown())
.then_some(checker.into_sorted_columns()))
Comment on lines
+310
to
+312
| if !self.required_columns.contains(&idx) { | ||
| self.required_columns.push(idx); | ||
| } |
Contributor
There was a problem hiding this comment.
see suggested
fn into_sorted_columns
below
Contributor
Author
Thanks for the feedback. Incorporated the changes. |
alamb
approved these changes
Jan 13, 2026
Contributor
alamb
left a comment
alamb
left a comment
There was a problem hiding this comment.
Thanks @kumarUjjawal and @kosiew -- this is really nice
| projected_columns: bool, | ||
| /// Indices into the file schema of columns required to evaluate the expression. | ||
| required_columns: BTreeSet<usize>, | ||
| required_columns: Vec<usize>, |
alamb
reviewed
Jan 13, 2026
| #[derive(Debug)] | ||
| struct PushdownColumns { | ||
| required_columns: BTreeSet<usize>, | ||
| required_columns: Vec<usize>, |
Contributor
There was a problem hiding this comment.
maybe it is worth a comment here explaining the assumption that required_columns are sorted and unique (non duplicate)
de-bgunter
pushed a commit
to de-bgunter/datafusion
that referenced
this pull request
Mar 24, 2026
…uct `PushdownChecker` (apache#19678) ## Which issue does this PR close? <!-- We generally require a GitHub issue to be filed for all bug fixes and enhancements and this helps us generate change logs for our releases. You can link an issue to this PR using the GitHub syntax. For example `Closes apache#123` indicates that this PR will close issue apache#123. --> - Closes apache#19673. ## Rationale for this change <!-- Why are you proposing this change? If this is already explained clearly in the issue then this section is not needed. Explaining clearly why changes are proposed helps reviewers understand your changes and offer better suggestions for fixes. --> ## What changes are included in this PR? - Changed [row_filter.rs](https://github.com/apache/datafusion/blob/main/datafusion/datasource-parquet/src/row_filter.rs) to use Vec instead of the BTreeSet <!-- There is no need to duplicate the description in the issue here but it is sometimes worth providing a summary of the individual changes in this PR. --> ## Are these changes tested? Yes <!-- We typically require tests for all PRs in order to: 1. Prevent the code from being accidentally broken by subsequent changes 2. Serve as another way to document the expected behavior of the code If tests are not included in your PR, please explain why (for example, are they covered by existing tests)? --> ## Are there any user-facing changes? <!-- If there are user-facing changes then we may require documentation to be updated before approving the PR. --> <!-- If there are any breaking changes to public APIs, please add the `api change` label. -->
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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?
required_columnsfromBTreeSet<usize>toVec<usize>in struct PushdownChecker<'schema> #19673.Rationale for this change
What changes are included in this PR?
Are these changes tested?
Yes
Are there any user-facing changes?