fix: preserve aggregate filter pushdown order - #5
Merged
evenyag merged 1 commit intoJun 9, 2026
Conversation
waynexia
approved these changes
Jun 9, 2026
5 tasks
evenyag
merged commit Jun 9, 2026
e8a127c
into
GreptimeTeam:greptimedb-53.1.0-function-signature-exec-error
This was referenced Jul 17, 2026
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.
What
Preserve parent filter ordering in
AggregateExec::gather_filters_for_pushdown.FilterPushdownmaps child pushdown results back to parent filters by position.AggregateExecpreviously split filters into safe and unsafe buckets, which reordered mixed filters and could report an aggregate-output filter as pushed down.Why
Filters on grouping keys are safe to push below
AggregateExec, while filters on aggregate outputs must remain above it. When both appear together, preserving the original parent filter order is required for correct result mapping.Tests
cargo fmt --checkcargo test -p datafusion --test core_integration physical_optimizer::filter_pushdown::test_pushdown_through_aggregates_preserves_parent_filter_ordercargo test -p datafusion --test core_integration physical_optimizer::filter_pushdown::test_pushdown_through_aggregatesAlso validated from GreptimeDB with local DataFusion path patch:
distributed:rdf_having_filter_repro$distributed:inner_join_advanced$