diff options
author | osado <osado@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 | 58cd0b86ed99a72df22479e26a20bc1c1e57e65e (patch) | |
tree | 5d5cb817648f650d76cf1076100726fd9b8448e8 /library | |
parent | 3ed175181ceac225ee14e4519492ad2967a7bd73 (diff) | |
download | ydb-58cd0b86ed99a72df22479e26a20bc1c1e57e65e.tar.gz |
Restoring authorship annotation for <osado@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'library')
-rw-r--r-- | library/cpp/json/writer/json_value_ut.cpp | 12 | ||||
-rw-r--r-- | library/cpp/monlib/dynamic_counters/golovan_page.cpp | 2 | ||||
-rw-r--r-- | library/cpp/retry/retry.cpp | 2 | ||||
-rw-r--r-- | library/cpp/retry/retry.h | 104 | ||||
-rw-r--r-- | library/cpp/retry/utils.cpp | 18 | ||||
-rw-r--r-- | library/cpp/retry/utils.h | 12 | ||||
-rw-r--r-- | library/cpp/retry/ya.make | 18 | ||||
-rw-r--r-- | library/cpp/scheme/scheme.h | 8 | ||||
-rw-r--r-- | library/cpp/scheme/scimpl.h | 30 | ||||
-rw-r--r-- | library/cpp/scheme/util/scheme_holder.cpp | 2 | ||||
-rw-r--r-- | library/cpp/scheme/util/scheme_holder.h | 150 | ||||
-rw-r--r-- | library/cpp/scheme/util/utils.cpp | 44 | ||||
-rw-r--r-- | library/cpp/scheme/util/utils.h | 44 | ||||
-rw-r--r-- | library/cpp/scheme/util/ya.make | 26 | ||||
-rw-r--r-- | library/cpp/streams/zc_memory_input/zc_memory_input.h | 2 | ||||
-rw-r--r-- | library/cpp/yson/node/node_io.cpp | 26 | ||||
-rw-r--r-- | library/cpp/yson/node/node_io.h | 2 |
17 files changed, 251 insertions, 251 deletions
diff --git a/library/cpp/json/writer/json_value_ut.cpp b/library/cpp/json/writer/json_value_ut.cpp index f11861f10e..dc7f6affdf 100644 --- a/library/cpp/json/writer/json_value_ut.cpp +++ b/library/cpp/json/writer/json_value_ut.cpp @@ -599,14 +599,14 @@ Y_UNIT_TEST_SUITE(TJsonValueTest) { GetMapPointer(outer, "x", &map); UNIT_ASSERT_VALUES_EQUAL((*map).at("b"), 2); } - + Y_UNIT_TEST(GetIntegerRobustBignumStringTest) { TString value = "1626862681464633683"; - TJsonValue json(value); - UNIT_ASSERT_VALUES_EQUAL(json.GetUIntegerRobust(), FromString<ui64>(value)); - UNIT_ASSERT_VALUES_EQUAL(json.GetIntegerRobust(), FromString<i64>(value)); - } - + TJsonValue json(value); + UNIT_ASSERT_VALUES_EQUAL(json.GetUIntegerRobust(), FromString<ui64>(value)); + UNIT_ASSERT_VALUES_EQUAL(json.GetIntegerRobust(), FromString<i64>(value)); + } + Y_UNIT_TEST(MoveSubpartToSelf) { TJsonValue json; json[0] = "testing 0"; diff --git a/library/cpp/monlib/dynamic_counters/golovan_page.cpp b/library/cpp/monlib/dynamic_counters/golovan_page.cpp index 3a8f29b261..49cf2d39bb 100644 --- a/library/cpp/monlib/dynamic_counters/golovan_page.cpp +++ b/library/cpp/monlib/dynamic_counters/golovan_page.cpp @@ -31,7 +31,7 @@ public: out << "[\"" << prefix + value; if (counter->ForDerivative()) { - out << "_dmmm"; + out << "_dmmm"; } else { out << "_ahhh"; } diff --git a/library/cpp/retry/retry.cpp b/library/cpp/retry/retry.cpp index cafe54177d..92466cdeca 100644 --- a/library/cpp/retry/retry.cpp +++ b/library/cpp/retry/retry.cpp @@ -2,7 +2,7 @@ #include <util/stream/output.h> -void DoWithRetry(std::function<void()> func, TRetryOptions retryOptions) { +void DoWithRetry(std::function<void()> func, TRetryOptions retryOptions) { DoWithRetry(func, retryOptions, true); } diff --git a/library/cpp/retry/retry.h b/library/cpp/retry/retry.h index 7c1566de60..c47ff5070f 100644 --- a/library/cpp/retry/retry.h +++ b/library/cpp/retry/retry.h @@ -1,7 +1,7 @@ #pragma once -#include "utils.h" - +#include "utils.h" + #include <library/cpp/retry/protos/retry_options.pb.h> #include <util/datetime/base.h> @@ -10,11 +10,11 @@ #include <util/generic/yexception.h> #include <functional> -struct TRetryOptions { - ui32 RetryCount; +struct TRetryOptions { + ui32 RetryCount; // TotalDuration = SleepDuration +/- SleepRandomDelta + (attempt * SleepIncrement) + (2**attempt * SleepExponentialMultiplier) - TDuration SleepDuration; + TDuration SleepDuration; TDuration SleepRandomDelta; TDuration SleepIncrement; TDuration SleepExponentialMultiplier; @@ -24,35 +24,35 @@ struct TRetryOptions { TRetryOptions(ui32 retryCount = 3, TDuration sleepDuration = TDuration::Seconds(1), TDuration sleepRandomDelta = TDuration::Zero(), TDuration sleepIncrement = TDuration::Zero(), TDuration sleepExponentialMultiplier = TDuration::Zero(), std::function<void(TDuration)> sleepFunction = [](TDuration d) { Sleep(d); }) // can't use Sleep itself due to Win compilation error - : RetryCount(retryCount) - , SleepDuration(sleepDuration) - , SleepRandomDelta(sleepRandomDelta) + : RetryCount(retryCount) + , SleepDuration(sleepDuration) + , SleepRandomDelta(sleepRandomDelta) , SleepIncrement(sleepIncrement) , SleepExponentialMultiplier(sleepExponentialMultiplier) , SleepFunction(sleepFunction) - { - } + { + } TRetryOptions& WithCount(ui32 retryCount) { - RetryCount = retryCount; - return *this; - } - - TRetryOptions& WithSleep(TDuration sleepDuration) { - SleepDuration = sleepDuration; - return *this; - } - - TRetryOptions& WithRandomDelta(TDuration sleepRandomDelta) { - SleepRandomDelta = sleepRandomDelta; - return *this; - } - + RetryCount = retryCount; + return *this; + } + + TRetryOptions& WithSleep(TDuration sleepDuration) { + SleepDuration = sleepDuration; + return *this; + } + + TRetryOptions& WithRandomDelta(TDuration sleepRandomDelta) { + SleepRandomDelta = sleepRandomDelta; + return *this; + } + TRetryOptions& WithIncrement(TDuration sleepIncrement) { SleepIncrement = sleepIncrement; return *this; - } - + } + TRetryOptions& WithExponentialMultiplier(TDuration sleepExponentialMultiplier) { SleepExponentialMultiplier = sleepExponentialMultiplier; return *this; @@ -68,45 +68,45 @@ struct TRetryOptions { return SleepDuration + NRetryPrivate::AddRandomDelta(SleepRandomDelta) + NRetryPrivate::AddIncrement(attempt, SleepIncrement) + NRetryPrivate::AddExponentialMultiplier(attempt, SleepExponentialMultiplier); } - static TRetryOptions Count(ui32 retryCount) { - return TRetryOptions(retryCount); - } + static TRetryOptions Count(ui32 retryCount) { + return TRetryOptions(retryCount); + } - static TRetryOptions Default() { - return TRetryOptions(); + static TRetryOptions Default() { + return TRetryOptions(); } - static TRetryOptions NoRetry() { - return TRetryOptions(0); + static TRetryOptions NoRetry() { + return TRetryOptions(0); } -}; +}; -template <typename TResult, typename TException = yexception> +template <typename TResult, typename TException = yexception> TMaybe<TResult> DoWithRetry(std::function<TResult()> func, std::function<void(const TException&)> onFail, TRetryOptions retryOptions, bool throwLast) { - for (ui32 attempt = 0; attempt <= retryOptions.RetryCount; ++attempt) { - try { - return func(); + for (ui32 attempt = 0; attempt <= retryOptions.RetryCount; ++attempt) { + try { + return func(); } catch (TException& ex) { onFail(ex); - if (attempt == retryOptions.RetryCount) { - if (throwLast) { - throw; + if (attempt == retryOptions.RetryCount) { + if (throwLast) { + throw; } - } else { + } else { auto sleep = retryOptions.SleepFunction; sleep(retryOptions.GetTimeToSleep(attempt)); } } } - return Nothing(); -} + return Nothing(); +} template <typename TResult, typename TException = yexception> TMaybe<TResult> DoWithRetry(std::function<TResult()> func, TRetryOptions retryOptions, bool throwLast) { return DoWithRetry<TResult, TException>(func, [](const TException&){}, retryOptions, throwLast); } -template <typename TException = yexception> +template <typename TException = yexception> bool DoWithRetry(std::function<void()> func, std::function<void(const TException&)> onFail, TRetryOptions retryOptions, bool throwLast) { auto f = [&]() { func(); @@ -116,15 +116,15 @@ bool DoWithRetry(std::function<void()> func, std::function<void(const TException } template <typename TException = yexception> -bool DoWithRetry(std::function<void()> func, TRetryOptions retryOptions, bool throwLast) { - auto f = [&]() { - func(); - return nullptr; - }; +bool DoWithRetry(std::function<void()> func, TRetryOptions retryOptions, bool throwLast) { + auto f = [&]() { + func(); + return nullptr; + }; return DoWithRetry<void*, TException>(f, [](const TException&){}, retryOptions, throwLast).Defined(); -} +} -void DoWithRetry(std::function<void()> func, TRetryOptions retryOptions); +void DoWithRetry(std::function<void()> func, TRetryOptions retryOptions); bool DoWithRetryOnRetCode(std::function<bool()> func, TRetryOptions retryOptions); diff --git a/library/cpp/retry/utils.cpp b/library/cpp/retry/utils.cpp index c3e797a68a..24d943f518 100644 --- a/library/cpp/retry/utils.cpp +++ b/library/cpp/retry/utils.cpp @@ -1,15 +1,15 @@ -#include "utils.h" - -#include <util/random/random.h> - +#include "utils.h" + +#include <util/random/random.h> + TDuration NRetryPrivate::AddRandomDelta(TDuration maxDelta) { - if (maxDelta == TDuration::Zero()) { + if (maxDelta == TDuration::Zero()) { return TDuration::Zero(); - } - - const TDuration delta = TDuration::MicroSeconds(RandomNumber(2 * maxDelta.MicroSeconds())); + } + + const TDuration delta = TDuration::MicroSeconds(RandomNumber(2 * maxDelta.MicroSeconds())); return delta - maxDelta; -} +} TDuration NRetryPrivate::AddIncrement(ui32 attempt, TDuration increment) { return TDuration::MicroSeconds(attempt * increment.MicroSeconds()); diff --git a/library/cpp/retry/utils.h b/library/cpp/retry/utils.h index 482bb846e1..a8fd3d1a89 100644 --- a/library/cpp/retry/utils.h +++ b/library/cpp/retry/utils.h @@ -1,10 +1,10 @@ -#pragma once - -#include <util/datetime/base.h> - -namespace NRetryPrivate { +#pragma once + +#include <util/datetime/base.h> + +namespace NRetryPrivate { TDuration AddRandomDelta(TDuration delta); TDuration AddIncrement(ui32 attempt, TDuration increment); TDuration AddExponentialMultiplier(ui32 attempt, TDuration exponentialMultiplier); - + } diff --git a/library/cpp/retry/ya.make b/library/cpp/retry/ya.make index 43486fa208..31e0c6a259 100644 --- a/library/cpp/retry/ya.make +++ b/library/cpp/retry/ya.make @@ -1,17 +1,17 @@ -LIBRARY() - +LIBRARY() + OWNER( osado g:yabs-small ) - -SRCS( - retry.cpp - utils.cpp -) - + +SRCS( + retry.cpp + utils.cpp +) + PEERDIR( library/cpp/retry/protos ) -END() +END() diff --git a/library/cpp/scheme/scheme.h b/library/cpp/scheme/scheme.h index 5548ce4297..3d7c59f3c9 100644 --- a/library/cpp/scheme/scheme.h +++ b/library/cpp/scheme/scheme.h @@ -15,7 +15,7 @@ namespace NSc { // todo: try to remove some rarely used methods class TValue { public: - enum class EType { + enum class EType { Null = 0 /* "Null" */, Bool /* "Bool" */, IntNumber /* "Int" */, @@ -396,9 +396,9 @@ namespace NSc { static const TArray& DefaultArray(); static const TDict& DefaultDict(); static const TValue& DefaultValue(); - static const TValue& Null() { - return DefaultValue(); - } + static const TValue& Null() { + return DefaultValue(); + } void DoWriteJsonImpl(IOutputStream&, const TJsonOpts&, NImpl::TKeySortContext&, NImpl::TSelfLoopContext&) const; diff --git a/library/cpp/scheme/scimpl.h b/library/cpp/scheme/scimpl.h index b7aaa02592..4f68f16290 100644 --- a/library/cpp/scheme/scimpl.h +++ b/library/cpp/scheme/scimpl.h @@ -12,7 +12,7 @@ namespace NSc { TStringBuf String; TDict Dict; TArray Array; - TValue::EType ValueType = TValue::EType::Null; + TValue::EType ValueType = TValue::EType::Null; TScCore(TPoolPtr& p) : Pool(p) @@ -22,31 +22,31 @@ namespace NSc { } bool IsNull() const { - return TValue::EType::Null == ValueType; + return TValue::EType::Null == ValueType; } bool IsBool() const { - return TValue::EType::Bool == ValueType; + return TValue::EType::Bool == ValueType; } bool IsIntNumber() const { - return TValue::EType::IntNumber == ValueType || IsBool(); + return TValue::EType::IntNumber == ValueType || IsBool(); } bool IsNumber() const { - return TValue::EType::FloatNumber == ValueType || IsIntNumber(); + return TValue::EType::FloatNumber == ValueType || IsIntNumber(); } bool IsString() const { - return TValue::EType::String == ValueType; + return TValue::EType::String == ValueType; } bool IsArray() const { - return TValue::EType::Array == ValueType; + return TValue::EType::Array == ValueType; } bool IsDict() const { - return TValue::EType::Dict == ValueType; + return TValue::EType::Dict == ValueType; } bool HasChildren() const { @@ -54,7 +54,7 @@ namespace NSc { } void SetNull() { - ValueType = TValue::EType::Null; + ValueType = TValue::EType::Null; } void SetArray() { @@ -62,7 +62,7 @@ namespace NSc { return; } - ValueType = TValue::EType::Array; + ValueType = TValue::EType::Array; Array.clear(); } @@ -71,22 +71,22 @@ namespace NSc { return; } - ValueType = TValue::EType::Dict; + ValueType = TValue::EType::Dict; Dict.clear(); } void SetNumber(double n) { - ValueType = TValue::EType::FloatNumber; + ValueType = TValue::EType::FloatNumber; FloatNumber = n; } void SetIntNumber(i64 n) { - ValueType = TValue::EType::IntNumber; + ValueType = TValue::EType::IntNumber; IntNumber = n; } void SetBool(bool b) { - ValueType = TValue::EType::Bool; + ValueType = TValue::EType::Bool; IntNumber = b; } @@ -95,7 +95,7 @@ namespace NSc { } void SetOwnedString(TStringBuf s) { - ValueType = TValue::EType::String; + ValueType = TValue::EType::String; String = s; } diff --git a/library/cpp/scheme/util/scheme_holder.cpp b/library/cpp/scheme/util/scheme_holder.cpp index 30f32db09c..33232acc50 100644 --- a/library/cpp/scheme/util/scheme_holder.cpp +++ b/library/cpp/scheme/util/scheme_holder.cpp @@ -1 +1 @@ -#include "scheme_holder.h" +#include "scheme_holder.h" diff --git a/library/cpp/scheme/util/scheme_holder.h b/library/cpp/scheme/util/scheme_holder.h index eae7e1fcc3..f2fa16d1cd 100644 --- a/library/cpp/scheme/util/scheme_holder.h +++ b/library/cpp/scheme/util/scheme_holder.h @@ -1,76 +1,76 @@ -#pragma once - +#pragma once + #include <library/cpp/scheme/scheme.h> - - -// Scheme adapter that holds referenced value -template <typename TScheme> -class TSchemeHolder { -public: - TSchemeHolder() - : Value_(NSc::Null()) - , Scheme_(&Value_) - { - } - - explicit TSchemeHolder(NSc::TValue&& value) - : Value_(std::move(value)) - , Scheme_(&Value_) - { - } - - explicit TSchemeHolder(const NSc::TValue& value) - : Value_(value) - , Scheme_(&Value_) - { - } - - TSchemeHolder(TSchemeHolder<TScheme>&& rhs) - : Value_(std::move(rhs.Value_)) - , Scheme_(&Value_) - { - } - - TSchemeHolder(const TSchemeHolder<TScheme>& rhs) - : Value_(rhs.Value_) - , Scheme_(&Value_) - { - } - - TSchemeHolder<TScheme>& operator=(TSchemeHolder<TScheme>&& rhs) { - Value_ = std::move(rhs.Value_); - return *this; - } - TSchemeHolder<TScheme>& operator=(const TSchemeHolder<TScheme>& rhs) { - Value_ = rhs.Value_; - return *this; - } - - TScheme& Scheme() { - return Scheme_; - } - const TScheme& Scheme() const { - return Scheme_; - } - TScheme& operator->() { - return Scheme_; - } - const TScheme& operator->() const { - return Scheme_; - } - - NSc::TValue& Value() { - return Value_; - } - const NSc::TValue& Value() const { - return Value_; - } - - bool IsNull() const { - return Value_.IsNull(); - } - -private: - NSc::TValue Value_; - TScheme Scheme_; -}; + + +// Scheme adapter that holds referenced value +template <typename TScheme> +class TSchemeHolder { +public: + TSchemeHolder() + : Value_(NSc::Null()) + , Scheme_(&Value_) + { + } + + explicit TSchemeHolder(NSc::TValue&& value) + : Value_(std::move(value)) + , Scheme_(&Value_) + { + } + + explicit TSchemeHolder(const NSc::TValue& value) + : Value_(value) + , Scheme_(&Value_) + { + } + + TSchemeHolder(TSchemeHolder<TScheme>&& rhs) + : Value_(std::move(rhs.Value_)) + , Scheme_(&Value_) + { + } + + TSchemeHolder(const TSchemeHolder<TScheme>& rhs) + : Value_(rhs.Value_) + , Scheme_(&Value_) + { + } + + TSchemeHolder<TScheme>& operator=(TSchemeHolder<TScheme>&& rhs) { + Value_ = std::move(rhs.Value_); + return *this; + } + TSchemeHolder<TScheme>& operator=(const TSchemeHolder<TScheme>& rhs) { + Value_ = rhs.Value_; + return *this; + } + + TScheme& Scheme() { + return Scheme_; + } + const TScheme& Scheme() const { + return Scheme_; + } + TScheme& operator->() { + return Scheme_; + } + const TScheme& operator->() const { + return Scheme_; + } + + NSc::TValue& Value() { + return Value_; + } + const NSc::TValue& Value() const { + return Value_; + } + + bool IsNull() const { + return Value_.IsNull(); + } + +private: + NSc::TValue Value_; + TScheme Scheme_; +}; diff --git a/library/cpp/scheme/util/utils.cpp b/library/cpp/scheme/util/utils.cpp index 202a9e3166..40cceceacd 100644 --- a/library/cpp/scheme/util/utils.cpp +++ b/library/cpp/scheme/util/utils.cpp @@ -1,23 +1,23 @@ -#include "utils.h" - +#include "utils.h" + #include <library/cpp/string_utils/base64/base64.h> - -namespace NScUtils { - -void CopyField(const NSc::TValue& from, NSc::TValue& to) { - to = from; -} - -} // namespace NScUtils - -void TSerializer<NSc::TValue>::Save(IOutputStream* out, const NSc::TValue& v) { - TString json = Base64Encode(v.ToJson()); - ::Save(out, json); -} - -void TSerializer<NSc::TValue>::Load(IInputStream* in, NSc::TValue& v) { - TString json; - ::Load(in, json); - json = Base64Decode(json); - v = NSc::TValue::FromJsonThrow(json); -} + +namespace NScUtils { + +void CopyField(const NSc::TValue& from, NSc::TValue& to) { + to = from; +} + +} // namespace NScUtils + +void TSerializer<NSc::TValue>::Save(IOutputStream* out, const NSc::TValue& v) { + TString json = Base64Encode(v.ToJson()); + ::Save(out, json); +} + +void TSerializer<NSc::TValue>::Load(IInputStream* in, NSc::TValue& v) { + TString json; + ::Load(in, json); + json = Base64Decode(json); + v = NSc::TValue::FromJsonThrow(json); +} diff --git a/library/cpp/scheme/util/utils.h b/library/cpp/scheme/util/utils.h index 6613215305..f7d666f67a 100644 --- a/library/cpp/scheme/util/utils.h +++ b/library/cpp/scheme/util/utils.h @@ -1,23 +1,23 @@ -#pragma once - +#pragma once + #include <library/cpp/scheme/scheme.h> - -#include <util/generic/strbuf.h> -#include <util/ysaveload.h> - -namespace NScUtils { - -void CopyField(const NSc::TValue& from, NSc::TValue& to); - -template <typename... Args> -void CopyField(const NSc::TValue& from, NSc::TValue& to, TStringBuf path, Args... args) { - CopyField(from[path], to[path], args...); -} - -} // namespace NScUtils - -template<> -struct TSerializer<NSc::TValue> { - static void Save(IOutputStream* out, const NSc::TValue& v); - static void Load(IInputStream* in, NSc::TValue& v); -}; + +#include <util/generic/strbuf.h> +#include <util/ysaveload.h> + +namespace NScUtils { + +void CopyField(const NSc::TValue& from, NSc::TValue& to); + +template <typename... Args> +void CopyField(const NSc::TValue& from, NSc::TValue& to, TStringBuf path, Args... args) { + CopyField(from[path], to[path], args...); +} + +} // namespace NScUtils + +template<> +struct TSerializer<NSc::TValue> { + static void Save(IOutputStream* out, const NSc::TValue& v); + static void Load(IInputStream* in, NSc::TValue& v); +}; diff --git a/library/cpp/scheme/util/ya.make b/library/cpp/scheme/util/ya.make index e2f71e9bfa..dffd1c8070 100644 --- a/library/cpp/scheme/util/ya.make +++ b/library/cpp/scheme/util/ya.make @@ -1,14 +1,14 @@ -LIBRARY() - -OWNER(g:cards_serivce) - -SRCS( - scheme_holder.cpp - utils.cpp -) - -PEERDIR( +LIBRARY() + +OWNER(g:cards_serivce) + +SRCS( + scheme_holder.cpp + utils.cpp +) + +PEERDIR( library/cpp/string_utils/base64 -) - -END() +) + +END() diff --git a/library/cpp/streams/zc_memory_input/zc_memory_input.h b/library/cpp/streams/zc_memory_input/zc_memory_input.h index a3b71e8374..c939d8e426 100644 --- a/library/cpp/streams/zc_memory_input/zc_memory_input.h +++ b/library/cpp/streams/zc_memory_input/zc_memory_input.h @@ -9,7 +9,7 @@ class TZCMemoryInput: public TMemoryInput { public: TZCMemoryInput() { } - + TZCMemoryInput(const char* dataPtr, size_t size) : TMemoryInput(dataPtr, size) { diff --git a/library/cpp/yson/node/node_io.cpp b/library/cpp/yson/node/node_io.cpp index b4ea46f1c0..294a7f7217 100644 --- a/library/cpp/yson/node/node_io.cpp +++ b/library/cpp/yson/node/node_io.cpp @@ -79,15 +79,15 @@ static TNode CreateEmptyNodeByType(::NYson::EYsonType type) default: break; } - return result; -} + return result; +} TNode NodeFromYsonString(const TStringBuf input, ::NYson::EYsonType type) -{ +{ TMemoryInput stream(input); return NodeFromYsonStream(&stream, type); } - + TString NodeToYsonString(const TNode& node, NYson::EYsonFormat format) { TStringStream stream; @@ -104,8 +104,8 @@ TString NodeToCanonicalYsonString(const TNode& node, NYson::EYsonFormat format) TNode NodeFromYsonStream(IInputStream* input, ::NYson::EYsonType type) { - TNode result = CreateEmptyNodeByType(type); - + TNode result = CreateEmptyNodeByType(type); + TNodeBuilder builder(&result); ::NYson::TYsonParser parser(&builder, input, type); parser.Parse(); @@ -129,17 +129,17 @@ void NodeToCanonicalYsonStream(const TNode& node, IOutputStream* output, NYson:: TNode NodeFromJsonString(const TStringBuf input) { TMemoryInput stream(input); - + TNode result; - - TNodeBuilder builder(&result); - TYson2JsonCallbacksAdapter callbacks(&builder, /*throwException*/ true); + + TNodeBuilder builder(&result); + TYson2JsonCallbacksAdapter callbacks(&builder, /*throwException*/ true); NJson::TJsonReaderConfig config; config.DontValidateUtf8 = true; NJson::ReadJson(&stream, &config, &callbacks); - return result; -} - + return result; +} + TNode NodeFromJsonValue(const NJson::TJsonValue& input) { TNode result; diff --git a/library/cpp/yson/node/node_io.h b/library/cpp/yson/node/node_io.h index 21016ec9e6..2ad23b658f 100644 --- a/library/cpp/yson/node/node_io.h +++ b/library/cpp/yson/node/node_io.h @@ -34,7 +34,7 @@ TNode NodeFromJsonString(const TStringBuf input); // Convert TJsonValue to TNode TNode NodeFromJsonValue(const NJson::TJsonValue& input); - + //////////////////////////////////////////////////////////////////////////////// } // namespace NYT |