Skip to content

Commit 0679ec4

Browse files
vitstnvitstn
committed
fix
1 parent 9a35289 commit 0679ec4

File tree

2 files changed

+9
-20
lines changed

2 files changed

+9
-20
lines changed

‎ydb/library/yql/minikql/comp_nodes/ut/mkql_decimal_ut.cpp

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,9 @@ Y_UNIT_TEST_SUITE(TMiniKQLDecimalTest) {
1717
const auto data2 = pb.NewOptional(pb.NewDecimalLiteral(+NYql::NDecimal::Inf(), 13, 5));
1818
const auto data3 = pb.NewOptional(pb.NewDecimalLiteral(-NYql::NDecimal::Inf(), 13, 5));
1919
const auto data4 = pb.NewEmptyOptional(type);
20-
const auto data5 = pb.NewOptional(pb.NewDecimalLiteral(-NYql::NDecimal::Nan(), 13, 5));
2120
const auto data = pb.NewDecimalLiteral(314159, 13, 5);
2221

23-
const auto list = pb.NewList(type, {data0, data1, data2, data3, data4, data5});
22+
const auto list = pb.NewList(type, {data0, data1, data2, data3, data4});
2423

2524
const auto pgmReturn = pb.Map(list,
2625
[&](TRuntimeNode item) {
@@ -40,8 +39,6 @@ Y_UNIT_TEST_SUITE(TMiniKQLDecimalTest) {
4039
UNIT_ASSERT(item.GetInt128() == -NYql::NDecimal::Inf());
4140
UNIT_ASSERT(iterator.Next(item));
4241
UNIT_ASSERT(!item);
43-
UNIT_ASSERT(iterator.Next(item));
44-
UNIT_ASSERT(item.GetInt128() == 314159);
4542
UNIT_ASSERT(!iterator.Next(item));
4643
UNIT_ASSERT(!iterator.Next(item));
4744
}
@@ -870,7 +867,7 @@ Y_UNIT_TEST_SUITE(TMiniKQLDecimalTest) {
870867
TSetup<LLVM> setup;
871868
TProgramBuilder& pb = *setup.PgmBuilder;
872869

873-
const auto data1 = pb.NewDecimalLiteral(-NYql::NDecimal::Nan(), 13, 2);
870+
const auto data1 = pb.NewDecimalLiteral(NYql::NDecimal::Nan(), 13, 2);
874871
const auto data2 = pb.NewDecimalLiteral(+NYql::NDecimal::Inf(), 13, 2);
875872
const auto data3 = pb.NewDecimalLiteral(314, 13, 2);
876873
const auto data4 = pb.NewDecimalLiteral(-213, 13, 2);
@@ -890,8 +887,8 @@ Y_UNIT_TEST_SUITE(TMiniKQLDecimalTest) {
890887
NUdf::TUnboxedValue item;
891888

892889
UNIT_ASSERT(iterator.Next(item));
893-
UNIT_ASSERT(item.GetElement(0).GetInt128() == -NYql::NDecimal::Nan());
894-
UNIT_ASSERT(item.GetElement(1).GetInt128() == -NYql::NDecimal::Nan());
890+
UNIT_ASSERT(item.GetElement(0).GetInt128() == NYql::NDecimal::Nan());
891+
UNIT_ASSERT(item.GetElement(1).GetInt128() == NYql::NDecimal::Nan());
895892

896893
UNIT_ASSERT(iterator.Next(item));
897894
UNIT_ASSERT(item.GetElement(0).GetInt128() == +NYql::NDecimal::Inf());
@@ -1124,7 +1121,7 @@ Y_UNIT_TEST_SUITE(TMiniKQLDecimalTest) {
11241121
TSetup<LLVM> setup;
11251122
TProgramBuilder& pb = *setup.PgmBuilder;
11261123

1127-
const auto data1 = pb.NewDecimalLiteral(-NYql::NDecimal::Nan(), 13, 2);
1124+
const auto data1 = pb.NewDecimalLiteral(NYql::NDecimal::Nan(), 13, 2);
11281125
const auto data2 = pb.NewDecimalLiteral(+NYql::NDecimal::Inf(), 13, 2);
11291126
const auto data3 = pb.NewDecimalLiteral(314, 13, 2);
11301127
const auto data4 = pb.NewDecimalLiteral(-213, 13, 2);
@@ -2115,15 +2112,14 @@ Y_UNIT_TEST_SUITE(TMiniKQLDecimalTest) {
21152112
TSetup<LLVM> setup;
21162113
TProgramBuilder& pb = *setup.PgmBuilder;
21172114

2118-
const auto data0 = pb.NewDecimalLiteral(-NYql::NDecimal::Nan(), 10, 1);
21192115
const auto data1 = pb.NewDecimalLiteral(-NYql::NDecimal::Inf(), 10, 1);
21202116
const auto data3 = pb.NewDecimalLiteral(-7, 10, 1);
21212117
const auto data4 = pb.NewDecimalLiteral(0, 10, 1);
21222118
const auto data5 = pb.NewDecimalLiteral(13, 10, 1);
21232119
const auto data7 = pb.NewDecimalLiteral(+NYql::NDecimal::Inf(), 10, 1);
2124-
const auto data8 = pb.NewDecimalLiteral(+NYql::NDecimal::Nan(), 10, 1);
2120+
const auto data8 = pb.NewDecimalLiteral(NYql::NDecimal::Nan(), 10, 1);
21252121

2126-
const auto list = pb.NewList(pb.NewDecimalType(10, 1), {data0, data1, data3, data4, data5, data7, data8});
2122+
const auto list = pb.NewList(pb.NewDecimalType(10, 1), {data1, data3, data4, data5, data7, data8});
21272123

21282124
const auto pgmReturn = pb.Map(list,
21292125
[&](TRuntimeNode item) {
@@ -2134,10 +2130,6 @@ Y_UNIT_TEST_SUITE(TMiniKQLDecimalTest) {
21342130
const auto iterator = graph->GetValue().GetListIterator();
21352131
NUdf::TUnboxedValue item;
21362132

2137-
UNIT_ASSERT(iterator.Next(item));
2138-
UNIT_ASSERT(item.GetElement(0).GetInt128() == -NYql::NDecimal::Nan());
2139-
UNIT_ASSERT(item.GetElement(1).GetInt128() == NYql::NDecimal::Nan());
2140-
21412133
UNIT_ASSERT(iterator.Next(item));
21422134
UNIT_ASSERT(item.GetElement(0).GetInt128() == NYql::NDecimal::Inf());
21432135
UNIT_ASSERT(item.GetElement(1).GetInt128() == NYql::NDecimal::Inf());

‎ydb/library/yql/public/decimal/ut/yql_decimal_ut.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -230,19 +230,16 @@ Y_UNIT_TEST_SUITE(TYqlDecimalTest) {
230230
}
231231

232232
Y_UNIT_TEST(TestSpecialAsString) {
233-
UNIT_ASSERT(IsValid("+Nan"));
234-
UNIT_ASSERT(IsValid("-nAn"));
233+
UNIT_ASSERT(IsValid("Nan"));
235234
UNIT_ASSERT(IsValid("INF"));
236235
UNIT_ASSERT(IsValid("-inf"));
237236

238-
UNIT_ASSERT_VALUES_EQUAL(ToString(+Nan(), 10, 2), "nan");
239-
UNIT_ASSERT_VALUES_EQUAL(ToString(-Nan(), 10, 2), "-nan");
237+
UNIT_ASSERT_VALUES_EQUAL(ToString(Nan(), 10, 2), "nan");
240238

241239
UNIT_ASSERT_VALUES_EQUAL(ToString(+Inf(), 10, 2), "inf");
242240
UNIT_ASSERT_VALUES_EQUAL(ToString(-Inf(), 10, 2), "-inf");
243241

244242
UNIT_ASSERT(IsNan(FromString("nan", 10, 2)));
245-
UNIT_ASSERT(IsNan(FromString("-nAN", 12, 7)));
246243
UNIT_ASSERT(IsInf(FromString("+INf", MaxPrecision, 6)));
247244
UNIT_ASSERT(IsInf(FromString("-inF", 4, 2)));
248245
}

0 commit comments

Comments
 (0)