YT-22593: Switch to std::string for endpoint description

babenko · babenko · commit fe922531a834 · 2024-09-03T00:14:58.000+03:00
e17521ea2be2d1728e2ac9fbd71b93c95bce5ccd
diff --git a/yt/yt/client/api/rpc_proxy/connection_impl.cpp b/yt/yt/client/api/rpc_proxy/connection_impl.cpp
@@ -164,7 +164,7 @@ class TProxyChannelProvider
         , EndpointAttributes_(MakeEndpointAttributes(config, connectionId))
     { }
 
-    const TString& GetEndpointDescription() const override
+    const std::string& GetEndpointDescription() const override
     {
         return EndpointDescription_;
     }
@@ -205,7 +205,7 @@ class TProxyChannelProvider
     const bool Sticky_;
     const TGuid ConnectionId_;
 
-    const TString EndpointDescription_;
+    const std::string EndpointDescription_;
     const IAttributeDictionaryPtr EndpointAttributes_;
 
     YT_DECLARE_SPIN_LOCK(NThreading::TSpinLock, SpinLock_);
diff --git a/yt/yt/client/transaction_client/remote_timestamp_provider.cpp b/yt/yt/client/transaction_client/remote_timestamp_provider.cpp
@@ -38,7 +38,7 @@ IChannelPtr CreateTimestampProviderChannel(
     auto channel = CreateBalancingChannel(
         config,
         std::move(channelFactory),
-        std::move(endpointDescription),
+        endpointDescription,
         std::move(endpointAttributes));
     channel = CreateRetryingChannel(
         config,
diff --git a/yt/yt/core/bus/bus.h b/yt/yt/core/bus/bus.h
@@ -70,7 +70,7 @@ struct IBus
 {
     //! Returns a textual representation of the bus' endpoint.
     //! Typically used for logging.
-    virtual const TString& GetEndpointDescription() const = 0;
+    virtual const std::string& GetEndpointDescription() const = 0;
 
     //! Returns the bus' endpoint attributes.
     //! Typically used for constructing errors.
diff --git a/yt/yt/core/bus/client.h b/yt/yt/core/bus/client.h
@@ -22,7 +22,7 @@ struct IBusClient
 {
     //! Returns a textual representation of the bus' endpoint.
     //! Typically used for logging.
-    virtual const TString& GetEndpointDescription() const = 0;
+    virtual const std::string& GetEndpointDescription() const = 0;
 
     //! Returns the bus' endpoint attributes.
     //! Typically used for constructing errors.
diff --git a/yt/yt/core/bus/tcp/client.cpp b/yt/yt/core/bus/tcp/client.cpp
@@ -51,7 +51,7 @@ class TTcpClientBusProxy
         Connection_->Terminate(TError(NBus::EErrorCode::TransportError, "Bus terminated"));
     }
 
-    const TString& GetEndpointDescription() const override
+    const std::string& GetEndpointDescription() const override
     {
         VERIFY_THREAD_AFFINITY_ANY();
         return Connection_->GetEndpointDescription();
@@ -161,7 +161,7 @@ class TTcpBusClient
             .EndMap());
     }
 
-    const TString& GetEndpointDescription() const override
+    const std::string& GetEndpointDescription() const override
     {
         return EndpointDescription_;
     }
@@ -220,7 +220,7 @@ class TTcpBusClient
 
     const IMemoryUsageTrackerPtr MemoryUsageTracker_;
 
-    TString EndpointDescription_;
+    std::string EndpointDescription_;
     IAttributeDictionaryPtr EndpointAttributes_;
 };
 
diff --git a/yt/yt/core/bus/tcp/connection.cpp b/yt/yt/core/bus/tcp/connection.cpp
@@ -106,7 +106,7 @@ TTcpConnection::TTcpConnection(
     TConnectionId id,
     SOCKET socket,
     EMultiplexingBand multiplexingBand,
-    const TString& endpointDescription,
+    const std::string& endpointDescription,
     const IAttributeDictionary& endpointAttributes,
     const TNetworkAddress& endpointNetworkAddress,
     const std::optional<std::string>& endpointAddress,
@@ -654,7 +654,7 @@ void TTcpConnection::OnDialerFinished(const TErrorOr<SOCKET>& socketOrError)
     }
 }
 
-const TString& TTcpConnection::GetEndpointDescription() const
+const std::string& TTcpConnection::GetEndpointDescription() const
 {
     return EndpointDescription_;
 }
diff --git a/yt/yt/core/bus/tcp/connection.h b/yt/yt/core/bus/tcp/connection.h
@@ -80,7 +80,7 @@ class TTcpConnection
         TConnectionId id,
         SOCKET socket,
         EMultiplexingBand multiplexingBand,
-        const TString& endpointDescription,
+        const std::string& endpointDescription,
         const NYTree::IAttributeDictionary& endpointAttributes,
         const NNet::TNetworkAddress& endpointNetworkAddress,
         const std::optional<std::string>& endpointAddress,
@@ -104,7 +104,7 @@ class TTcpConnection
     void OnShutdown() override;
 
     // IBus implementation.
-    const TString& GetEndpointDescription() const override;
+    const std::string& GetEndpointDescription() const override;
     const NYTree::IAttributeDictionary& GetEndpointAttributes() const override;
     const std::string& GetEndpointAddress() const override;
     const NNet::TNetworkAddress& GetEndpointNetworkAddress() const override;
@@ -187,7 +187,7 @@ class TTcpConnection
     const TBusConfigPtr Config_;
     const EConnectionType ConnectionType_;
     const TConnectionId Id_;
-    const TString EndpointDescription_;
+    const std::string EndpointDescription_;
     const NYTree::IAttributeDictionaryPtr EndpointAttributes_;
     const NNet::TNetworkAddress EndpointNetworkAddress_;
     const std::optional<TString> EndpointAddress_;
diff --git a/yt/yt/core/rpc/balancing_channel.cpp b/yt/yt/core/rpc/balancing_channel.cpp
@@ -42,7 +42,7 @@ class TBalancingChannelSubprovider
     TBalancingChannelSubprovider(
         TBalancingChannelConfigPtr config,
         IChannelFactoryPtr channelFactory,
-        TString endpointDescription,
+        const std::string& endpointDescription,
         IAttributeDictionaryPtr endpointAttributes,
         std::string serviceName,
         IPeerDiscoveryPtr peerDiscovery)
@@ -96,7 +96,7 @@ class TBalancingChannelSubprovider
 
 private:
     const TBalancingChannelConfigPtr Config_;
-    const TString EndpointDescription_;
+    const std::string EndpointDescription_;
     const IAttributeDictionaryPtr EndpointAttributes_;
     const TString ServiceName_;
 
@@ -176,7 +176,7 @@ class TBalancingChannelProvider
     TBalancingChannelProvider(
         TBalancingChannelConfigPtr config,
         IChannelFactoryPtr channelFactory,
-        TString endpointDescription,
+        const std::string& endpointDescription,
         IAttributeDictionaryPtr endpointAttributes,
         IPeerDiscoveryPtr peerDiscovery)
         : Config_(std::move(config))
@@ -192,7 +192,7 @@ class TBalancingChannelProvider
         , PeerDiscovery_(std::move(peerDiscovery))
     { }
 
-    const TString& GetEndpointDescription() const override
+    const std::string& GetEndpointDescription() const override
     {
         return EndpointDescription_;
     }
@@ -243,7 +243,7 @@ class TBalancingChannelProvider
     const TBalancingChannelConfigPtr Config_;
     const IChannelFactoryPtr ChannelFactory_;
 
-    const TString EndpointDescription_;
+    const std::string EndpointDescription_;
     const IAttributeDictionaryPtr EndpointAttributes_;
     const IPeerDiscoveryPtr PeerDiscovery_;
 
@@ -288,14 +288,14 @@ DEFINE_REFCOUNTED_TYPE(TBalancingChannelProvider)
 IChannelPtr CreateBalancingChannel(
     TBalancingChannelConfigPtr config,
     IChannelFactoryPtr channelFactory,
-    TString endpointDescription,
+    const std::string& endpointDescription,
     IAttributeDictionaryPtr endpointAttributes,
     IPeerDiscoveryPtr peerDiscovery)
 {
     auto channelProvider = CreateBalancingChannelProvider(
         std::move(config),
         std::move(channelFactory),
-        std::move(endpointDescription),
+        endpointDescription,
         std::move(endpointAttributes),
         std::move(peerDiscovery));
 
@@ -305,7 +305,7 @@ IChannelPtr CreateBalancingChannel(
 IRoamingChannelProviderPtr CreateBalancingChannelProvider(
     TBalancingChannelConfigPtr config,
     IChannelFactoryPtr channelFactory,
-    TString endpointDescription,
+    const std::string& endpointDescription,
     IAttributeDictionaryPtr endpointAttributes,
     IPeerDiscoveryPtr peerDiscovery)
 {
@@ -316,7 +316,7 @@ IRoamingChannelProviderPtr CreateBalancingChannelProvider(
     return New<TBalancingChannelProvider>(
         std::move(config),
         std::move(channelFactory),
-        std::move(endpointDescription),
+        endpointDescription,
         std::move(endpointAttributes),
         std::move(peerDiscovery));
 }
diff --git a/yt/yt/core/rpc/balancing_channel.h b/yt/yt/core/rpc/balancing_channel.h
@@ -16,14 +16,14 @@ namespace NYT::NRpc {
 IChannelPtr CreateBalancingChannel(
     TBalancingChannelConfigPtr config,
     IChannelFactoryPtr channelFactory,
-    TString endpointDescription,
+    const std::string& endpointDescription,
     NYTree::IAttributeDictionaryPtr endpointAttributes,
     IPeerDiscoveryPtr peerDiscovery = CreateDefaultPeerDiscovery());
 
 IRoamingChannelProviderPtr CreateBalancingChannelProvider(
     TBalancingChannelConfigPtr config,
     IChannelFactoryPtr channelFactory,
-    TString endpointDescription,
+    const std::string& endpointDescription,
     NYTree::IAttributeDictionaryPtr endpointAttributes,
     IPeerDiscoveryPtr peerDiscovery = CreateDefaultPeerDiscovery());
 
diff --git a/yt/yt/core/rpc/bus/channel.cpp b/yt/yt/core/rpc/bus/channel.cpp
@@ -64,7 +64,7 @@ class TBusChannel
         YT_VERIFY(MemoryUsageTracker_);
     }
 
-    const TString& GetEndpointDescription() const override
+    const std::string& GetEndpointDescription() const override
     {
         return Client_->GetEndpointDescription();
     }
diff --git a/yt/yt/core/rpc/channel.h b/yt/yt/core/rpc/channel.h
@@ -92,7 +92,7 @@ struct IChannel
 {
     //! Returns a textual representation of the channel's endpoint.
     //! Typically used for logging.
-    virtual const TString& GetEndpointDescription() const = 0;
+    virtual const std::string& GetEndpointDescription() const = 0;
 
     //! Returns the channel's endpoint attributes.
     //! Typically used for constructing errors.
diff --git a/yt/yt/core/rpc/channel_detail.cpp b/yt/yt/core/rpc/channel_detail.cpp
@@ -21,7 +21,7 @@ TChannelWrapper::TChannelWrapper(IChannelPtr underlyingChannel)
     YT_ASSERT(UnderlyingChannel_);
 }
 
-const TString& TChannelWrapper::GetEndpointDescription() const
+const std::string& TChannelWrapper::GetEndpointDescription() const
 {
     return UnderlyingChannel_->GetEndpointDescription();
 }
diff --git a/yt/yt/core/rpc/channel_detail.h b/yt/yt/core/rpc/channel_detail.h
@@ -14,7 +14,7 @@ class TChannelWrapper
 public:
     explicit TChannelWrapper(IChannelPtr underlyingChannel);
 
-    const TString& GetEndpointDescription() const override;
+    const std::string& GetEndpointDescription() const override;
     const NYTree::IAttributeDictionary& GetEndpointAttributes() const override;
 
     IClientRequestControlPtr Send(
diff --git a/yt/yt/core/rpc/dynamic_channel_pool.cpp b/yt/yt/core/rpc/dynamic_channel_pool.cpp
@@ -43,13 +43,13 @@ class TDynamicChannelPool::TImpl
     TImpl(
         TDynamicChannelPoolConfigPtr config,
         IChannelFactoryPtr channelFactory,
-        TString endpointDescription,
+        const std::string& endpointDescription,
         IAttributeDictionaryPtr endpointAttributes,
         std::string serviceName,
         IPeerDiscoveryPtr peerDiscovery)
         : Config_(std::move(config))
         , ChannelFactory_(std::move(channelFactory))
-        , EndpointDescription_(std::move(endpointDescription))
+        , EndpointDescription_(endpointDescription)
         , EndpointAttributes_(ConvertToAttributes(BuildYsonStringFluently()
             .BeginMap()
                 .Items(*endpointAttributes)
@@ -188,7 +188,7 @@ class TDynamicChannelPool::TImpl
 
     const TDynamicChannelPoolConfigPtr Config_;
     const IChannelFactoryPtr ChannelFactory_;
-    const TString EndpointDescription_;
+    const std::string EndpointDescription_;
     const IAttributeDictionaryPtr EndpointAttributes_;
     const std::string ServiceName_;
     IPeerDiscoveryPtr PeerDiscovery_;
@@ -900,14 +900,14 @@ class TDynamicChannelPool::TImpl
 TDynamicChannelPool::TDynamicChannelPool(
     TDynamicChannelPoolConfigPtr config,
     IChannelFactoryPtr channelFactory,
-    TString endpointDescription,
+    const std::string& endpointDescription,
     NYTree::IAttributeDictionaryPtr endpointAttributes,
     std::string serviceName,
     IPeerDiscoveryPtr peerDiscovery)
     : Impl_(New<TImpl>(
         std::move(config),
         std::move(channelFactory),
-        std::move(endpointDescription),
+        endpointDescription,
         std::move(endpointAttributes),
         std::move(serviceName),
         std::move(peerDiscovery)))
diff --git a/yt/yt/core/rpc/dynamic_channel_pool.h b/yt/yt/core/rpc/dynamic_channel_pool.h
@@ -28,7 +28,7 @@ class TDynamicChannelPool
     TDynamicChannelPool(
         TDynamicChannelPoolConfigPtr config,
         IChannelFactoryPtr channelFactory,
-        TString endpointDescription,
+        const std::string& endpointDescription,
         NYTree::IAttributeDictionaryPtr endpointAttributes,
         std::string serviceName,
         IPeerDiscoveryPtr peerDiscovery);
diff --git a/yt/yt/core/rpc/grpc/channel.cpp b/yt/yt/core/rpc/grpc/channel.cpp
@@ -149,7 +149,7 @@ class TChannel
     }
 
     // IChannel implementation.
-    const TString& GetEndpointDescription() const override
+    const std::string& GetEndpointDescription() const override
     {
         return EndpointAddress_;
     }
diff --git a/yt/yt/core/rpc/grpc/server.cpp b/yt/yt/core/rpc/grpc/server.cpp
@@ -238,7 +238,7 @@ class TServer
         { }
 
         // IBus overrides.
-        const TString& GetEndpointDescription() const override
+        const std::string& GetEndpointDescription() const override
         {
             return PeerAddressString_;
         }
diff --git a/yt/yt/core/rpc/hedging_channel.cpp b/yt/yt/core/rpc/hedging_channel.cpp
@@ -345,7 +345,7 @@ class THedgingChannel
             .EndMap()))
     { }
 
-    const TString& GetEndpointDescription() const override
+    const std::string& GetEndpointDescription() const override
     {
         return EndpointDescription_;
     }
@@ -403,7 +403,7 @@ class THedgingChannel
 
     const THedgingChannelOptions Options_;
 
-    const TString EndpointDescription_;
+    const std::string EndpointDescription_;
     const IAttributeDictionaryPtr EndpointAttributes_;
 };
 
diff --git a/yt/yt/core/rpc/http/channel.cpp b/yt/yt/core/rpc/http/channel.cpp
@@ -45,7 +45,7 @@ class THttpChannel
     }
 
     // IChannel implementation.
-    const TString& GetEndpointDescription() const override
+    const std::string& GetEndpointDescription() const override
     {
         return EndpointAddress_;
     }
diff --git a/yt/yt/core/rpc/http/server.cpp b/yt/yt/core/rpc/http/server.cpp
@@ -54,7 +54,7 @@ class THttpReplyBus
         , Logger(logger)
     { }
 
-    const TString& GetEndpointDescription() const override
+    const std::string& GetEndpointDescription() const override
     {
         return EndpointAddress_;
     }
diff --git a/yt/yt/core/rpc/local_channel.cpp b/yt/yt/core/rpc/local_channel.cpp
@@ -34,7 +34,7 @@ static constexpr auto& Logger = RpcClientLogger;
 
 ////////////////////////////////////////////////////////////////////////////////
 
-static const TString EndpointDescription = "<local>";
+static const std::string EndpointDescription = "<local>";
 static const IAttributeDictionaryPtr EndpointAttributes =
     ConvertToAttributes(BuildYsonStringFluently()
         .BeginMap()
@@ -51,7 +51,7 @@ class TLocalChannel
         : Server_(std::move(server))
     { }
 
-    const TString& GetEndpointDescription() const override
+    const std::string& GetEndpointDescription() const override
     {
         return EndpointDescription;
     }
@@ -165,7 +165,7 @@ class TLocalChannel
             }
         }
 
-        const TString& GetEndpointDescription() const override
+        const std::string& GetEndpointDescription() const override
         {
             return EndpointDescription;
         }
diff --git a/yt/yt/core/rpc/null_channel.cpp b/yt/yt/core/rpc/null_channel.cpp
@@ -21,7 +21,7 @@ class TNullChannel
         : Address_(address)
     { }
 
-    const TString& GetEndpointDescription() const override
+    const std::string& GetEndpointDescription() const override
     {
         return Address_;
     }
diff --git a/yt/yt/core/rpc/roaming_channel.cpp b/yt/yt/core/rpc/roaming_channel.cpp
@@ -124,7 +124,7 @@ class TRoamingChannel
         : Provider_(std::move(provider))
     { }
 
-    const TString& GetEndpointDescription() const override
+    const std::string& GetEndpointDescription() const override
     {
         return Provider_->GetEndpointDescription();
     }
diff --git a/yt/yt/core/rpc/roaming_channel.h b/yt/yt/core/rpc/roaming_channel.h
diff --git a/yt/yt/core/rpc/server_detail.cpp b/yt/yt/core/rpc/server_detail.cpp
diff --git a/yt/yt/core/rpc/server_detail.h b/yt/yt/core/rpc/server_detail.h
diff --git a/yt/yt/core/rpc/service.h b/yt/yt/core/rpc/service.h
diff --git a/yt/yt/core/rpc/service_detail.cpp b/yt/yt/core/rpc/service_detail.cpp
diff --git a/yt/yt/core/rpc/unittests/roaming_channel_ut.cpp b/yt/yt/core/rpc/unittests/roaming_channel_ut.cpp
diff --git a/yt/yt/core/rpc/unittests/viable_peer_registry_ut.cpp b/yt/yt/core/rpc/unittests/viable_peer_registry_ut.cpp
diff --git a/yt/yt/core/test_framework/test_proxy_service.cpp b/yt/yt/core/test_framework/test_proxy_service.cpp
diff --git a/yt/yt/core/test_framework/test_proxy_service.h b/yt/yt/core/test_framework/test_proxy_service.h

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ class TProxyChannelProvider`
`164`	`164`	`, EndpointAttributes_(MakeEndpointAttributes(config, connectionId))`
`165`	`165`	`{ }`
`166`	`166`
`167`		`- const TString& GetEndpointDescription() const override`
	`167`	`+ const std::string& GetEndpointDescription() const override`
`168`	`168`	`{`
`169`	`169`	`return EndpointDescription_;`
`170`	`170`	`}`
`@@ -205,7 +205,7 @@ class TProxyChannelProvider`
`205`	`205`	`const bool Sticky_;`
`206`	`206`	`const TGuid ConnectionId_;`
`207`	`207`
`208`		`- const TString EndpointDescription_;`
	`208`	`+ const std::string EndpointDescription_;`
`209`	`209`	`const IAttributeDictionaryPtr EndpointAttributes_;`
`210`	`210`
`211`	`211`	`YT_DECLARE_SPIN_LOCK(NThreading::TSpinLock, SpinLock_);`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ struct IBus`
`70`	`70`	`{`
`71`	`71`	`//! Returns a textual representation of the bus' endpoint.`
`72`	`72`	`//! Typically used for logging.`
`73`		`- virtual const TString& GetEndpointDescription() const = 0;`
	`73`	`+ virtual const std::string& GetEndpointDescription() const = 0;`
`74`	`74`
`75`	`75`	`//! Returns the bus' endpoint attributes.`
`76`	`76`	`//! Typically used for constructing errors.`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ struct IBusClient`
`22`	`22`	`{`
`23`	`23`	`//! Returns a textual representation of the bus' endpoint.`
`24`	`24`	`//! Typically used for logging.`
`25`		`- virtual const TString& GetEndpointDescription() const = 0;`
	`25`	`+ virtual const std::string& GetEndpointDescription() const = 0;`
`26`	`26`
`27`	`27`	`//! Returns the bus' endpoint attributes.`
`28`	`28`	`//! Typically used for constructing errors.`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ class TTcpClientBusProxy`
`51`	`51`	`Connection_->Terminate(TError(NBus::EErrorCode::TransportError, "Bus terminated"));`
`52`	`52`	`}`
`53`	`53`
`54`		`- const TString& GetEndpointDescription() const override`
	`54`	`+ const std::string& GetEndpointDescription() const override`
`55`	`55`	`{`
`56`	`56`	`VERIFY_THREAD_AFFINITY_ANY();`
`57`	`57`	`return Connection_->GetEndpointDescription();`
`@@ -161,7 +161,7 @@ class TTcpBusClient`
`161`	`161`	`.EndMap());`
`162`	`162`	`}`
`163`	`163`
`164`		`- const TString& GetEndpointDescription() const override`
	`164`	`+ const std::string& GetEndpointDescription() const override`
`165`	`165`	`{`
`166`	`166`	`return EndpointDescription_;`
`167`	`167`	`}`
`@@ -220,7 +220,7 @@ class TTcpBusClient`
`220`	`220`
`221`	`221`	`const IMemoryUsageTrackerPtr MemoryUsageTracker_;`
`222`	`222`
`223`		`- TString EndpointDescription_;`
	`223`	`+ std::string EndpointDescription_;`
`224`	`224`	`IAttributeDictionaryPtr EndpointAttributes_;`
`225`	`225`	`};`
`226`	`226`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ TTcpConnection::TTcpConnection(`
`106`	`106`	`TConnectionId id,`
`107`	`107`	`SOCKET socket,`
`108`	`108`	`EMultiplexingBand multiplexingBand,`
`109`		`- const TString& endpointDescription,`
	`109`	`+ const std::string& endpointDescription,`
`110`	`110`	`const IAttributeDictionary& endpointAttributes,`
`111`	`111`	`const TNetworkAddress& endpointNetworkAddress,`
`112`	`112`	`const std::optional<std::string>& endpointAddress,`
`@@ -654,7 +654,7 @@ void TTcpConnection::OnDialerFinished(const TErrorOr<SOCKET>& socketOrError)`
`654`	`654`	`}`
`655`	`655`	`}`
`656`	`656`
`657`		`-const TString& TTcpConnection::GetEndpointDescription() const`
	`657`	`+const std::string& TTcpConnection::GetEndpointDescription() const`
`658`	`658`	`{`
`659`	`659`	`return EndpointDescription_;`
`660`	`660`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ class TBusChannel`
`64`	`64`	`YT_VERIFY(MemoryUsageTracker_);`
`65`	`65`	`}`
`66`	`66`
`67`		`- const TString& GetEndpointDescription() const override`
	`67`	`+ const std::string& GetEndpointDescription() const override`
`68`	`68`	`{`
`69`	`69`	`return Client_->GetEndpointDescription();`
`70`	`70`	`}`