Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add WriteNanAsString option in Yson::SerializeJson #1871

Merged
merged 6 commits into from
Feb 18, 2024
Merged

add WriteNanAsString option in Yson::SerializeJson #1871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
aa88bb8
add WriteNanAsString option in Yson::SerializeJson
Feb 12, 2024
aa56c4c
fix TYsonTests::TestSerializeJsonNanInf
Feb 12, 2024
8231639
add WriteNanAsString option to yson2_udf
Feb 18, 2024
6ea7994
add testcase WriteNanAsString to yson2
Feb 18, 2024
80e3799
Merge branch 'ydb-platform:main' into dev
Feb 18, 2024
0e6506c
delete SetNanAsString in TJsonWriterConfig
Feb 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ydb/library/yql/minikql/dom/json.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,10 +323,13 @@ TUnboxedValue TryParseJsonDom(const TStringBuf json, const IValueBuilder* valueB
}
}

TString SerializeJsonDom(const NUdf::TUnboxedValuePod dom, bool skipMapEntity, bool encodeUtf8) {
TString SerializeJsonDom(const NUdf::TUnboxedValuePod dom, bool skipMapEntity, bool encodeUtf8, bool writeNanAsString) {
TStringStream output;
TJsonWriterConfig config;

config.SetFormatOutput(false);
config.WriteNanAsString = writeNanAsString;

config.FloatToStringMode = EFloatToStringMode::PREC_AUTO;
TJsonWriter writer(&output, config);
if (skipMapEntity)
Expand Down
2 changes: 1 addition & 1 deletion ydb/library/yql/minikql/dom/json.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ bool IsValidJson(const TStringBuf json);

NUdf::TUnboxedValue TryParseJsonDom(const TStringBuf json, const NUdf::IValueBuilder* valueBuilder, bool decodeUtf8 = false);

TString SerializeJsonDom(const NUdf::TUnboxedValuePod dom, bool skipMapEntity = false, bool encodeUtf8 = false);
TString SerializeJsonDom(const NUdf::TUnboxedValuePod dom, bool skipMapEntity = false, bool encodeUtf8 = false, bool writeNanAsString = false);

}
25 changes: 25 additions & 0 deletions ydb/library/yql/minikql/dom/ut/yson_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#include <ydb/library/yql/minikql/dom/yson.h>

#include <ydb/library/yql/minikql/dom/json.h>

#include <library/cpp/testing/unittest/registar.h>
#include <ydb/library/yql/minikql/mkql_alloc.h>
#include <ydb/library/yql/minikql/computation/mkql_computation_node_holders.h>
Expand Down Expand Up @@ -2059,4 +2061,27 @@ Y_UNIT_TEST_SUITE(TYsonTests) {
const auto time = TInstant::Now() - t;
Cerr << "Time is " << time << Endl;
}

Y_UNIT_TEST(TestSerializeJsonNanInf) {
NMiniKQL::TScopedAlloc alloc(__LOCATION__);
NMiniKQL::TMemoryUsageInfo memInfo("Memory");
NMiniKQL::THolderFactory holderFactory(alloc.Ref(), memInfo, nullptr);
NMiniKQL::TDefaultValueBuilder builder(holderFactory);

constexpr char yson[] =
R"(
{
"Nan" = %nan;
"Inf" = %inf;
"NegInf" = %-inf
}
)";

TString expected(R"({"Inf":"inf","Nan":"nan","NegInf":"-inf"})");

const auto dom = TryParseYsonDom(yson, &builder);
TString res = SerializeJsonDom(dom, false, true, true);

UNIT_ASSERT_EQUAL(expected, res);
}
}
5 changes: 5 additions & 0 deletions ydb/library/yql/udfs/common/yson2/test/canondata/result.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,11 @@
"uri": "file://test.test_JsonWithUtf8_/results.txt"
}
],
"test.test[JsonWithNanAsString]": [
{
"uri": "file://test.test_JsonWithNanAsString_/results.txt"
}
],
"test.test[Lists]": [
{
"uri": "file://test.test_Lists_/results.txt"
Expand Down
59 changes: 59 additions & 0 deletions ydb/library/yql/udfs/common/yson2/test/canondata/test.test_JsonWithNanAsString_/results.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
[
{
"Write" = [
{
"Type" = [
"ListType";
[
"StructType";
[
[
"column0";
[
"OptionalType";
[
"DataType";
"Json"
]
]
];
[
"column1";
[
"OptionalType";
[
"DataType";
"Json"
]
]
];
[
"column2";
[
"OptionalType";
[
"DataType";
"Json"
]
]
]
]
]
];
"Data" = [
[
[
"\"nan\""
];
[
"\"inf\""
];
[
"\"-inf\""
]
]
]
}
]
}
]
8 changes: 8 additions & 0 deletions ydb/library/yql/udfs/common/yson2/test/cases/JsonWithNanAsString.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
$src = Yson::From(0./0.); -- nan
$src1 = Yson::From(1./0.); -- inf
$src2 = Yson::From(-1./0.); -- -inf

SELECT
Yson::SerializeJson($src, true AS WriteNanAsString),
Yson::SerializeJson($src1, true AS WriteNanAsString),
Yson::SerializeJson($src2, true AS WriteNanAsString)
5 changes: 3 additions & 2 deletions ydb/library/yql/udfs/common/yson2/yson2_udf.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,9 +670,10 @@ SIMPLE_STRICT_UDF(TSerializePretty, TYson(TAutoMap<TNodeResource>)) {

constexpr char SkipMapEntity[] = "SkipMapEntity";
constexpr char EncodeUtf8[] = "EncodeUtf8";
constexpr char WriteNanAsString[] = "WriteNanAsString";

SIMPLE_UDF_WITH_OPTIONAL_ARGS(TSerializeJson, TOptional<TJson>(TAutoMap<TNodeResource>, TOptional<TOptionsResource>, TNamedArg<bool, SkipMapEntity>, TNamedArg<bool, EncodeUtf8>), 3) try {
return valueBuilder->NewString(SerializeJsonDom(args[0], args[2].GetOrDefault(false), args[3].GetOrDefault(false)));
SIMPLE_UDF_WITH_OPTIONAL_ARGS(TSerializeJson, TOptional<TJson>(TAutoMap<TNodeResource>, TOptional<TOptionsResource>, TNamedArg<bool, SkipMapEntity>, TNamedArg<bool, EncodeUtf8>, TNamedArg<bool, WriteNanAsString>), 4) try {
return valueBuilder->NewString(SerializeJsonDom(args[0], args[2].GetOrDefault(false), args[3].GetOrDefault(false), args[4].GetOrDefault(false)));
} catch (const std::exception& e) {
if (ParseOptions(args[1]).Strict) {
UdfTerminate((::TStringBuilder() << valueBuilder->WithCalleePosition(GetPos()) << " " << e.what()).data());
Expand Down
Loading