Fix Compare to return raw diff when source equals base #9844
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.
Problem
When comparing a branch with an ancestor commit (where source == base), the
CompareValueIteratorwas filtering out all changes that were 'added on destination', resulting in empty diff results.This caused:
lakectl branch revertto return 'no changes' error even when there were actual differenceslakectl diffto return empty results when comparing with an ancestor tag/commitSolution
Added a short-circuit in the
Comparefunction: whensource == base(i.e., comparing with an ancestor), return the raw diff iterator directly instead of wrapping it inCompareValueIteratorwhich filters results.When source equals base, the three-way comparison degenerates to a two-way diff, so the filtering logic is inappropriate.
Changes
pkg/graveler/committed/manager.go: Added check forsource == basecase inComparefunctionpkg/graveler/committed/manager_test.go: AddedTestManager_CompareSourceEqualsBasetestTesting
Fixes #9802