Preserve custom FieldOptions extensions when loading schema metadata from JSON - #4540
Open
pengpeng-lu wants to merge 3 commits into
Open
Preserve custom FieldOptions extensions when loading schema metadata from JSON#4540pengpeng-lu wants to merge 3 commits into
pengpeng-lu wants to merge 3 commits into
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
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.
Summary
CommandUtil.loadRecordMetaDataFromJsonparses downloaded schema metadata JSON viaJsonFormat.parser().ignoringUnknownFields().JsonFormat(protobuf-java-util) cannot parseproto2 extensions under any configuration, so any custom
FieldOptionsextension in theJSON (e.g. a per-field marker used to distinguish multiple
RecordTypeUniongenerations of thesame record type) was silently dropped during parsing.
FieldOptions, andRecordLayerTable.Builder.addGeneration's dedup check throws"Duplicated options for different generations of Table X"as soon as a schema has more thanone generation of the same record type in its
RecordTypeUnion.CommandUtil.restoreFieldOptionExtensions(+ helpers): after the normalJsonFormatmergeand dependency resolution, it walks the raw JSON tree, finds any
FieldOptionsextensionsdeclared by the already-resolved proto dependencies, and copies their values back in via
protobuf's reflective
DynamicMessage/setFieldAPI, which — unlikeJsonFormat— doessupport extensions.
Test
custom_field_option.proto, a small self-contained proto2FieldOptionsextension usedonly by this test.
field-options-extension-metadata.json+field-options-extension.yamsql: aRecordTypeUnionwith two fields referencing the same record type, each carrying a distinctextension value; registered in
YamlIntegrationTestsasfieldOptionsExtensionTest."Duplicated options for different generations of Table MyRecord"; re-enabling it passes.