Rebase branch staging-746d25783-rebase with staging-746d25783-head (746d257)

[prestodb-ci]

Base Branch Or Commit

746d257

Target Branch

staging-746d25783-rebase

Force Push

• Please force push

Other contents

Rebase branch staging-746d25783-rebase with staging-746d25783-head (746d257)

[prestodb-ci]

Failed

Failed to cherry-pick item Iceberg staging hub commit 2/13 - 458a964 onto staging/staging-746d25783-rebase

exit status 1
error: could not apply 458a9645fb... Revert "feat: Add iceberg partition specification (#15423)"

Auto-merging velox/connectors/hive/iceberg/CMakeLists.txt
Auto-merging velox/connectors/hive/iceberg/IcebergDataSink.cpp
Auto-merging velox/connectors/hive/iceberg/IcebergDataSink.h
CONFLICT (content): Merge conflict in velox/connectors/hive/iceberg/IcebergDataSink.h
CONFLICT (modify/delete): velox/connectors/hive/iceberg/PartitionSpec.h deleted in 458a9645fb (Revert "feat: Add iceberg partition specification (#15423)") and modified in HEAD.  Version HEAD of velox/connectors/hive/iceberg/PartitionSpec.h left in tree.
Auto-merging velox/connectors/hive/iceberg/tests/CMakeLists.txt
CONFLICT (content): Merge conflict in velox/connectors/hive/iceberg/tests/CMakeLists.txt
Auto-merging velox/connectors/hive/iceberg/tests/IcebergTestBase.cpp
CONFLICT (content): Merge conflict in velox/connectors/hive/iceberg/tests/IcebergTestBase.cpp
Auto-merging velox/connectors/hive/iceberg/tests/IcebergTestBase.h
CONFLICT (content): Merge conflict in velox/connectors/hive/iceberg/tests/IcebergTestBase.h

Base time: 2025-11-14T00:33:20Z
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
758	velox	ibm	30	[6020 ] Spark sql avg agg function support decimal	2023-08-07T10:37:06Z	liujiayi771	44ff88d	2025-10-27T06:40:59Z	prestodb-ci	#30 (comment)	NULL	NULL	NULL
679	velox	ibm	31	[oap ] Register merge extract companion agg functions without suffix	2023-12-29T02:31:07Z	zhztheplayer	830028e	2025-10-05T15:04:58Z	prestodb-ci	#31 (comment)	NULL	NULL	NULL
532	velox	ibm	501	feat: Build hash table while adding input rows for left semi and anti join	2024-11-24T09:50:05Z	liujiayi771	73ee99f	2025-08-27T18:20:50Z	prestodb-ci	#501 (comment)	NULL	NULL	NULL
840	velox	ibm	28	[11067] Support scan filter for decimal in ORC	2025-03-14T11:44:17Z	rui-mo	fee4403	2025-11-10T00:00:00Z	prestodb-ci	#28 (comment)	NULL	NULL	NULL

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