Skip to content

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.

@prestodb-ci
Copy link
Collaborator

Failed to cherry-pick commit 1b67eb8 in rebase request #1146:

exit status 128
error: cannot lock ref 'HEAD': Unable to create '/opt/alchemy/data/velox/.git/HEAD.lock': File exists.

Another git process seems to be running in this repository, e.g.
an editor opened by 'git commit'. Please make sure all processes
are terminated then try again. If it still fails, a git process
may have crashed in this repository earlier:
remove the file manually to continue.
fatal: cherry-pick failed

Please:

  1. Rebase your branch with staging/staging-c4a3a7ec6-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-19T05:35:01Z
  1. Re-open Rebase branch staging-c4a3a7ec6-rebase with staging-c4a3a7ec6-head (c4a3a7e) #1146 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.

5 participants