Remove strategy from EntryConflictResolver #9567
Merged
Conversation
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
itaigilo
added
exclude-changelog
AliRamberg
reviewed
Oct 8, 2025
| } | ||
|
|
||
| func (cr *ConflictResolverWrapper) ResolveConflict(ctx context.Context, sCtx graveler.StorageContext, strategy graveler.MergeStrategy, srcValue, destValue *graveler.ValueRecord) (*graveler.ValueRecord, error) { | ||
| func (cr *ConflictResolverWrapper) ResolveConflict(ctx context.Context, sCtx graveler.StorageContext, _ graveler.MergeStrategy, srcValue, destValue *graveler.ValueRecord) (*graveler.ValueRecord, error) { |
There was a problem hiding this comment.
qq, if we're removing the strategy from the interface, why do you keep it in the ConflictResolverWrapper implementation? wouldn't that break its interface compatibility.
There was a problem hiding this comment.
The strategy is removed from the catalog.EntryConflictResolver interface,
While ConflictResolverWrapper implements the graveler.ConflictResolver interface.
The only struct that implements catalog.EntryConflictResolver is in the Enterprise.
guy-har
approved these changes
Oct 9, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Remove a param which is unused by any of the consumers (OSS or Enterprise).