Support Save/Load TYsonString

4 files changed, 73 insertions, 0 deletions

diff --git a/library/cpp/yt/yson_string/string.cpp b/library/cpp/yt/yson_string/string.cpp
index dec428c31e..164e450b72 100644
--- a/library/cpp/yt/yson_string/string.cpp
+++ b/library/cpp/yt/yson_string/string.cpp
@@ -173,6 +173,28 @@ size_t TYsonString::ComputeHash() const
     return THash<TStringBuf>()(TStringBuf(Begin_, Begin_ + Size_));
 }
 
+void TYsonString::Save(IOutputStream* s) const
+{
+    EYsonType type = Type_;
+    if (*this) {
+        ::SaveMany(s, type, ToSharedRef());
+    } else {
+        ::SaveMany(s, type, TString());
+    }
+}
+
+void TYsonString::Load(IInputStream* s)
+{
+    EYsonType type;
+    TString data;
+    ::LoadMany(s, type, data);
+    if (data) {
+        *this = TYsonString(data, type);
+    } else {
+        *this = TYsonString();
+    }
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 
 TString ToString(const TYsonString& yson)
diff --git a/library/cpp/yt/yson_string/string.h b/library/cpp/yt/yson_string/string.h
index 29845b70ae..d9f036569f 100644
--- a/library/cpp/yt/yson_string/string.h
+++ b/library/cpp/yt/yson_string/string.h
@@ -107,6 +107,10 @@ public:
     //! Computes the hash code.
     size_t ComputeHash() const;
 
+    //! Allow to serialize/deserialize using the ::Save ::Load functions. See util/ysaveload.h.
+    void Save(IOutputStream* s) const;
+    void Load(IInputStream* s);
+
 private:
     struct TNullPayload
     { };
diff --git a/library/cpp/yt/yson_string/unittests/saveload_ut.cpp b/library/cpp/yt/yson_string/unittests/saveload_ut.cpp
new file mode 100644
index 0000000000..33a98a30ea
--- /dev/null
+++ b/library/cpp/yt/yson_string/unittests/saveload_ut.cpp
@@ -0,0 +1,46 @@
+#include <library/cpp/testing/gtest/gtest.h>
+
+#include <library/cpp/testing/gtest_extensions/assertions.h>
+
+#include <library/cpp/yt/yson_string/string.h>
+
+namespace NYT::NYson {
+namespace {
+
+////////////////////////////////////////////////////////////////////////////////
+
+TEST(TYsonStringTest, SaveLoadNull)
+{
+    const TYsonString expected;
+    TStringStream s;
+    ::Save(&s, expected);
+    TYsonString result;
+    ::Load(&s, result);
+    EXPECT_EQ(expected, result);
+}
+
+TEST(TYsonStringTest, SaveLoadString)
+{
+    const TYsonString expected(TString("My tests data"));
+    TStringStream s;
+    ::Save(&s, expected);
+    TYsonString result;
+    ::Load(&s, result);
+    EXPECT_EQ(expected, result);
+}
+
+TEST(TYsonStringTest, SaveLoadSharedRef)
+{
+    TSharedRef ref = TSharedRef::FromString("My tests data");
+    const TYsonString expected(ref);
+    TStringStream s;
+    ::Save(&s, expected);
+    TYsonString result;
+    ::Load(&s, result);
+    EXPECT_EQ(expected, result);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+} // namespace
+} // namespace NYT::NYson
diff --git a/library/cpp/yt/yson_string/unittests/ya.make b/library/cpp/yt/yson_string/unittests/ya.make
index f301e5b438..b584119f78 100644
--- a/library/cpp/yt/yson_string/unittests/ya.make
+++ b/library/cpp/yt/yson_string/unittests/ya.make
@@ -4,6 +4,7 @@ INCLUDE(${ARCADIA_ROOT}/library/cpp/yt/ya_cpp.make.inc)
 
 SRCS(
     convert_ut.cpp
+    saveload_ut.cpp
 )
 
 PEERDIR(