From 57a0ff8c92fb5758f0d2c51ab8e676cef4e28bda Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Wed, 17 Jan 2024 10:39:22 -0800 Subject: [PATCH] Reserve and extension number in proto2.FeatureSet for Go PiperOrigin-RevId: 599220883 --- src/google/protobuf/descriptor.pb.cc | 69 ++++++++++++++-------------- src/google/protobuf/descriptor.proto | 1 + 2 files changed, 36 insertions(+), 34 deletions(-) diff --git a/src/google/protobuf/descriptor.pb.cc b/src/google/protobuf/descriptor.pb.cc index 78e8ea3f35..48684355e8 100644 --- a/src/google/protobuf/descriptor.pb.cc +++ b/src/google/protobuf/descriptor.pb.cc @@ -1837,7 +1837,7 @@ const char descriptor_table_protodef_google_2fprotobuf_2fdescriptor_2eproto[] AB "ative_int_value\030\005 \001(\003\022\024\n\014double_value\030\006 " "\001(\001\022\024\n\014string_value\030\007 \001(\014\022\027\n\017aggregate_v" "alue\030\010 \001(\t\0323\n\010NamePart\022\021\n\tname_part\030\001 \002(" - "\t\022\024\n\014is_extension\030\002 \002(\010\"\235\t\n\nFeatureSet\022|" + "\t\022\024\n\014is_extension\030\002 \002(\010\"\245\t\n\nFeatureSet\022|" "\n\016field_presence\030\001 \001(\0162).google.protobuf" ".FeatureSet.FieldPresenceB9\210\001\001\230\001\004\230\001\001\242\001\r\022" "\010EXPLICIT\030\346\007\242\001\r\022\010IMPLICIT\030\347\007\242\001\r\022\010EXPLICI" @@ -1866,44 +1866,45 @@ const char descriptor_table_protodef_google_2fprotobuf_2fdescriptor_2eproto[] AB "ESSAGE_ENCODING_UNKNOWN\020\000\022\023\n\017LENGTH_PREF" "IXED\020\001\022\r\n\tDELIMITED\020\002\"H\n\nJsonFormat\022\027\n\023J" "SON_FORMAT_UNKNOWN\020\000\022\t\n\005ALLOW\020\001\022\026\n\022LEGAC" - "Y_BEST_EFFORT\020\002*\006\010\350\007\020\351\007*\006\010\351\007\020\352\007*\006\010\213N\020\220NJ" - "\006\010\347\007\020\350\007\"\300\002\n\022FeatureSetDefaults\022N\n\010defaul" - "ts\030\001 \003(\0132<.google.protobuf.FeatureSetDef" - "aults.FeatureSetEditionDefault\0221\n\017minimu" - "m_edition\030\004 \001(\0162\030.google.protobuf.Editio" - "n\0221\n\017maximum_edition\030\005 \001(\0162\030.google.prot" - "obuf.Edition\032t\n\030FeatureSetEditionDefault" - "\022)\n\007edition\030\003 \001(\0162\030.google.protobuf.Edit" - "ion\022-\n\010features\030\002 \001(\0132\033.google.protobuf." - "FeatureSet\"\325\001\n\016SourceCodeInfo\022:\n\010locatio" - "n\030\001 \003(\0132(.google.protobuf.SourceCodeInfo" - ".Location\032\206\001\n\010Location\022\020\n\004path\030\001 \003(\005B\002\020\001" - "\022\020\n\004span\030\002 \003(\005B\002\020\001\022\030\n\020leading_comments\030\003" - " \001(\t\022\031\n\021trailing_comments\030\004 \001(\t\022!\n\031leadi" - "ng_detached_comments\030\006 \003(\t\"\234\002\n\021Generated" - "CodeInfo\022A\n\nannotation\030\001 \003(\0132-.google.pr" - "otobuf.GeneratedCodeInfo.Annotation\032\303\001\n\n" - "Annotation\022\020\n\004path\030\001 \003(\005B\002\020\001\022\023\n\013source_f" - "ile\030\002 \001(\t\022\r\n\005begin\030\003 \001(\005\022\013\n\003end\030\004 \001(\005\022H\n" - "\010semantic\030\005 \001(\01626.google.protobuf.Genera" - "tedCodeInfo.Annotation.Semantic\"(\n\010Seman" - "tic\022\010\n\004NONE\020\000\022\007\n\003SET\020\001\022\t\n\005ALIAS\020\002*\222\002\n\007Ed" - "ition\022\023\n\017EDITION_UNKNOWN\020\000\022\023\n\016EDITION_PR" - "OTO2\020\346\007\022\023\n\016EDITION_PROTO3\020\347\007\022\021\n\014EDITION_" - "2023\020\350\007\022\021\n\014EDITION_2024\020\351\007\022\027\n\023EDITION_1_" - "TEST_ONLY\020\001\022\027\n\023EDITION_2_TEST_ONLY\020\002\022\035\n\027" - "EDITION_99997_TEST_ONLY\020\235\215\006\022\035\n\027EDITION_9" - "9998_TEST_ONLY\020\236\215\006\022\035\n\027EDITION_99999_TEST" - "_ONLY\020\237\215\006\022\023\n\013EDITION_MAX\020\377\377\377\377\007B~\n\023com.go" - "ogle.protobufB\020DescriptorProtosH\001Z-googl" - "e.golang.org/protobuf/types/descriptorpb" - "\370\001\001\242\002\003GPB\252\002\032Google.Protobuf.Reflection" + "Y_BEST_EFFORT\020\002*\006\010\350\007\020\351\007*\006\010\351\007\020\352\007*\006\010\352\007\020\353\007*" + "\006\010\213N\020\220NJ\006\010\347\007\020\350\007\"\300\002\n\022FeatureSetDefaults\022N" + "\n\010defaults\030\001 \003(\0132<.google.protobuf.Featu" + "reSetDefaults.FeatureSetEditionDefault\0221" + "\n\017minimum_edition\030\004 \001(\0162\030.google.protobu" + "f.Edition\0221\n\017maximum_edition\030\005 \001(\0162\030.goo" + "gle.protobuf.Edition\032t\n\030FeatureSetEditio" + "nDefault\022)\n\007edition\030\003 \001(\0162\030.google.proto" + "buf.Edition\022-\n\010features\030\002 \001(\0132\033.google.p" + "rotobuf.FeatureSet\"\325\001\n\016SourceCodeInfo\022:\n" + "\010location\030\001 \003(\0132(.google.protobuf.Source" + "CodeInfo.Location\032\206\001\n\010Location\022\020\n\004path\030\001" + " \003(\005B\002\020\001\022\020\n\004span\030\002 \003(\005B\002\020\001\022\030\n\020leading_co" + "mments\030\003 \001(\t\022\031\n\021trailing_comments\030\004 \001(\t\022" + "!\n\031leading_detached_comments\030\006 \003(\t\"\234\002\n\021G" + "eneratedCodeInfo\022A\n\nannotation\030\001 \003(\0132-.g" + "oogle.protobuf.GeneratedCodeInfo.Annotat" + "ion\032\303\001\n\nAnnotation\022\020\n\004path\030\001 \003(\005B\002\020\001\022\023\n\013" + "source_file\030\002 \001(\t\022\r\n\005begin\030\003 \001(\005\022\013\n\003end\030" + "\004 \001(\005\022H\n\010semantic\030\005 \001(\01626.google.protobu" + "f.GeneratedCodeInfo.Annotation.Semantic\"" + "(\n\010Semantic\022\010\n\004NONE\020\000\022\007\n\003SET\020\001\022\t\n\005ALIAS\020" + "\002*\222\002\n\007Edition\022\023\n\017EDITION_UNKNOWN\020\000\022\023\n\016ED" + "ITION_PROTO2\020\346\007\022\023\n\016EDITION_PROTO3\020\347\007\022\021\n\014" + "EDITION_2023\020\350\007\022\021\n\014EDITION_2024\020\351\007\022\027\n\023ED" + "ITION_1_TEST_ONLY\020\001\022\027\n\023EDITION_2_TEST_ON" + "LY\020\002\022\035\n\027EDITION_99997_TEST_ONLY\020\235\215\006\022\035\n\027E" + "DITION_99998_TEST_ONLY\020\236\215\006\022\035\n\027EDITION_99" + "999_TEST_ONLY\020\237\215\006\022\023\n\013EDITION_MAX\020\377\377\377\377\007B~" + "\n\023com.google.protobufB\020DescriptorProtosH" + "\001Z-google.golang.org/protobuf/types/desc" + "riptorpb\370\001\001\242\002\003GPB\252\002\032Google.Protobuf.Refl" + "ection" }; static ::absl::once_flag descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_once; const ::_pbi::DescriptorTable descriptor_table_google_2fprotobuf_2fdescriptor_2eproto = { false, false, - 9558, + 9566, descriptor_table_protodef_google_2fprotobuf_2fdescriptor_2eproto, "google/protobuf/descriptor.proto", &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_once, diff --git a/src/google/protobuf/descriptor.proto b/src/google/protobuf/descriptor.proto index 1dbeaa0c53..76630e9209 100644 --- a/src/google/protobuf/descriptor.proto +++ b/src/google/protobuf/descriptor.proto @@ -1014,6 +1014,7 @@ message FeatureSet { extensions 1000; // for Protobuf C++ extensions 1001; // for Protobuf Java + extensions 1002; // for Protobuf Go extensions 9995 to 9999; // For internal testing }