Open
Conversation
- Implemented unit tests for various branch merge strategies including Merge, Squash, Rebase, Cherry-Pick, and Fast-Forward. - Added tests for utility functions related to snapshot management and ancestor finding. - Ensured coverage for edge cases such as missing snapshots, circular references, and validation errors during merges. - Verified that all strategies return consistent structures and handle integration scenarios correctly. - Included tests for error handling and behavior differences across strategies.
Contributor
Author
|
@jayceslesar i know you have done a good bit of work in the managed snapshots class, can you review this as well? |
Contributor
Author
|
@gabeiglio i noticed you had created a pretty great proposal for this work. It would be awesome if you wanted to review the implementation and help get it in good shape! |
Contributor
|
Thanks for the PR! this is awesome, will review it by this week! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #2433
Rationale for this change
This PR adds comprehensive branch merge strategies to PyIceberg, bringing Git-like branch merging capabilities to Iceberg table operations. This enhancement enables users to merge branches with different strategies depending on their workflow needs.
Feature Overview:
Apache Iceberg supports branch operations (create, delete, tag), but lacked merge capabilities between branches. This PR implements 5 standard merge strategies commonly used in version control systems (note, there are differences between this and the java implementation):
Implementation Details:
Use Cases:
Are these changes tested?
Yes,
extremelysomewhat comprehensive test coverage with 35 tests across multiple categories:Are there any user-facing changes?
Yes - New Feature Addition (No Breaking Changes)
New Public API: