Rebase branch staging-2e3fc8712-rebase with staging-2e3fc8712-head (2e3fc87)

[prestodb-ci]

Base Branch Or Commit

2e3fc87

Target Branch

staging-2e3fc8712-rebase

Force Push

• Please force push

Other contents

Rebase branch staging-2e3fc8712-rebase with staging-2e3fc8712-head (2e3fc87)

[prestodb-ci]

Failed

Failed to cherry-pick item [oap ] Register merge extract companion agg functions without suffix commit 1/1 - 7593dc3 onto staging/staging-2e3fc8712-rebase

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

Base time: 2025-10-02T03:23:35Z
Rebase items finished before the failure:

id	repo	remote	issue_number	issue_title	issue_first_introduced	owner	commits	time_added	added_by_user	added_by_url	time_removed	removed_by_user	removed_by_url
518	velox	ibm	30	[6020 ] Spark sql avg agg function support decimal	2023-08-07T10:37:06Z	liujiayi771	0cd1be1	2025-08-22T23:20:22Z	FelixYBW	#30 (comment)	NULL	NULL	NULL

If you would like to retry, fix the issue input by editing the description if needed, then reopen.