From 80beea4920cd7469782e78c2695187798a8c3cdc Mon Sep 17 00:00:00 2001 From: Eric Salo Date: Mon, 4 Dec 2023 09:36:25 -0800 Subject: [PATCH] Update "upb::SymbolTable" to "upb::DefPool" The old name has been deprecated for a while so this should be safe. Also update variable names accordingly. --- src/core/ext/xds/xds_api.cc | 35 ++++++++++++------- src/core/ext/xds/xds_api.h | 4 +-- src/core/ext/xds/xds_client.cc | 6 ++-- src/core/ext/xds/xds_client.h | 2 +- .../xds/xds_audit_logger_registry_test.cc | 8 ++--- test/core/xds/xds_lb_policy_registry_test.cc | 8 ++--- 6 files changed, 36 insertions(+), 27 deletions(-) diff --git a/src/core/ext/xds/xds_api.cc b/src/core/ext/xds/xds_api.cc index 8b77e30ed79..b23c446401f 100644 --- a/src/core/ext/xds/xds_api.cc +++ b/src/core/ext/xds/xds_api.cc @@ -57,12 +57,12 @@ namespace grpc_core { XdsApi::XdsApi(XdsClient* client, TraceFlag* tracer, - const XdsBootstrap::Node* node, upb::SymbolTable* symtab, + const XdsBootstrap::Node* node, upb::DefPool* def_pool, std::string user_agent_name, std::string user_agent_version) : client_(client), tracer_(tracer), node_(node), - symtab_(symtab), + def_pool_(def_pool), user_agent_name_(std::move(user_agent_name)), user_agent_version_(std::move(user_agent_version)) {} @@ -71,7 +71,7 @@ namespace { struct XdsApiContext { XdsClient* client; TraceFlag* tracer; - upb_DefPool* symtab; + upb_DefPool* def_pool; upb_Arena* arena; }; @@ -183,7 +183,7 @@ void MaybeLogDiscoveryRequest( if (GRPC_TRACE_FLAG_ENABLED(*context.tracer) && gpr_should_log(GPR_LOG_SEVERITY_DEBUG)) { const upb_MessageDef* msg_type = - envoy_service_discovery_v3_DiscoveryRequest_getmsgdef(context.symtab); + envoy_service_discovery_v3_DiscoveryRequest_getmsgdef(context.def_pool); char buf[10240]; upb_TextEncode(request, msg_type, nullptr, 0, buf, sizeof(buf)); gpr_log(GPR_DEBUG, "[xds_client %p] constructed ADS request: %s", @@ -207,7 +207,8 @@ std::string XdsApi::CreateAdsRequest( absl::string_view nonce, const std::vector& resource_names, absl::Status status, bool populate_node) { upb::Arena arena; - const XdsApiContext context = {client_, tracer_, symtab_->ptr(), arena.ptr()}; + const XdsApiContext context = {client_, tracer_, def_pool_->ptr(), + arena.ptr()}; // Create a request. envoy_service_discovery_v3_DiscoveryRequest* request = envoy_service_discovery_v3_DiscoveryRequest_new(arena.ptr()); @@ -270,7 +271,8 @@ void MaybeLogDiscoveryResponse( if (GRPC_TRACE_FLAG_ENABLED(*context.tracer) && gpr_should_log(GPR_LOG_SEVERITY_DEBUG)) { const upb_MessageDef* msg_type = - envoy_service_discovery_v3_DiscoveryResponse_getmsgdef(context.symtab); + envoy_service_discovery_v3_DiscoveryResponse_getmsgdef( + context.def_pool); char buf[10240]; upb_TextEncode(response, msg_type, nullptr, 0, buf, sizeof(buf)); gpr_log(GPR_DEBUG, "[xds_client %p] received response: %s", context.client, @@ -283,7 +285,8 @@ void MaybeLogDiscoveryResponse( absl::Status XdsApi::ParseAdsResponse(absl::string_view encoded_response, AdsResponseParserInterface* parser) { upb::Arena arena; - const XdsApiContext context = {client_, tracer_, symtab_->ptr(), arena.ptr()}; + const XdsApiContext context = {client_, tracer_, def_pool_->ptr(), + arena.ptr()}; // Decode the response. const envoy_service_discovery_v3_DiscoveryResponse* response = envoy_service_discovery_v3_DiscoveryResponse_parse( @@ -356,7 +359,8 @@ void MaybeLogLrsRequest( if (GRPC_TRACE_FLAG_ENABLED(*context.tracer) && gpr_should_log(GPR_LOG_SEVERITY_DEBUG)) { const upb_MessageDef* msg_type = - envoy_service_load_stats_v3_LoadStatsRequest_getmsgdef(context.symtab); + envoy_service_load_stats_v3_LoadStatsRequest_getmsgdef( + context.def_pool); char buf[10240]; upb_TextEncode(request, msg_type, nullptr, 0, buf, sizeof(buf)); gpr_log(GPR_DEBUG, "[xds_client %p] constructed LRS request: %s", @@ -377,7 +381,8 @@ std::string SerializeLrsRequest( std::string XdsApi::CreateLrsInitialRequest() { upb::Arena arena; - const XdsApiContext context = {client_, tracer_, symtab_->ptr(), arena.ptr()}; + const XdsApiContext context = {client_, tracer_, def_pool_->ptr(), + arena.ptr()}; // Create a request. envoy_service_load_stats_v3_LoadStatsRequest* request = envoy_service_load_stats_v3_LoadStatsRequest_new(arena.ptr()); @@ -447,7 +452,8 @@ void LocalityStatsPopulate( std::string XdsApi::CreateLrsRequest( ClusterLoadReportMap cluster_load_report_map) { upb::Arena arena; - const XdsApiContext context = {client_, tracer_, symtab_->ptr(), arena.ptr()}; + const XdsApiContext context = {client_, tracer_, def_pool_->ptr(), + arena.ptr()}; // Create a request. envoy_service_load_stats_v3_LoadStatsRequest* request = envoy_service_load_stats_v3_LoadStatsRequest_new(arena.ptr()); @@ -514,7 +520,8 @@ void MaybeLogLrsResponse( if (GRPC_TRACE_FLAG_ENABLED(*context.tracer) && gpr_should_log(GPR_LOG_SEVERITY_DEBUG)) { const upb_MessageDef* msg_type = - envoy_service_load_stats_v3_LoadStatsResponse_getmsgdef(context.symtab); + envoy_service_load_stats_v3_LoadStatsResponse_getmsgdef( + context.def_pool); char buf[10240]; upb_TextEncode(response, msg_type, nullptr, 0, buf, sizeof(buf)); gpr_log(GPR_DEBUG, "[xds_client %p] received LRS response: %s", @@ -537,7 +544,8 @@ absl::Status XdsApi::ParseLrsResponse(absl::string_view encoded_response, if (decoded_response == nullptr) { return absl::UnavailableError("Can't decode response."); } - const XdsApiContext context = {client_, tracer_, symtab_->ptr(), arena.ptr()}; + const XdsApiContext context = {client_, tracer_, def_pool_->ptr(), + arena.ptr()}; MaybeLogLrsResponse(context, decoded_response); // Check send_all_clusters. if (envoy_service_load_stats_v3_LoadStatsResponse_send_all_clusters( @@ -585,7 +593,8 @@ std::string XdsApi::AssembleClientConfig( // Fill-in the node information auto* node = envoy_service_status_v3_ClientConfig_mutable_node(client_config, arena.ptr()); - const XdsApiContext context = {client_, tracer_, symtab_->ptr(), arena.ptr()}; + const XdsApiContext context = {client_, tracer_, def_pool_->ptr(), + arena.ptr()}; PopulateNode(context, node_, user_agent_name_, user_agent_version_, node); // Dump each resource. std::vector type_url_storage; diff --git a/src/core/ext/xds/xds_api.h b/src/core/ext/xds/xds_api.h index 256998cc24d..2d968924966 100644 --- a/src/core/ext/xds/xds_api.h +++ b/src/core/ext/xds/xds_api.h @@ -148,7 +148,7 @@ class XdsApi { ""); XdsApi(XdsClient* client, TraceFlag* tracer, const XdsBootstrap::Node* node, - upb::SymbolTable* symtab, std::string user_agent_name, + upb::DefPool* def_pool, std::string user_agent_name, std::string user_agent_version); // Creates an ADS request. @@ -184,7 +184,7 @@ class XdsApi { XdsClient* client_; TraceFlag* tracer_; const XdsBootstrap::Node* node_; // Do not own. - upb::SymbolTable* symtab_; // Do not own. + upb::DefPool* def_pool_; // Do not own. const std::string user_agent_name_; const std::string user_agent_version_; }; diff --git a/src/core/ext/xds/xds_client.cc b/src/core/ext/xds/xds_client.cc index 19d2702a6d5..e6399e98d1a 100644 --- a/src/core/ext/xds/xds_client.cc +++ b/src/core/ext/xds/xds_client.cc @@ -756,7 +756,7 @@ void XdsClient::ChannelState::AdsCallState::AdsResponseParser::ParseResource( // Parse the resource. XdsResourceType::DecodeContext context = { xds_client(), ads_call_state_->chand()->server_, &grpc_xds_client_trace, - xds_client()->symtab_.ptr(), arena}; + xds_client()->def_pool_.ptr(), arena}; XdsResourceType::DecodeResult decode_result = result_.type->Decode(context, serialized_resource); // If we didn't already have the resource name from the Resource @@ -1490,7 +1490,7 @@ XdsClient::XdsClient( transport_factory_(std::move(transport_factory)), request_timeout_(resource_request_timeout), xds_federation_enabled_(XdsFederationEnabled()), - api_(this, &grpc_xds_client_trace, bootstrap_->node(), &symtab_, + api_(this, &grpc_xds_client_trace, bootstrap_->node(), &def_pool_, std::move(user_agent_name), std::move(user_agent_version)), work_serializer_(engine), engine_(std::move(engine)) { @@ -1722,7 +1722,7 @@ void XdsClient::MaybeRegisterResourceTypeLocked( return; } resource_types_.emplace(resource_type->type_url(), resource_type); - resource_type->InitUpbSymtab(this, symtab_.ptr()); + resource_type->InitUpbSymtab(this, def_pool_.ptr()); } const XdsResourceType* XdsClient::GetResourceTypeLocked( diff --git a/src/core/ext/xds/xds_client.h b/src/core/ext/xds/xds_client.h index bd24d8ae193..0831c3c768a 100644 --- a/src/core/ext/xds/xds_client.h +++ b/src/core/ext/xds/xds_client.h @@ -317,7 +317,7 @@ class XdsClient : public DualRefCounted { // Stores resource type objects seen by type URL. std::map resource_types_ ABSL_GUARDED_BY(mu_); - upb::SymbolTable symtab_ ABSL_GUARDED_BY(mu_); + upb::DefPool def_pool_ ABSL_GUARDED_BY(mu_); // Map of existing xDS server channels. // Key is owned by the bootstrap config. diff --git a/test/core/xds/xds_audit_logger_registry_test.cc b/test/core/xds/xds_audit_logger_registry_test.cc index abfc73801e6..7249b1c8b1b 100644 --- a/test/core/xds/xds_audit_logger_registry_test.cc +++ b/test/core/xds/xds_audit_logger_registry_test.cc @@ -65,10 +65,10 @@ absl::StatusOr ConvertAuditLoggerConfig( const AuditLoggerConfigProto& config) { std::string serialized_config = config.SerializeAsString(); upb::Arena arena; - upb::SymbolTable symtab; - XdsResourceType::DecodeContext context = {nullptr, - GrpcXdsBootstrap::GrpcXdsServer(), - nullptr, symtab.ptr(), arena.ptr()}; + upb::DefPool def_pool; + XdsResourceType::DecodeContext context = { + nullptr, GrpcXdsBootstrap::GrpcXdsServer(), nullptr, def_pool.ptr(), + arena.ptr()}; auto* upb_config = envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_parse( serialized_config.data(), serialized_config.size(), arena.ptr()); diff --git a/test/core/xds/xds_lb_policy_registry_test.cc b/test/core/xds/xds_lb_policy_registry_test.cc index b6b10dddd3c..d139d6005e3 100644 --- a/test/core/xds/xds_lb_policy_registry_test.cc +++ b/test/core/xds/xds_lb_policy_registry_test.cc @@ -74,10 +74,10 @@ absl::StatusOr ConvertXdsPolicy( const LoadBalancingPolicyProto& policy) { std::string serialized_policy = policy.SerializeAsString(); upb::Arena arena; - upb::SymbolTable symtab; - XdsResourceType::DecodeContext context = {nullptr, - GrpcXdsBootstrap::GrpcXdsServer(), - nullptr, symtab.ptr(), arena.ptr()}; + upb::DefPool def_pool; + XdsResourceType::DecodeContext context = { + nullptr, GrpcXdsBootstrap::GrpcXdsServer(), nullptr, def_pool.ptr(), + arena.ptr()}; auto* upb_policy = envoy_config_cluster_v3_LoadBalancingPolicy_parse( serialized_policy.data(), serialized_policy.size(), arena.ptr()); ValidationErrors errors;