Skip to content

Commit e684b85

Browse files
azevaykinazevaykin
committed
SetTypeInfo -> SetType
1 parent 4853f96 commit e684b85

File tree

8 files changed

+135
-128
lines changed

8 files changed

+135
-128
lines changed

‎ydb/core/kqp/ut/common/columnshard.cpp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,11 @@ namespace NKqp {
165165
return str;
166166
}
167167

168+
TTestHelper::TColumnSchema& TTestHelper::TColumnSchema::SetType(NScheme::TTypeId typeId) {
169+
TypeInfo = NScheme::TTypeInfo(typeId);
170+
return *this;
171+
}
172+
168173
TString TTestHelper::TColumnTableBase::BuildQuery() const {
169174
auto str = TStringBuilder() << "CREATE " << GetObjectType() << " `" << Name << "`";
170175
str << " (" << BuildColumnsStr(Schema) << ", PRIMARY KEY (" << JoinStrings(PrimaryKey, ", ") << "))";

‎ydb/core/kqp/ut/common/columnshard.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ namespace NKqp {
2323
YDB_FLAG_ACCESSOR(Nullable, true);
2424
public:
2525
TString BuildQuery() const;
26+
27+
TColumnSchema& SetType(NScheme::TTypeId typeId);
2628
};
2729

2830
using TUpdatesBuilder = NColumnShard::TTableUpdatesBuilder;

‎ydb/core/kqp/ut/olap/datatime64_ut.cpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ Y_UNIT_TEST_SUITE(KqpDatetime64ColumnShard) {
3131
TTestHelper testHelper(runnerSettings);
3232

3333
TVector<TTestHelper::TColumnSchema> schema = {
34-
TTestHelper::TColumnSchema().SetName("id").SetTypeInfo(NScheme::NTypeIds::Int32).SetNullable(false),
35-
TTestHelper::TColumnSchema().SetName("interval").SetTypeInfo(NScheme::NTypeIds::Interval64),
36-
TTestHelper::TColumnSchema().SetName("timestamp").SetTypeInfo(NScheme::NTypeIds::Timestamp64)
34+
TTestHelper::TColumnSchema().SetName("id").SetType(NScheme::NTypeIds::Int32).SetNullable(false),
35+
TTestHelper::TColumnSchema().SetName("interval").SetType(NScheme::NTypeIds::Interval64),
36+
TTestHelper::TColumnSchema().SetName("timestamp").SetType(NScheme::NTypeIds::Timestamp64)
3737
};
3838

3939
Tests::NCommon::TLoggerInit(testHelper.GetKikimr()).Initialize();
@@ -59,8 +59,8 @@ Y_UNIT_TEST_SUITE(KqpDatetime64ColumnShard) {
5959
TTestHelper testHelper(runnerSettings);
6060

6161
TVector<TTestHelper::TColumnSchema> schema = {
62-
TTestHelper::TColumnSchema().SetName("timestamp").SetTypeInfo(NScheme::NTypeIds::Timestamp64).SetNullable(false),
63-
TTestHelper::TColumnSchema().SetName("interval").SetTypeInfo(NScheme::NTypeIds::Interval64)
62+
TTestHelper::TColumnSchema().SetName("timestamp").SetType(NScheme::NTypeIds::Timestamp64).SetNullable(false),
63+
TTestHelper::TColumnSchema().SetName("interval").SetType(NScheme::NTypeIds::Interval64)
6464
};
6565

6666
Tests::NCommon::TLoggerInit(testHelper.GetKikimr()).Initialize();
@@ -98,8 +98,8 @@ Y_UNIT_TEST_SUITE(KqpDatetime64ColumnShard) {
9898
TTestHelper testHelper(runnerSettings);
9999

100100
TVector<TTestHelper::TColumnSchema> schema = {
101-
TTestHelper::TColumnSchema().SetName("datetime").SetTypeInfo(NScheme::NTypeIds::Datetime64).SetNullable(false),
102-
TTestHelper::TColumnSchema().SetName("interval").SetTypeInfo(NScheme::NTypeIds::Interval64)
101+
TTestHelper::TColumnSchema().SetName("datetime").SetType(NScheme::NTypeIds::Datetime64).SetNullable(false),
102+
TTestHelper::TColumnSchema().SetName("interval").SetType(NScheme::NTypeIds::Interval64)
103103
};
104104

105105
Tests::NCommon::TLoggerInit(testHelper.GetKikimr()).Initialize();
@@ -137,8 +137,8 @@ Y_UNIT_TEST_SUITE(KqpDatetime64ColumnShard) {
137137
TTestHelper testHelper(runnerSettings);
138138

139139
TVector<TTestHelper::TColumnSchema> schema = {
140-
TTestHelper::TColumnSchema().SetName("date").SetTypeInfo(NScheme::NTypeIds::Date32).SetNullable(false),
141-
TTestHelper::TColumnSchema().SetName("interval").SetTypeInfo(NScheme::NTypeIds::Interval64)
140+
TTestHelper::TColumnSchema().SetName("date").SetType(NScheme::NTypeIds::Date32).SetNullable(false),
141+
TTestHelper::TColumnSchema().SetName("interval").SetType(NScheme::NTypeIds::Interval64)
142142
};
143143

144144
Tests::NCommon::TLoggerInit(testHelper.GetKikimr()).Initialize();
@@ -173,10 +173,10 @@ Y_UNIT_TEST_SUITE(KqpDatetime64ColumnShard) {
173173
Tests::NCommon::TLoggerInit(testHelper.GetKikimr()).SetComponents({ NKikimrServices::GROUPED_MEMORY_LIMITER }, "CS").Initialize();
174174

175175
TVector<TTestHelper::TColumnSchema> schema = {
176-
TTestHelper::TColumnSchema().SetName("id").SetTypeInfo(NScheme::NTypeIds::Int64).SetNullable(false),
177-
TTestHelper::TColumnSchema().SetName("date32").SetTypeInfo(NScheme::NTypeIds::Date32),
178-
TTestHelper::TColumnSchema().SetName("timestamp64").SetTypeInfo(NScheme::NTypeIds::Timestamp64),
179-
TTestHelper::TColumnSchema().SetName("datetime64").SetTypeInfo(NScheme::NTypeIds::Datetime64),
176+
TTestHelper::TColumnSchema().SetName("id").SetType(NScheme::NTypeIds::Int64).SetNullable(false),
177+
TTestHelper::TColumnSchema().SetName("date32").SetType(NScheme::NTypeIds::Date32),
178+
TTestHelper::TColumnSchema().SetName("timestamp64").SetType(NScheme::NTypeIds::Timestamp64),
179+
TTestHelper::TColumnSchema().SetName("datetime64").SetType(NScheme::NTypeIds::Datetime64),
180180
};
181181

182182
TTestHelper::TColumnTable testTable;

‎ydb/core/kqp/ut/olap/decimal_ut.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ Y_UNIT_TEST_SUITE(KqpDecimalColumnShard) {
4444

4545
void PrepareTable1() {
4646
Schema = {
47-
TTestHelper::TColumnSchema().SetName("id").SetTypeInfo(NScheme::NTypeIds::Int32).SetNullable(false),
48-
TTestHelper::TColumnSchema().SetName("int").SetTypeInfo(NScheme::NTypeIds::Int64),
49-
TTestHelper::TColumnSchema().SetName("dec").SetTypeInfo(NScheme::NTypeIds::Decimal),
47+
TTestHelper::TColumnSchema().SetName("id").SetType(NScheme::NTypeIds::Int32).SetNullable(false),
48+
TTestHelper::TColumnSchema().SetName("int").SetType(NScheme::NTypeIds::Int64),
49+
TTestHelper::TColumnSchema().SetName("dec").SetType(NScheme::NTypeIds::Decimal),
5050
};
5151
TestTable.SetName("/Root/Table1").SetPrimaryKey({ "id" }).SetSharding({ "id" }).SetSchema(Schema);
5252
TestHelper.CreateTable(TestTable);
@@ -68,9 +68,9 @@ Y_UNIT_TEST_SUITE(KqpDecimalColumnShard) {
6868

6969
void PrepareTable2() {
7070
Schema = {
71-
TTestHelper::TColumnSchema().SetName("id").SetTypeInfo(NScheme::NTypeIds::Int32).SetNullable(false),
72-
TTestHelper::TColumnSchema().SetName("table1_id").SetTypeInfo(NScheme::NTypeIds::Int64),
73-
TTestHelper::TColumnSchema().SetName("dec").SetTypeInfo(NScheme::NTypeIds::Decimal),
71+
TTestHelper::TColumnSchema().SetName("id").SetType(NScheme::NTypeIds::Int32).SetNullable(false),
72+
TTestHelper::TColumnSchema().SetName("table1_id").SetType(NScheme::NTypeIds::Int64),
73+
TTestHelper::TColumnSchema().SetName("dec").SetType(NScheme::NTypeIds::Decimal),
7474
};
7575
TestTable.SetName("/Root/Table2").SetPrimaryKey({ "id" }).SetSharding({ "id" }).SetSchema(Schema);
7676
TestHelper.CreateTable(TestTable);

‎ydb/core/kqp/ut/olap/kqp_olap_stats_ut.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ Y_UNIT_TEST_SUITE(KqpOlapStats) {
1515
constexpr size_t size_single_table = 13152;
1616

1717
const TVector<TTestHelper::TColumnSchema> schema = {
18-
TTestHelper::TColumnSchema().SetName("id").SetTypeInfo(NScheme::NTypeIds::Int32).SetNullable(false),
19-
TTestHelper::TColumnSchema().SetName("resource_id").SetTypeInfo(NScheme::NTypeIds::Utf8),
20-
TTestHelper::TColumnSchema().SetName("level").SetTypeInfo(NScheme::NTypeIds::Int32)};
18+
TTestHelper::TColumnSchema().SetName("id").SetType(NScheme::NTypeIds::Int32).SetNullable(false),
19+
TTestHelper::TColumnSchema().SetName("resource_id").SetType(NScheme::NTypeIds::Utf8),
20+
TTestHelper::TColumnSchema().SetName("level").SetType(NScheme::NTypeIds::Int32)};
2121

2222
class TOlapStatsController : public NYDBTest::NColumnShard::TController {
2323
public:

‎ydb/core/kqp/ut/olap/kqp_olap_ut.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2426,10 +2426,10 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
24262426
TTestHelper testHelper(runnerSettings);
24272427
Tests::NCommon::TLoggerInit(testHelper.GetRuntime()).Initialize();
24282428
TVector<TTestHelper::TColumnSchema> schema = {
2429-
TTestHelper::TColumnSchema().SetName("id").SetTypeInfo(NScheme::NTypeIds::Int32).SetNullable(false),
2430-
TTestHelper::TColumnSchema().SetName("id_second").SetTypeInfo(NScheme::NTypeIds::Utf8).SetNullable(false),
2431-
TTestHelper::TColumnSchema().SetName("resource_id").SetTypeInfo(NScheme::NTypeIds::Utf8),
2432-
TTestHelper::TColumnSchema().SetName("level").SetTypeInfo(NScheme::NTypeIds::Int32)
2429+
TTestHelper::TColumnSchema().SetName("id").SetType(NScheme::NTypeIds::Int32).SetNullable(false),
2430+
TTestHelper::TColumnSchema().SetName("id_second").SetType(NScheme::NTypeIds::Utf8).SetNullable(false),
2431+
TTestHelper::TColumnSchema().SetName("resource_id").SetType(NScheme::NTypeIds::Utf8),
2432+
TTestHelper::TColumnSchema().SetName("level").SetType(NScheme::NTypeIds::Int32)
24332433
};
24342434
TTestHelper::TColumnTable testTable;
24352435

@@ -2458,8 +2458,8 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
24582458
TTestHelper testHelper(runnerSettings);
24592459

24602460
TVector<TTestHelper::TColumnSchema> schema = {
2461-
TTestHelper::TColumnSchema().SetName("id").SetTypeInfo(NScheme::NTypeIds::Int64).SetNullable(false),
2462-
TTestHelper::TColumnSchema().SetName("value").SetTypeInfo(NScheme::NTypeIds::Int32).SetNullable(false),
2461+
TTestHelper::TColumnSchema().SetName("id").SetType(NScheme::NTypeIds::Int64).SetNullable(false),
2462+
TTestHelper::TColumnSchema().SetName("value").SetType(NScheme::NTypeIds::Int32).SetNullable(false),
24632463
};
24642464

24652465
TTestHelper::TColumnTable testTable;

0 commit comments

Comments
 (0)