minimal support v2 messages in *dynamic.Message #533
Merged
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
jhump
commented
Sep 28, 2022
| @@ -2553,13 +2558,48 @@ func (m *Message) mergeFrom(pm proto.Message) error { | |||
| } | |||
| } | |||
|
|
|||
| // unrecognized extensions fields: | |||
There was a problem hiding this comment.
Here's the actual fix. The rest of the diff is mostly the fallout of gofmt.
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.
In the V2 API, an extendable message can have extensions that are neither present in the return values from
proto.ExtensionDescsnor in the message's unknown/unrecognized field bytes.That means that they are simply dropped if such a message is converted to a
*dynamic.Message.This simple fix targets just the extensions in question and merges them into the dynamic message via marshalling to bytes and then unmarshalling.
While in here, the files I touched got reformetted with the Go 1.19 version of
gofmt. And I also updated a few places that were relying on reflection to utilize newer(ish) features of the protobuf runtime (back when the version pinned was old enough that the simple/non-reflection logic wouldn't compile).