fix merge issue due to 2 PRs refactor

[zhouyuan]

No description provided.

[zhouyuan]

alchemy merge

[prestodb-ci]

alchemy link d661edc

[prestodb-ci]

Added new rebase item:

• ID 811 [velox/ibm/1264] "fix merge issue due to 2 PRs refactor" first introduced at 2025-10-31T23:51:29Z owned by @karthikeyann with commits d661edc - added at 2025-10-31T23:51:29Z by @prestodb-ci via fix merge issue due to 2 PRs refactor #1264 (comment), still effective

[zhouyuan]

alchemy sync facebookincubator#15366

[prestodb-ci]

Issue state will sync with facebookincubator/velox #15366: fix: Fix compile error in CI

[prestodb-ci]

This issue is automatically updated because the linked original issue facebookincubator#15366 is closed

[prestodb-ci]

Expired 1 rebase items linked in this issue at 2025-11-03T18:01:37Z

[prestodb-ci]

Failed to cherry-pick commit d661edc in rebase request #1269:

exit status 1
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

    git commit --allow-empty

Otherwise, please use 'git cherry-pick --skip'

On branch staging/staging-83985716b-rebase
You are currently cherry-picking commit d661edcd8.
  (all conflicts fixed: run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)


It took 4.66 seconds to enumerate untracked files.
See 'git help status' for information on how to improve this.

nothing to commit, working tree clean

Please:

1. Rebase your branch with staging/staging-83985716b-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-11-03T17:53:30Z

3. Re-open Rebase branch staging-83985716b-rebase with staging-83985716b-head (8398571) #1269 to retry the cherry-pick.