[v24.3.x] pandaproxy/sr: Fix normalized rendering for custom options #24872
+628
−56
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
When an option is made of multiple names, the names need to be separated by a ".". (cherry picked from commit 44da70e)
…fields (cherry picked from commit cca81ed)
When calling CopyTo, uninterpreted options are discarded. A manual pass to copy them from the old FileDescriptorProto has been added. (cherry picked from commit b278596)
Uninterpreted options (custom options) should be sorted by name when normalized for all types of uninterpreted options. Added missing sorting for enum options and enumValue options. (cherry picked from commit 057ec12)
(cherry picked from commit a46feb4)
(cherry picked from commit f15e7e4)
- grouped all the duplicated calls to maybe_sort custom options into a single helper function - changed projection function from just the name of the custom option to the full serialization of it. This way, both the name and the value contributes to the ordering. (cherry picked from commit 0ec5585)
(cherry picked from commit f8c11ae)
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.
Backport of PR #24856