From 6d397d0ad5c68cb175538e98ec23a7aeb87ed368 Mon Sep 17 00:00:00 2001 From: Adam Cozzette Date: Sat, 21 Jan 2023 15:04:56 -0800 Subject: [PATCH] Roll-forward of: Add retention and target attributes to descriptor.proto PiperOrigin-RevId: 503691684 --- .../stage0/google/protobuf/descriptor.upb.c | 38 ++++++++++++++----- .../stage0/google/protobuf/descriptor.upb.h | 21 ++++++++++ 2 files changed, 50 insertions(+), 9 deletions(-) diff --git a/upb/reflection/stage0/google/protobuf/descriptor.upb.c b/upb/reflection/stage0/google/protobuf/descriptor.upb.c index da9b960425..8620a81a1a 100644 --- a/upb/reflection/stage0/google/protobuf/descriptor.upb.c +++ b/upb/reflection/stage0/google/protobuf/descriptor.upb.c @@ -325,6 +325,16 @@ const upb_MiniTable* google_protobuf_GeneratedCodeInfo_Annotation_msg_init() { return mini_table; } +const upb_MiniTableEnum* google_protobuf_FieldDescriptorProto_Label_enum_init() { + static const upb_MiniTableEnum* mini_table = NULL; + static const char* mini_descriptor = "!0"; + if (mini_table) return mini_table; + mini_table = + upb_MiniTableEnum_Build(mini_descriptor, strlen(mini_descriptor), + upb_BootstrapArena(), NULL); + return mini_table; +} + const upb_MiniTableEnum* google_protobuf_FieldDescriptorProto_Type_enum_init() { static const upb_MiniTableEnum* mini_table = NULL; static const char* mini_descriptor = "!@AA1"; @@ -335,9 +345,9 @@ const upb_MiniTableEnum* google_protobuf_FieldDescriptorProto_Type_enum_init() { return mini_table; } -const upb_MiniTableEnum* google_protobuf_FieldDescriptorProto_Label_enum_init() { +const upb_MiniTableEnum* google_protobuf_FieldOptions_CType_enum_init() { static const upb_MiniTableEnum* mini_table = NULL; - static const char* mini_descriptor = "!0"; + static const char* mini_descriptor = "!)"; if (mini_table) return mini_table; mini_table = upb_MiniTableEnum_Build(mini_descriptor, strlen(mini_descriptor), @@ -345,9 +355,9 @@ const upb_MiniTableEnum* google_protobuf_FieldDescriptorProto_Label_enum_init() return mini_table; } -const upb_MiniTableEnum* google_protobuf_FileOptions_OptimizeMode_enum_init() { +const upb_MiniTableEnum* google_protobuf_FieldOptions_JSType_enum_init() { static const upb_MiniTableEnum* mini_table = NULL; - static const char* mini_descriptor = "!0"; + static const char* mini_descriptor = "!)"; if (mini_table) return mini_table; mini_table = upb_MiniTableEnum_Build(mini_descriptor, strlen(mini_descriptor), @@ -355,7 +365,7 @@ const upb_MiniTableEnum* google_protobuf_FileOptions_OptimizeMode_enum_init() { return mini_table; } -const upb_MiniTableEnum* google_protobuf_FieldOptions_CType_enum_init() { +const upb_MiniTableEnum* google_protobuf_FieldOptions_OptionRetention_enum_init() { static const upb_MiniTableEnum* mini_table = NULL; static const char* mini_descriptor = "!)"; if (mini_table) return mini_table; @@ -365,9 +375,9 @@ const upb_MiniTableEnum* google_protobuf_FieldOptions_CType_enum_init() { return mini_table; } -const upb_MiniTableEnum* google_protobuf_FieldOptions_JSType_enum_init() { +const upb_MiniTableEnum* google_protobuf_FieldOptions_OptionTargetType_enum_init() { static const upb_MiniTableEnum* mini_table = NULL; - static const char* mini_descriptor = "!)"; + static const char* mini_descriptor = "!AA"; if (mini_table) return mini_table; mini_table = upb_MiniTableEnum_Build(mini_descriptor, strlen(mini_descriptor), @@ -375,9 +385,9 @@ const upb_MiniTableEnum* google_protobuf_FieldOptions_JSType_enum_init() { return mini_table; } -const upb_MiniTableEnum* google_protobuf_MethodOptions_IdempotencyLevel_enum_init() { +const upb_MiniTableEnum* google_protobuf_FileOptions_OptimizeMode_enum_init() { static const upb_MiniTableEnum* mini_table = NULL; - static const char* mini_descriptor = "!)"; + static const char* mini_descriptor = "!0"; if (mini_table) return mini_table; mini_table = upb_MiniTableEnum_Build(mini_descriptor, strlen(mini_descriptor), @@ -395,3 +405,13 @@ const upb_MiniTableEnum* google_protobuf_GeneratedCodeInfo_Annotation_Semantic_e return mini_table; } +const upb_MiniTableEnum* google_protobuf_MethodOptions_IdempotencyLevel_enum_init() { + static const upb_MiniTableEnum* mini_table = NULL; + static const char* mini_descriptor = "!)"; + if (mini_table) return mini_table; + mini_table = + upb_MiniTableEnum_Build(mini_descriptor, strlen(mini_descriptor), + upb_BootstrapArena(), NULL); + return mini_table; +} + diff --git a/upb/reflection/stage0/google/protobuf/descriptor.upb.h b/upb/reflection/stage0/google/protobuf/descriptor.upb.h index a500b581c8..47b2935cbd 100644 --- a/upb/reflection/stage0/google/protobuf/descriptor.upb.h +++ b/upb/reflection/stage0/google/protobuf/descriptor.upb.h @@ -125,6 +125,25 @@ typedef enum { google_protobuf_FieldOptions_JS_NUMBER = 2 } google_protobuf_FieldOptions_JSType; +typedef enum { + google_protobuf_FieldOptions_RETENTION_UNKNOWN = 0, + google_protobuf_FieldOptions_RETENTION_RUNTIME = 1, + google_protobuf_FieldOptions_RETENTION_SOURCE = 2 +} google_protobuf_FieldOptions_OptionRetention; + +typedef enum { + google_protobuf_FieldOptions_TARGET_TYPE_UNKNOWN = 0, + google_protobuf_FieldOptions_TARGET_TYPE_FILE = 1, + google_protobuf_FieldOptions_TARGET_TYPE_EXTENSION_RANGE = 2, + google_protobuf_FieldOptions_TARGET_TYPE_MESSAGE = 3, + google_protobuf_FieldOptions_TARGET_TYPE_FIELD = 4, + google_protobuf_FieldOptions_TARGET_TYPE_ONEOF = 5, + google_protobuf_FieldOptions_TARGET_TYPE_ENUM = 6, + google_protobuf_FieldOptions_TARGET_TYPE_ENUM_ENTRY = 7, + google_protobuf_FieldOptions_TARGET_TYPE_SERVICE = 8, + google_protobuf_FieldOptions_TARGET_TYPE_METHOD = 9 +} google_protobuf_FieldOptions_OptionTargetType; + typedef enum { google_protobuf_MethodOptions_IDEMPOTENCY_UNKNOWN = 0, google_protobuf_MethodOptions_NO_SIDE_EFFECTS = 1, @@ -143,6 +162,8 @@ extern const upb_MiniTableEnum* google_protobuf_FieldDescriptorProto_Label_enum_ extern const upb_MiniTableEnum* google_protobuf_FileOptions_OptimizeMode_enum_init(); extern const upb_MiniTableEnum* google_protobuf_FieldOptions_CType_enum_init(); extern const upb_MiniTableEnum* google_protobuf_FieldOptions_JSType_enum_init(); +extern const upb_MiniTableEnum* google_protobuf_FieldOptions_OptionRetention_enum_init(); +extern const upb_MiniTableEnum* google_protobuf_FieldOptions_OptionTargetType_enum_init(); extern const upb_MiniTableEnum* google_protobuf_MethodOptions_IdempotencyLevel_enum_init(); extern const upb_MiniTableEnum* google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init();