yikf opened a new pull request, #12653:
URL: https://github.com/apache/gluten/pull/12653
<!--
Thank you for submitting a pull request! Here are some tips:
1. For first-time contributors, please read our contributing guide:
https://github.com/apache/gluten/blob/main/CONTRIBUTING.md
2. If necessary, create a GitHub issue for discussion beforehand to avoid
duplicate work.
3. If the PR is specific to a single backend, include [VL] or [CH] in the PR
title to indicate the
Velox or ClickHouse backend, respectively.
4. If the PR is not ready for review, please mark it as a draft.
-->
## What changes are proposed in this pull request?
Previously MergeTwoPhasesHashBaseAggregate skipped merging any two-phase
aggregate whose expressions carry a FILTER clause. This PR removes that
restriction.
The physical Final aggregate has its FILTER stripped by Spark's
AggUtils.mayRemoveAggFilters (FILTER is only kept in Partial/Complete modes).
So when merging into Complete mode, the FILTER is now restored from the partial
aggregate — whose expressions align 1:1 with the final ones — via a new
`toCompleteAggregateExpressions` helper (guarded by a length check). This
covers the hash, object-hash, and sort aggregate merge paths.
Fix https://github.com/apache/gluten/issues/12652.
<!--
Provide a clear and concise description of the changes introduced in this PR.
Ensure the PR description aligns with the code changes, especially after
updates.
If applicable, include "Fixes #<GitHub_Issue_ID>" to automatically close the
corresponding issue
when the PR is merged.
-->
## How was this patch tested?
<!--
Describe how the changes were tested, if applicable.
Include new tests to validate the functionality, if necessary.
For UI-related changes, attach screenshots to demonstrate the updates.
-->
Extended MergeTwoPhasesHashBaseAggregateSuite to assert both merge (single
aggregate node) and result correctness against vanilla Spark for filtered
hash/object/sort aggregates, plus a mixed filtered + non-filtered case that
verifies the FILTER is restored on the correct expression by positional
alignment.
## Was this patch authored or co-authored using generative AI tooling?
Yes, Generated-by: Claude claude-opus-4-8
<!--
If generative AI tooling has been used in the process of authoring this
patch, please include the
phrase: 'Generated-by: ' followed by the name of the tool and its version.
If no, write 'No'.
Please refer to the [ASF Generative Tooling
Guidance](https://www.apache.org/legal/generative-tooling.html) for details.
-->
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
