Fix decoding of maps to match conformance tests #391
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
v0idpwn
commented
Dec 30, 2024
| test "map i32 i32" do | ||
| mod = ProtobufTestMessages.Proto2.TestAllTypesProto2 | ||
| problematic_payload = <<194, 3, 0>> | ||
| assert m = %{map_int32_int32: %{0 => 0}} = mod.decode(problematic_payload) |
There was a problem hiding this comment.
Without my change, the problematic map decodes to %{nil => nil} instead of %{0 => 0}, which is the desired behaviour.
whatyouhide
reviewed
Jan 2, 2025
lib/protobuf/decoder.ex
Outdated
Comment on lines
238
to
244
| val = | ||
| if map?, | ||
| do: %{ | ||
| (embedded_msg.key || map_default(prop, :key)) => | ||
| embedded_msg.value || map_default(prop, :value) | ||
| }, | ||
| else: embedded_msg |
There was a problem hiding this comment.
Nit but we'll probably want a do/end here rather than the inline do:.
Also, is this gonna be fine with booleans?
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.
Different from the previous fixes in #390, I'm not 100% sure about this one. Feels like it could/should be solved in a different layer, but I didn't find a better way to do it without breaking anything else.