Merge pull request #17129 from protocolbuffers/delimited-fix

Backport fixes to delimited handling
protocolbuffers · Jun 14, 2024 · 86768b3 · 86768b3
2 parents eb61e6b + 3d71e22
commit 86768b3
Show file tree

Hide file tree

Showing 12 changed files with 263 additions and 214 deletions.
diff --git a/conformance/binary_json_conformance_suite.cc b/conformance/binary_json_conformance_suite.cc
@@ -155,6 +155,11 @@ std::string group(uint32_t fieldnum, std::string content) {
                       tag(fieldnum, WireFormatLite::WIRETYPE_END_GROUP));
 }
 
+std::string len(uint32_t fieldnum, std::string content) {
+  return absl::StrCat(tag(fieldnum, WireFormatLite::WIRETYPE_LENGTH_DELIMITED),
+                      delim(content));
+}
+
 std::string GetDefaultValue(FieldDescriptor::Type type) {
   switch (type) {
     case FieldDescriptor::TYPE_INT32:
@@ -363,6 +368,33 @@ void BinaryAndJsonConformanceSuite::RunDelimitedFieldTests() {
   TestAllTypesEdition2023 prototype;
   SetTypeUrl(GetTypeUrl(TestAllTypesEdition2023::GetDescriptor()));
 
+  RunValidProtobufTest<TestAllTypesEdition2023>(
+      absl::StrCat("ValidNonMessage"), REQUIRED,
+      field(1, WireFormatLite::WIRETYPE_VARINT, varint(99)),
+      R"pb(optional_int32: 99)pb");
+
+  RunValidProtobufTest<TestAllTypesEdition2023>(
+      absl::StrCat("ValidLengthPrefixedField"), REQUIRED,
+      len(18, field(1, WireFormatLite::WIRETYPE_VARINT, varint(99))),
+      R"pb(optional_nested_message { a: 99 })pb");
+
+  RunValidProtobufTest<TestAllTypesEdition2023>(
+      absl::StrCat("ValidMap.Integer"), REQUIRED,
+      len(56,
+          absl::StrCat(field(1, WireFormatLite::WIRETYPE_VARINT, varint(99)),
+                       field(2, WireFormatLite::WIRETYPE_VARINT, varint(87)))),
+      R"pb(map_int32_int32 { key: 99 value: 87 })pb");
+
+  RunValidProtobufTest<TestAllTypesEdition2023>(
+      absl::StrCat("ValidMap.LengthPrefixed"), REQUIRED,
+      len(71, absl::StrCat(len(1, "a"),
+                           len(2, field(1, WireFormatLite::WIRETYPE_VARINT,
+                                        varint(87))))),
+      R"pb(map_string_nested_message {
+             key: "a"
+             value: { a: 87 }
+           })pb");
+
   RunValidProtobufTest<TestAllTypesEdition2023>(
       absl::StrCat("ValidDelimitedField.GroupLike"), REQUIRED,
       group(201, field(202, WireFormatLite::WIRETYPE_VARINT, varint(99))),

diff --git a/conformance/test_protos/test_messages_edition2023.proto b/conformance/test_protos/test_messages_edition2023.proto
@@ -2,14 +2,16 @@ edition = "2023";
 
 package protobuf_test_messages.editions;
 
+option features.message_encoding = DELIMITED;
 option java_package = "com.google.protobuf_test_messages.edition2023";
 option java_multiple_files = true;
 option objc_class_prefix = "Editions";
 
 message TestAllTypesEdition2023 {
   message NestedMessage {
     int32 a = 1;
-    TestAllTypesEdition2023 corecursive = 2;
+    TestAllTypesEdition2023 corecursive = 2
+        [features.message_encoding = LENGTH_PREFIXED];
   }
 
   enum NestedEnum {
@@ -36,16 +38,19 @@ message TestAllTypesEdition2023 {
   string optional_string = 14;
   bytes optional_bytes = 15;
 
-  NestedMessage optional_nested_message = 18;
-  ForeignMessageEdition2023 optional_foreign_message = 19;
+  NestedMessage optional_nested_message = 18
+      [features.message_encoding = LENGTH_PREFIXED];
+  ForeignMessageEdition2023 optional_foreign_message = 19
+      [features.message_encoding = LENGTH_PREFIXED];
 
   NestedEnum optional_nested_enum = 21;
   ForeignEnumEdition2023 optional_foreign_enum = 22;
 
   string optional_string_piece = 24 [ctype = STRING_PIECE];
   string optional_cord = 25 [ctype = CORD];
 
-  TestAllTypesEdition2023 recursive_message = 27;
+  TestAllTypesEdition2023 recursive_message = 27
+      [features.message_encoding = LENGTH_PREFIXED];
 
   // Repeated
   repeated int32 repeated_int32 = 31;
@@ -64,8 +69,10 @@ message TestAllTypesEdition2023 {
   repeated string repeated_string = 44;
   repeated bytes repeated_bytes = 45;
 
-  repeated NestedMessage repeated_nested_message = 48;
-  repeated ForeignMessageEdition2023 repeated_foreign_message = 49;
+  repeated NestedMessage repeated_nested_message = 48
+      [features.message_encoding = LENGTH_PREFIXED];
+  repeated ForeignMessageEdition2023 repeated_foreign_message = 49
+      [features.message_encoding = LENGTH_PREFIXED];
 
   repeated NestedEnum repeated_nested_enum = 51;
   repeated ForeignEnumEdition2023 repeated_foreign_enum = 52;
@@ -152,7 +159,8 @@ message TestAllTypesEdition2023 {
 
   oneof oneof_field {
     uint32 oneof_uint32 = 111;
-    NestedMessage oneof_nested_message = 112;
+    NestedMessage oneof_nested_message = 112
+        [features.message_encoding = LENGTH_PREFIXED];
     string oneof_string = 113;
     bytes oneof_bytes = 114;
     bool oneof_bool = 115;
@@ -170,8 +178,8 @@ message TestAllTypesEdition2023 {
     int32 group_int32 = 202;
     uint32 group_uint32 = 203;
   }
-  GroupLikeType groupliketype = 201 [features.message_encoding = DELIMITED];
-  GroupLikeType delimited_field = 202 [features.message_encoding = DELIMITED];
+  GroupLikeType groupliketype = 201;
+  GroupLikeType delimited_field = 202;
 }
 
 message ForeignMessageEdition2023 {
@@ -193,6 +201,6 @@ message GroupLikeType {
 }
 
 extend TestAllTypesEdition2023 {
-  GroupLikeType groupliketype = 121 [features.message_encoding = DELIMITED];
-  GroupLikeType delimited_ext = 122 [features.message_encoding = DELIMITED];
+  GroupLikeType groupliketype = 121;
+  GroupLikeType delimited_ext = 122;
 }