Fixed to_h with repeated messages to return hashes in Ruby #3639
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
|
Thanks for your pull request. The automated tests will run as soon as one of the admins verifies this change is ok for us to run on our infrastructure. |
1 similar comment
|
Thanks for your pull request. The automated tests will run as soon as one of the admins verifies this change is ok for us to run on our infrastructure. |
|
Can one of the admins verify this patch? |
|
ok to test |
haberman
requested changes
Sep 20, 2017
ruby/ext/google/protobuf_c/message.c
Outdated
| @@ -419,6 +419,13 @@ VALUE Message_to_h(VALUE _self) { | |||
| msg_value = Map_to_h(msg_value); | |||
| } else if (upb_fielddef_label(field) == UPB_LABEL_REPEATED) { | |||
| msg_value = RepeatedField_to_ary(msg_value); | |||
|
|
|||
| if (upb_fielddef_msgsubdef(field) != NULL) { | |||
There was a problem hiding this comment.
I think it would be a bit clearer to write:
if (upb_fieldddef_type(field) == UPB_TYPE_MESSAGE)
There was a problem hiding this comment.
Makes sense! I fixed that.
zanker
force-pushed
the
zanker/fix-embedded-to_h
branch
from
8a06394
to
83264bd
Compare
haberman
approved these changes
Sep 20, 2017
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.
Calling
to_hconverts everything to a Ruby object representation, except if you have a repeated field with a message, then you get the message field object. This fixes it so it converts that to a hash too (and recursively does it).Calling
to_hin JRuby didn't work if you had a repeated field, which is fixed in this too (mostly incidentally).RubyRepeatedFieldincludesRubyEnumerablewhich responds toto_h, so it was trying to callto_hon an array, which errored.to_hin JRuby with a map field is still broken, because it converts it to a key/value representation where value is the proto object not the hash representation. Didn't fix that here, because it was unrelated to fixing repeated messages.I think it likely makes more sense if
RepeatedField_to_aryandRubyRepeatedField#toArraydid this, but I was opting to make less dramatic changes.