diff options
author | nadya73 <nadya73@yandex-team.ru> | 2022-02-10 16:49:18 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:49:18 +0300 |
commit | b6e35c760e81fe851ac4da1abc08e6ec8e779c10 (patch) | |
tree | bffcb657a262b70deabd6a12cf65b823c9332150 /library/cpp/yson/node | |
parent | cb691264f012c552bac85a9fe352baa062cd81dd (diff) | |
download | ydb-b6e35c760e81fe851ac4da1abc08e6ec8e779c10.tar.gz |
Restoring authorship annotation for <nadya73@yandex-team.ru>. Commit 1 of 2.
Diffstat (limited to 'library/cpp/yson/node')
-rw-r--r-- | library/cpp/yson/node/node.cpp | 4 | ||||
-rw-r--r-- | library/cpp/yson/node/node_builder.cpp | 4 | ||||
-rw-r--r-- | library/cpp/yson/node/node_builder.h | 4 | ||||
-rw-r--r-- | library/cpp/yson/node/node_io.cpp | 24 | ||||
-rw-r--r-- | library/cpp/yson/node/node_io.h | 12 | ||||
-rw-r--r-- | library/cpp/yson/node/node_visitor.h | 4 | ||||
-rw-r--r-- | library/cpp/yson/node/serialize.cpp | 16 | ||||
-rw-r--r-- | library/cpp/yson/node/serialize.h | 38 |
8 files changed, 53 insertions, 53 deletions
diff --git a/library/cpp/yson/node/node.cpp b/library/cpp/yson/node/node.cpp index b39e070718..c6c4b47971 100644 --- a/library/cpp/yson/node/node.cpp +++ b/library/cpp/yson/node/node.cpp @@ -852,13 +852,13 @@ void TNode::CreateAttributes() void TNode::Save(IOutputStream* out) const { - NodeToYsonStream(*this, out, NYson::EYsonFormat::Binary); + NodeToYsonStream(*this, out, NYson::EYsonFormat::Binary); } void TNode::Load(IInputStream* in) { Clear(); - *this = NodeFromYsonStream(in, ::NYson::EYsonType::Node); + *this = NodeFromYsonStream(in, ::NYson::EYsonType::Node); } //////////////////////////////////////////////////////////////////////////////// diff --git a/library/cpp/yson/node/node_builder.cpp b/library/cpp/yson/node/node_builder.cpp index b4431bc77a..40807f5b12 100644 --- a/library/cpp/yson/node/node_builder.cpp +++ b/library/cpp/yson/node/node_builder.cpp @@ -9,7 +9,7 @@ TNodeBuilder::TNodeBuilder(TNode* node) Stack_.push(node); } -void TNodeBuilder::OnStringScalar(TStringBuf value) +void TNodeBuilder::OnStringScalar(TStringBuf value) { AddNode(value, true); } @@ -59,7 +59,7 @@ void TNodeBuilder::OnBeginMap() AddNode(TNode::CreateMap(), false); } -void TNodeBuilder::OnKeyedItem(TStringBuf key) +void TNodeBuilder::OnKeyedItem(TStringBuf key) { Stack_.push(&(*Stack_.top())[TString(key)]); } diff --git a/library/cpp/yson/node/node_builder.h b/library/cpp/yson/node/node_builder.h index 69800016e0..8725298e25 100644 --- a/library/cpp/yson/node/node_builder.h +++ b/library/cpp/yson/node/node_builder.h @@ -18,7 +18,7 @@ class TNodeBuilder public: TNodeBuilder(TNode* node); - void OnStringScalar(TStringBuf) override; + void OnStringScalar(TStringBuf) override; void OnInt64Scalar(i64) override; void OnUint64Scalar(ui64) override; void OnDoubleScalar(double) override; @@ -28,7 +28,7 @@ public: void OnListItem() override; void OnEndList() override; void OnBeginMap() override; - void OnKeyedItem(TStringBuf) override; + void OnKeyedItem(TStringBuf) override; void OnEndMap() override; void OnBeginAttributes() override; void OnEndAttributes() override; diff --git a/library/cpp/yson/node/node_io.cpp b/library/cpp/yson/node/node_io.cpp index 294a7f7217..6d581f9b81 100644 --- a/library/cpp/yson/node/node_io.cpp +++ b/library/cpp/yson/node/node_io.cpp @@ -66,14 +66,14 @@ static void WalkJsonTree(const NJson::TJsonValue& jsonValue, NJson::TJsonCallbac Y_UNREACHABLE(); } -static TNode CreateEmptyNodeByType(::NYson::EYsonType type) +static TNode CreateEmptyNodeByType(::NYson::EYsonType type) { TNode result; switch (type) { - case ::NYson::EYsonType::ListFragment: + case ::NYson::EYsonType::ListFragment: result = TNode::CreateList(); break; - case ::NYson::EYsonType::MapFragment: + case ::NYson::EYsonType::MapFragment: result = TNode::CreateMap(); break; default: @@ -82,46 +82,46 @@ static TNode CreateEmptyNodeByType(::NYson::EYsonType type) return result; } -TNode NodeFromYsonString(const TStringBuf input, ::NYson::EYsonType type) +TNode NodeFromYsonString(const TStringBuf input, ::NYson::EYsonType type) { TMemoryInput stream(input); return NodeFromYsonStream(&stream, type); } -TString NodeToYsonString(const TNode& node, NYson::EYsonFormat format) +TString NodeToYsonString(const TNode& node, NYson::EYsonFormat format) { TStringStream stream; NodeToYsonStream(node, &stream, format); return stream.Str(); } -TString NodeToCanonicalYsonString(const TNode& node, NYson::EYsonFormat format) +TString NodeToCanonicalYsonString(const TNode& node, NYson::EYsonFormat format) { TStringStream stream; NodeToCanonicalYsonStream(node, &stream, format); return stream.Str(); } -TNode NodeFromYsonStream(IInputStream* input, ::NYson::EYsonType type) +TNode NodeFromYsonStream(IInputStream* input, ::NYson::EYsonType type) { TNode result = CreateEmptyNodeByType(type); TNodeBuilder builder(&result); - ::NYson::TYsonParser parser(&builder, input, type); + ::NYson::TYsonParser parser(&builder, input, type); parser.Parse(); return result; } -void NodeToYsonStream(const TNode& node, IOutputStream* output, NYson::EYsonFormat format) +void NodeToYsonStream(const TNode& node, IOutputStream* output, NYson::EYsonFormat format) { - ::NYson::TYsonWriter writer(output, format); + ::NYson::TYsonWriter writer(output, format); TNodeVisitor visitor(&writer); visitor.Visit(node); } -void NodeToCanonicalYsonStream(const TNode& node, IOutputStream* output, NYson::EYsonFormat format) +void NodeToCanonicalYsonStream(const TNode& node, IOutputStream* output, NYson::EYsonFormat format) { - ::NYson::TYsonWriter writer(output, format); + ::NYson::TYsonWriter writer(output, format); TNodeVisitor visitor(&writer, /*sortMapKeys*/ true); visitor.Visit(node); } diff --git a/library/cpp/yson/node/node_io.h b/library/cpp/yson/node/node_io.h index 2ad23b658f..d86b9f8bda 100644 --- a/library/cpp/yson/node/node_io.h +++ b/library/cpp/yson/node/node_io.h @@ -12,22 +12,22 @@ namespace NYT { //////////////////////////////////////////////////////////////////////////////// // Parse TNode from string in YSON format -TNode NodeFromYsonString(const TStringBuf input, ::NYson::EYsonType type = ::NYson::EYsonType::Node); +TNode NodeFromYsonString(const TStringBuf input, ::NYson::EYsonType type = ::NYson::EYsonType::Node); // Serialize TNode to string in one of YSON formats with random order of maps' keys (don't use in tests) -TString NodeToYsonString(const TNode& node, ::NYson::EYsonFormat format = ::NYson::EYsonFormat::Text); +TString NodeToYsonString(const TNode& node, ::NYson::EYsonFormat format = ::NYson::EYsonFormat::Text); // Same as the latter, but maps' keys are sorted lexicographically (to be used in tests) -TString NodeToCanonicalYsonString(const TNode& node, ::NYson::EYsonFormat format = ::NYson::EYsonFormat::Text); +TString NodeToCanonicalYsonString(const TNode& node, ::NYson::EYsonFormat format = ::NYson::EYsonFormat::Text); // Parse TNode from stream in YSON format -TNode NodeFromYsonStream(IInputStream* input, ::NYson::EYsonType type = ::NYson::EYsonType::Node); +TNode NodeFromYsonStream(IInputStream* input, ::NYson::EYsonType type = ::NYson::EYsonType::Node); // Serialize TNode to stream in one of YSON formats with random order of maps' keys (don't use in tests) -void NodeToYsonStream(const TNode& node, IOutputStream* output, ::NYson::EYsonFormat format = ::NYson::EYsonFormat::Text); +void NodeToYsonStream(const TNode& node, IOutputStream* output, ::NYson::EYsonFormat format = ::NYson::EYsonFormat::Text); // Same as the latter, but maps' keys are sorted lexicographically (to be used in tests) -void NodeToCanonicalYsonStream(const TNode& node, IOutputStream* output, ::NYson::EYsonFormat format = ::NYson::EYsonFormat::Text); +void NodeToCanonicalYsonStream(const TNode& node, IOutputStream* output, ::NYson::EYsonFormat format = ::NYson::EYsonFormat::Text); // Parse TNode from string in JSON format TNode NodeFromJsonString(const TStringBuf input); diff --git a/library/cpp/yson/node/node_visitor.h b/library/cpp/yson/node/node_visitor.h index db25832309..45be709a76 100644 --- a/library/cpp/yson/node/node_visitor.h +++ b/library/cpp/yson/node/node_visitor.h @@ -11,14 +11,14 @@ namespace NYT { class TNodeVisitor { public: - TNodeVisitor(NYson::IYsonConsumer* consumer, bool sortMapKeys = false); + TNodeVisitor(NYson::IYsonConsumer* consumer, bool sortMapKeys = false); void Visit(const TNode& node); void VisitMap(const TNode::TMapType& nodeMap); void VisitList(const TNode::TListType& nodeMap); private: - NYson::IYsonConsumer* Consumer_; + NYson::IYsonConsumer* Consumer_; bool SortMapKeys_; private: diff --git a/library/cpp/yson/node/serialize.cpp b/library/cpp/yson/node/serialize.cpp index aeb467622b..50b836db9c 100644 --- a/library/cpp/yson/node/serialize.cpp +++ b/library/cpp/yson/node/serialize.cpp @@ -8,17 +8,17 @@ namespace NYT { //////////////////////////////////////////////////////////////////////////////// -void Serialize(const TString& value, NYson::IYsonConsumer* consumer) +void Serialize(const TString& value, NYson::IYsonConsumer* consumer) { consumer->OnStringScalar(value); } -void Serialize(const TStringBuf& value, NYson::IYsonConsumer* consumer) +void Serialize(const TStringBuf& value, NYson::IYsonConsumer* consumer) { consumer->OnStringScalar(value); } -void Serialize(const char* value, NYson::IYsonConsumer* consumer) +void Serialize(const char* value, NYson::IYsonConsumer* consumer) { consumer->OnStringScalar(value); } @@ -29,13 +29,13 @@ void Deserialize(TString& value, const TNode& node) } #define SERIALIZE_SIGNED(type) \ -void Serialize(type value, NYson::IYsonConsumer* consumer) \ +void Serialize(type value, NYson::IYsonConsumer* consumer) \ { \ consumer->OnInt64Scalar(static_cast<i64>(value)); \ } #define SERIALIZE_UNSIGNED(type) \ -void Serialize(type value, NYson::IYsonConsumer* consumer) \ +void Serialize(type value, NYson::IYsonConsumer* consumer) \ { \ consumer->OnUint64Scalar(static_cast<ui64>(value)); \ } @@ -65,7 +65,7 @@ void Deserialize(ui64& value, const TNode& node) value = node.AsUint64(); } -void Serialize(double value, NYson::IYsonConsumer* consumer) +void Serialize(double value, NYson::IYsonConsumer* consumer) { consumer->OnDoubleScalar(value); } @@ -75,7 +75,7 @@ void Deserialize(double& value, const TNode& node) value = node.AsDouble(); } -void Serialize(bool value, NYson::IYsonConsumer* consumer) +void Serialize(bool value, NYson::IYsonConsumer* consumer) { consumer->OnBooleanScalar(value); } @@ -85,7 +85,7 @@ void Deserialize(bool& value, const TNode& node) value = node.AsBool(); } -void Serialize(const TNode& node, NYson::IYsonConsumer* consumer) +void Serialize(const TNode& node, NYson::IYsonConsumer* consumer) { TNodeVisitor visitor(consumer); visitor.Visit(node); diff --git a/library/cpp/yson/node/serialize.h b/library/cpp/yson/node/serialize.h index 99b598a44c..d8a48031a6 100644 --- a/library/cpp/yson/node/serialize.h +++ b/library/cpp/yson/node/serialize.h @@ -2,43 +2,43 @@ #include "node.h" -namespace NYT { - +namespace NYT { + namespace NYson { struct IYsonConsumer; } // namespace NYson //////////////////////////////////////////////////////////////////////////////// -void Serialize(const TString& value, NYson::IYsonConsumer* consumer); -void Serialize(const TStringBuf& value, NYson::IYsonConsumer* consumer); -void Serialize(const char* value, NYson::IYsonConsumer* consumer); +void Serialize(const TString& value, NYson::IYsonConsumer* consumer); +void Serialize(const TStringBuf& value, NYson::IYsonConsumer* consumer); +void Serialize(const char* value, NYson::IYsonConsumer* consumer); void Deserialize(TString& value, const TNode& node); -void Serialize(signed char value, NYson::IYsonConsumer* consumer); -void Serialize(short value, NYson::IYsonConsumer* consumer); -void Serialize(int value, NYson::IYsonConsumer* consumer); -void Serialize(long value, NYson::IYsonConsumer* consumer); -void Serialize(long long value, NYson::IYsonConsumer* consumer); +void Serialize(signed char value, NYson::IYsonConsumer* consumer); +void Serialize(short value, NYson::IYsonConsumer* consumer); +void Serialize(int value, NYson::IYsonConsumer* consumer); +void Serialize(long value, NYson::IYsonConsumer* consumer); +void Serialize(long long value, NYson::IYsonConsumer* consumer); void Deserialize(i64& value, const TNode& node); -void Serialize(unsigned char value, NYson::IYsonConsumer* consumer); -void Serialize(unsigned short value, NYson::IYsonConsumer* consumer); -void Serialize(unsigned int value, NYson::IYsonConsumer* consumer); -void Serialize(unsigned long value, NYson::IYsonConsumer* consumer); -void Serialize(unsigned long long value, NYson::IYsonConsumer* consumer); +void Serialize(unsigned char value, NYson::IYsonConsumer* consumer); +void Serialize(unsigned short value, NYson::IYsonConsumer* consumer); +void Serialize(unsigned int value, NYson::IYsonConsumer* consumer); +void Serialize(unsigned long value, NYson::IYsonConsumer* consumer); +void Serialize(unsigned long long value, NYson::IYsonConsumer* consumer); void Deserialize(ui64& value, const TNode& node); -void Serialize(double value, NYson::IYsonConsumer* consumer); +void Serialize(double value, NYson::IYsonConsumer* consumer); void Deserialize(double& value, const TNode& node); -void Serialize(bool value, NYson::IYsonConsumer* consumer); +void Serialize(bool value, NYson::IYsonConsumer* consumer); void Deserialize(bool& value, const TNode& node); -void Serialize(const TNode& node, NYson::IYsonConsumer* consumer); +void Serialize(const TNode& node, NYson::IYsonConsumer* consumer); void Deserialize(TNode& value, const TNode& node); -void Serialize(const THashMap<TString, TString>& renameColumns, NYson::IYsonConsumer* consumer); +void Serialize(const THashMap<TString, TString>& renameColumns, NYson::IYsonConsumer* consumer); //////////////////////////////////////////////////////////////////////////////// |