Imported Upstream version 1.27.0

[platform/upstream/grpc.git] / src / core / ext / filters / client_channel / lb_policy / xds / cds.cc

diff --git a/src/core/ext/filters/client_channel/lb_policy/xds/cds.cc b/src/core/ext/filters/client_channel/lb_policy/xds/cds.cc
index ae8c5f0..341d290 100644 (file)
--- a/src/core/ext/filters/client_channel/lb_policy/xds/cds.cc
+++ b/src/core/ext/filters/client_channel/lb_policy/xds/cds.cc
@@ -39,13 +39,13 @@ constexpr char kCds[] = "cds_experimental";
 // Parsed config for this LB policy.
 class ParsedCdsConfig : public LoadBalancingPolicy::Config {
  public:
-  explicit ParsedCdsConfig(grpc_core::UniquePtr<char> cluster)
+  explicit ParsedCdsConfig(std::string cluster)
       : cluster_(std::move(cluster)) {}
-  const char* cluster() const { return cluster_.get(); }
+  const char* cluster() const { return cluster_.c_str(); }
   const char* name() const override { return kCds; }
 
  private:
-  grpc_core::UniquePtr<char> cluster_;
+  std::string cluster_;
 };
 
 // CDS LB policy.
@@ -119,9 +119,9 @@ void CdsLb::ClusterWatcher::OnClusterChanged(CdsUpdate cluster_data) {
   }
   // Construct config for child policy.
   char* lrs_str = nullptr;
-  if (cluster_data.lrs_load_reporting_server_name != nullptr) {
+  if (cluster_data.lrs_load_reporting_server_name.has_value()) {
     gpr_asprintf(&lrs_str, "    \"lrsLoadReportingServerName\": \"%s\",\n",
-                 cluster_data.lrs_load_reporting_server_name.get());
+                 cluster_data.lrs_load_reporting_server_name.value().c_str());
   }
   char* json_str;
   gpr_asprintf(&json_str,
@@ -132,9 +132,9 @@ void CdsLb::ClusterWatcher::OnClusterChanged(CdsUpdate cluster_data) {
                "  }\n"
                "}]",
                (lrs_str == nullptr ? "" : lrs_str),
-               (cluster_data.eds_service_name == nullptr
+               (cluster_data.eds_service_name.empty()
                     ? parent_->config_->cluster()
-                    : cluster_data.eds_service_name.get()));
+                    : cluster_data.eds_service_name.c_str()));
   gpr_free(lrs_str);
   grpc_core::UniquePtr<char> json_str_deleter(json_str);
   if (GRPC_TRACE_FLAG_ENABLED(grpc_cds_lb_trace)) {
@@ -342,8 +342,7 @@ class CdsFactory : public LoadBalancingPolicyFactory {
           "required field 'cluster' not present"));
     }
     if (error_list.empty()) {
-      return MakeRefCounted<ParsedCdsConfig>(
-          grpc_core::UniquePtr<char>(gpr_strdup(cluster)));
+      return MakeRefCounted<ParsedCdsConfig>(cluster);
     } else {
       *error = GRPC_ERROR_CREATE_FROM_VECTOR("Cds Parser", &error_list);
       return nullptr;