Import: Change merge logic #6251
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
Jonathan-Rosenberg
added
the
include-changelog
|
Like I said in #6250, while it's great to reuse the merge logic for the import, I don't think the import is part of the merge. I feel responsible for taking us down this path but I can only suggest two things:
|
johnnyaug
reviewed
Jul 25, 2023
nopcoder
suggested changes
Jul 27, 2023
…lity to the committed manager
…ge-logic # Conflicts: # pkg/graveler/committed/skip_prefix_iterator.go
nopcoder
suggested changes
Aug 2, 2023
Jonathan-Rosenberg
changed the base branch from
feature/import/prefix-iterator
to
master
johnnyaug
reviewed
Aug 2, 2023
pkg/graveler/graveler.go
Outdated
| @@ -565,7 +567,7 @@ type VersionController interface { | |||
| Merge(ctx context.Context, repository *RepositoryRecord, destination BranchID, source Ref, commitParams CommitParams, strategy string) (CommitID, error) | |||
|
|
|||
| // Import Creates a merge-commit using source MetaRangeID into destination branch with a src-wins merge strategy | |||
There was a problem hiding this comment.
Doc needs to be updated to reflect the prefix logic
There was a problem hiding this comment.
oops
done
| return false | ||
| } | ||
| ipi.updateValue() | ||
| ipi.currentPrefixIndex++ |
There was a problem hiding this comment.
Why? What if the next range is also bounded by the prefix?
There was a problem hiding this comment.
True
This should be like in Next() and call updatePrefix.
Co-authored-by: Yoni <yoni.augarten@treeverse.io>
…eFS into feature/import/merge-logic
nopcoder
approved these changes
Aug 2, 2023
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.
In order to support some cases of the import behavior, additional checks were needed to be added to the
mergerlogic.This PR includes those changes and tests for the import behavior.
It's recommended to review #6250 (the
PrefixIteratoris sufficient)Closes #6162