Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prepare REST API for content-aware merges #6619

Merged
merged 4 commits into from
Apr 19, 2023
Merged

Prepare REST API for content-aware merges #6619

merged 4 commits into from
Apr 19, 2023

Conversation

snazy
Copy link
Member

@snazy snazy commented Apr 17, 2023

  • Adds the necessary bits to allow content-aware merge & transplant operations.
  • Also update the version-store SPIs to.
  • Does not add the functionality to the (new) storage model.

Fixes #6592

@snazy
Copy link
Member Author

snazy commented Apr 17, 2023

@dimas-b @adutra would also need appreciate your opinion on this REST API enhancement.

snazy added 2 commits April 19, 2023 15:01
@snazy
Prepare REST API for content-aware merges
5cbc0a0 
* Adds the necessary bits to allow content-aware merge & transplant operations.
* Also update the version-store SPIs to.
* Does not add the functionality to the (new) storage model.

Fixes projectnessie#6592
@snazy
address review comments
d31b3b6
@snazy snazy force-pushed the prep-content-aware-merges branch from a6bb4cb to d31b3b6 Compare April 19, 2023 13:21
@snazy snazy marked this pull request as ready for review April 19, 2023 13:22
@snazy snazy mentioned this pull request Apr 19, 2023
Merged
@snazy snazy requested a review from dimas-b April 19, 2023 13:23
dimas-b
dimas-b reviewed Apr 19, 2023
View reviewed changes
Copy link
Member

@dimas-b dimas-b left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍 with some nits :)

api/model/src/main/java/org/projectnessie/model/MergeKeyBehavior.java Outdated Show resolved Hide resolved
api/model/src/main/java/org/projectnessie/model/MergeKeyBehavior.java Show resolved Hide resolved
...e/store/src/main/java/org/projectnessie/versioned/storage/versionstore/BaseCommitHelper.java Outdated Show resolved Hide resolved
...storage/store/src/main/java/org/projectnessie/versioned/storage/versionstore/Transplant.java Outdated Show resolved Hide resolved
@snazy snazy requested a review from dimas-b April 19, 2023 15:01
@snazy snazy merged commit d38d7ac into projectnessie:main Apr 19, 2023
@snazy snazy deleted the prep-content-aware-merges branch April 19, 2023 17:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dimas-b dimas-b dimas-b approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Prepare for content-aware merges
2 participants
@snazy @dimas-b