Skip to content

B
brpc
Commit 2979f5c9 authored by Zhangyi Chen's avatar Zhangyi Chen
Browse files
Options

r53423: Fix the bug that empty required arrays in sub messages are not 

serialized as empty
parent c5710867
Show whitespace changes
Inline Side-by-side
Showing with 47 additions and 12 deletions
src/mcpack2pb/generator.cpp
View file @ 2979f5c9
...@@ -765,12 +765,21 @@ static bool generate_parsing(const google::protobuf::Descriptor* d, ...@@ -765,12 +765,21 @@ static bool generate_parsing(const google::protobuf::Descriptor* d,
(printer).Print( \ (printer).Print( \
" serializer.add_multiple_$type$($msg$.$lcfield$().data(), $msg$.$lcfield$_size());\n" \ " serializer.add_multiple_$type$($msg$.$lcfield$().data(), $msg$.$lcfield$_size());\n" \
" serializer.end_array();\n" \ " serializer.end_array();\n" \
"} else {\n" \ "}" \
" serializer.add_null();\n" \
"}\n" \
, "msg", msg \ , "msg", msg \
, "type", to_mcpack_typestr(cit, (field)) \ , "type", to_mcpack_typestr(cit, (field)) \
, "lcfield", (field)->lowercase_name()); \ , "lcfield", (field)->lowercase_name()); \
if ((field)->options().GetExtension(idl_on)) { \
(printer).Print( \
" else {\n" \
" serializer.add_empty_array();\n" \
"}\n"); \
} else { \
(printer).Print( \
" else {\n" \
" serializer.add_null();\n" \
"}\n"); \
} \
} else if (looser_cond) { \ } else if (looser_cond) { \
(printer).Print( \ (printer).Print( \
"if ($msg$.$lcfield$_size()) {\n" \ "if ($msg$.$lcfield$_size()) {\n" \
...@@ -783,12 +792,21 @@ static bool generate_parsing(const google::protobuf::Descriptor* d, ...@@ -783,12 +792,21 @@ static bool generate_parsing(const google::protobuf::Descriptor* d,
" serializer.add_$type$($msg$.$lcfield$(j));\n" \ " serializer.add_$type$($msg$.$lcfield$(j));\n" \
" }\n" \ " }\n" \
" serializer.end_array();\n" \ " serializer.end_array();\n" \
"} else {\n" \ "}" \
" serializer.add_null();\n" \
"}\n" \
, "msg", msg \ , "msg", msg \
, "type", to_mcpack_typestr(cit, (field)) \ , "type", to_mcpack_typestr(cit, (field)) \
, "lcfield", (field)->lowercase_name()); \ , "lcfield", (field)->lowercase_name()); \
if ((field)->options().GetExtension(idl_on)) { \
(printer).Print( \
" else {\n" \
" serializer.add_empty_array();\n" \
"}\n"); \
} else { \
(printer).Print( \
" else {\n" \
" serializer.add_null();\n" \
"}\n"); \
} \
} else { \ } else { \
if ((field)->type() == google::protobuf::FieldDescriptor::TYPE_ENUM) { \ if ((field)->type() == google::protobuf::FieldDescriptor::TYPE_ENUM) { \
LOG(ERROR) << "Disallow converting " << (field)->full_name() \ LOG(ERROR) << "Disallow converting " << (field)->full_name() \
...@@ -993,12 +1011,20 @@ static bool generate_serializing(const google::protobuf::Descriptor* d, ...@@ -993,12 +1011,20 @@ static bool generate_serializing(const google::protobuf::Descriptor* d,
" serializer.end_object();\n" " serializer.end_object();\n"
" }\n" " }\n"
" serializer.end_array();\n" " serializer.end_array();\n"
" }\n" " }"
"} else if (msg.$lcfield$_size()) {\n"
, "field", get_idl_name(f) , "field", get_idl_name(f)
, "lcfield", f->lowercase_name() , "lcfield", f->lowercase_name()
, "vmsg2", var_name2); , "vmsg2", var_name2);
if (f->options().GetExtension(idl_on)) {
impl.Print(
" else {\n"
" serializer.add_empty_array(\"$field$\");\n"
" }\n", "field", get_idl_name(f));
} else {
impl.Print("\n");
}
impl.Print("} else if (msg.$lcfield$_size()) {\n"
, "lcfield", f->lowercase_name());
impl.Indent(); impl.Indent();
impl.Print("serializer.begin_object(\"$field$\");\n" impl.Print("serializer.begin_object(\"$field$\");\n"
, "field", get_idl_name(f)); , "field", get_idl_name(f));
...@@ -1032,12 +1058,21 @@ static bool generate_serializing(const google::protobuf::Descriptor* d, ...@@ -1032,12 +1058,21 @@ static bool generate_serializing(const google::protobuf::Descriptor* d,
" serializer.end_object();\n" " serializer.end_object();\n"
" }\n" " }\n"
" serializer.end_array();\n" " serializer.end_array();\n"
"} else {\n" "}"
" serializer.add_null();\n"
"}\n"
, "vmsg3", var_name3 , "vmsg3", var_name3
, "lcfield", f->lowercase_name() , "lcfield", f->lowercase_name()
, "lcfield2", f2->lowercase_name()); , "lcfield2", f2->lowercase_name());
if (f2->options().GetExtension(idl_on)) {
impl.Print(
" else {\n"
" serializer.add_empty_array();\n"
"}\n");
} else {
impl.Print(
" else {\n"
" serializer.add_null();\n"
"}\n");
}
} else { } else {
impl.Print( impl.Print(
"if (msg.$lcfield$(i).has_$lcfield2$()) {\n" "if (msg.$lcfield$(i).has_$lcfield2$()) {\n"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment