grpc 1.72.0 → 1.74.0.pre2

data/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.c

@@ -84,15 +84,16 @@ const upb_MiniTable grpc__gcp__Identity__AttributesEntry_msg_init = {
 };
 
 const upb_MiniTable* grpc__gcp__Identity__AttributesEntry_msg_init_ptr = &grpc__gcp__Identity__AttributesEntry_msg_init;
-static const upb_MiniTableSubInternal grpc_gcp_StartClientHandshakeReq__submsgs[5] = {
+static const upb_MiniTableSubInternal grpc_gcp_StartClientHandshakeReq__submsgs[6] = {
   {.UPB_PRIVATE(submsg) = &grpc__gcp__Identity_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &grpc__gcp__Identity_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &grpc__gcp__Endpoint_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &grpc__gcp__Endpoint_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &grpc__gcp__RpcProtocolVersions_msg_init_ptr},
+  {.UPB_PRIVATE(submsg) = &grpc__gcp__TransportProtocolPreferences_msg_init_ptr},
 };
 
-static const upb_MiniTableField grpc_gcp_StartClientHandshakeReq__fields[10] = {
+static const upb_MiniTableField grpc_gcp_StartClientHandshakeReq__fields[11] = {
   {1, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
   {2, UPB_SIZE(16, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
   {3, UPB_SIZE(20, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
@@ -100,15 +101,16 @@ static const upb_MiniTableField grpc_gcp_StartClientHandshakeReq__fields[10] = {
   {5, UPB_SIZE(28, 64), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
   {6, UPB_SIZE(32, 72), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
   {7, UPB_SIZE(36, 80), 66, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(48, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(52, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
   {9, UPB_SIZE(40, 88), 67, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
   {10, UPB_SIZE(44, 16), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {12, UPB_SIZE(48, 96), 68, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };
 
 const upb_MiniTable grpc__gcp__StartClientHandshakeReq_msg_init = {
   &grpc_gcp_StartClientHandshakeReq__submsgs[0],
   &grpc_gcp_StartClientHandshakeReq__fields[0],
-  UPB_SIZE(56, 96), 10, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(120), 0,
+  UPB_SIZE(64, 104), 11, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(120), 0,
 #ifdef UPB_TRACING_ENABLED
   "grpc.gcp.StartClientHandshakeReq",
 #endif
@@ -158,27 +160,29 @@ const upb_MiniTable grpc__gcp__ServerHandshakeParameters_msg_init = {
 };
 
 const upb_MiniTable* grpc__gcp__ServerHandshakeParameters_msg_init_ptr = &grpc__gcp__ServerHandshakeParameters_msg_init;
-static const upb_MiniTableSubInternal grpc_gcp_StartServerHandshakeReq__submsgs[4] = {
+static const upb_MiniTableSubInternal grpc_gcp_StartServerHandshakeReq__submsgs[5] = {
   {.UPB_PRIVATE(submsg) = &grpc__gcp__StartServerHandshakeReq__HandshakeParametersEntry_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &grpc__gcp__Endpoint_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &grpc__gcp__Endpoint_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &grpc__gcp__RpcProtocolVersions_msg_init_ptr},
+  {.UPB_PRIVATE(submsg) = &grpc__gcp__TransportProtocolPreferences_msg_init_ptr},
 };
 
-static const upb_MiniTableField grpc_gcp_StartServerHandshakeReq__fields[7] = {
+static const upb_MiniTableField grpc_gcp_StartServerHandshakeReq__fields[8] = {
   {1, UPB_SIZE(12, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
   {2, UPB_SIZE(16, 40), 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(36, 16), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(40, 16), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
   {4, UPB_SIZE(20, 48), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
   {5, UPB_SIZE(24, 56), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
   {6, UPB_SIZE(28, 64), 66, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
   {7, UPB_SIZE(32, 12), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(36, 72), 67, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };
 
 const upb_MiniTable grpc__gcp__StartServerHandshakeReq_msg_init = {
   &grpc_gcp_StartServerHandshakeReq__submsgs[0],
   &grpc_gcp_StartServerHandshakeReq__fields[0],
-  UPB_SIZE(48, 72), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
+  UPB_SIZE(48, 80), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(56), 0,
 #ifdef UPB_TRACING_ENABLED
   "grpc.gcp.StartServerHandshakeReq",
 #endif
@@ -264,27 +268,29 @@ const upb_MiniTable grpc__gcp__HandshakerReq_msg_init = {
 };
 
 const upb_MiniTable* grpc__gcp__HandshakerReq_msg_init_ptr = &grpc__gcp__HandshakerReq_msg_init;
-static const upb_MiniTableSubInternal grpc_gcp_HandshakerResult__submsgs[3] = {
+static const upb_MiniTableSubInternal grpc_gcp_HandshakerResult__submsgs[4] = {
   {.UPB_PRIVATE(submsg) = &grpc__gcp__Identity_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &grpc__gcp__Identity_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &grpc__gcp__RpcProtocolVersions_msg_init_ptr},
+  {.UPB_PRIVATE(submsg) = &grpc__gcp__NegotiatedTransportProtocol_msg_init_ptr},
 };
 
-static const upb_MiniTableField grpc_gcp_HandshakerResult__fields[8] = {
-  {1, UPB_SIZE(28, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(36, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(44, 48), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+static const upb_MiniTableField grpc_gcp_HandshakerResult__fields[9] = {
+  {1, UPB_SIZE(32, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(40, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, 48, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
   {4, UPB_SIZE(12, 64), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
   {5, UPB_SIZE(16, 72), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
   {6, 9, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
   {7, UPB_SIZE(20, 80), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
   {8, UPB_SIZE(24, 12), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(28, 88), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };
 
 const upb_MiniTable grpc__gcp__HandshakerResult_msg_init = {
   &grpc_gcp_HandshakerResult__submsgs[0],
   &grpc_gcp_HandshakerResult__fields[0],
-  UPB_SIZE(56, 88), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
+  UPB_SIZE(56, 96), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0,
 #ifdef UPB_TRACING_ENABLED
   "grpc.gcp.HandshakerResult",
 #endif

data/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb.h

@@ -23,6 +23,8 @@ extern "C" {
 
 typedef struct grpc_gcp_RpcProtocolVersions { upb_Message UPB_PRIVATE(base); } grpc_gcp_RpcProtocolVersions;
 typedef struct grpc_gcp_RpcProtocolVersions_Version { upb_Message UPB_PRIVATE(base); } grpc_gcp_RpcProtocolVersions_Version;
+typedef struct grpc_gcp_TransportProtocolPreferences { upb_Message UPB_PRIVATE(base); } grpc_gcp_TransportProtocolPreferences;
+typedef struct grpc_gcp_NegotiatedTransportProtocol { upb_Message UPB_PRIVATE(base); } grpc_gcp_NegotiatedTransportProtocol;
 
 typedef enum {
   grpc_gcp_SECURITY_NONE = 0,
@@ -200,6 +202,158 @@ UPB_INLINE void grpc_gcp_RpcProtocolVersions_Version_set_minor(grpc_gcp_RpcProto
   upb_Message_SetBaseField((upb_Message *)msg, &field, &value);
 }
 
+/* grpc.gcp.TransportProtocolPreferences */
+
+UPB_INLINE grpc_gcp_TransportProtocolPreferences* grpc_gcp_TransportProtocolPreferences_new(upb_Arena* arena) {
+  return (grpc_gcp_TransportProtocolPreferences*)_upb_Message_New(&grpc__gcp__TransportProtocolPreferences_msg_init, arena);
+}
+UPB_INLINE grpc_gcp_TransportProtocolPreferences* grpc_gcp_TransportProtocolPreferences_parse(const char* buf, size_t size, upb_Arena* arena) {
+  grpc_gcp_TransportProtocolPreferences* ret = grpc_gcp_TransportProtocolPreferences_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, UPB_UPCAST(ret), &grpc__gcp__TransportProtocolPreferences_msg_init, NULL, 0, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE grpc_gcp_TransportProtocolPreferences* grpc_gcp_TransportProtocolPreferences_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  grpc_gcp_TransportProtocolPreferences* ret = grpc_gcp_TransportProtocolPreferences_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, UPB_UPCAST(ret), &grpc__gcp__TransportProtocolPreferences_msg_init, extreg, options,
+                 arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* grpc_gcp_TransportProtocolPreferences_serialize(const grpc_gcp_TransportProtocolPreferences* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(UPB_UPCAST(msg), &grpc__gcp__TransportProtocolPreferences_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* grpc_gcp_TransportProtocolPreferences_serialize_ex(const grpc_gcp_TransportProtocolPreferences* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(UPB_UPCAST(msg), &grpc__gcp__TransportProtocolPreferences_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void grpc_gcp_TransportProtocolPreferences_clear_transport_protocol(grpc_gcp_TransportProtocolPreferences* msg) {
+  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Message_ClearBaseField(UPB_UPCAST(msg), &field);
+}
+UPB_INLINE upb_StringView const* grpc_gcp_TransportProtocolPreferences_transport_protocol(const grpc_gcp_TransportProtocolPreferences* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field);
+  if (arr) {
+    if (size) *size = arr->UPB_PRIVATE(size);
+    return (upb_StringView const*)upb_Array_DataPtr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _grpc_gcp_TransportProtocolPreferences_transport_protocol_upb_array(const grpc_gcp_TransportProtocolPreferences* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field);
+  if (size) {
+    *size = arr ? arr->UPB_PRIVATE(size) : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _grpc_gcp_TransportProtocolPreferences_transport_protocol_mutable_upb_array(grpc_gcp_TransportProtocolPreferences* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg),
+                                                       &field, arena);
+  if (size) {
+    *size = arr ? arr->UPB_PRIVATE(size) : 0;
+  }
+  return arr;
+}
+
+UPB_INLINE upb_StringView* grpc_gcp_TransportProtocolPreferences_mutable_transport_protocol(grpc_gcp_TransportProtocolPreferences* msg, size_t* size) {
+  upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field);
+  if (arr) {
+    if (size) *size = arr->UPB_PRIVATE(size);
+    return (upb_StringView*)upb_Array_MutableDataPtr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE upb_StringView* grpc_gcp_TransportProtocolPreferences_resize_transport_protocol(grpc_gcp_TransportProtocolPreferences* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (upb_StringView*)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg),
+                                                   &field, size, arena);
+}
+UPB_INLINE bool grpc_gcp_TransportProtocolPreferences_add_transport_protocol(grpc_gcp_TransportProtocolPreferences* msg, upb_StringView val, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      UPB_UPCAST(msg), &field, arena);
+  if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)(
+                  arr, arr->UPB_PRIVATE(size) + 1, arena)) {
+    return false;
+  }
+  UPB_PRIVATE(_upb_Array_Set)
+  (arr, arr->UPB_PRIVATE(size) - 1, &val, sizeof(val));
+  return true;
+}
+
+/* grpc.gcp.NegotiatedTransportProtocol */
+
+UPB_INLINE grpc_gcp_NegotiatedTransportProtocol* grpc_gcp_NegotiatedTransportProtocol_new(upb_Arena* arena) {
+  return (grpc_gcp_NegotiatedTransportProtocol*)_upb_Message_New(&grpc__gcp__NegotiatedTransportProtocol_msg_init, arena);
+}
+UPB_INLINE grpc_gcp_NegotiatedTransportProtocol* grpc_gcp_NegotiatedTransportProtocol_parse(const char* buf, size_t size, upb_Arena* arena) {
+  grpc_gcp_NegotiatedTransportProtocol* ret = grpc_gcp_NegotiatedTransportProtocol_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, UPB_UPCAST(ret), &grpc__gcp__NegotiatedTransportProtocol_msg_init, NULL, 0, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE grpc_gcp_NegotiatedTransportProtocol* grpc_gcp_NegotiatedTransportProtocol_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  grpc_gcp_NegotiatedTransportProtocol* ret = grpc_gcp_NegotiatedTransportProtocol_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, UPB_UPCAST(ret), &grpc__gcp__NegotiatedTransportProtocol_msg_init, extreg, options,
+                 arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* grpc_gcp_NegotiatedTransportProtocol_serialize(const grpc_gcp_NegotiatedTransportProtocol* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(UPB_UPCAST(msg), &grpc__gcp__NegotiatedTransportProtocol_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* grpc_gcp_NegotiatedTransportProtocol_serialize_ex(const grpc_gcp_NegotiatedTransportProtocol* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(UPB_UPCAST(msg), &grpc__gcp__NegotiatedTransportProtocol_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void grpc_gcp_NegotiatedTransportProtocol_clear_transport_protocol(grpc_gcp_NegotiatedTransportProtocol* msg) {
+  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  upb_Message_ClearBaseField(UPB_UPCAST(msg), &field);
+}
+UPB_INLINE upb_StringView grpc_gcp_NegotiatedTransportProtocol_transport_protocol(const grpc_gcp_NegotiatedTransportProtocol* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field,
+                                    &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void grpc_gcp_NegotiatedTransportProtocol_set_transport_protocol(grpc_gcp_NegotiatedTransportProtocol *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  upb_Message_SetBaseField((upb_Message *)msg, &field, &value);
+}
+
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif

data/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.c

@@ -55,16 +55,54 @@ const upb_MiniTable grpc__gcp__RpcProtocolVersions__Version_msg_init = {
 };
 
 const upb_MiniTable* grpc__gcp__RpcProtocolVersions__Version_msg_init_ptr = &grpc__gcp__RpcProtocolVersions__Version_msg_init;
-static const upb_MiniTable *messages_layout[2] = {
+static const upb_MiniTableField grpc_gcp_TransportProtocolPreferences__fields[1] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable grpc__gcp__TransportProtocolPreferences_msg_init = {
+  NULL,
+  &grpc_gcp_TransportProtocolPreferences__fields[0],
+  16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+#ifdef UPB_TRACING_ENABLED
+  "grpc.gcp.TransportProtocolPreferences",
+#endif
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_prs_1bt},
+  })
+};
+
+const upb_MiniTable* grpc__gcp__TransportProtocolPreferences_msg_init_ptr = &grpc__gcp__TransportProtocolPreferences_msg_init;
+static const upb_MiniTableField grpc_gcp_NegotiatedTransportProtocol__fields[1] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable grpc__gcp__NegotiatedTransportProtocol_msg_init = {
+  NULL,
+  &grpc_gcp_NegotiatedTransportProtocol__fields[0],
+  UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+#ifdef UPB_TRACING_ENABLED
+  "grpc.gcp.NegotiatedTransportProtocol",
+#endif
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+  })
+};
+
+const upb_MiniTable* grpc__gcp__NegotiatedTransportProtocol_msg_init_ptr = &grpc__gcp__NegotiatedTransportProtocol_msg_init;
+static const upb_MiniTable *messages_layout[4] = {
   &grpc__gcp__RpcProtocolVersions_msg_init,
   &grpc__gcp__RpcProtocolVersions__Version_msg_init,
+  &grpc__gcp__TransportProtocolPreferences_msg_init,
+  &grpc__gcp__NegotiatedTransportProtocol_msg_init,
 };
 
 const upb_MiniTableFile src_proto_grpc_gcp_transport_security_common_proto_upb_file_layout = {
   messages_layout,
   NULL,
   NULL,
-  2,
+  4,
   0,
   0,
 };

data/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.h

@@ -22,6 +22,10 @@ extern const upb_MiniTable grpc__gcp__RpcProtocolVersions_msg_init;
 extern const upb_MiniTable* grpc__gcp__RpcProtocolVersions_msg_init_ptr;
 extern const upb_MiniTable grpc__gcp__RpcProtocolVersions__Version_msg_init;
 extern const upb_MiniTable* grpc__gcp__RpcProtocolVersions__Version_msg_init_ptr;
+extern const upb_MiniTable grpc__gcp__TransportProtocolPreferences_msg_init;
+extern const upb_MiniTable* grpc__gcp__TransportProtocolPreferences_msg_init_ptr;
+extern const upb_MiniTable grpc__gcp__NegotiatedTransportProtocol_msg_init;
+extern const upb_MiniTable* grpc__gcp__NegotiatedTransportProtocol_msg_init_ptr;
 
 extern const upb_MiniTableFile src_proto_grpc_gcp_transport_security_common_proto_upb_file_layout;
 

data/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb.h

@@ -83,6 +83,10 @@ UPB_INLINE grpc_lb_v1_LoadBalanceRequest_load_balance_request_type_oneofcases gr
   return (grpc_lb_v1_LoadBalanceRequest_load_balance_request_type_oneofcases)upb_Message_WhichOneofFieldNumber(
       UPB_UPCAST(msg), &field);
 }
+UPB_INLINE void grpc_lb_v1_LoadBalanceRequest_clear_load_balance_request_type(grpc_lb_v1_LoadBalanceRequest* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Message_ClearOneof(UPB_UPCAST(msg), &grpc__lb__v1__LoadBalanceRequest_msg_init, &field);
+}
 UPB_INLINE void grpc_lb_v1_LoadBalanceRequest_clear_initial_request(grpc_lb_v1_LoadBalanceRequest* msg) {
   const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
   upb_Message_ClearBaseField(UPB_UPCAST(msg), &field);
@@ -515,6 +519,10 @@ UPB_INLINE grpc_lb_v1_LoadBalanceResponse_load_balance_response_type_oneofcases
   return (grpc_lb_v1_LoadBalanceResponse_load_balance_response_type_oneofcases)upb_Message_WhichOneofFieldNumber(
       UPB_UPCAST(msg), &field);
 }
+UPB_INLINE void grpc_lb_v1_LoadBalanceResponse_clear_load_balance_response_type(grpc_lb_v1_LoadBalanceResponse* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Message_ClearOneof(UPB_UPCAST(msg), &grpc__lb__v1__LoadBalanceResponse_msg_init, &field);
+}
 UPB_INLINE void grpc_lb_v1_LoadBalanceResponse_clear_initial_response(grpc_lb_v1_LoadBalanceResponse* msg) {
   const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
   upb_Message_ClearBaseField(UPB_UPCAST(msg), &field);

data/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb.h

@@ -22,7 +22,6 @@ extern "C" {
 #endif
 
 typedef struct grpc_lookup_v1_RouteLookupRequest { upb_Message UPB_PRIVATE(base); } grpc_lookup_v1_RouteLookupRequest;
-typedef struct grpc_lookup_v1_RouteLookupRequest_KeyMapEntry { upb_Message UPB_PRIVATE(base); } grpc_lookup_v1_RouteLookupRequest_KeyMapEntry;
 typedef struct grpc_lookup_v1_RouteLookupResponse { upb_Message UPB_PRIVATE(base); } grpc_lookup_v1_RouteLookupResponse;
 
 typedef enum {
@@ -178,23 +177,6 @@ UPB_INLINE void grpc_lookup_v1_RouteLookupRequest_set_stale_header_data(grpc_loo
   upb_Message_SetBaseField((upb_Message *)msg, &field, &value);
 }
 
-/* grpc.lookup.v1.RouteLookupRequest.KeyMapEntry */
-
-UPB_INLINE upb_StringView grpc_lookup_v1_RouteLookupRequest_KeyMapEntry_key(const grpc_lookup_v1_RouteLookupRequest_KeyMapEntry* msg) {
-  upb_StringView ret;
-  _upb_msg_map_key(msg, &ret, 0);
-  return ret;
-}
-UPB_INLINE upb_StringView grpc_lookup_v1_RouteLookupRequest_KeyMapEntry_value(const grpc_lookup_v1_RouteLookupRequest_KeyMapEntry* msg) {
-  upb_StringView ret;
-  _upb_msg_map_value(msg, &ret, 0);
-  return ret;
-}
-
-UPB_INLINE void grpc_lookup_v1_RouteLookupRequest_KeyMapEntry_set_value(grpc_lookup_v1_RouteLookupRequest_KeyMapEntry *msg, upb_StringView value) {
-  _upb_msg_map_set_value(msg, &value, 0);
-}
-
 /* grpc.lookup.v1.RouteLookupResponse */
 
 UPB_INLINE grpc_lookup_v1_RouteLookupResponse* grpc_lookup_v1_RouteLookupResponse_new(upb_Arena* arena) {

data/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb.h

@@ -26,9 +26,7 @@ typedef struct grpc_lookup_v1_NameMatcher { upb_Message UPB_PRIVATE(base); } grp
 typedef struct grpc_lookup_v1_GrpcKeyBuilder { upb_Message UPB_PRIVATE(base); } grpc_lookup_v1_GrpcKeyBuilder;
 typedef struct grpc_lookup_v1_GrpcKeyBuilder_Name { upb_Message UPB_PRIVATE(base); } grpc_lookup_v1_GrpcKeyBuilder_Name;
 typedef struct grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys { upb_Message UPB_PRIVATE(base); } grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys;
-typedef struct grpc_lookup_v1_GrpcKeyBuilder_ConstantKeysEntry { upb_Message UPB_PRIVATE(base); } grpc_lookup_v1_GrpcKeyBuilder_ConstantKeysEntry;
 typedef struct grpc_lookup_v1_HttpKeyBuilder { upb_Message UPB_PRIVATE(base); } grpc_lookup_v1_HttpKeyBuilder;
-typedef struct grpc_lookup_v1_HttpKeyBuilder_ConstantKeysEntry { upb_Message UPB_PRIVATE(base); } grpc_lookup_v1_HttpKeyBuilder_ConstantKeysEntry;
 typedef struct grpc_lookup_v1_RouteLookupConfig { upb_Message UPB_PRIVATE(base); } grpc_lookup_v1_RouteLookupConfig;
 typedef struct grpc_lookup_v1_RouteLookupClusterSpecifier { upb_Message UPB_PRIVATE(base); } grpc_lookup_v1_RouteLookupClusterSpecifier;
 struct google_protobuf_Duration;
@@ -582,23 +580,6 @@ UPB_INLINE void grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys_set_method(grpc_lookup_v
   upb_Message_SetBaseField((upb_Message *)msg, &field, &value);
 }
 
-/* grpc.lookup.v1.GrpcKeyBuilder.ConstantKeysEntry */
-
-UPB_INLINE upb_StringView grpc_lookup_v1_GrpcKeyBuilder_ConstantKeysEntry_key(const grpc_lookup_v1_GrpcKeyBuilder_ConstantKeysEntry* msg) {
-  upb_StringView ret;
-  _upb_msg_map_key(msg, &ret, 0);
-  return ret;
-}
-UPB_INLINE upb_StringView grpc_lookup_v1_GrpcKeyBuilder_ConstantKeysEntry_value(const grpc_lookup_v1_GrpcKeyBuilder_ConstantKeysEntry* msg) {
-  upb_StringView ret;
-  _upb_msg_map_value(msg, &ret, 0);
-  return ret;
-}
-
-UPB_INLINE void grpc_lookup_v1_GrpcKeyBuilder_ConstantKeysEntry_set_value(grpc_lookup_v1_GrpcKeyBuilder_ConstantKeysEntry *msg, upb_StringView value) {
-  _upb_msg_map_set_value(msg, &value, 0);
-}
-
 /* grpc.lookup.v1.HttpKeyBuilder */
 
 UPB_INLINE grpc_lookup_v1_HttpKeyBuilder* grpc_lookup_v1_HttpKeyBuilder_new(upb_Arena* arena) {
@@ -950,23 +931,6 @@ UPB_INLINE bool grpc_lookup_v1_HttpKeyBuilder_constant_keys_delete(grpc_lookup_v
   return _upb_Map_Delete(map, &key, 0, NULL);
 }
 
-/* grpc.lookup.v1.HttpKeyBuilder.ConstantKeysEntry */
-
-UPB_INLINE upb_StringView grpc_lookup_v1_HttpKeyBuilder_ConstantKeysEntry_key(const grpc_lookup_v1_HttpKeyBuilder_ConstantKeysEntry* msg) {
-  upb_StringView ret;
-  _upb_msg_map_key(msg, &ret, 0);
-  return ret;
-}
-UPB_INLINE upb_StringView grpc_lookup_v1_HttpKeyBuilder_ConstantKeysEntry_value(const grpc_lookup_v1_HttpKeyBuilder_ConstantKeysEntry* msg) {
-  upb_StringView ret;
-  _upb_msg_map_value(msg, &ret, 0);
-  return ret;
-}
-
-UPB_INLINE void grpc_lookup_v1_HttpKeyBuilder_ConstantKeysEntry_set_value(grpc_lookup_v1_HttpKeyBuilder_ConstantKeysEntry *msg, upb_StringView value) {
-  _upb_msg_map_set_value(msg, &value, 0);
-}
-
 /* grpc.lookup.v1.RouteLookupConfig */
 
 UPB_INLINE grpc_lookup_v1_RouteLookupConfig* grpc_lookup_v1_RouteLookupConfig_new(upb_Arena* arena) {

data/src/core/ext/upb-gen/validate/validate.upb.h

@@ -126,6 +126,10 @@ UPB_INLINE validate_FieldRules_type_oneofcases validate_FieldRules_type_case(con
   return (validate_FieldRules_type_oneofcases)upb_Message_WhichOneofFieldNumber(
       UPB_UPCAST(msg), &field);
 }
+UPB_INLINE void validate_FieldRules_clear_type(validate_FieldRules* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Message_ClearOneof(UPB_UPCAST(msg), &validate__FieldRules_msg_init, &field);
+}
 UPB_INLINE void validate_FieldRules_clear_float(validate_FieldRules* msg) {
   const upb_MiniTableField field = {1, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
   upb_Message_ClearBaseField(UPB_UPCAST(msg), &field);
@@ -4236,6 +4240,10 @@ UPB_INLINE validate_StringRules_well_known_oneofcases validate_StringRules_well_
   return (validate_StringRules_well_known_oneofcases)upb_Message_WhichOneofFieldNumber(
       UPB_UPCAST(msg), &field);
 }
+UPB_INLINE void validate_StringRules_clear_well_known(validate_StringRules* msg) {
+  const upb_MiniTableField field = {12, UPB_SIZE(24, 16), UPB_SIZE(-21, -13), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  upb_Message_ClearOneof(UPB_UPCAST(msg), &validate__StringRules_msg_init, &field);
+}
 UPB_INLINE void validate_StringRules_clear_const(validate_StringRules* msg) {
   const upb_MiniTableField field = {1, UPB_SIZE(28, 24), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
   upb_Message_ClearBaseField(UPB_UPCAST(msg), &field);
@@ -4885,6 +4893,10 @@ UPB_INLINE validate_BytesRules_well_known_oneofcases validate_BytesRules_well_kn
   return (validate_BytesRules_well_known_oneofcases)upb_Message_WhichOneofFieldNumber(
       UPB_UPCAST(msg), &field);
 }
+UPB_INLINE void validate_BytesRules_clear_well_known(validate_BytesRules* msg) {
+  const upb_MiniTableField field = {10, 11, UPB_SIZE(-21, -13), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  upb_Message_ClearOneof(UPB_UPCAST(msg), &validate__BytesRules_msg_init, &field);
+}
 UPB_INLINE void validate_BytesRules_clear_const(validate_BytesRules* msg) {
   const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
   upb_Message_ClearBaseField(UPB_UPCAST(msg), &field);

data/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb.h

@@ -78,6 +78,10 @@ UPB_INLINE xds_core_v3_CollectionEntry_resource_specifier_oneofcases xds_core_v3
   return (xds_core_v3_CollectionEntry_resource_specifier_oneofcases)upb_Message_WhichOneofFieldNumber(
       UPB_UPCAST(msg), &field);
 }
+UPB_INLINE void xds_core_v3_CollectionEntry_clear_resource_specifier(xds_core_v3_CollectionEntry* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Message_ClearOneof(UPB_UPCAST(msg), &xds__core__v3__CollectionEntry_msg_init, &field);
+}
 UPB_INLINE void xds_core_v3_CollectionEntry_clear_locator(xds_core_v3_CollectionEntry* msg) {
   const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
   upb_Message_ClearBaseField(UPB_UPCAST(msg), &field);

data/src/core/ext/upb-gen/xds/core/v3/context_params.upb.h

@@ -23,7 +23,6 @@ extern "C" {
 #endif
 
 typedef struct xds_core_v3_ContextParams { upb_Message UPB_PRIVATE(base); } xds_core_v3_ContextParams;
-typedef struct xds_core_v3_ContextParams_ParamsEntry { upb_Message UPB_PRIVATE(base); } xds_core_v3_ContextParams_ParamsEntry;
 
 
 
@@ -124,23 +123,6 @@ UPB_INLINE bool xds_core_v3_ContextParams_params_delete(xds_core_v3_ContextParam
   return _upb_Map_Delete(map, &key, 0, NULL);
 }
 
-/* xds.core.v3.ContextParams.ParamsEntry */
-
-UPB_INLINE upb_StringView xds_core_v3_ContextParams_ParamsEntry_key(const xds_core_v3_ContextParams_ParamsEntry* msg) {
-  upb_StringView ret;
-  _upb_msg_map_key(msg, &ret, 0);
-  return ret;
-}
-UPB_INLINE upb_StringView xds_core_v3_ContextParams_ParamsEntry_value(const xds_core_v3_ContextParams_ParamsEntry* msg) {
-  upb_StringView ret;
-  _upb_msg_map_value(msg, &ret, 0);
-  return ret;
-}
-
-UPB_INLINE void xds_core_v3_ContextParams_ParamsEntry_set_value(xds_core_v3_ContextParams_ParamsEntry *msg, upb_StringView value) {
-  _upb_msg_map_set_value(msg, &value, 0);
-}
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif

data/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb.h

@@ -81,6 +81,10 @@ UPB_INLINE xds_core_v3_ResourceLocator_context_param_specifier_oneofcases xds_co
   return (xds_core_v3_ResourceLocator_context_param_specifier_oneofcases)upb_Message_WhichOneofFieldNumber(
       UPB_UPCAST(msg), &field);
 }
+UPB_INLINE void xds_core_v3_ResourceLocator_clear_context_param_specifier(xds_core_v3_ResourceLocator* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(20, 72), UPB_SIZE(-17, -13), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Message_ClearOneof(UPB_UPCAST(msg), &xds__core__v3__ResourceLocator_msg_init, &field);
+}
 UPB_INLINE void xds_core_v3_ResourceLocator_clear_scheme(xds_core_v3_ResourceLocator* msg) {
   const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
   upb_Message_ClearBaseField(UPB_UPCAST(msg), &field);
@@ -290,6 +294,10 @@ UPB_INLINE xds_core_v3_ResourceLocator_Directive_directive_oneofcases xds_core_v
   return (xds_core_v3_ResourceLocator_Directive_directive_oneofcases)upb_Message_WhichOneofFieldNumber(
       UPB_UPCAST(msg), &field);
 }
+UPB_INLINE void xds_core_v3_ResourceLocator_Directive_clear_directive(xds_core_v3_ResourceLocator_Directive* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Message_ClearOneof(UPB_UPCAST(msg), &xds__core__v3__ResourceLocator__Directive_msg_init, &field);
+}
 UPB_INLINE void xds_core_v3_ResourceLocator_Directive_clear_alt(xds_core_v3_ResourceLocator_Directive* msg) {
   const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
   upb_Message_ClearBaseField(UPB_UPCAST(msg), &field);

data/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb.h

@@ -23,9 +23,6 @@ extern "C" {
 #endif
 
 typedef struct xds_data_orca_v3_OrcaLoadReport { upb_Message UPB_PRIVATE(base); } xds_data_orca_v3_OrcaLoadReport;
-typedef struct xds_data_orca_v3_OrcaLoadReport_RequestCostEntry { upb_Message UPB_PRIVATE(base); } xds_data_orca_v3_OrcaLoadReport_RequestCostEntry;
-typedef struct xds_data_orca_v3_OrcaLoadReport_UtilizationEntry { upb_Message UPB_PRIVATE(base); } xds_data_orca_v3_OrcaLoadReport_UtilizationEntry;
-typedef struct xds_data_orca_v3_OrcaLoadReport_NamedMetricsEntry { upb_Message UPB_PRIVATE(base); } xds_data_orca_v3_OrcaLoadReport_NamedMetricsEntry;
 
 
 
@@ -340,57 +337,6 @@ UPB_INLINE void xds_data_orca_v3_OrcaLoadReport_set_application_utilization(xds_
   upb_Message_SetBaseField((upb_Message *)msg, &field, &value);
 }
 
-/* xds.data.orca.v3.OrcaLoadReport.RequestCostEntry */
-
-UPB_INLINE upb_StringView xds_data_orca_v3_OrcaLoadReport_RequestCostEntry_key(const xds_data_orca_v3_OrcaLoadReport_RequestCostEntry* msg) {
-  upb_StringView ret;
-  _upb_msg_map_key(msg, &ret, 0);
-  return ret;
-}
-UPB_INLINE double xds_data_orca_v3_OrcaLoadReport_RequestCostEntry_value(const xds_data_orca_v3_OrcaLoadReport_RequestCostEntry* msg) {
-  double ret;
-  _upb_msg_map_value(msg, &ret, sizeof(ret));
-  return ret;
-}
-
-UPB_INLINE void xds_data_orca_v3_OrcaLoadReport_RequestCostEntry_set_value(xds_data_orca_v3_OrcaLoadReport_RequestCostEntry *msg, double value) {
-  _upb_msg_map_set_value(msg, &value, sizeof(double));
-}
-
-/* xds.data.orca.v3.OrcaLoadReport.UtilizationEntry */
-
-UPB_INLINE upb_StringView xds_data_orca_v3_OrcaLoadReport_UtilizationEntry_key(const xds_data_orca_v3_OrcaLoadReport_UtilizationEntry* msg) {
-  upb_StringView ret;
-  _upb_msg_map_key(msg, &ret, 0);
-  return ret;
-}
-UPB_INLINE double xds_data_orca_v3_OrcaLoadReport_UtilizationEntry_value(const xds_data_orca_v3_OrcaLoadReport_UtilizationEntry* msg) {
-  double ret;
-  _upb_msg_map_value(msg, &ret, sizeof(ret));
-  return ret;
-}
-
-UPB_INLINE void xds_data_orca_v3_OrcaLoadReport_UtilizationEntry_set_value(xds_data_orca_v3_OrcaLoadReport_UtilizationEntry *msg, double value) {
-  _upb_msg_map_set_value(msg, &value, sizeof(double));
-}
-
-/* xds.data.orca.v3.OrcaLoadReport.NamedMetricsEntry */
-
-UPB_INLINE upb_StringView xds_data_orca_v3_OrcaLoadReport_NamedMetricsEntry_key(const xds_data_orca_v3_OrcaLoadReport_NamedMetricsEntry* msg) {
-  upb_StringView ret;
-  _upb_msg_map_key(msg, &ret, 0);
-  return ret;
-}
-UPB_INLINE double xds_data_orca_v3_OrcaLoadReport_NamedMetricsEntry_value(const xds_data_orca_v3_OrcaLoadReport_NamedMetricsEntry* msg) {
-  double ret;
-  _upb_msg_map_value(msg, &ret, sizeof(ret));
-  return ret;
-}
-
-UPB_INLINE void xds_data_orca_v3_OrcaLoadReport_NamedMetricsEntry_set_value(xds_data_orca_v3_OrcaLoadReport_NamedMetricsEntry *msg, double value) {
-  _upb_msg_map_set_value(msg, &value, sizeof(double));
-}
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif