Skip to content

Iceberg staging hub#425

Open
PingLiuPing wants to merge 10 commits intooss-mainfrom
ibm_iceberg
Open

Iceberg staging hub#425
PingLiuPing wants to merge 10 commits intooss-mainfrom
ibm_iceberg

Conversation

@PingLiuPing
Copy link
Collaborator

This PR means to temporally holding all iceberg code changes that are not been merged to upstream velox repository.
This is because some of the PRs are dependent each other and we cannot pick them one by one.

@PingLiuPing PingLiuPing self-assigned this Aug 7, 2025
@PingLiuPing
Copy link
Collaborator Author

alchemy merge

@prestodb-ci
Copy link
Collaborator

alchemy link e951481,8cb17fb19e24290cf03924e2e4501c844646d7e9,c188f8700bff198ca0c9fad7784ea8401d844f8b

@prestodb-ci
Copy link
Collaborator

Added new rebase item:

@prestodb-ci
Copy link
Collaborator

Failed to cherry-pick commit e951481 in rebase request #426:

exit status 1
error: could not apply e95148181... refactor: Move toValues from InPredicate.cpp to Filter.h

Auto-merging velox/type/Filter.h
CONFLICT (content): Merge conflict in velox/type/Filter.h

Please:

  1. Rebase your branch with staging/staging-a417b2b45-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-08-07T06:40:22Z
  1. Re-open Rebase branch staging-a417b2b45-rebase with staging-a417b2b45-head (a417b2b) #426 to retry the cherry-pick.

@PingLiuPing PingLiuPing changed the base branch from oss-main to staging/staging-a417b2b45-rebase August 7, 2025 10:07
@zhouyuan zhouyuan changed the base branch from staging/staging-a417b2b45-rebase to oss-main August 7, 2025 10:20
@prestodb-ci
Copy link
Collaborator

Failed to cherry-pick commit e951481 in rebase request #427:

exit status 1
error: could not apply e95148181... refactor: Move toValues from InPredicate.cpp to Filter.h

Auto-merging velox/type/Filter.h
CONFLICT (content): Merge conflict in velox/type/Filter.h

Please:

  1. Rebase your branch with staging/staging-a417b2b45-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-08-07T06:40:22Z
  1. Re-open Rebase branch staging-a417b2b45-rebase with staging-a417b2b45-head (a417b2b) #427 to retry the cherry-pick.

@PingLiuPing
Copy link
Collaborator Author

alchemy merge @2026-03-11T08:52:49Z

@prestodb-ci
Copy link
Collaborator

alchemy link 551ef4b,18c2f9c2d57ba8ae20c29081efc719baf5a08508,a7c78333d942f52908cd3b81e1407f7b721bf3bb,0369a5a674c8f6e268edf8b392f40a27fdec9659,c357a2cbf13890360d64687798f8af65bcf4eaf9,495bf5c13d3e0263cc8ea5120ee880969e868106,a166cddcece4d8f046d97cfdf5e5a0ee818c801b,9d223f545ee112064c6653f1fd786c320ea8945c,1537c2c72581976401b7758eac0a5da95ec0abbb,9daad64706949b456a29f92af5ef0cf68a46800d @2026-03-11T08:52:49Z

@prestodb-ci
Copy link
Collaborator

The following unexpired item was removed at 2026-03-11T08:52:49Z by @prestodb-ci via #425 (comment):

Added new rebase item:

@unidevel
Copy link

unidevel commented Mar 11, 2026

@PingLiuPing please check the base branch, there are extra commits in the PR, you may need update base branch, then update alchemy with alchemy merge @2026-03-11T08:52:49Z again.

@unidevel
Copy link

alchemy link c357a2c,495bf5c13d3e0263cc8ea5120ee880969e868106,a166cddcece4d8f046d97cfdf5e5a0ee818c801b,9d223f545ee112064c6653f1fd786c320ea8945c,1537c2c72581976401b7758eac0a5da95ec0abbb,9daad64706949b456a29f92af5ef0cf68a46800d @2026-03-11T08:52:49Z

@prestodb-ci
Copy link
Collaborator

The following unexpired item was removed at 2026-03-11T08:52:49Z by @unidevel via #425 (comment):

Added new rebase item:

@unidevel
Copy link

Based on the history, the last 6 commits is most likely you want to add to alchemy.

@prestodb-ci
Copy link
Collaborator

Failed to cherry-pick commit c357a2c in rebase request #1813:

exit status 1
error: could not apply c357a2cbf... Iceberg core code

Auto-merging velox/connectors/hive/CMakeLists.txt
Auto-merging velox/connectors/hive/HiveDataSink.h
Auto-merging velox/connectors/hive/iceberg/CMakeLists.txt
CONFLICT (content): Merge conflict in velox/connectors/hive/iceberg/CMakeLists.txt
Auto-merging velox/connectors/hive/iceberg/IcebergDataSink.cpp
CONFLICT (content): Merge conflict in 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
Auto-merging velox/connectors/hive/iceberg/tests/CMakeLists.txt
CONFLICT (content): Merge conflict in velox/connectors/hive/iceberg/tests/CMakeLists.txt
Auto-merging velox/dwio/parquet/tests/reader/E2EFilterTest.cpp
Auto-merging velox/dwio/parquet/writer/Writer.cpp
CONFLICT (content): Merge conflict in velox/dwio/parquet/writer/Writer.cpp
Auto-merging velox/dwio/parquet/writer/Writer.h
CONFLICT (content): Merge conflict in velox/dwio/parquet/writer/Writer.h
Auto-merging velox/exec/tests/utils/AssertQueryBuilder.h

Please:

  1. Rebase your branch with staging/staging-e7dd656c9-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] @2026-03-14T08:06:35Z
  1. Re-open Rebase branch staging-e7dd656c9-rebase with staging-e7dd656c9-head (e7dd656) #1813 to retry the cherry-pick.

@prestodb-ci
Copy link
Collaborator

Failed to cherry-pick commit c357a2c in rebase request #1814:

exit status 1
error: could not apply c357a2cbf... Iceberg core code

Auto-merging velox/connectors/hive/CMakeLists.txt
Auto-merging velox/connectors/hive/HiveDataSink.h
Auto-merging velox/connectors/hive/iceberg/CMakeLists.txt
CONFLICT (content): Merge conflict in velox/connectors/hive/iceberg/CMakeLists.txt
Auto-merging velox/connectors/hive/iceberg/IcebergDataSink.cpp
CONFLICT (content): Merge conflict in 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
Auto-merging velox/connectors/hive/iceberg/tests/CMakeLists.txt
CONFLICT (content): Merge conflict in velox/connectors/hive/iceberg/tests/CMakeLists.txt
Auto-merging velox/dwio/parquet/tests/reader/E2EFilterTest.cpp
Auto-merging velox/dwio/parquet/writer/Writer.cpp
CONFLICT (content): Merge conflict in velox/dwio/parquet/writer/Writer.cpp
Auto-merging velox/dwio/parquet/writer/Writer.h
CONFLICT (content): Merge conflict in velox/dwio/parquet/writer/Writer.h
Auto-merging velox/exec/tests/utils/AssertQueryBuilder.h

Please:

  1. Rebase your branch with staging/staging-bef4c3772-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] @2026-03-14T18:30:45Z
  1. Re-open Rebase branch staging-bef4c3772-rebase with staging-bef4c3772-head (bef4c37) #1814 to retry the cherry-pick.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants