aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryurial <yurial@yandex-team.com>2023-11-30 20:41:22 +0300
committeryurial <yurial@yandex-team.com>2023-11-30 22:50:37 +0300
commit2461bca3b5eef9aca1ad825aada6036d37fa734a (patch)
tree06e20dd6429aa14fa58de49ca6a51128cd557694
parent8e776e16ab601874538faa1d1fc675525f60f10a (diff)
downloadydb-2461bca3b5eef9aca1ad825aada6036d37fa734a.tar.gz
Fixup codestyle
-rw-r--r--yt/yt/core/json/json_callbacks.cpp2
-rw-r--r--yt/yt/core/json/public.h3
-rw-r--r--yt/yt/core/json/unittests/parser_ut.cpp40
-rw-r--r--yt/yt/library/formats/format.cpp2
4 files changed, 24 insertions, 23 deletions
diff --git a/yt/yt/core/json/json_callbacks.cpp b/yt/yt/core/json/json_callbacks.cpp
index 39703c007f..be342c6e8a 100644
--- a/yt/yt/core/json/json_callbacks.cpp
+++ b/yt/yt/core/json/json_callbacks.cpp
@@ -151,7 +151,7 @@ void TJsonCallbacksBuildingNodesImpl::OnItemFinished()
void TJsonCallbacksBuildingNodesImpl::ConsumeNode(INodePtr node, int nestingLevel)
{
if (NestingLevelLimit_ > 0 && nestingLevel > NestingLevelLimit_) {
- THROW_ERROR_EXCEPTION("JSON nesting level limit exceeded") << NYT::TErrorAttribute("NestingLevelLimit", NestingLevelLimit_);
+ THROW_ERROR_EXCEPTION("JSON nesting level limit exceeded") << TErrorAttribute("nesting_level_limit", NestingLevelLimit_);
}
switch (node->GetType()) {
case ENodeType::Int64:
diff --git a/yt/yt/core/json/public.h b/yt/yt/core/json/public.h
index 6e7b4486d1..d57069f7a9 100644
--- a/yt/yt/core/json/public.h
+++ b/yt/yt/core/json/public.h
@@ -1,6 +1,7 @@
#pragma once
#include <yt/yt/core/misc/public.h>
+
#include <yt/yt/core/yson/public.h>
namespace NYT::NJson {
@@ -13,7 +14,7 @@ struct IJsonConsumer;
struct IJsonWriter;
// YSON with attributes is represented in JSON with additional nested objects. It leads to doubled nesting levels.
-constexpr int NestingLevelLimit = NYT::NYson::NewNestingLevelLimit * 2;
+constexpr int NestingLevelLimit = NYson::NewNestingLevelLimit * 2;
////////////////////////////////////////////////////////////////////////////////
diff --git a/yt/yt/core/json/unittests/parser_ut.cpp b/yt/yt/core/json/unittests/parser_ut.cpp
index c1d6ed0787..fdac858356 100644
--- a/yt/yt/core/json/unittests/parser_ut.cpp
+++ b/yt/yt/core/json/unittests/parser_ut.cpp
@@ -828,44 +828,44 @@ TString MakeDeepListJson(int depth)
return result;
}
-TEST(TJsonParser, ParseDeepMapNoExcept)
+TEST(TJsonParserTest, ParseDeepMapNoExcept)
{
TStringStream yson;
NYT::NYson::TYsonWriter writer(&yson);
- auto configPtr = NYT::New<NYT::NJson::TJsonFormatConfig>();
- configPtr->NestingLevelLimit = 20;
- NYT::NJson::TJsonParser parser(&writer, configPtr, NYT::NJson::EYsonType::Node);
- EXPECT_NO_THROW(parser.Read(MakeDeepMapJson(configPtr->NestingLevelLimit)));
+ auto config = NYT::New<TJsonFormatConfig>();
+ config->NestingLevelLimit = 20;
+ TJsonParser parser(&writer, config, EYsonType::Node);
+ EXPECT_NO_THROW(parser.Read(MakeDeepMapJson(config->NestingLevelLimit)));
}
-TEST(TJsonParser, ParseDeepMapExcept)
+TEST(TJsonParserTest, ParseDeepMapExcept)
{
TStringStream yson;
NYT::NYson::TYsonWriter writer(&yson);
- auto configPtr = NYT::New<NYT::NJson::TJsonFormatConfig>();
- configPtr->NestingLevelLimit = 20;
- NYT::NJson::TJsonParser parser(&writer, configPtr, NYT::NJson::EYsonType::Node);
- EXPECT_THROW(parser.Read(MakeDeepMapJson(configPtr->NestingLevelLimit + 1)), NYT::TErrorException);
+ auto config = NYT::New<TJsonFormatConfig>();
+ config->NestingLevelLimit = 20;
+ TJsonParser parser(&writer, config, EYsonType::Node);
+ EXPECT_THROW(parser.Read(MakeDeepMapJson(config->NestingLevelLimit + 1)), NYT::TErrorException);
}
-TEST(TJsonParser, ParseDeepListNoExcept)
+TEST(TJsonParserTest, ParseDeepListNoExcept)
{
TStringStream yson;
NYT::NYson::TYsonWriter writer(&yson);
- auto configPtr = NYT::New<NYT::NJson::TJsonFormatConfig>();
- configPtr->NestingLevelLimit = 20;
- NYT::NJson::TJsonParser parser(&writer, configPtr, NYT::NJson::EYsonType::Node);
- EXPECT_NO_THROW(parser.Read(MakeDeepListJson(configPtr->NestingLevelLimit)));
+ auto config = NYT::New<TJsonFormatConfig>();
+ config->NestingLevelLimit = 20;
+ TJsonParser parser(&writer, config, EYsonType::Node);
+ EXPECT_NO_THROW(parser.Read(MakeDeepListJson(config->NestingLevelLimit)));
}
-TEST(TJsonParser, ParseDeepListExcept)
+TEST(TJsonParserTest, ParseDeepListExcept)
{
TStringStream yson;
NYT::NYson::TYsonWriter writer(&yson);
- auto configPtr = NYT::New<NYT::NJson::TJsonFormatConfig>();
- configPtr->NestingLevelLimit = 20;
- NYT::NJson::TJsonParser parser(&writer, configPtr, NYT::NJson::EYsonType::Node);
- EXPECT_THROW(parser.Read(MakeDeepListJson(configPtr->NestingLevelLimit + 1)), NYT::TErrorException);
+ auto config = NYT::New<TJsonFormatConfig>();
+ config->NestingLevelLimit = 20;
+ TJsonParser parser(&writer, config, EYsonType::Node);
+ EXPECT_THROW(parser.Read(MakeDeepListJson(config->NestingLevelLimit + 1)), NYT::TErrorException);
}
////////////////////////////////////////////////////////////////////////////////
diff --git a/yt/yt/library/formats/format.cpp b/yt/yt/library/formats/format.cpp
index a8ac005ae5..ed02fbdc76 100644
--- a/yt/yt/library/formats/format.cpp
+++ b/yt/yt/library/formats/format.cpp
@@ -466,7 +466,7 @@ std::unique_ptr<IParser> CreateParserForFormat(const TFormat& format, EDataType
case EFormatType::Json: {
auto config = ConvertTo<TJsonFormatConfigPtr>(&format.Attributes());
if (config->NestingLevelLimit == 0) {
- config->NestingLevelLimit = NYT::NJson::NestingLevelLimit;
+ config->NestingLevelLimit = NJson::NestingLevelLimit;
}
return std::unique_ptr<IParser>(new TParserAdapter<TJsonParser>(consumer, config, DataTypeToYsonType(dataType)));
}