Fix a bug in hidden field handling in std.mergePatch#250
Merged
stephenamar-db merged 6 commits intodatabricks:masterfrom Dec 31, 2024
Merged
Conversation
stephenamar-db
approved these changes
Dec 31, 2024
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
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.
This PR fixes a bug related to handling of hidden fields in
std.mergePatch:In both google/jsonnet and google/go-jsonnet, hidden fields are ineligible to participate in field merges:
std.mergePatch({a: 1}, {a :: 2}{a: 1}(ignoring the hidden patch field){a: 2}std.mergePatch({a: {a: 1}}, {a:: {b: 1}}{a: {a: 1}}{a: {a: 1, b: 1}}std.mergePatch({a:: {a: 1}}, {a: {b: 1}}(symmetrical to previous case, but swaps hidden between target and patch){a: {b: 1}}{a: {a: 1, b: 1}}The problem is that the current code iterates over the union of visible fields, but never re-checks the specific visibility in target and patch during per-field merges.
This PR fixes that bug and significantly expands unit test coverage for
std.mergePatch.