[oap ] Register merge extract companion agg functions without suffix

[zhouyuan]

No description provided.

[unidevel]

alchemy merge

[prestodb-ci]

alchemy link 2de4df7

[prestodb-ci]

Added new rebase item:

• ID 311 [velox/ibm/31] "[oap ] Register merge extract companion agg functions without suffix" first introduced at 2023-12-29T02:31:07Z owned by @zhztheplayer with commits 2de4df7 - added at 2023-12-29T02:31:07Z by @prestodb-ci via [oap ] Register merge extract companion agg functions without suffix #31 (comment), still effective

[prestodb-ci]

Failed to cherry-pick commit 7593dc3 in rebase request #993:

exit status 1
error: could not apply 7593dc3d2... [oap   ] Register merge extract companion agg functions without suffix

Auto-merging velox/exec/Aggregate.cpp
CONFLICT (content): Merge conflict in velox/exec/Aggregate.cpp
Auto-merging velox/exec/tests/AggregationTest.cpp
CONFLICT (content): Merge conflict in velox/exec/tests/AggregationTest.cpp

Please:

1. Rebase your branch with staging/staging-2e3fc8712-rebase and fix the conflict. If the rebase item is a PR, you can change the base branch to this staging branch.
2. Comment on this issue:

alchemy link [updated comma-separated commit SHAs for this issue] @2025-10-02T03:23:35Z

3. Re-open Rebase branch staging-2e3fc8712-rebase with staging-2e3fc8712-head (2e3fc87) #993 to retry the cherry-pick.

[prestodb-ci]

Failed to cherry-pick commit 7593dc3 in rebase request #994:

exit status 1
error: could not apply 7593dc3d2... [oap   ] Register merge extract companion agg functions without suffix

Auto-merging velox/exec/Aggregate.cpp
CONFLICT (content): Merge conflict in velox/exec/Aggregate.cpp
Auto-merging velox/exec/tests/AggregationTest.cpp
CONFLICT (content): Merge conflict in velox/exec/tests/AggregationTest.cpp

Please:

1. Rebase your branch with staging/staging-846b3dc4b-rebase and fix the conflict. If the rebase item is a PR, you can change the base branch to this staging branch.
2. Comment on this issue:

alchemy link [updated comma-separated commit SHAs for this issue] @2025-10-02T17:51:30Z

3. Re-open Rebase branch staging-846b3dc4b-rebase with staging-846b3dc4b-head (846b3dc) #994 to retry the cherry-pick.

[prestodb-ci]

Failed to cherry-pick commit 7593dc3 in rebase request #995:

exit status 1
error: could not apply 7593dc3d2... [oap   ] Register merge extract companion agg functions without suffix

Auto-merging velox/exec/Aggregate.cpp
CONFLICT (content): Merge conflict in velox/exec/Aggregate.cpp
Auto-merging velox/exec/tests/AggregationTest.cpp
CONFLICT (content): Merge conflict in velox/exec/tests/AggregationTest.cpp

Please:

1. Rebase your branch with staging/staging-c20ed29f2-rebase and fix the conflict. If the rebase item is a PR, you can change the base branch to this staging branch.
2. Comment on this issue:

alchemy link [updated comma-separated commit SHAs for this issue] @2025-10-03T01:07:29Z

3. Re-open Rebase branch staging-c20ed29f2-rebase with staging-c20ed29f2-head (c20ed29) #995 to retry the cherry-pick.

[FelixYBW]

alchemy merge @2025-10-02T03:23:35Z

[prestodb-ci]

alchemy link c8c8ea6,391ffef8913fbf79283331a9edc37e47bc9f7f12 @2025-10-02T03:23:35Z

[prestodb-ci]

The following unexpired item was removed at 2025-10-02T03:23:35Z by @prestodb-ci via #31 (comment):

• ID 644 [velox/ibm/31] "[oap ] Register merge extract companion agg functions without suffix" first introduced at 2023-12-29T02:31:07Z owned by @zhztheplayer with commits 7593dc3 - added at 2023-12-29T02:31:07Z by @prestodb-ci via [oap ] Register merge extract companion agg functions without suffix #31 (comment), still effective

Added new rebase item:

• ID 674 [velox/ibm/31] "[oap ] Register merge extract companion agg functions without suffix" first introduced at 2023-12-29T02:31:07Z owned by @zhztheplayer with commits c8c8ea6 391ffef - added at 2025-10-02T03:23:35Z by @prestodb-ci via [oap ] Register merge extract companion agg functions without suffix #31 (comment), still effective