Implement correct map merging behavior for C# #10339
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
This will enable message MergeFrom methods to implement the documented behavior.
The only change is in generated MergeFrom methods for messages with map fields, which now call MapField.MergeFrom instead of Add.
Before the change, one test passed (merging from a stream) and one failed (merging from another message object)
fowles
approved these changes
Aug 2, 2022
|
@fowles: Thanks for the quick review. If you're happy to merge it, please do so - I don't have write permission. |
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.
Previously, calling
message1.MergeFrom(message2)would fail ifmessage1andmessage2had map fields sharing a common key. After this change, the map entry frommessage2takes priority over the one inmessage1, as documented in the language guide.Fixes #10327.
Note that after this is released, any code using the latest generator will need to also use the latest version of Google.Protobuf, if it uses map fields. (That's the general expectation anyway, but definitely true this time.)