Browse Source

YT-22317: Refactor after review
7cdfd2b230e7cc23a9e9d94f97981fcd5400903b

don-dron 7 months ago
parent
commit
d7d99122c6

+ 1 - 1
yt/yt/core/rpc/bus/channel.cpp

@@ -150,7 +150,7 @@ public:
         return requestCount;
     }
 
-    IMemoryUsageTrackerPtr GetChannelMemoryTracker() override
+    const IMemoryUsageTrackerPtr& GetChannelMemoryTracker() override
     {
         return MemoryUsageTracker_;
     }

+ 1 - 1
yt/yt/core/rpc/channel.h

@@ -124,7 +124,7 @@ struct IChannel
 
     virtual int GetInflightRequestCount() = 0;
 
-    virtual IMemoryUsageTrackerPtr GetChannelMemoryTracker() = 0;
+    virtual const IMemoryUsageTrackerPtr& GetChannelMemoryTracker() = 0;
 };
 
 DEFINE_REFCOUNTED_TYPE(IChannel)

+ 1 - 1
yt/yt/core/rpc/channel_detail.cpp

@@ -62,7 +62,7 @@ int TChannelWrapper::GetInflightRequestCount()
     return UnderlyingChannel_->GetInflightRequestCount();
 }
 
-IMemoryUsageTrackerPtr TChannelWrapper::GetChannelMemoryTracker()
+const IMemoryUsageTrackerPtr& TChannelWrapper::GetChannelMemoryTracker()
 {
     return UnderlyingChannel_->GetChannelMemoryTracker();
 }

+ 1 - 1
yt/yt/core/rpc/channel_detail.h

@@ -29,7 +29,7 @@ public:
 
     int GetInflightRequestCount() override;
 
-    IMemoryUsageTrackerPtr GetChannelMemoryTracker() override;
+    const IMemoryUsageTrackerPtr& GetChannelMemoryTracker() override;
 
 protected:
     const IChannelPtr UnderlyingChannel_;

+ 3 - 2
yt/yt/core/rpc/grpc/channel.cpp

@@ -216,15 +216,16 @@ public:
         YT_UNIMPLEMENTED();
     }
 
-    IMemoryUsageTrackerPtr GetChannelMemoryTracker() override
+    const IMemoryUsageTrackerPtr& GetChannelMemoryTracker() override
     {
-        return GetNullMemoryUsageTracker();
+        return MemoryUsageTracker_;
     }
 
 private:
     const TChannelConfigPtr Config_;
     const TString EndpointAddress_;
     const IAttributeDictionaryPtr EndpointAttributes_;
+    const IMemoryUsageTrackerPtr MemoryUsageTracker_ = GetNullMemoryUsageTracker();
 
     TSingleShotCallbackList<void(const TError&)> Terminated_;
 

+ 1 - 1
yt/yt/core/rpc/hedging_channel.cpp

@@ -392,7 +392,7 @@ public:
         YT_UNIMPLEMENTED();
     }
 
-    IMemoryUsageTrackerPtr GetChannelMemoryTracker() override
+    const IMemoryUsageTrackerPtr& GetChannelMemoryTracker() override
     {
         return PrimaryChannel_->GetChannelMemoryTracker();
     }

+ 4 - 2
yt/yt/core/rpc/http/channel.cpp

@@ -121,9 +121,9 @@ public:
         YT_UNIMPLEMENTED();
     }
 
-    IMemoryUsageTrackerPtr GetChannelMemoryTracker() override
+    const IMemoryUsageTrackerPtr& GetChannelMemoryTracker() override
     {
-        return GetNullMemoryUsageTracker();
+        return MemoryUsageTracker_;
     }
 
 private:
@@ -133,6 +133,8 @@ private:
     const TString EndpointAddress_;
     const IAttributeDictionaryPtr EndpointAttributes_;
     const NConcurrency::IPollerPtr Poller_;
+    const IMemoryUsageTrackerPtr MemoryUsageTracker_ = GetNullMemoryUsageTracker();
+
     bool IsHttps_;
     NHttps::TClientCredentialsConfigPtr Credentials_;
 

+ 3 - 2
yt/yt/core/rpc/local_channel.cpp

@@ -133,9 +133,9 @@ public:
         return 0;
     }
 
-    IMemoryUsageTrackerPtr GetChannelMemoryTracker() override
+    const IMemoryUsageTrackerPtr& GetChannelMemoryTracker() override
     {
-        return GetNullMemoryUsageTracker();
+        return MemoryUsageTracker_;
     }
 
 private:
@@ -143,6 +143,7 @@ private:
     using TSessionPtr = TIntrusivePtr<TSession>;
 
     const IServerPtr Server_;
+    const IMemoryUsageTrackerPtr MemoryUsageTracker_ = GetNullMemoryUsageTracker();
 
     TSingleShotCallbackList<void(const TError&)> Terminated_;
 

+ 3 - 2
yt/yt/core/rpc/null_channel.cpp

@@ -49,13 +49,14 @@ public:
         return 0;
     }
 
-    IMemoryUsageTrackerPtr GetChannelMemoryTracker() override
+    const IMemoryUsageTrackerPtr& GetChannelMemoryTracker() override
     {
-        return GetNullMemoryUsageTracker();
+        return MemoryUsageTracker_;
     }
 
 private:
     const TString Address_;
+    const IMemoryUsageTrackerPtr MemoryUsageTracker_ = GetNullMemoryUsageTracker();
 };
 
 IChannelPtr CreateNullChannel(TString address)

+ 3 - 2
yt/yt/core/rpc/roaming_channel.cpp

@@ -183,13 +183,14 @@ public:
         return 0;
     }
 
-    IMemoryUsageTrackerPtr GetChannelMemoryTracker() override
+    const IMemoryUsageTrackerPtr& GetChannelMemoryTracker() override
     {
-        return GetNullMemoryUsageTracker();
+        return MemoryUsageTracker_;
     }
 
 private:
     const IRoamingChannelProviderPtr Provider_;
+    const IMemoryUsageTrackerPtr MemoryUsageTracker_ = GetNullMemoryUsageTracker();
 };
 
 IChannelPtr CreateRoamingChannel(IRoamingChannelProviderPtr provider)

Some files were not shown because too many files changed in this diff