From 3a2cd26c13463edea4d5800e12dac5ed22b32b40 Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Tue, 2 Apr 2024 18:26:50 +0000 Subject: [PATCH] Auto-generate files after cl/621236613 --- csharp/src/Google.Protobuf.Test/testprotos.pb | Bin 372341 -> 372420 bytes .../Reflection/Descriptor.pb.cs | 26 +++++------ php/ext/google/protobuf/php-upb.c | 41 +++++++++--------- php/ext/google/protobuf/php-upb.h | 1 - ruby/ext/google/protobuf_c/ruby-upb.c | 3 +- ruby/ext/google/protobuf_c/ruby-upb.h | 1 - upb/cmake/google/protobuf/descriptor.upb.h | 1 - .../protobuf/descriptor.upb_minitable.c | 3 +- .../cmake/google/protobuf/descriptor.upb.h | 1 - .../protobuf/descriptor.upb_minitable.c | 3 +- 10 files changed, 33 insertions(+), 47 deletions(-) diff --git a/csharp/src/Google.Protobuf.Test/testprotos.pb b/csharp/src/Google.Protobuf.Test/testprotos.pb index 28510344e69308f8b6aad6b14fb198dd6189de1f..39cd57a5d8c27c7b1e5d2e9459bb20894bf14ebb 100644 GIT binary patch delta 20677 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 delta 20599 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∓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 diff --git a/csharp/src/Google.Protobuf/Reflection/Descriptor.pb.cs b/csharp/src/Google.Protobuf/Reflection/Descriptor.pb.cs index d6b1c0ab51..9b58e28f2d 100644 --- a/csharp/src/Google.Protobuf/Reflection/Descriptor.pb.cs +++ b/csharp/src/Google.Protobuf/Reflection/Descriptor.pb.cs @@ -236,17 +236,16 @@ namespace Google.Protobuf.Reflection { "Cgtzb3VyY2VfZmlsZRgCIAEoCRINCgViZWdpbhgDIAEoBRILCgNlbmQYBCAB", "KAUSSAoIc2VtYW50aWMYBSABKA4yNi5nb29nbGUucHJvdG9idWYuR2VuZXJh", "dGVkQ29kZUluZm8uQW5ub3RhdGlvbi5TZW1hbnRpYyIoCghTZW1hbnRpYxII", - "CgROT05FEAASBwoDU0VUEAESCQoFQUxJQVMQAiqnAgoHRWRpdGlvbhITCg9F", - "RElUSU9OX1VOS05PV04QABITCg5FRElUSU9OX0xFR0FDWRCEBxITCg5FRElU", - "SU9OX1BST1RPMhDmBxITCg5FRElUSU9OX1BST1RPMxDnBxIRCgxFRElUSU9O", - "XzIwMjMQ6AcSEQoMRURJVElPTl8yMDI0EOkHEhcKE0VESVRJT05fMV9URVNU", - "X09OTFkQARIXChNFRElUSU9OXzJfVEVTVF9PTkxZEAISHQoXRURJVElPTl85", - "OTk5N19URVNUX09OTFkQnY0GEh0KF0VESVRJT05fOTk5OThfVEVTVF9PTkxZ", - "EJ6NBhIdChdFRElUSU9OXzk5OTk5X1RFU1RfT05MWRCfjQYSEwoLRURJVElP", - "Tl9NQVgQ/////wdCfgoTY29tLmdvb2dsZS5wcm90b2J1ZkIQRGVzY3JpcHRv", - "clByb3Rvc0gBWi1nb29nbGUuZ29sYW5nLm9yZy9wcm90b2J1Zi90eXBlcy9k", - "ZXNjcmlwdG9ycGL4AQGiAgNHUEKqAhpHb29nbGUuUHJvdG9idWYuUmVmbGVj", - "dGlvbg==")); + "CgROT05FEAASBwoDU0VUEAESCQoFQUxJQVMQAiqaAgoHRWRpdGlvbhITCg9F", + "RElUSU9OX1VOS05PV04QABITCg5FRElUSU9OX1BST1RPMhDmBxITCg5FRElU", + "SU9OX1BST1RPMxDnBxIRCgxFRElUSU9OXzIwMjMQ6AcSEQoMRURJVElPTl8y", + "MDI0EOkHEhcKE0VESVRJT05fMV9URVNUX09OTFkQARIXChNFRElUSU9OXzJf", + "VEVTVF9PTkxZEAISHQoXRURJVElPTl85OTk5N19URVNUX09OTFkQnY0GEh0K", + "F0VESVRJT05fOTk5OThfVEVTVF9PTkxZEJ6NBhIdChdFRElUSU9OXzk5OTk5", + "X1RFU1RfT05MWRCfjQYSEwoLRURJVElPTl9NQVgQ/////wciBgiEBxCEB0J+", + "ChNjb20uZ29vZ2xlLnByb3RvYnVmQhBEZXNjcmlwdG9yUHJvdG9zSAFaLWdv", + "b2dsZS5nb2xhbmcub3JnL3Byb3RvYnVmL3R5cGVzL2Rlc2NyaXB0b3JwYvgB", + "AaICA0dQQqoCGkdvb2dsZS5Qcm90b2J1Zi5SZWZsZWN0aW9u")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Google.Protobuf.Reflection.Edition), }, null, new pbr::GeneratedClrTypeInfo[] { @@ -290,11 +289,6 @@ namespace Google.Protobuf.Reflection { /// [pbr::OriginalName("EDITION_UNKNOWN")] Unknown = 0, ///

- /// A placeholder edition for specifying default behaviors *before* a feature - /// was first introduced. This is effectively an "infinite past". - /// - [pbr::OriginalName("EDITION_LEGACY")] Legacy = 900, - /// /// Legacy syntax "editions". These pre-date editions, but behave much like /// distinct editions. These can't be used to specify the edition of proto /// files, but feature definitions must supply proto2/proto3 defaults for diff --git a/php/ext/google/protobuf/php-upb.c b/php/ext/google/protobuf/php-upb.c index 27e07a4141..641b5f2e0f 100644 --- a/php/ext/google/protobuf/php-upb.c +++ b/php/ext/google/protobuf/php-upb.c @@ -1569,11 +1569,10 @@ static const upb_MiniTable *messages_layout[33] = { const upb_MiniTableEnum google_protobuf_Edition_enum_init = { 64, - 9, + 8, { 0x7, 0x0, - 0x384, 0x3e6, 0x3e7, 0x3e8, @@ -1767,7 +1766,7 @@ const upb_MiniTableFile google_protobuf_descriptor_proto_upb_file_layout = { * regenerated. */ -static const char descriptor[12175] = {'\n', ' ', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'e', 's', 'c', 'r', 'i', 'p', +static const char descriptor[12162] = {'\n', ' ', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '.', 'p', 'r', 'o', 't', 'o', '\022', '\017', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '\"', 'M', '\n', '\021', 'F', 'i', 'l', 'e', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'S', 'e', 't', '\022', '8', '\n', '\004', 'f', 'i', 'l', 'e', '\030', '\001', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', @@ -2237,23 +2236,23 @@ static const char descriptor[12175] = {'\n', ' ', 'g', 'o', 'o', 'g', 'l', 'e', 'f', 'o', '.', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', '.', 'S', 'e', 'm', 'a', 'n', 't', 'i', 'c', 'R', '\010', 's', 'e', 'm', 'a', 'n', 't', 'i', 'c', '\"', '(', '\n', '\010', 'S', 'e', 'm', 'a', 'n', 't', 'i', 'c', '\022', '\010', '\n', '\004', 'N', 'O', 'N', 'E', '\020', '\000', '\022', '\007', '\n', '\003', 'S', 'E', 'T', '\020', '\001', '\022', '\t', '\n', '\005', 'A', 'L', 'I', 'A', 'S', '\020', '\002', '*', -'\247', '\002', '\n', '\007', 'E', 'd', 'i', 't', 'i', 'o', 'n', '\022', '\023', '\n', '\017', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', 'U', 'N', -'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\023', '\n', '\016', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', 'L', 'E', 'G', 'A', 'C', 'Y', -'\020', '\204', '\007', '\022', '\023', '\n', '\016', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', 'P', 'R', 'O', 'T', 'O', '2', '\020', '\346', '\007', '\022', -'\023', '\n', '\016', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', 'P', 'R', 'O', 'T', 'O', '3', '\020', '\347', '\007', '\022', '\021', '\n', '\014', 'E', -'D', 'I', 'T', 'I', 'O', 'N', '_', '2', '0', '2', '3', '\020', '\350', '\007', '\022', '\021', '\n', '\014', 'E', 'D', 'I', 'T', 'I', 'O', 'N', -'_', '2', '0', '2', '4', '\020', '\351', '\007', '\022', '\027', '\n', '\023', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '1', '_', 'T', 'E', 'S', -'T', '_', 'O', 'N', 'L', 'Y', '\020', '\001', '\022', '\027', '\n', '\023', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '2', '_', 'T', 'E', 'S', -'T', '_', 'O', 'N', 'L', 'Y', '\020', '\002', '\022', '\035', '\n', '\027', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '9', '9', '9', '9', '7', -'_', 'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', 'Y', '\020', '\235', '\215', '\006', '\022', '\035', '\n', '\027', 'E', 'D', 'I', 'T', 'I', 'O', 'N', -'_', '9', '9', '9', '9', '8', '_', 'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', 'Y', '\020', '\236', '\215', '\006', '\022', '\035', '\n', '\027', 'E', -'D', 'I', 'T', 'I', 'O', 'N', '_', '9', '9', '9', '9', '9', '_', 'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', 'Y', '\020', '\237', '\215', -'\006', '\022', '\023', '\n', '\013', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', 'M', 'A', 'X', '\020', '\377', '\377', '\377', '\377', '\007', 'B', '~', '\n', -'\023', 'c', 'o', 'm', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', 'B', '\020', 'D', 'e', 's', -'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 's', 'H', '\001', 'Z', '-', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'g', -'o', 'l', 'a', 'n', 'g', '.', 'o', 'r', 'g', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 't', 'y', 'p', 'e', 's', '/', -'d', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'p', 'b', '\370', '\001', '\001', '\242', '\002', '\003', 'G', 'P', 'B', '\252', '\002', '\032', 'G', -'o', 'o', 'g', 'l', 'e', '.', 'P', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'R', 'e', 'f', 'l', 'e', 'c', 't', 'i', 'o', 'n', +'\232', '\002', '\n', '\007', 'E', 'd', 'i', 't', 'i', 'o', 'n', '\022', '\023', '\n', '\017', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', 'U', 'N', +'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\023', '\n', '\016', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', 'P', 'R', 'O', 'T', 'O', '2', +'\020', '\346', '\007', '\022', '\023', '\n', '\016', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', 'P', 'R', 'O', 'T', 'O', '3', '\020', '\347', '\007', '\022', +'\021', '\n', '\014', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '2', '0', '2', '3', '\020', '\350', '\007', '\022', '\021', '\n', '\014', 'E', 'D', 'I', +'T', 'I', 'O', 'N', '_', '2', '0', '2', '4', '\020', '\351', '\007', '\022', '\027', '\n', '\023', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '1', +'_', 'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', 'Y', '\020', '\001', '\022', '\027', '\n', '\023', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '2', +'_', 'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', 'Y', '\020', '\002', '\022', '\035', '\n', '\027', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '9', +'9', '9', '9', '7', '_', 'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', 'Y', '\020', '\235', '\215', '\006', '\022', '\035', '\n', '\027', 'E', 'D', 'I', +'T', 'I', 'O', 'N', '_', '9', '9', '9', '9', '8', '_', 'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', 'Y', '\020', '\236', '\215', '\006', '\022', +'\035', '\n', '\027', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '9', '9', '9', '9', '9', '_', 'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', +'Y', '\020', '\237', '\215', '\006', '\022', '\023', '\n', '\013', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', 'M', 'A', 'X', '\020', '\377', '\377', '\377', '\377', +'\007', '\"', '\006', '\010', '\204', '\007', '\020', '\204', '\007', 'B', '~', '\n', '\023', 'c', 'o', 'm', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', +'r', 'o', 't', 'o', 'b', 'u', 'f', 'B', '\020', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 's', +'H', '\001', 'Z', '-', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'g', 'o', 'l', 'a', 'n', 'g', '.', 'o', 'r', 'g', '/', 'p', 'r', 'o', +'t', 'o', 'b', 'u', 'f', '/', 't', 'y', 'p', 'e', 's', '/', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'p', 'b', '\370', +'\001', '\001', '\242', '\002', '\003', 'G', 'P', 'B', '\252', '\002', '\032', 'G', 'o', 'o', 'g', 'l', 'e', '.', 'P', 'r', 'o', 't', 'o', 'b', 'u', +'f', '.', 'R', 'e', 'f', 'l', 'e', 'c', 't', 'i', 'o', 'n', }; static _upb_DefPool_Init *deps[1] = { @@ -2264,7 +2263,7 @@ _upb_DefPool_Init google_protobuf_descriptor_proto_upbdefinit = { deps, &google_protobuf_descriptor_proto_upb_file_layout, "google/protobuf/descriptor.proto", - UPB_STRINGVIEW_INIT(descriptor, 12175) + UPB_STRINGVIEW_INIT(descriptor, 12162) }; diff --git a/php/ext/google/protobuf/php-upb.h b/php/ext/google/protobuf/php-upb.h index da173d1c97..e40d9134f5 100644 --- a/php/ext/google/protobuf/php-upb.h +++ b/php/ext/google/protobuf/php-upb.h @@ -4519,7 +4519,6 @@ typedef enum { google_protobuf_EDITION_UNKNOWN = 0, google_protobuf_EDITION_1_TEST_ONLY = 1, google_protobuf_EDITION_2_TEST_ONLY = 2, - google_protobuf_EDITION_LEGACY = 900, google_protobuf_EDITION_PROTO2 = 998, google_protobuf_EDITION_PROTO3 = 999, google_protobuf_EDITION_2023 = 1000, diff --git a/ruby/ext/google/protobuf_c/ruby-upb.c b/ruby/ext/google/protobuf_c/ruby-upb.c index 769a8c91c5..6213592a23 100644 --- a/ruby/ext/google/protobuf_c/ruby-upb.c +++ b/ruby/ext/google/protobuf_c/ruby-upb.c @@ -1569,11 +1569,10 @@ static const upb_MiniTable *messages_layout[33] = { const upb_MiniTableEnum google_protobuf_Edition_enum_init = { 64, - 9, + 8, { 0x7, 0x0, - 0x384, 0x3e6, 0x3e7, 0x3e8, diff --git a/ruby/ext/google/protobuf_c/ruby-upb.h b/ruby/ext/google/protobuf_c/ruby-upb.h index c54132320d..2982fab997 100755 --- a/ruby/ext/google/protobuf_c/ruby-upb.h +++ b/ruby/ext/google/protobuf_c/ruby-upb.h @@ -4921,7 +4921,6 @@ typedef enum { google_protobuf_EDITION_UNKNOWN = 0, google_protobuf_EDITION_1_TEST_ONLY = 1, google_protobuf_EDITION_2_TEST_ONLY = 2, - google_protobuf_EDITION_LEGACY = 900, google_protobuf_EDITION_PROTO2 = 998, google_protobuf_EDITION_PROTO3 = 999, google_protobuf_EDITION_2023 = 1000, diff --git a/upb/cmake/google/protobuf/descriptor.upb.h b/upb/cmake/google/protobuf/descriptor.upb.h index f7e5821c38..eaa2291174 100644 --- a/upb/cmake/google/protobuf/descriptor.upb.h +++ b/upb/cmake/google/protobuf/descriptor.upb.h @@ -57,7 +57,6 @@ typedef enum { google_protobuf_EDITION_UNKNOWN = 0, google_protobuf_EDITION_1_TEST_ONLY = 1, google_protobuf_EDITION_2_TEST_ONLY = 2, - google_protobuf_EDITION_LEGACY = 900, google_protobuf_EDITION_PROTO2 = 998, google_protobuf_EDITION_PROTO3 = 999, google_protobuf_EDITION_2023 = 1000, diff --git a/upb/cmake/google/protobuf/descriptor.upb_minitable.c b/upb/cmake/google/protobuf/descriptor.upb_minitable.c index 1cc463de95..d09c175145 100644 --- a/upb/cmake/google/protobuf/descriptor.upb_minitable.c +++ b/upb/cmake/google/protobuf/descriptor.upb_minitable.c @@ -1171,11 +1171,10 @@ static const upb_MiniTable *messages_layout[33] = { const upb_MiniTableEnum google_protobuf_Edition_enum_init = { 64, - 9, + 8, { 0x7, 0x0, - 0x384, 0x3e6, 0x3e7, 0x3e8, diff --git a/upb/reflection/cmake/google/protobuf/descriptor.upb.h b/upb/reflection/cmake/google/protobuf/descriptor.upb.h index f7e5821c38..eaa2291174 100644 --- a/upb/reflection/cmake/google/protobuf/descriptor.upb.h +++ b/upb/reflection/cmake/google/protobuf/descriptor.upb.h @@ -57,7 +57,6 @@ typedef enum { google_protobuf_EDITION_UNKNOWN = 0, google_protobuf_EDITION_1_TEST_ONLY = 1, google_protobuf_EDITION_2_TEST_ONLY = 2, - google_protobuf_EDITION_LEGACY = 900, google_protobuf_EDITION_PROTO2 = 998, google_protobuf_EDITION_PROTO3 = 999, google_protobuf_EDITION_2023 = 1000, diff --git a/upb/reflection/cmake/google/protobuf/descriptor.upb_minitable.c b/upb/reflection/cmake/google/protobuf/descriptor.upb_minitable.c index 1cc463de95..d09c175145 100644 --- a/upb/reflection/cmake/google/protobuf/descriptor.upb_minitable.c +++ b/upb/reflection/cmake/google/protobuf/descriptor.upb_minitable.c @@ -1171,11 +1171,10 @@ static const upb_MiniTable *messages_layout[33] = { const upb_MiniTableEnum google_protobuf_Edition_enum_init = { 64, - 9, + 8, { 0x7, 0x0, - 0x384, 0x3e6, 0x3e7, 0x3e8,