MID-11101 Fix skipped approval ADD delta merging#674
Open
kay1313 wants to merge 1 commit into
Open
Conversation
Skipped approval instructions were merged back into changes without approval using ordered merge. For ADD operations decomposed by approval processing, this could leave an empty ADD placeholder and merge fragments in an unsafe order. Treat empty object deltas as absent during ObjectTreeDeltas merge, and use unordered merge when returning skipped approval deltas. This lets ADD operations continue normally when the whole approval processing is automatically skipped.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Summary
This fixes MID-11101, where role creation/duplication could fail when the applicable approval processing was automatically skipped.
When approval instructions were skipped, their deltas were merged back into the non-approval changes using ordered merge. For ADD operations decomposed by approval processing, especially with
deltaFrom, this could leave an empty ADD placeholder or merge ADD/MODIFY fragments in an unsafe order. This resulted in errors such as:Cannot merge two ADD deltasobjectToAdd is nullThe fix treats empty object deltas as absent during
ObjectTreeDeltasmerge and uses unordered merge when returning skipped approval deltas back fromPrimaryChangeProcessor.