Implement "external" conflict resolution for merges #6631
Merged
Conversation
This file contains 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
snazy
force-pushed
the
implement-ext-conflict-resolution
branch
2 times, most recently
from
407403a
to
05ca371
Compare
dimas-b
reviewed
Apr 20, 2023
...e/common/src/main/java/org/projectnessie/versioned/storage/common/logic/CommitLogicImpl.java
Outdated
Show resolved
Hide resolved
...e/common/src/main/java/org/projectnessie/versioned/storage/common/logic/CommitLogicImpl.java
Outdated
Show resolved
Hide resolved
...e/store/src/main/java/org/projectnessie/versioned/storage/versionstore/BaseCommitHelper.java
Outdated
Show resolved
Hide resolved
...e/store/src/main/java/org/projectnessie/versioned/storage/versionstore/BaseCommitHelper.java
Outdated
Show resolved
Hide resolved
...e/store/src/main/java/org/projectnessie/versioned/storage/versionstore/BaseCommitHelper.java
Show resolved
Hide resolved
adutra
reviewed
Apr 21, 2023
...orage/common/src/main/java/org/projectnessie/versioned/storage/common/logic/CommitLogic.java
Outdated
Show resolved
Hide resolved
| */ | ||
| @Nullable | ||
| @jakarta.annotation.Nullable | ||
| ObjId doCommit( |
There was a problem hiding this comment.
FYI some of the changes here overlap with changes introduced in #6647, but so far they seem compatible.
snazy
force-pushed
the
implement-ext-conflict-resolution
branch
from
05ca371
to
08041b8
Compare
snazy
force-pushed
the
implement-ext-conflict-resolution
branch
from
08041b8
to
1e7d033
Compare
dimas-b
reviewed
Apr 25, 2023
| if (mergeKeyBe.getExpectedTargetContent() == null) { | ||
| keyDetailsMap.put(key, keyDetails(mergeBehavior, ConflictType.NONE)); | ||
| return mergeBehavior == MergeBehavior.FORCE | ||
| ? ConflictResolution.IGNORE |
There was a problem hiding this comment.
nit: maybe rename ConflictResolution.IGNORE to ADD for the sake of clarity? On the caller side it is not obvious that IGNORE will cause the action to be added to the commit.
|
|
||
| // It's okay to do the fetchCommit() here and not complicate the surrounding logic (think: | ||
| // local cache) | ||
| StoreIndex<CommitOp> headIndex = indexesLogic(persist).buildCompleteIndexOrEmpty(head); | ||
| verifyMergeTransplantCommitPolicies(headIndex, mergeCommit); | ||
|
|
||
| mergeBehaviors.postValidate(); | ||
|
|
||
| // TODO check keyDetailsMap for conflicts here - no need to persist the merge commit |
There was a problem hiding this comment.
Good point. We should not call commitLogic.storeCommit() if there are conflicts (same for transplanting individual commits).
There was a problem hiding this comment.
Let's do in a separate PR (same for the comment below)
There was a problem hiding this comment.
Or do you wanna tackle it as part of #6677?
|
|
||
| if (!indexesLogic.commitOperations(newCommit).iterator().hasNext()) { | ||
| // No operations in this commit, skip it. | ||
| continue; | ||
| } | ||
|
|
||
| CommitLogic commitLogic = commitLogic(persist); | ||
| boolean committed = commitLogic.storeCommit(newCommit, emptyList()); | ||
| boolean committed = commitLogic.storeCommit(newCommit, objsToStore); |
There was a problem hiding this comment.
We should probably not call this method if/when keyDetailsMap contains conflicts.
dimas-b
approved these changes
Apr 25, 2023
|
|
||
| // It's okay to do the fetchCommit() here and not complicate the surrounding logic (think: | ||
| // local cache) | ||
| StoreIndex<CommitOp> headIndex = indexesLogic(persist).buildCompleteIndexOrEmpty(head); | ||
| verifyMergeTransplantCommitPolicies(headIndex, mergeCommit); | ||
|
|
||
| mergeBehaviors.postValidate(); | ||
|
|
||
| // TODO check keyDetailsMap for conflicts here - no need to persist the merge commit |
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.
Build on the API changes in #6619. Implements the logic for the new storage model.