azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Protobuf: reworked size estimation of fields

Browse Source
This commit is contained in:
dsavvinov
2016-08-12 17:31:23 +03:00
parent 13bac3aa11
commit 041f5a539a
1 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
proto/compiler/google/src/google/protobuf/compiler/kotlin/src/kotlin_field_generator.cc
+29 -13
View File
@@ -196,7 +196,7 @@ void FieldGenerator::generateSerializationForEnums(io::Printer * printer, bool i
printer->Print(vars, "output.write$suffix$NoTag ()\n"); printer->Print(vars, "output.write$suffix$NoTag ()\n");
} }
else { else {
printer->Print(vars, "output.write$suffix$ ($fieldNumber$, $fieldName$.ord)\n"); printer->Print(vars, "output.write$suffix$ ($fieldNumber$, $fieldName$.id)\n");
} }
} }
} }
@@ -297,19 +297,27 @@ void FieldGenerator::generateSerializationCode(io::Printer *printer, bool isRead
else { else {
throw UnreachableStateException("Arrays of non-primitive types are not supported"); throw UnreachableStateException("Arrays of non-primitive types are not supported");
} }
if (!isRead && isField) {
printer->Outdent();
printer->Print("}\n");
}
} }
else { else {
// we shouldn't write fair fields with default values
if (!isRead && isField) {
printer->Print(vars, "if ($fieldName$ != $initValue$) {\n");
printer->Indent();
}
/* Then check is current field is enum. We have to handle it separately too, because /* Then check is current field is enum. We have to handle it separately too, because
* we have to pass enums as Int's to CodedStreams as per protobuf-format */ * we have to pass enums as Int's to CodedStreams as per protobuf-format */
if (descriptor->type() == FieldDescriptor::TYPE_ENUM) { if (descriptor->type() == FieldDescriptor::TYPE_ENUM) {
// we shouldn't write fair fields with default values
// compare enums as their ids
if (!isRead && isField) {
printer->Print(vars, "if ($fieldName$.id != $initValue$.id) {\n");
printer->Indent();
}
generateSerializationForEnums(printer, isRead, noTag, isField); generateSerializationForEnums(printer, isRead, noTag, isField);
if (!isRead && isField) {
printer->Outdent();
printer->Print("}\n");
}
} }
/* Then check for nested messages. Here we re-use writeTo method, that should be defined in /* Then check for nested messages. Here we re-use writeTo method, that should be defined in
@@ -317,19 +325,27 @@ void FieldGenerator::generateSerializationCode(io::Printer *printer, bool isRead
* Note that readFrom/writeTo methods write message as it's top-level message, i.e. without * Note that readFrom/writeTo methods write message as it's top-level message, i.e. without
* any tags. Therefore, we have to prepend tags and size manually. */ * any tags. Therefore, we have to prepend tags and size manually. */
else if (descriptor->type() == FieldDescriptor::TYPE_MESSAGE) { else if (descriptor->type() == FieldDescriptor::TYPE_MESSAGE) {
// note that we don't check message-type fields for default values
generateSerializationForMessages(printer, isRead, noTag, isField); generateSerializationForMessages(printer, isRead, noTag, isField);
} }
/* Finally, serialize trivial cases */ /* Finally, serialize trivial cases */
else { else {
// we shouldn't write fair fields with default values
// compare enums as their ids
if (!isRead && isField) {
printer->Print(vars, "if ($fieldName$ != $initValue$) {\n");
printer->Indent();
}
generateSerializationForPrimitives(printer, isRead, noTag, isField); generateSerializationForPrimitives(printer, isRead, noTag, isField);
if (!isRead && isField) {
printer->Outdent();
printer->Print("}\n");
}
} }
} }
if (!isRead && isField) {
printer->Outdent();
printer->Print("}\n");
}
} }
@@ -391,7 +407,7 @@ void FieldGenerator::generateSizeForPacked(io::Printer * printer, string varName
// Add tag size, if necessary // Add tag size, if necessary
if (!noTag) { if (!noTag) {
printer->Print(vars, "arraySize += WireFormat.getTagSize($fieldNumber$, WireType.LENGTH_DELIMITED)\n"); printer->Print(vars, "$varName$ += WireFormat.getTagSize($fieldNumber$, WireType.LENGTH_DELIMITED)\n");
} }
// iterate over all elements of array // iterate over all elements of array
@@ -431,7 +447,7 @@ void FieldGenerator::generateSizeForEnums(io::Printer *printer, string varName,
vars["varName"] = varName; vars["varName"] = varName;
vars["fieldName"] = simpleName; vars["fieldName"] = simpleName;
vars["fieldNumber"] = std::to_string(getFieldNumber()); vars["fieldNumber"] = std::to_string(getFieldNumber());
printer->Print(vars, "$varName$ += WireFormat.getEnumSize($fieldNumber$, $fieldName$.ord)\n"); printer->Print(vars, "$varName$ += WireFormat.getEnumSize($fieldNumber$, $fieldName$.id)\n");
} }
void FieldGenerator::generateSizeForMessages(io::Printer * printer, string varName, bool noTag, bool isField) const { void FieldGenerator::generateSizeForMessages(io::Printer * printer, string varName, bool noTag, bool isField) const {