Skip to content

Conversation

@prestodb-ci
Copy link
Collaborator

No description provided.

@ethanyzhang
Copy link

alchemy merge

@prestodb-ci
Copy link
Collaborator Author

alchemy link 3b172d7

@prestodb-ci prestodb-ci added Merged Rebase items not closed but incorporated rebase-item Items we need to rebase for the release labels Apr 10, 2025
@prestodb-ci
Copy link
Collaborator Author

Added new rebase item:

This was referenced Apr 11, 2025
prestodb-ci pushed a commit that referenced this pull request May 30, 2025
Alchemy-item: [[5962] Support struct schema evolution matching by name](#510 (comment)) commit 1/1 - 65c76eb
@prestodb-ci prestodb-ci added the rebase-conflict Conflict we encountered when processing rebase requests label May 30, 2025
@prestodb-ci
Copy link
Collaborator Author

Failed to cherry-pick commit 65c76eb in rebase request #802:

exit status 1
error: could not apply 65c76eb7b... [5962] Support struct schema evolution matching by name

Auto-merging velox/dwio/common/SelectiveStructColumnReader.cpp
Auto-merging velox/dwio/common/SelectiveStructColumnReader.h
CONFLICT (content): Merge conflict in velox/dwio/common/SelectiveStructColumnReader.h

Please:

  1. Rebase your branch with staging/velox_pr_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-05-30T22:18:40Z
  1. Re-open Rebase branch velox_pr_rebase (1678304) with oss-main (1626ee0) #802 to retry the cherry-pick.

@prestodb-ci
Copy link
Collaborator Author

Failed to cherry-pick commit 65c76eb in rebase request #803:

exit status 1
error: could not apply 65c76eb7b... [5962] Support struct schema evolution matching by name

Auto-merging velox/dwio/common/SelectiveStructColumnReader.cpp
Auto-merging velox/dwio/common/SelectiveStructColumnReader.h
CONFLICT (content): Merge conflict in velox/dwio/common/SelectiveStructColumnReader.h

Please:

  1. Rebase your branch with staging/velox_pr_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-05-30T23:05:36Z
  1. Re-open Rebase branch velox_pr_rebase (1678304) with oss-main (4c1892b) #803 to retry the cherry-pick.

@prestodb-ci
Copy link
Collaborator Author

Failed to cherry-pick commit 65c76eb in rebase request #804:

exit status 1
error: could not apply 65c76eb7b... [5962] Support struct schema evolution matching by name

Auto-merging velox/dwio/common/SelectiveStructColumnReader.cpp
Auto-merging velox/dwio/common/SelectiveStructColumnReader.h
CONFLICT (content): Merge conflict in velox/dwio/common/SelectiveStructColumnReader.h

Please:

  1. Rebase your branch with staging/velox_pr_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-05-31T01:12:11Z
  1. Re-open Rebase branch velox_pr_rebase (1678304) with oss-main (ffe6e1c) #804 to retry the cherry-pick.

@FelixYBW
Copy link
Collaborator

alchemy link 819f6dc

@prestodb-ci
Copy link
Collaborator Author

Failed to add new rebase item:

The new rebase item overlaps with the following existing item:

Please double check your input and retry.

@FelixYBW
Copy link
Collaborator

alchemy merge

@prestodb-ci
Copy link
Collaborator Author

alchemy link 819f6dc

@prestodb-ci
Copy link
Collaborator Author

Failed to add new rebase item:

The new rebase item overlaps with the following existing item:

Please double check your input and retry.

@FelixYBW FelixYBW closed this May 31, 2025
@prestodb-ci
Copy link
Collaborator Author

Expired 1 rebase items linked in this issue at 2025-05-31T03:34:15Z

@FelixYBW FelixYBW reopened this May 31, 2025
@FelixYBW FelixYBW closed this May 31, 2025
@prestodb-ci
Copy link
Collaborator Author

Failed to cherry-pick commit 65c76eb in rebase request #804:

exit status 1
error: could not apply 65c76eb7b... [5962] Support struct schema evolution matching by name

Auto-merging velox/dwio/common/SelectiveStructColumnReader.cpp
CONFLICT (content): Merge conflict in velox/dwio/common/SelectiveStructColumnReader.cpp
Auto-merging velox/dwio/common/SelectiveStructColumnReader.h
CONFLICT (content): Merge conflict in velox/dwio/common/SelectiveStructColumnReader.h
Auto-merging velox/dwio/dwrf/reader/SelectiveFlatMapColumnReader.cpp
Auto-merging velox/dwio/dwrf/reader/SelectiveStructColumnReader.cpp
Auto-merging velox/dwio/dwrf/reader/SelectiveStructColumnReader.h
Auto-merging velox/dwio/parquet/reader/ParquetColumnReader.cpp
CONFLICT (content): Merge conflict in velox/dwio/parquet/reader/ParquetColumnReader.cpp
Auto-merging velox/dwio/parquet/reader/ParquetColumnReader.h
CONFLICT (content): Merge conflict in velox/dwio/parquet/reader/ParquetColumnReader.h
Auto-merging velox/dwio/parquet/reader/ParquetReader.cpp
CONFLICT (content): Merge conflict in velox/dwio/parquet/reader/ParquetReader.cpp
Auto-merging velox/dwio/parquet/reader/RepeatedColumnReader.cpp
CONFLICT (content): Merge conflict in velox/dwio/parquet/reader/RepeatedColumnReader.cpp
Auto-merging velox/dwio/parquet/reader/RepeatedColumnReader.h
CONFLICT (content): Merge conflict in velox/dwio/parquet/reader/RepeatedColumnReader.h
Auto-merging velox/dwio/parquet/reader/StructColumnReader.cpp
CONFLICT (content): Merge conflict in velox/dwio/parquet/reader/StructColumnReader.cpp
Auto-merging velox/dwio/parquet/reader/StructColumnReader.h
CONFLICT (content): Merge conflict in velox/dwio/parquet/reader/StructColumnReader.h

Please:

  1. Rebase your branch with staging/velox_pr_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-05-31T01:12:11Z
  1. Re-open Rebase branch velox_pr_rebase (1678304) with oss-main (ffe6e1c) #804 to retry the cherry-pick.

@FelixYBW
Copy link
Collaborator

alchemy delete 65c76eb

@prestodb-ci
Copy link
Collaborator Author

Invalid alchemy verb: delete

@FelixYBW
Copy link
Collaborator

alchemy help

@prestodb-ci
Copy link
Collaborator Author

🫙 Alchemy usage

alchemy link

Track the current issue or PR as a rebase item with the provided commits.

alchemy link [comma-separated commit SHAs] [@timestamp]?
  • comma-separated commit SHAs: Provide a comma-separated list of commits to be cherry-picked for this item.

  • @timestamp (optional): Indicates the time when this rebase item is taking effect. Accepted formats:

    • RFC3339: @2006-01-02T15:04:05Z07:00
    • MMDDYYYY: @01022006

    If omitted, the author time of the first commit is used.

alchemy sync

Sync the open/closed state of this issue or PR with another open-source issue or PR.

alchemy sync [URL of the issue or PR to sync with | null]
  • Provide a URL to start syncing status.
  • Use null to remove any existing sync rule.

alchemy merge

Only works for a PR. Shortcut for linking all commits in the current PR as rebase items.

alchemy merge

Equivalent to:

alchemy link [comma-separated commit SHAs from this PR]

@FelixYBW
Copy link
Collaborator

alchemy sync

@prestodb-ci
Copy link
Collaborator Author

🫙 Alchemy usage

alchemy link

Track the current issue or PR as a rebase item with the provided commits.

alchemy link [comma-separated commit SHAs] [@timestamp]?
  • comma-separated commit SHAs: Provide a comma-separated list of commits to be cherry-picked for this item.

  • @timestamp (optional): Indicates the time when this rebase item is taking effect. Accepted formats:

    • RFC3339: @2006-01-02T15:04:05Z07:00
    • MMDDYYYY: @01022006

    If omitted, the author time of the first commit is used.

alchemy sync

Sync the open/closed state of this issue or PR with another open-source issue or PR.

alchemy sync [URL of the issue or PR to sync with | null]
  • Provide a URL to start syncing status.
  • Use null to remove any existing sync rule.

alchemy merge

Only works for a PR. Shortcut for linking all commits in the current PR as rebase items.

alchemy merge

Equivalent to:

alchemy link [comma-separated commit SHAs from this PR]

@prestodb-ci
Copy link
Collaborator Author

@FelixYBW imported this issue as oap-project/velox #510

@prestodb-ci
Copy link
Collaborator Author

Failed to cherry-pick commit 65c76eb in rebase request #804:

exit status 1
error: could not apply 65c76eb7b... [5962] Support struct schema evolution matching by name

Auto-merging velox/dwio/common/SelectiveStructColumnReader.cpp
CONFLICT (content): Merge conflict in velox/dwio/common/SelectiveStructColumnReader.cpp
Auto-merging velox/dwio/common/SelectiveStructColumnReader.h
CONFLICT (content): Merge conflict in velox/dwio/common/SelectiveStructColumnReader.h
Auto-merging velox/dwio/dwrf/reader/SelectiveFlatMapColumnReader.cpp
Auto-merging velox/dwio/dwrf/reader/SelectiveStructColumnReader.cpp
Auto-merging velox/dwio/dwrf/reader/SelectiveStructColumnReader.h
Auto-merging velox/dwio/parquet/reader/ParquetColumnReader.cpp
CONFLICT (content): Merge conflict in velox/dwio/parquet/reader/ParquetColumnReader.cpp
Auto-merging velox/dwio/parquet/reader/ParquetColumnReader.h
CONFLICT (content): Merge conflict in velox/dwio/parquet/reader/ParquetColumnReader.h
Auto-merging velox/dwio/parquet/reader/ParquetReader.cpp
CONFLICT (content): Merge conflict in velox/dwio/parquet/reader/ParquetReader.cpp
Auto-merging velox/dwio/parquet/reader/RepeatedColumnReader.cpp
CONFLICT (content): Merge conflict in velox/dwio/parquet/reader/RepeatedColumnReader.cpp
Auto-merging velox/dwio/parquet/reader/RepeatedColumnReader.h
CONFLICT (content): Merge conflict in velox/dwio/parquet/reader/RepeatedColumnReader.h
Auto-merging velox/dwio/parquet/reader/StructColumnReader.cpp
CONFLICT (content): Merge conflict in velox/dwio/parquet/reader/StructColumnReader.cpp
Auto-merging velox/dwio/parquet/reader/StructColumnReader.h
CONFLICT (content): Merge conflict in velox/dwio/parquet/reader/StructColumnReader.h

Please:

  1. Rebase your branch with staging/velox_pr_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-05-31T01:12:11Z
  1. Re-open Rebase branch velox_pr_rebase (1678304) with oss-main (ffe6e1c) #804 to retry the cherry-pick.

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

Labels

Merged Rebase items not closed but incorporated rebase-conflict Conflict we encountered when processing rebase requests rebase-item Items we need to rebase for the release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants