Skip to content

fix: disable dynamic filter pushdown for non min/max aggregates#20279

Merged
adriangb merged 6 commits intoapache:mainfrom
notashes:max-minus-count
Feb 12, 2026
Merged

fix: disable dynamic filter pushdown for non min/max aggregates#20279
adriangb merged 6 commits intoapache:mainfrom
notashes:max-minus-count

Conversation

@notashes
Copy link
Contributor

@notashes notashes commented Feb 10, 2026

Which issue does this PR close?

Rationale for this change

Currently whenever we get a query with min or max we default to always pushing down the dynamic filter (when it's enabled). However if the query contains other aggregate functions such as sum, avg they require the full batch of rows. And because of the pruned rows we receive incorrect outputs for the query.

What changes are included in this PR?

return the init_dynamic_filter() early if it contains non min/max aggregates.

Are these changes tested?

Tested locally for the same query mentioned in the issue with hits_partitioned and got the correct output. Will add the tests!

Are there any user-facing changes?

@notashes notashes marked this pull request as draft February 10, 2026 21:46
@github-actions github-actions bot added the physical-plan Changes to the physical-plan crate label Feb 10, 2026
@notashes notashes marked this pull request as ready for review February 11, 2026 01:45
notashes and others added 2 commits February 11, 2026 08:47
Co-authored-by: Adrian Garcia Badaracco <1755071+adriangb@users.noreply.github.com>
Co-authored-by: Adrian Garcia Badaracco <1755071+adriangb@users.noreply.github.com>
@adriangb
Copy link
Contributor

@notashes can we add a test? Ideally an SLT test in datafusion/sqllogictest/test_files/push_down_filter.slt

@github-actions github-actions bot added the sqllogictest SQL Logic Tests (.slt) label Feb 11, 2026
Copy link
Contributor

@adriangb adriangb left a comment

Choose a reason for hiding this comment

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

One of the new tests likely duplicates existing ones - otherwise LGTM!


# Test 4b: Mixed aggregates with non MIN/MAX should not have DynamicFilter

# Pure MAX — DynamicFilter is expected here as we can safely prune that don't match the filter.
Copy link
Contributor

Choose a reason for hiding this comment

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

I think there is already a test for this

Copy link
Contributor Author

Choose a reason for hiding this comment

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

removed that one! thanks!

@adriangb
Copy link
Contributor

I plan to merge this once CI passes 😄

@adriangb adriangb added this pull request to the merge queue Feb 12, 2026
Merged via the queue into apache:main with commit a544b8f Feb 12, 2026
32 checks passed
erratic-pattern pushed a commit to influxdata/arrow-datafusion that referenced this pull request Mar 9, 2026
…he#20279)

## 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.
-->

- Partially closes apache#20267 

## 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.
-->
Currently whenever we get a query with `min` or `max` we default to
always pushing down the dynamic filter (when it's enabled). However if
the query contains other aggregate functions such as `sum`, `avg` they
require the full batch of rows. And because of the pruned rows we
receive incorrect outputs for the query.

## What changes are included in this PR?

<!--
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.
-->

return the `init_dynamic_filter()` early if it contains non min/max
aggregates.

## Are these changes tested?

<!--
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)?
-->

Tested locally for the same query mentioned in the issue with
`hits_partitioned` and got the correct output. Will add the 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.
-->

---------

Co-authored-by: Adrian Garcia Badaracco <1755071+adriangb@users.noreply.github.com>
erratic-pattern pushed a commit to influxdata/arrow-datafusion that referenced this pull request Mar 9, 2026
…he#20279)

## 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.
-->

- Partially closes apache#20267 

## 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.
-->
Currently whenever we get a query with `min` or `max` we default to
always pushing down the dynamic filter (when it's enabled). However if
the query contains other aggregate functions such as `sum`, `avg` they
require the full batch of rows. And because of the pruned rows we
receive incorrect outputs for the query.

## What changes are included in this PR?

<!--
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.
-->

return the `init_dynamic_filter()` early if it contains non min/max
aggregates.

## Are these changes tested?

<!--
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)?
-->

Tested locally for the same query mentioned in the issue with
`hits_partitioned` and got the correct output. Will add the 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.
-->

---------

Co-authored-by: Adrian Garcia Badaracco <1755071+adriangb@users.noreply.github.com>
alamb pushed a commit to alamb/datafusion that referenced this pull request Mar 11, 2026
…he#20279)

## 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.
-->

- Partially closes apache#20267 

## 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.
-->
Currently whenever we get a query with `min` or `max` we default to
always pushing down the dynamic filter (when it's enabled). However if
the query contains other aggregate functions such as `sum`, `avg` they
require the full batch of rows. And because of the pruned rows we
receive incorrect outputs for the query.

## What changes are included in this PR?

<!--
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.
-->

return the `init_dynamic_filter()` early if it contains non min/max
aggregates.

## Are these changes tested?

<!--
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)?
-->

Tested locally for the same query mentioned in the issue with
`hits_partitioned` and got the correct output. Will add the 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.
-->

---------

Co-authored-by: Adrian Garcia Badaracco <1755071+adriangb@users.noreply.github.com>
alamb added a commit that referenced this pull request Mar 12, 2026
…egates (#20279) (#20877)

- Part of #20855
- Closes #20267 on branch-52

This PR:
- Backports #20279 from
@notashes to the branch-52 line

Co-authored-by: notashes <edgerunnergit@riseup.net>
Co-authored-by: Adrian Garcia Badaracco <1755071+adriangb@users.noreply.github.com>
lukekim pushed a commit to spiceai/datafusion that referenced this pull request Mar 12, 2026
…egates (apache#20279) (apache#20877)

- Part of apache#20855
- Closes apache#20267 on branch-52

This PR:
- Backports apache#20279 from
@notashes to the branch-52 line

Co-authored-by: notashes <edgerunnergit@riseup.net>
Co-authored-by: Adrian Garcia Badaracco <1755071+adriangb@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

physical-plan Changes to the physical-plan crate sqllogictest SQL Logic Tests (.slt)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Bug] Dynamic filter leads to wrong results in some aggregation queries with >1 partitions

2 participants