Added support for maps with custom key types in yson struct

commit_hash:689f70793e329f380fb3a8c065bce0f3bfff92f5

Author: mikari

yt/yt/core/ytree/unittests/complex_key_map.cpp

@@ -0,0 +1,81 @@
+#include "complex_key_map.h"
+
+#include <util/string/split.h>
+
+#include <util/string/cast.h>
+#include <util/stream/output.h>
+
+namespace NYT::NYTree {
+
+using namespace NYson;
+
+////////////////////////////////////////////////////////////////////////////////
+
+TTestComplexKey TTestComplexKey::FromString(TStringBuf string)
+{
+    TTestComplexKey key;
+    Split(string, '/', key.First, key.Second);
+    return key;
+}
+
+TString TTestComplexKey::ToString() const
+{
+    return Format("%v/%v", First, Second);
+}
+
+bool TTestComplexKey::operator==(const TTestComplexKey& other) const
+{
+    return std::tie(First, Second) == std::tie(other.First, other.Second);
+}
+
+bool TTestComplexKey::operator<(const TTestComplexKey& other) const
+{
+    return std::tie(First, Second) < std::tie(other.First, other.Second);
+}
+
+void Serialize(const TTestComplexKey& value, IYsonConsumer* consumer)
+{
+    consumer->OnStringScalar(ToString(value));
+}
+
+void Deserialize(TTestComplexKey& value, INodePtr node)
+{
+    if (node->GetType() == ENodeType::String) {
+        value = FromString<TTestComplexKey>(node->AsString()->GetValue());
+    } else {
+        THROW_ERROR_EXCEPTION("Cannot parse TTestComplexKey value from %Qlv",
+            node->GetType());
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+} // namespace NYT::NYTree
+
+////////////////////////////////////////////////////////////////////////////////
+
+template <>
+NYT::NYTree::TTestComplexKey FromStringImpl<NYT::NYTree::TTestComplexKey, char>(const char* data, size_t size)
+{
+    return NYT::NYTree::TTestComplexKey::FromString(TStringBuf(data, size));
+}
+
+template <>
+bool TryFromStringImpl<NYT::NYTree::TTestComplexKey, char>(const char* data, size_t size, NYT::NYTree::TTestComplexKey& value)
+{
+    try {
+        value = NYT::NYTree::TTestComplexKey::FromString(TStringBuf(data, size));
+        return true;
+    } catch (const std::exception&) {
+        return false;
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+template <>
+void Out<NYT::NYTree::TTestComplexKey>(IOutputStream& out, const NYT::NYTree::TTestComplexKey& value) {
+    out << value.ToString();
+}
+
+////////////////////////////////////////////////////////////////////////////////

yt/yt/core/ytree/unittests/complex_key_map.h

@@ -0,0 +1,26 @@
+#pragma once
+
+#include <yt/yt/core/ytree/yson_struct.h>
+
+namespace NYT::NYTree {
+
+////////////////////////////////////////////////////////////////////////////////
+
+struct TTestComplexKey
+{
+    TString First;
+    TString Second;
+
+    static TTestComplexKey FromString(TStringBuf string);
+    TString ToString() const;
+
+    bool operator==(const TTestComplexKey& other) const;
+    bool operator<(const TTestComplexKey& other) const;
+};
+
+void Serialize(const TTestComplexKey& value, NYson::IYsonConsumer* consumer);
+void Deserialize(TTestComplexKey& value, NYTree::INodePtr node);
+
+////////////////////////////////////////////////////////////////////////////////
+
+} // namespace NYT::NYTree

yt/yt/core/ytree/unittests/ya.make

@@ -7,6 +7,7 @@ PROTO_NAMESPACE(yt)
 SRCS(
     attribute_filter_ut.cpp
     attributes_ut.cpp
+    complex_key_map.cpp
     lazy_ypath_service_ut.cpp
     options_ut.cpp
     resolver_ut.cpp

yt/yt/core/ytree/unittests/yson_struct_ut.cpp

@@ -1,3 +1,5 @@
+#include "complex_key_map.h"
+
 #include <yt/yt/core/test_framework/framework.h>
 
 #include <yt/yt/core/yson/writer.h>
@@ -4212,5 +4214,44 @@ TEST(TYsonStructTest, YsonStructLiteMoveAssign)
 
 ////////////////////////////////////////////////////////////////////////////////
 
+struct TTestYsonStructWithMap
+    : public TYsonStruct
+{
+    std::map<TString, TString> Map;
+    std::map<TTestComplexKey, TString> ComplexMap;
+    TTestComplexKey ComplexKey;
+
+    REGISTER_YSON_STRUCT(TTestYsonStructWithMap);
+
+    static void Register(TRegistrar registrar)
+    {
+        registrar.Parameter("map", &TThis::Map)
+            .Default();
+        registrar.Parameter("complex_map", &TThis::ComplexMap)
+            .Default();
+        registrar.Parameter("complex_key", &TThis::ComplexKey)
+            .Default();
+    }
+};
+
+using TTestYsonStructWithMapPtr = TIntrusivePtr<TTestYsonStructWithMap>;
+
+TEST(TYsonStructTest, Map)
+{
+    auto ysonStruct = New<TTestYsonStructWithMap>();
+    ysonStruct->Map["abc"] = "def";
+    ysonStruct->ComplexMap[{"abc", "def"}] = "ghi";
+    ysonStruct->ComplexKey = {"abc", "def"};
+
+    auto node = ConvertToNode(ysonStruct);
+    auto fromNode = ConvertTo<TTestYsonStructWithMapPtr>(node);
+    EXPECT_EQ(fromNode->Map, ysonStruct->Map);
+    EXPECT_EQ(fromNode->ComplexMap, ysonStruct->ComplexMap);
+    EXPECT_EQ(fromNode->ComplexKey, ysonStruct->ComplexKey);
+    EXPECT_EQ(*fromNode, *ysonStruct);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
 } // namespace
 } // namespace NYT::NYTree

yt/yt/core/ytree/yson_struct_detail-inl.h

@@ -109,6 +109,20 @@ T DeserializeMapKey(TStringBuf value)
     }
 }
 
+template <class T>
+TString SerializeMapKey(const T& value)
+{
+    if constexpr (TEnumTraits<T>::IsEnum) {
+        return FormatEnum(value);
+    } else if constexpr (std::is_same_v<T, TGuid>) {
+        return ToString(value);
+    } else if constexpr (TStrongTypedefTraits<T>::IsStrongTypedef) {
+        return SerializeMapKey<typename TStrongTypedefTraits<T>::TUnderlying>(value.Underlying());
+    } else {
+        return ToString(value);
+    }
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 
 template <class T>
@@ -577,7 +591,7 @@ inline void PostprocessRecursive(
         PostprocessRecursive(
             value,
             [&pathGetter, &key = key] {
-                return pathGetter() + "/" + NYPath::ToYPathLiteral(key);
+                return pathGetter() + "/" + NYPath::ToYPathLiteral(SerializeMapKey(key));
             });
     }
 }