grpc 1.68.1 → 1.69.0.pre1

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

@@ -17,7 +17,7 @@
 #include "upb/port/def.inc"
 
 extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal xds_core_v3_ResourceLocator_submsgs[2] = {
+static const upb_MiniTableSubInternal xds_core_v3_ResourceLocator__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &xds__core__v3__ContextParams_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &xds__core__v3__ResourceLocator__Directive_msg_init_ptr},
 };
@@ -32,7 +32,7 @@ static const upb_MiniTableField xds_core_v3_ResourceLocator__fields[6] = {
 };
 
 const upb_MiniTable xds__core__v3__ResourceLocator_msg_init = {
-  &xds_core_v3_ResourceLocator_submsgs[0],
+  &xds_core_v3_ResourceLocator__submsgs[0],
   &xds_core_v3_ResourceLocator__fields[0],
   UPB_SIZE(48, 80), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -51,7 +51,7 @@ const upb_MiniTable xds__core__v3__ResourceLocator_msg_init = {
 };
 
 const upb_MiniTable* xds__core__v3__ResourceLocator_msg_init_ptr = &xds__core__v3__ResourceLocator_msg_init;
-static const upb_MiniTableSubInternal xds_core_v3_ResourceLocator_Directive_submsgs[1] = {
+static const upb_MiniTableSubInternal xds_core_v3_ResourceLocator_Directive__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &xds__core__v3__ResourceLocator_msg_init_ptr},
 };
 
@@ -61,7 +61,7 @@ static const upb_MiniTableField xds_core_v3_ResourceLocator_Directive__fields[2]
 };
 
 const upb_MiniTable xds__core__v3__ResourceLocator__Directive_msg_init = {
-  &xds_core_v3_ResourceLocator_Directive_submsgs[0],
+  &xds_core_v3_ResourceLocator_Directive__submsgs[0],
   &xds_core_v3_ResourceLocator_Directive__fields[0],
   UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_MINITABLE_H_
-#define XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_MINITABLE_H_
+#ifndef XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_H__UPB_MINITABLE_H_
+#define XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_H__UPB_MINITABLE_H_
 
 #include "upb/generated_code_support.h"
 
@@ -31,4 +31,4 @@ extern const upb_MiniTableFile xds_core_v3_resource_locator_proto_upb_file_layou
 
 #include "upb/port/undef.inc"
 
-#endif  /* XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_MINITABLE_H_ */
+#endif  /* XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_H__UPB_MINITABLE_H_ */

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_H_
-#define XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_H_
+#ifndef XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_H__UPB_H_
+#define XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -151,4 +151,4 @@ UPB_INLINE struct xds_core_v3_ContextParams* xds_core_v3_ResourceName_mutable_co
 
 #include "upb/port/undef.inc"
 
-#endif  /* XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_H_ */
+#endif  /* XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_H__UPB_H_ */

data/src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.c

@@ -17,7 +17,7 @@
 #include "upb/port/def.inc"
 
 extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal xds_core_v3_ResourceName_submsgs[1] = {
+static const upb_MiniTableSubInternal xds_core_v3_ResourceName__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &xds__core__v3__ContextParams_msg_init_ptr},
 };
 
@@ -29,7 +29,7 @@ static const upb_MiniTableField xds_core_v3_ResourceName__fields[4] = {
 };
 
 const upb_MiniTable xds__core__v3__ResourceName_msg_init = {
-  &xds_core_v3_ResourceName_submsgs[0],
+  &xds_core_v3_ResourceName__submsgs[0],
   &xds_core_v3_ResourceName__fields[0],
   UPB_SIZE(40, 72), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_MINITABLE_H_
-#define XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_MINITABLE_H_
+#ifndef XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_H__UPB_MINITABLE_H_
+#define XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_H__UPB_MINITABLE_H_
 
 #include "upb/generated_code_support.h"
 
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile xds_core_v3_resource_name_proto_upb_file_layout;
 
 #include "upb/port/undef.inc"
 
-#endif  /* XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_MINITABLE_H_ */
+#endif  /* XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_H__UPB_MINITABLE_H_ */

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef XDS_DATA_ORCA_V3_ORCA_LOAD_REPORT_PROTO_UPB_H_
-#define XDS_DATA_ORCA_V3_ORCA_LOAD_REPORT_PROTO_UPB_H_
+#ifndef XDS_DATA_ORCA_V3_ORCA_LOAD_REPORT_PROTO_UPB_H__UPB_H_
+#define XDS_DATA_ORCA_V3_ORCA_LOAD_REPORT_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -400,4 +400,4 @@ UPB_INLINE void xds_data_orca_v3_OrcaLoadReport_NamedMetricsEntry_set_value(xds_
 
 #include "upb/port/undef.inc"
 
-#endif  /* XDS_DATA_ORCA_V3_ORCA_LOAD_REPORT_PROTO_UPB_H_ */
+#endif  /* XDS_DATA_ORCA_V3_ORCA_LOAD_REPORT_PROTO_UPB_H__UPB_H_ */

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

@@ -15,7 +15,7 @@
 #include "upb/port/def.inc"
 
 extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal xds_data_orca_v3_OrcaLoadReport_submsgs[3] = {
+static const upb_MiniTableSubInternal xds_data_orca_v3_OrcaLoadReport__submsgs[3] = {
   {.UPB_PRIVATE(submsg) = &xds__data__orca__v3__OrcaLoadReport__RequestCostEntry_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &xds__data__orca__v3__OrcaLoadReport__UtilizationEntry_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &xds__data__orca__v3__OrcaLoadReport__NamedMetricsEntry_msg_init_ptr},
@@ -34,7 +34,7 @@ static const upb_MiniTableField xds_data_orca_v3_OrcaLoadReport__fields[9] = {
 };
 
 const upb_MiniTable xds__data__orca__v3__OrcaLoadReport_msg_init = {
-  &xds_data_orca_v3_OrcaLoadReport_submsgs[0],
+  &xds_data_orca_v3_OrcaLoadReport__submsgs[0],
   &xds_data_orca_v3_OrcaLoadReport__fields[0],
   UPB_SIZE(72, 80), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0,
 #ifdef UPB_TRACING_ENABLED

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef XDS_DATA_ORCA_V3_ORCA_LOAD_REPORT_PROTO_UPB_MINITABLE_H_
-#define XDS_DATA_ORCA_V3_ORCA_LOAD_REPORT_PROTO_UPB_MINITABLE_H_
+#ifndef XDS_DATA_ORCA_V3_ORCA_LOAD_REPORT_PROTO_UPB_H__UPB_MINITABLE_H_
+#define XDS_DATA_ORCA_V3_ORCA_LOAD_REPORT_PROTO_UPB_H__UPB_MINITABLE_H_
 
 #include "upb/generated_code_support.h"
 
@@ -35,4 +35,4 @@ extern const upb_MiniTableFile xds_data_orca_v3_orca_load_report_proto_upb_file_
 
 #include "upb/port/undef.inc"
 
-#endif  /* XDS_DATA_ORCA_V3_ORCA_LOAD_REPORT_PROTO_UPB_MINITABLE_H_ */
+#endif  /* XDS_DATA_ORCA_V3_ORCA_LOAD_REPORT_PROTO_UPB_H__UPB_MINITABLE_H_ */

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef XDS_SERVICE_ORCA_V3_ORCA_PROTO_UPB_H_
-#define XDS_SERVICE_ORCA_V3_ORCA_PROTO_UPB_H_
+#ifndef XDS_SERVICE_ORCA_V3_ORCA_PROTO_UPB_H__UPB_H_
+#define XDS_SERVICE_ORCA_V3_ORCA_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -162,4 +162,4 @@ UPB_INLINE bool xds_service_orca_v3_OrcaLoadReportRequest_add_request_cost_names
 
 #include "upb/port/undef.inc"
 
-#endif  /* XDS_SERVICE_ORCA_V3_ORCA_PROTO_UPB_H_ */
+#endif  /* XDS_SERVICE_ORCA_V3_ORCA_PROTO_UPB_H__UPB_H_ */

data/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.c

@@ -16,7 +16,7 @@
 #include "upb/port/def.inc"
 
 extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal xds_service_orca_v3_OrcaLoadReportRequest_submsgs[1] = {
+static const upb_MiniTableSubInternal xds_service_orca_v3_OrcaLoadReportRequest__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
 };
 
@@ -26,7 +26,7 @@ static const upb_MiniTableField xds_service_orca_v3_OrcaLoadReportRequest__field
 };
 
 const upb_MiniTable xds__service__orca__v3__OrcaLoadReportRequest_msg_init = {
-  &xds_service_orca_v3_OrcaLoadReportRequest_submsgs[0],
+  &xds_service_orca_v3_OrcaLoadReportRequest__submsgs[0],
   &xds_service_orca_v3_OrcaLoadReportRequest__fields[0],
   UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef XDS_SERVICE_ORCA_V3_ORCA_PROTO_UPB_MINITABLE_H_
-#define XDS_SERVICE_ORCA_V3_ORCA_PROTO_UPB_MINITABLE_H_
+#ifndef XDS_SERVICE_ORCA_V3_ORCA_PROTO_UPB_H__UPB_MINITABLE_H_
+#define XDS_SERVICE_ORCA_V3_ORCA_PROTO_UPB_H__UPB_MINITABLE_H_
 
 #include "upb/generated_code_support.h"
 
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile xds_service_orca_v3_orca_proto_upb_file_layout;
 
 #include "upb/port/undef.inc"
 
-#endif  /* XDS_SERVICE_ORCA_V3_ORCA_PROTO_UPB_MINITABLE_H_ */
+#endif  /* XDS_SERVICE_ORCA_V3_ORCA_PROTO_UPB_H__UPB_MINITABLE_H_ */

data/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb.h

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_H_
-#define XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_H_
+#ifndef XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_H__UPB_H_
+#define XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -119,4 +119,4 @@ UPB_INLINE void xds_type_matcher_v3_CelMatcher_set_description(xds_type_matcher_
 
 #include "upb/port/undef.inc"
 
-#endif  /* XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_H_ */
+#endif  /* XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_H__UPB_H_ */

data/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.c

@@ -17,7 +17,7 @@
 #include "upb/port/def.inc"
 
 extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal xds_type_matcher_v3_CelMatcher_submsgs[1] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_CelMatcher__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &xds__type__v3__CelExpression_msg_init_ptr},
 };
 
@@ -27,7 +27,7 @@ static const upb_MiniTableField xds_type_matcher_v3_CelMatcher__fields[2] = {
 };
 
 const upb_MiniTable xds__type__matcher__v3__CelMatcher_msg_init = {
-  &xds_type_matcher_v3_CelMatcher_submsgs[0],
+  &xds_type_matcher_v3_CelMatcher__submsgs[0],
   &xds_type_matcher_v3_CelMatcher__fields[0],
   UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED

data/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.h

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_MINITABLE_H_
-#define XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_MINITABLE_H_
+#ifndef XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_H__UPB_MINITABLE_H_
+#define XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_H__UPB_MINITABLE_H_
 
 #include "upb/generated_code_support.h"
 
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile xds_type_matcher_v3_cel_proto_upb_file_layout;
 
 #include "upb/port/undef.inc"
 
-#endif  /* XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_MINITABLE_H_ */
+#endif  /* XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_H__UPB_MINITABLE_H_ */

data/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb.h

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_H_
-#define XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_H_
+#ifndef XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_H__UPB_H_
+#define XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -269,4 +269,4 @@ UPB_INLINE struct xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_Serve
 
 #include "upb/port/undef.inc"
 
-#endif  /* XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_H_ */
+#endif  /* XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_H__UPB_H_ */

data/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.c

@@ -17,7 +17,7 @@
 #include "upb/port/def.inc"
 
 extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal xds_type_matcher_v3_ServerNameMatcher_submsgs[1] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_ServerNameMatcher__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__ServerNameMatcher__DomainMatcher_msg_init_ptr},
 };
 
@@ -26,7 +26,7 @@ static const upb_MiniTableField xds_type_matcher_v3_ServerNameMatcher__fields[1]
 };
 
 const upb_MiniTable xds__type__matcher__v3__ServerNameMatcher_msg_init = {
-  &xds_type_matcher_v3_ServerNameMatcher_submsgs[0],
+  &xds_type_matcher_v3_ServerNameMatcher__submsgs[0],
   &xds_type_matcher_v3_ServerNameMatcher__fields[0],
   16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -39,7 +39,7 @@ const upb_MiniTable xds__type__matcher__v3__ServerNameMatcher_msg_init = {
 };
 
 const upb_MiniTable* xds__type__matcher__v3__ServerNameMatcher_msg_init_ptr = &xds__type__matcher__v3__ServerNameMatcher_msg_init;
-static const upb_MiniTableSubInternal xds_type_matcher_v3_ServerNameMatcher_DomainMatcher_submsgs[1] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_ServerNameMatcher_DomainMatcher__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__OnMatch_msg_init_ptr},
 };
 
@@ -49,7 +49,7 @@ static const upb_MiniTableField xds_type_matcher_v3_ServerNameMatcher_DomainMatc
 };
 
 const upb_MiniTable xds__type__matcher__v3__ServerNameMatcher__DomainMatcher_msg_init = {
-  &xds_type_matcher_v3_ServerNameMatcher_DomainMatcher_submsgs[0],
+  &xds_type_matcher_v3_ServerNameMatcher_DomainMatcher__submsgs[0],
   &xds_type_matcher_v3_ServerNameMatcher_DomainMatcher__fields[0],
   UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
 #ifdef UPB_TRACING_ENABLED

data/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.h

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_MINITABLE_H_
-#define XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_MINITABLE_H_
+#ifndef XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_H__UPB_MINITABLE_H_
+#define XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_H__UPB_MINITABLE_H_
 
 #include "upb/generated_code_support.h"
 
@@ -31,4 +31,4 @@ extern const upb_MiniTableFile xds_type_matcher_v3_domain_proto_upb_file_layout;
 
 #include "upb/port/undef.inc"
 
-#endif  /* XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_MINITABLE_H_ */
+#endif  /* XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_H__UPB_MINITABLE_H_ */

data/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb.h

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H_
-#define XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H_
+#ifndef XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H__UPB_H_
+#define XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -70,4 +70,4 @@ UPB_INLINE char* xds_type_matcher_v3_HttpAttributesCelMatchInput_serialize_ex(co
 
 #include "upb/port/undef.inc"
 
-#endif  /* XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H_ */
+#endif  /* XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H__UPB_H_ */

data/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.h

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_MINITABLE_H_
-#define XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_MINITABLE_H_
+#ifndef XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H__UPB_MINITABLE_H_
+#define XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H__UPB_MINITABLE_H_
 
 #include "upb/generated_code_support.h"
 
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile xds_type_matcher_v3_http_inputs_proto_upb_file_la
 
 #include "upb/port/undef.inc"
 
-#endif  /* XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_MINITABLE_H_ */
+#endif  /* XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H__UPB_MINITABLE_H_ */

data/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb.h

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_H_
-#define XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_H_
+#ifndef XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_H__UPB_H_
+#define XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -294,4 +294,4 @@ UPB_INLINE void xds_type_matcher_v3_IPMatcher_IPRangeMatcher_set_exclusive(xds_t
 
 #include "upb/port/undef.inc"
 
-#endif  /* XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_H_ */
+#endif  /* XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_H__UPB_H_ */

data/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.c

@@ -18,7 +18,7 @@
 #include "upb/port/def.inc"
 
 extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal xds_type_matcher_v3_IPMatcher_submsgs[1] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_IPMatcher__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__IPMatcher__IPRangeMatcher_msg_init_ptr},
 };
 
@@ -27,7 +27,7 @@ static const upb_MiniTableField xds_type_matcher_v3_IPMatcher__fields[1] = {
 };
 
 const upb_MiniTable xds__type__matcher__v3__IPMatcher_msg_init = {
-  &xds_type_matcher_v3_IPMatcher_submsgs[0],
+  &xds_type_matcher_v3_IPMatcher__submsgs[0],
   &xds_type_matcher_v3_IPMatcher__fields[0],
   16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -40,7 +40,7 @@ const upb_MiniTable xds__type__matcher__v3__IPMatcher_msg_init = {
 };
 
 const upb_MiniTable* xds__type__matcher__v3__IPMatcher_msg_init_ptr = &xds__type__matcher__v3__IPMatcher_msg_init;
-static const upb_MiniTableSubInternal xds_type_matcher_v3_IPMatcher_IPRangeMatcher_submsgs[2] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_IPMatcher_IPRangeMatcher__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &xds__core__v3__CidrRange_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__OnMatch_msg_init_ptr},
 };
@@ -52,7 +52,7 @@ static const upb_MiniTableField xds_type_matcher_v3_IPMatcher_IPRangeMatcher__fi
 };
 
 const upb_MiniTable xds__type__matcher__v3__IPMatcher__IPRangeMatcher_msg_init = {
-  &xds_type_matcher_v3_IPMatcher_IPRangeMatcher_submsgs[0],
+  &xds_type_matcher_v3_IPMatcher_IPRangeMatcher__submsgs[0],
   &xds_type_matcher_v3_IPMatcher_IPRangeMatcher__fields[0],
   UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED

data/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.h

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_MINITABLE_H_
-#define XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_MINITABLE_H_
+#ifndef XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_H__UPB_MINITABLE_H_
+#define XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_H__UPB_MINITABLE_H_
 
 #include "upb/generated_code_support.h"
 
@@ -31,4 +31,4 @@ extern const upb_MiniTableFile xds_type_matcher_v3_ip_proto_upb_file_layout;
 
 #include "upb/port/undef.inc"
 
-#endif  /* XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_MINITABLE_H_ */
+#endif  /* XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_H__UPB_MINITABLE_H_ */

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_H_
-#define XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_H_
+#ifndef XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_H__UPB_H_
+#define XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -1202,4 +1202,4 @@ UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_set_va
 
 #include "upb/port/undef.inc"
 
-#endif  /* XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_H_ */
+#endif  /* XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_H__UPB_H_ */

data/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.c

@@ -18,7 +18,7 @@
 #include "upb/port/def.inc"
 
 extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_submsgs[3] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher__submsgs[3] = {
   {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherList_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherTree_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__OnMatch_msg_init_ptr},
@@ -31,7 +31,7 @@ static const upb_MiniTableField xds_type_matcher_v3_Matcher__fields[3] = {
 };
 
 const upb_MiniTable xds__type__matcher__v3__Matcher_msg_init = {
-  &xds_type_matcher_v3_Matcher_submsgs[0],
+  &xds_type_matcher_v3_Matcher__submsgs[0],
   &xds_type_matcher_v3_Matcher__fields[0],
   UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -46,7 +46,7 @@ const upb_MiniTable xds__type__matcher__v3__Matcher_msg_init = {
 };
 
 const upb_MiniTable* xds__type__matcher__v3__Matcher_msg_init_ptr = &xds__type__matcher__v3__Matcher_msg_init;
-static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_OnMatch_submsgs[2] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_OnMatch__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &xds__core__v3__TypedExtensionConfig_msg_init_ptr},
 };
@@ -57,7 +57,7 @@ static const upb_MiniTableField xds_type_matcher_v3_Matcher_OnMatch__fields[2] =
 };
 
 const upb_MiniTable xds__type__matcher__v3__Matcher__OnMatch_msg_init = {
-  &xds_type_matcher_v3_Matcher_OnMatch_submsgs[0],
+  &xds_type_matcher_v3_Matcher_OnMatch__submsgs[0],
   &xds_type_matcher_v3_Matcher_OnMatch__fields[0],
   UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -72,7 +72,7 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__OnMatch_msg_init = {
 };
 
 const upb_MiniTable* xds__type__matcher__v3__Matcher__OnMatch_msg_init_ptr = &xds__type__matcher__v3__Matcher__OnMatch_msg_init;
-static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherList_submsgs[1] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherList__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init_ptr},
 };
 
@@ -81,7 +81,7 @@ static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherList__fields[
 };
 
 const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList_msg_init = {
-  &xds_type_matcher_v3_Matcher_MatcherList_submsgs[0],
+  &xds_type_matcher_v3_Matcher_MatcherList__submsgs[0],
   &xds_type_matcher_v3_Matcher_MatcherList__fields[0],
   16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -94,7 +94,7 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList_msg_init = {
 };
 
 const upb_MiniTable* xds__type__matcher__v3__Matcher__MatcherList_msg_init_ptr = &xds__type__matcher__v3__Matcher__MatcherList_msg_init;
-static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherList_Predicate_submsgs[4] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherList_Predicate__submsgs[4] = {
   {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init_ptr},
@@ -109,7 +109,7 @@ static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherList_Predicat
 };
 
 const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init = {
-  &xds_type_matcher_v3_Matcher_MatcherList_Predicate_submsgs[0],
+  &xds_type_matcher_v3_Matcher_MatcherList_Predicate__submsgs[0],
   &xds_type_matcher_v3_Matcher_MatcherList_Predicate__fields[0],
   UPB_SIZE(16, 24), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -128,7 +128,7 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_
 };
 
 const upb_MiniTable* xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init_ptr = &xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init;
-static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_submsgs[3] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate__submsgs[3] = {
   {.UPB_PRIVATE(submsg) = &xds__core__v3__TypedExtensionConfig_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__StringMatcher_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &xds__core__v3__TypedExtensionConfig_msg_init_ptr},
@@ -141,7 +141,7 @@ static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherList_Predicat
 };
 
 const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init = {
-  &xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_submsgs[0],
+  &xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate__submsgs[0],
   &xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate__fields[0],
   UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -156,7 +156,7 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__Predicate__Sin
 };
 
 const upb_MiniTable* xds__type__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init_ptr = &xds__type__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init;
-static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_submsgs[1] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init_ptr},
 };
 
@@ -165,7 +165,7 @@ static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherList_Predicat
 };
 
 const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init = {
-  &xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_submsgs[0],
+  &xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList__submsgs[0],
   &xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList__fields[0],
   16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -178,7 +178,7 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__Predicate__Pre
 };
 
 const upb_MiniTable* xds__type__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init_ptr = &xds__type__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init;
-static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_submsgs[2] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__OnMatch_msg_init_ptr},
 };
@@ -189,7 +189,7 @@ static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherList_FieldMat
 };
 
 const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init = {
-  &xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_submsgs[0],
+  &xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher__submsgs[0],
   &xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher__fields[0],
   UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -198,7 +198,7 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__FieldMatcher_m
 };
 
 const upb_MiniTable* xds__type__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init_ptr = &xds__type__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init;
-static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherTree_submsgs[4] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherTree__submsgs[4] = {
   {.UPB_PRIVATE(submsg) = &xds__core__v3__TypedExtensionConfig_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init_ptr},
@@ -213,7 +213,7 @@ static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherTree__fields[
 };
 
 const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherTree_msg_init = {
-  &xds_type_matcher_v3_Matcher_MatcherTree_submsgs[0],
+  &xds_type_matcher_v3_Matcher_MatcherTree__submsgs[0],
   &xds_type_matcher_v3_Matcher_MatcherTree__fields[0],
   UPB_SIZE(24, 32), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -232,7 +232,7 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherTree_msg_init = {
 };
 
 const upb_MiniTable* xds__type__matcher__v3__Matcher__MatcherTree_msg_init_ptr = &xds__type__matcher__v3__Matcher__MatcherTree_msg_init;
-static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_submsgs[1] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherTree_MatchMap__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init_ptr},
 };
 
@@ -241,7 +241,7 @@ static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherTree_MatchMap
 };
 
 const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init = {
-  &xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_submsgs[0],
+  &xds_type_matcher_v3_Matcher_MatcherTree_MatchMap__submsgs[0],
   &xds_type_matcher_v3_Matcher_MatcherTree_MatchMap__fields[0],
   16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -250,7 +250,7 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherTree__MatchMap_msg_i
 };
 
 const upb_MiniTable* xds__type__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init_ptr = &xds__type__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init;
-static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_submsgs[1] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__OnMatch_msg_init_ptr},
 };
 
@@ -260,7 +260,7 @@ static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherTree_MatchMap
 };
 
 const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init = {
-  &xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_submsgs[0],
+  &xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry__submsgs[0],
   &xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry__fields[0],
   48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
 #ifdef UPB_TRACING_ENABLED