Skip to content

Commit 0b48dcc

Browse files
ztlpnztlpn
committed
tests: split CreateUniformTable into two functions
1 parent 026201c commit 0b48dcc

File tree

6 files changed

+22
-23
lines changed

6 files changed

+22
-23
lines changed

‎ydb/core/statistics/aggregator/ut/ut_analyze_datashard.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Y_UNIT_TEST_SUITE(AnalyzeDatashard) {
1818
auto& runtime = *env.GetServer().GetRuntime();
1919

2020
CreateDatabase(env, "Database");
21-
CreateUniformTable(env, "Database", "Table");
21+
PrepareUniformTable(env, "Database", "Table");
2222

2323
ui64 saTabletId;
2424
auto pathId = ResolvePathId(runtime, "/Root/Database/Table", nullptr, &saTabletId);
@@ -34,8 +34,8 @@ Y_UNIT_TEST_SUITE(AnalyzeDatashard) {
3434
auto& runtime = *env.GetServer().GetRuntime();
3535

3636
CreateDatabase(env, "Database");
37-
CreateUniformTable(env, "Database", "Table1");
38-
CreateUniformTable(env, "Database", "Table2");
37+
PrepareUniformTable(env, "Database", "Table1");
38+
PrepareUniformTable(env, "Database", "Table2");
3939

4040
ui64 saTabletId1;
4141
auto pathId1 = ResolvePathId(runtime, "/Root/Database/Table1", nullptr, &saTabletId1);
@@ -53,7 +53,7 @@ Y_UNIT_TEST_SUITE(AnalyzeDatashard) {
5353
auto& runtime = *env.GetServer().GetRuntime();
5454

5555
CreateDatabase(env, "Database");
56-
CreateUniformTable(env, "Database", "Table");
56+
PrepareUniformTable(env, "Database", "Table");
5757

5858
ui64 saTabletId = 0;
5959
auto pathId = ResolvePathId(runtime, "/Root/Database/Table", nullptr, &saTabletId);

‎ydb/core/statistics/aggregator/ut/ut_traverse_datashard.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Y_UNIT_TEST_SUITE(TraverseDatashard) {
2828
auto& runtime = *env.GetServer().GetRuntime();
2929

3030
CreateDatabase(env, "Database");
31-
CreateUniformTable(env, "Database", "Table");
31+
PrepareUniformTable(env, "Database", "Table");
3232

3333
auto pathId = ResolvePathId(runtime, "/Root/Database/Table");
3434
ValidateCountMinAbsence(runtime, pathId);
@@ -39,8 +39,8 @@ Y_UNIT_TEST_SUITE(TraverseDatashard) {
3939
auto& runtime = *env.GetServer().GetRuntime();
4040

4141
CreateDatabase(env, "Database");
42-
CreateUniformTable(env, "Database", "Table1");
43-
CreateUniformTable(env, "Database", "Table2");
42+
PrepareUniformTable(env, "Database", "Table1");
43+
PrepareUniformTable(env, "Database", "Table2");
4444

4545
auto pathId1 = ResolvePathId(runtime, "/Root/Database/Table1");
4646
auto pathId2 = ResolvePathId(runtime, "/Root/Database/Table2");
@@ -54,7 +54,7 @@ Y_UNIT_TEST_SUITE(TraverseDatashard) {
5454

5555
CreateDatabase(env, "Shared", 1, true);
5656
CreateServerlessDatabase(env, "Serverless", "/Root/Shared");
57-
CreateUniformTable(env, "Serverless", "Table");
57+
PrepareUniformTable(env, "Serverless", "Table");
5858

5959
auto pathId = ResolvePathId(runtime, "/Root/Serverless/Table");
6060
ValidateCountMinAbsence(runtime, pathId);
@@ -66,8 +66,8 @@ Y_UNIT_TEST_SUITE(TraverseDatashard) {
6666

6767
CreateDatabase(env, "Shared", 1, true);
6868
CreateServerlessDatabase(env, "Serverless", "/Root/Shared");
69-
CreateUniformTable(env, "Serverless", "Table1");
70-
CreateUniformTable(env, "Serverless", "Table2");
69+
PrepareUniformTable(env, "Serverless", "Table1");
70+
PrepareUniformTable(env, "Serverless", "Table2");
7171

7272
auto pathId1 = ResolvePathId(runtime, "/Root/Serverless/Table1");
7373
auto pathId2 = ResolvePathId(runtime, "/Root/Serverless/Table2");
@@ -82,8 +82,8 @@ Y_UNIT_TEST_SUITE(TraverseDatashard) {
8282
CreateDatabase(env, "Shared", 1, true);
8383
CreateServerlessDatabase(env, "Serverless1", "/Root/Shared");
8484
CreateServerlessDatabase(env, "Serverless2", "/Root/Shared");
85-
CreateUniformTable(env, "Serverless1", "Table1");
86-
CreateUniformTable(env, "Serverless2", "Table2");
85+
PrepareUniformTable(env, "Serverless1", "Table1");
86+
PrepareUniformTable(env, "Serverless2", "Table2");
8787

8888
auto pathId1 = ResolvePathId(runtime, "/Root/Serverless1/Table1");
8989
auto pathId2 = ResolvePathId(runtime, "/Root/Serverless2/Table2");

‎ydb/core/statistics/database/ut/ut_database.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ Y_UNIT_TEST_SUITE(StatisticsSaveLoad) {
8989
auto& runtime = *env.GetServer().GetRuntime();
9090

9191
CreateDatabase(env, "Database", 1, true);
92-
CreateUniformTable(env, "Database", "Table");
92+
PrepareUniformTable(env, "Database", "Table");
9393

9494
NYdb::EStatus status;
9595
auto test = [&] () {

‎ydb/core/statistics/service/ut/ut_basic_statistics.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ Y_UNIT_TEST_SUITE(BasicStatistics) {
322322
TTestEnv env(1, 1);
323323

324324
CreateDatabase(env, "Database");
325-
CreateUniformTable(env, "Database", "Table");
325+
PrepareUniformTable(env, "Database", "Table");
326326

327327
TestNotFullStatistics(env, /*shardCount=*/ 4, /*expectedRowCount=*/ 4);
328328
}

‎ydb/core/statistics/ut_common/ut_common.cpp‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,10 @@ void CreateUniformTable(TTestEnv& env, const TString& databaseName, const TStrin
253253
)
254254
WITH ( UNIFORM_PARTITIONS = 4 );
255255
)", databaseName.c_str(), tableName.c_str()));
256+
}
257+
258+
void PrepareUniformTable(TTestEnv& env, const TString& databaseName, const TString& tableName) {
259+
CreateUniformTable(env, databaseName, tableName);
256260

257261
TStringBuilder replace;
258262
replace << Sprintf("REPLACE INTO `Root/%s/%s` (Key, Value) VALUES ",
@@ -438,14 +442,6 @@ std::shared_ptr<TCountMinSketch> ExtractCountMin(TTestActorRuntime& runtime, con
438442
return stat.CountMin;
439443
}
440444

441-
void ValidateCountMinColumnshard(TTestActorRuntime& runtime, const TPathId& pathId, ui64 expectedProbe) {
442-
auto countMin = ExtractCountMin(runtime, pathId);
443-
444-
ui32 value = 1;
445-
auto actualProbe = countMin->Probe((const char *)&value, sizeof(value));
446-
UNIT_ASSERT_VALUES_EQUAL(actualProbe, expectedProbe);
447-
}
448-
449445
void ValidateCountMinDatashard(TTestActorRuntime& runtime, TPathId pathId) {
450446
auto countMin = ExtractCountMin(runtime, pathId);
451447

‎ydb/core/statistics/ut_common/ut_common.h‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,14 @@ NKikimrScheme::TEvDescribeSchemeResult DescribeTable(
9898
TVector<ui64> GetTableShards(TTestActorRuntime& runtime, TActorId sender, const TString &path);
9999
TVector<ui64> GetColumnTableShards(TTestActorRuntime& runtime, TActorId sender,const TString &path);
100100

101+
// Create a datashard table with 4 uniform shards.
101102
void CreateUniformTable(TTestEnv& env, const TString& databaseName, const TString& tableName);
103+
// Create a datashard table with 4 uniform shards and insert 1 row into each shard.
104+
void PrepareUniformTable(TTestEnv& env, const TString& databaseName, const TString& tableName);
105+
102106
void DropTable(TTestEnv& env, const TString& databaseName, const TString& tableName);
103107

104108
std::shared_ptr<TCountMinSketch> ExtractCountMin(TTestActorRuntime& runtime, const TPathId& pathId, ui64 columnTag = 1);
105-
void ValidateCountMinColumnshard(TTestActorRuntime& runtime, const TPathId& pathId, ui64 expectedProbe);
106109

107110
void ValidateCountMinDatashard(TTestActorRuntime& runtime, TPathId pathId);
108111
void ValidateCountMinAbsence(TTestActorRuntime& runtime, TPathId pathId);

0 commit comments

Comments
 (0)