Refactor and improve TSharedRangeHolder

2 files changed, 33 insertions, 14 deletions

diff --git a/library/cpp/yt/yson_string/string-inl.h b/library/cpp/yt/yson_string/string-inl.h
index 5c41629cc0..09db98881f 100644
--- a/library/cpp/yt/yson_string/string-inl.h
+++ b/library/cpp/yt/yson_string/string-inl.h
@@ -26,6 +26,35 @@ bool Equals(const TLeft& lhs, const TRight& rhs)
         lhs.GetType() == rhs.GetType();
 }
 
+class TYsonStringHolder
+    : public TSharedRangeHolder
+    , public TWithExtraSpace<TYsonStringHolder>
+{
+public:
+    explicit TYsonStringHolder(size_t size)
+        : Size_(size)
+    { }
+
+    char* GetData()
+    {
+        return static_cast<char*>(GetExtraSpacePtr());
+    }
+
+    // TSharedRangeHolder overrides.
+    std::optional<size_t> GetTotalByteSize() const override
+    {
+        return Size_ + sizeof(TYsonStringHolder);
+    }
+
+    static TIntrusivePtr<TYsonStringHolder> Allocate(size_t size)
+    {
+        return NewWithExtraSpace<TYsonStringHolder>(size, size);
+    }
+
+private:
+    const size_t Size_;
+};
+
 } // namespace NDetail
 
 inline bool operator == (const TYsonString& lhs, const TYsonString& rhs)
diff --git a/library/cpp/yt/yson_string/string.cpp b/library/cpp/yt/yson_string/string.cpp
index c92d4d6e42..dec428c31e 100644
--- a/library/cpp/yt/yson_string/string.cpp
+++ b/library/cpp/yt/yson_string/string.cpp
@@ -71,23 +71,13 @@ TYsonString::TYsonString()
 TYsonString::TYsonString(const TYsonStringBuf& ysonStringBuf)
 {
     if (ysonStringBuf) {
-        struct TCapturedYsonStringPayload
-            : public TSharedRangeHolder
-            , public TWithExtraSpace<TCapturedYsonStringPayload>
-        {
-            char* GetData()
-            {
-                return static_cast<char*>(GetExtraSpacePtr());
-            }
-        };
-
         auto data = ysonStringBuf.AsStringBuf();
-        auto payload = NewWithExtraSpace<TCapturedYsonStringPayload>(data.length());
-        ::memcpy(payload->GetData(), data.data(), data.length());
-        Payload_ = payload;
-        Begin_ = payload->GetData();
+        auto holder = NDetail::TYsonStringHolder::Allocate(data.length());
+        ::memcpy(holder->GetData(), data.data(), data.length());
+        Begin_ = holder->GetData();
         Size_ = data.Size();
         Type_ = ysonStringBuf.GetType();
+        Payload_ = std::move(holder);
     } else {
         Begin_ = nullptr;
         Size_ = 0;