Skip to content

Using Decimal in olap #4722

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

Merged
merged 2 commits into from
May 21, 2024
Merged

Using Decimal in olap #4722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a5da67
cherry-pick 6d272baf74 (Decimal type in olap)
iddqdex May 21, 2024
6991785
Use Decimal(22, 9) as Primary Key in Olap (#4716) (cherry-pick from c…
iddqdex May 21, 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
3 changes: 0 additions & 3 deletions ydb/core/formats/arrow/converter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,6 @@ static bool ConvertData(TCell& cell, const NScheme::TTypeInfo& colType, TMemoryP
cell = TCell(saved.data(), saved.size());
break;
}
case NScheme::NTypeIds::Decimal:
errorMessage = "Decimal conversion is not supported yet";
return false;
default:
break;
}
Expand Down
12 changes: 11 additions & 1 deletion ydb/core/kqp/ut/common/columnshard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,17 @@ namespace NKqp {


TString TTestHelper::TColumnSchema::BuildQuery() const {
auto str = TStringBuilder() << Name << " " << NScheme::GetTypeName(Type);
auto str = TStringBuilder() << Name << " ";
switch (Type) {
case NScheme::NTypeIds::Decimal: {
TTypeBuilder builder;
builder.Decimal(TDecimalType(22, 9));
str << builder.Build();
break;
}
default:
str << NScheme::GetTypeName(Type);
}
if (!NullableFlag) {
str << " NOT NULL";
}
Expand Down
80 changes: 80 additions & 0 deletions ydb/core/kqp/ut/scheme/kqp_scheme_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5869,6 +5869,86 @@ Y_UNIT_TEST_SUITE(KqpOlapTypes) {
testHelper.ReadData("SELECT * FROM `/Root/ColumnTableTest` WHERE id=1", TStringBuilder() << "[[1;" << ts.MicroSeconds() << "u;" << ts.MicroSeconds() << "u]]");
}

Y_UNIT_TEST(Decimal) {
TKikimrSettings runnerSettings;
runnerSettings.WithSampleTables = false;

TTestHelper testHelper(runnerSettings);

TVector<TTestHelper::TColumnSchema> schema = {
TTestHelper::TColumnSchema().SetName("id").SetType(NScheme::NTypeIds::Int64).SetNullable(false),
TTestHelper::TColumnSchema().SetName("dec").SetType(NScheme::NTypeIds::Decimal).SetNullable(false),
};

TTestHelper::TColumnTable testTable;
testTable.SetName("/Root/ColumnTableTest").SetPrimaryKey({"id", "dec"}).SetSharding({"id", "dec"}).SetSchema(schema);
testHelper.CreateTable(testTable);

{
TValueBuilder builder;
builder.BeginList();
builder.AddListItem().BeginStruct()
.AddMember("id").Int64(1)
.AddMember("dec").Decimal(TString("10.1"))
.EndStruct();
builder.AddListItem().BeginStruct()
.AddMember("id").Int64(2)
.AddMember("dec").Decimal(TString("inf"))
.EndStruct();
builder.AddListItem().BeginStruct()
.AddMember("id").Int64(3)
.AddMember("dec").Decimal(TString("-inf"))
.EndStruct();
builder.AddListItem().BeginStruct()
.AddMember("id").Int64(4)
.AddMember("dec").Decimal(TString("nan"))
.EndStruct();
builder.AddListItem().BeginStruct()
.AddMember("id").Int64(5)
.AddMember("dec").Decimal(TString("-nan"))
.EndStruct();
builder.AddListItem().BeginStruct()
.AddMember("id").Int64(6)
.AddMember("dec").Decimal(TString("1.1"))
.EndStruct();
builder.AddListItem().BeginStruct()
.AddMember("id").Int64(7)
.AddMember("dec").Decimal(TString("12.1"))
.EndStruct();
builder.AddListItem().BeginStruct()
.AddMember("id").Int64(8)
.AddMember("dec").Decimal(TString("inf"))
.EndStruct();
builder.AddListItem().BeginStruct()
.AddMember("id").Int64(9)
.AddMember("dec").Decimal(TString("-inf"))
.EndStruct();
builder.AddListItem().BeginStruct()
.AddMember("id").Int64(10)
.AddMember("dec").Decimal(TString("2.1"))
.EndStruct();
builder.AddListItem().BeginStruct()
.AddMember("id").Int64(11)
.AddMember("dec").Decimal(TString("15.1"))
.EndStruct();
builder.EndList();
const auto result = testHelper.GetKikimr().GetTableClient().BulkUpsert(testTable.GetName(), builder.Build()).GetValueSync();
UNIT_ASSERT_C(result.IsSuccess() , result.GetIssues().ToString());
}
testHelper.ReadData("SELECT dec FROM `/Root/ColumnTableTest` WHERE id=1", "[[\"10.1\"]]");
testHelper.ReadData("SELECT dec FROM `/Root/ColumnTableTest` WHERE id=2", "[[\"inf\"]]");
testHelper.ReadData("SELECT dec FROM `/Root/ColumnTableTest` WHERE id=3", "[[\"-inf\"]]");
testHelper.ReadData("SELECT dec FROM `/Root/ColumnTableTest` WHERE id=4", "[[\"nan\"]]");
testHelper.ReadData("SELECT dec FROM `/Root/ColumnTableTest` WHERE id=5", "[[\"-nan\"]]");
testHelper.ReadData("SELECT id FROM `/Root/ColumnTableTest` WHERE dec=CAST(\"10.1\" As Decimal(22,9))", "[[1]]");
testHelper.ReadData("SELECT id FROM `/Root/ColumnTableTest` WHERE dec=CAST(\"inf\" As Decimal(22,9)) ORDER BY id", "[[2];[8]]");
testHelper.ReadData("SELECT id FROM `/Root/ColumnTableTest` WHERE dec=CAST(\"-inf\" As Decimal(22,9)) ORDER BY id", "[[3];[9]]");
// Nan cannot by find.
testHelper.ReadData("SELECT id FROM `/Root/ColumnTableTest` WHERE dec=CAST(\"nan\" As Decimal(22,9))", "[]");
testHelper.ReadData("SELECT id FROM `/Root/ColumnTableTest` WHERE dec=CAST(\"-nan\" As Decimal(22,9))", "[]");
testHelper.ReadData("SELECT dec FROM `/Root/ColumnTableTest` WHERE id > 5 ORDER BY dec", "[[\"-inf\"];[\"1.1\"];[\"2.1\"];[\"12.1\"];[\"15.1\"];[\"inf\"]]");
}

Y_UNIT_TEST(TimestampCmpErr) {
TKikimrSettings runnerSettings;
runnerSettings.WithSampleTables = false;
Expand Down
3 changes: 2 additions & 1 deletion ydb/core/tx/columnshard/transactions/operators/schema.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@ namespace NKikimr::NColumnShard {
//NTypeIds::Float,
//NTypeIds::Double,
NTypeIds::String,
NTypeIds::Utf8
NTypeIds::Utf8,
NTypeIds::Decimal
};

if (!schema.HasEngine() ||
Expand Down
3 changes: 1 addition & 2 deletions ydb/core/tx/schemeshard/olap/columns/update.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,6 @@ namespace NKikimr::NSchemeShard {
switch (typeId) {
case NYql::NProto::Bool:
case NYql::NProto::Interval:
case NYql::NProto::Decimal:
case NYql::NProto::DyNumber:
return false;
default:
Expand All @@ -152,9 +151,9 @@ namespace NKikimr::NSchemeShard {
case NYql::NProto::Date:
case NYql::NProto::Datetime:
case NYql::NProto::Timestamp:
case NYql::NProto::Decimal:
return true;
case NYql::NProto::Interval:
case NYql::NProto::Decimal:
case NYql::NProto::DyNumber:
case NYql::NProto::Yson:
case NYql::NProto::Json:
Expand Down
4 changes: 4 additions & 0 deletions ydb/public/lib/ydb_cli/common/csv_parser_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,10 @@ Y_UNIT_TEST_SUITE(YdbCliCsvParserTests) {
CommonTestParams("name", "1.183", {{"$name", TValueBuilder().Double(1.183).Build()}});
CommonTestParams("name", "1.183", {{"$name", TValueBuilder().DyNumber("1.183").Build()}});
CommonTestParams("name", "1.183", {{"$name", TValueBuilder().Decimal(TString("1.183")).Build()}});
CommonTestParams("name", "inf", {{"$name", TValueBuilder().Decimal(TString("inf")).Build()}});
CommonTestParams("name", "-inf", {{"$name", TValueBuilder().Decimal(TString("-inf")).Build()}});
CommonTestParams("name", "nan", {{"$name", TValueBuilder().Decimal(TString("nan")).Build()}});
CommonTestParams("name", "-nan", {{"$name", TValueBuilder().Decimal(TString("-nan")).Build()}});
CommonTestParams("name", "550e8400-e29b-41d4-a716-446655440000", {{"$name", TValueBuilder().Uuid(TUuidValue("550e8400-e29b-41d4-a716-446655440000")).Build()}});
CommonTestParams("name", "\"{\"\"a\"\":10, \"\"b\"\":\"\"string\"\"}\"", {{"$name", TValueBuilder().Json("{\"a\":10, \"b\":\"string\"}").Build()}});
CommonTestParams("name", "строка", {{"$name", TValueBuilder().OptionalUtf8("строка").Build()}});
Expand Down