Skip to content

Commit d74aa94

Browse files
MBkktMBkkt
committed
Rename tmp index impl tables to build index impl tables
1 parent 951e5fb commit d74aa94

File tree

3 files changed

+156
-103
lines changed

3 files changed

+156
-103
lines changed

‎ydb/core/tx/datashard/datashard_ut_reshuffle_kmeans.cpp

Lines changed: 34 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -153,12 +153,14 @@ Y_UNIT_TEST_SUITE (TTxDataShardReshuffleKMeansScan) {
153153
return std::move(posting);
154154
}
155155

156-
static void DropTable(Tests::TServer::TPtr server, TActorId sender, const char* name) {
156+
static void DropTable(Tests::TServer::TPtr server, TActorId sender, const char* name)
157+
{
157158
ui64 txId = AsyncDropTable(server, sender, "/Root", name);
158159
WaitTxNotification(server, sender, txId);
159160
}
160161

161-
static void CreateMainTable(Tests::TServer::TPtr server, TActorId sender, TShardedTableOptions options) {
162+
static void CreateMainTable(Tests::TServer::TPtr server, TActorId sender, TShardedTableOptions options)
163+
{
162164
options.AllowSystemColumnNames(false);
163165
options.Columns({
164166
{"key", "Uint32", true, true},
@@ -168,7 +170,8 @@ Y_UNIT_TEST_SUITE (TTxDataShardReshuffleKMeansScan) {
168170
CreateShardedTable(server, sender, "/Root", "table-main", options);
169171
}
170172

171-
static void CreatePostingTable(Tests::TServer::TPtr server, TActorId sender, TShardedTableOptions options) {
173+
static void CreatePostingTable(Tests::TServer::TPtr server, TActorId sender, TShardedTableOptions options)
174+
{
172175
options.AllowSystemColumnNames(true);
173176
options.Columns({
174177
{PostingTable_ParentIdColumn, "Uint32", true, true},
@@ -178,7 +181,7 @@ Y_UNIT_TEST_SUITE (TTxDataShardReshuffleKMeansScan) {
178181
CreateShardedTable(server, sender, "/Root", "table-posting", options);
179182
}
180183

181-
static void CreateTmpTable(Tests::TServer::TPtr server, TActorId sender, TShardedTableOptions options,
184+
static void CreateBuildTable(Tests::TServer::TPtr server, TActorId sender, TShardedTableOptions options,
182185
const char* name)
183186
{
184187
options.AllowSystemColumnNames(true);
@@ -338,8 +341,8 @@ Y_UNIT_TEST_SUITE (TTxDataShardReshuffleKMeansScan) {
338341
"__ydb_parent = 2, key = 5, data = five\n");
339342
recreate();
340343
}
341-
for (auto similarity :
342-
{VectorIndexSettings::SIMILARITY_INNER_PRODUCT, VectorIndexSettings::SIMILARITY_COSINE}) {
344+
for (auto similarity : {VectorIndexSettings::SIMILARITY_INNER_PRODUCT, VectorIndexSettings::SIMILARITY_COSINE})
345+
{
343346
std::vector<TString> level = {
344347
"II\3",
345348
};
@@ -369,7 +372,7 @@ Y_UNIT_TEST_SUITE (TTxDataShardReshuffleKMeansScan) {
369372
}
370373
}
371374

372-
Y_UNIT_TEST (MainToTmp) {
375+
Y_UNIT_TEST (MainToBuild) {
373376
TPortManager pm;
374377
TServerSettings serverSettings(pm.GetPort(2134));
375378
serverSettings.SetDomainName("Root");
@@ -399,7 +402,7 @@ Y_UNIT_TEST_SUITE (TTxDataShardReshuffleKMeansScan) {
399402
"(4, \"\x65\x65\3\", \"four\"),"
400403
"(5, \"\x75\x75\3\", \"five\");");
401404

402-
auto create = [&] { CreateTmpTable(server, sender, options, "table-posting"); };
405+
auto create = [&] { CreateBuildTable(server, sender, options, "table-posting"); };
403406
create();
404407
auto recreate = [&] {
405408
DropTable(server, sender, "table-posting");
@@ -412,7 +415,7 @@ Y_UNIT_TEST_SUITE (TTxDataShardReshuffleKMeansScan) {
412415
"11\3",
413416
};
414417
auto posting = DoReshuffleKMeans(server, sender, 0, level,
415-
NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_MAIN_TO_TMP,
418+
NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_MAIN_TO_BUILD,
416419
VectorIndexSettings::VECTOR_TYPE_UINT8, distance);
417420
UNIT_ASSERT_VALUES_EQUAL(posting, "__ydb_parent = 1, key = 4, embedding = \x65\x65\3, data = four\n"
418421
"__ydb_parent = 1, key = 5, embedding = \x75\x75\3, data = five\n"
@@ -427,7 +430,7 @@ Y_UNIT_TEST_SUITE (TTxDataShardReshuffleKMeansScan) {
427430
"mm\3",
428431
};
429432
auto posting = DoReshuffleKMeans(server, sender, 0, level,
430-
NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_MAIN_TO_TMP,
433+
NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_MAIN_TO_BUILD,
431434
VectorIndexSettings::VECTOR_TYPE_UINT8, distance);
432435
UNIT_ASSERT_VALUES_EQUAL(posting, "__ydb_parent = 1, key = 1, embedding = \x30\x30\3, data = one\n"
433436
"__ydb_parent = 1, key = 2, embedding = \x31\x31\3, data = two\n"
@@ -436,13 +439,13 @@ Y_UNIT_TEST_SUITE (TTxDataShardReshuffleKMeansScan) {
436439
"__ydb_parent = 2, key = 5, embedding = \x75\x75\3, data = five\n");
437440
recreate();
438441
}
439-
for (auto similarity :
440-
{VectorIndexSettings::SIMILARITY_INNER_PRODUCT, VectorIndexSettings::SIMILARITY_COSINE}) {
442+
for (auto similarity : {VectorIndexSettings::SIMILARITY_INNER_PRODUCT, VectorIndexSettings::SIMILARITY_COSINE})
443+
{
441444
std::vector<TString> level = {
442445
"II\3",
443446
};
444447
auto posting = DoReshuffleKMeans(server, sender, 0, level,
445-
NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_MAIN_TO_TMP,
448+
NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_MAIN_TO_BUILD,
446449
VectorIndexSettings::VECTOR_TYPE_UINT8, similarity);
447450
UNIT_ASSERT_VALUES_EQUAL(posting, "__ydb_parent = 1, key = 1, embedding = \x30\x30\3, data = one\n"
448451
"__ydb_parent = 1, key = 2, embedding = \x31\x31\3, data = two\n"
@@ -456,7 +459,7 @@ Y_UNIT_TEST_SUITE (TTxDataShardReshuffleKMeansScan) {
456459
"II\3",
457460
};
458461
auto posting = DoReshuffleKMeans(
459-
server, sender, 0, level, NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_MAIN_TO_TMP,
462+
server, sender, 0, level, NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_MAIN_TO_BUILD,
460463
VectorIndexSettings::VECTOR_TYPE_UINT8, VectorIndexSettings::DISTANCE_COSINE);
461464
UNIT_ASSERT_VALUES_EQUAL(posting, "__ydb_parent = 1, key = 1, embedding = \x30\x30\3, data = one\n"
462465
"__ydb_parent = 1, key = 2, embedding = \x31\x31\3, data = two\n"
@@ -467,7 +470,7 @@ Y_UNIT_TEST_SUITE (TTxDataShardReshuffleKMeansScan) {
467470
}
468471
}
469472

470-
Y_UNIT_TEST (TmpToPosting) {
473+
Y_UNIT_TEST (BuildToPosting) {
471474
TPortManager pm;
472475
TServerSettings serverSettings(pm.GetPort(2134));
473476
serverSettings.SetDomainName("Root");
@@ -484,7 +487,7 @@ Y_UNIT_TEST_SUITE (TTxDataShardReshuffleKMeansScan) {
484487
options.EnableOutOfOrder(true); // TODO(mbkkt) what is it?
485488
options.Shards(1);
486489

487-
CreateTmpTable(server, sender, options, "table-main");
490+
CreateBuildTable(server, sender, options, "table-main");
488491
// Upsert some initial values
489492
ExecSQL(server, sender,
490493
R"(
@@ -512,7 +515,7 @@ Y_UNIT_TEST_SUITE (TTxDataShardReshuffleKMeansScan) {
512515
"11\3",
513516
};
514517
auto posting = DoReshuffleKMeans(server, sender, 40, level,
515-
NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_TMP_TO_POSTING,
518+
NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_BUILD_TO_POSTING,
516519
VectorIndexSettings::VECTOR_TYPE_UINT8, distance);
517520
UNIT_ASSERT_VALUES_EQUAL(posting, "__ydb_parent = 41, key = 4, data = four\n"
518521
"__ydb_parent = 41, key = 5, data = five\n"
@@ -527,7 +530,7 @@ Y_UNIT_TEST_SUITE (TTxDataShardReshuffleKMeansScan) {
527530
"mm\3",
528531
};
529532
auto posting = DoReshuffleKMeans(server, sender, 40, level,
530-
NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_TMP_TO_POSTING,
533+
NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_BUILD_TO_POSTING,
531534
VectorIndexSettings::VECTOR_TYPE_UINT8, distance);
532535
UNIT_ASSERT_VALUES_EQUAL(posting, "__ydb_parent = 41, key = 1, data = one\n"
533536
"__ydb_parent = 41, key = 2, data = two\n"
@@ -536,13 +539,13 @@ Y_UNIT_TEST_SUITE (TTxDataShardReshuffleKMeansScan) {
536539
"__ydb_parent = 42, key = 5, data = five\n");
537540
recreate();
538541
}
539-
for (auto similarity :
540-
{VectorIndexSettings::SIMILARITY_INNER_PRODUCT, VectorIndexSettings::SIMILARITY_COSINE}) {
542+
for (auto similarity : {VectorIndexSettings::SIMILARITY_INNER_PRODUCT, VectorIndexSettings::SIMILARITY_COSINE})
543+
{
541544
std::vector<TString> level = {
542545
"II\3",
543546
};
544547
auto posting = DoReshuffleKMeans(server, sender, 40, level,
545-
NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_TMP_TO_POSTING,
548+
NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_BUILD_TO_POSTING,
546549
VectorIndexSettings::VECTOR_TYPE_UINT8, similarity);
547550
UNIT_ASSERT_VALUES_EQUAL(posting, "__ydb_parent = 41, key = 1, data = one\n"
548551
"__ydb_parent = 41, key = 2, data = two\n"
@@ -556,7 +559,7 @@ Y_UNIT_TEST_SUITE (TTxDataShardReshuffleKMeansScan) {
556559
"II\3",
557560
};
558561
auto posting = DoReshuffleKMeans(
559-
server, sender, 40, level, NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_TMP_TO_POSTING,
562+
server, sender, 40, level, NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_BUILD_TO_POSTING,
560563
VectorIndexSettings::VECTOR_TYPE_UINT8, VectorIndexSettings::DISTANCE_COSINE);
561564
UNIT_ASSERT_VALUES_EQUAL(posting, "__ydb_parent = 41, key = 1, data = one\n"
562565
"__ydb_parent = 41, key = 2, data = two\n"
@@ -567,7 +570,7 @@ Y_UNIT_TEST_SUITE (TTxDataShardReshuffleKMeansScan) {
567570
}
568571
}
569572

570-
Y_UNIT_TEST (TmpToTmp) {
573+
Y_UNIT_TEST (BuildToBuild) {
571574
TPortManager pm;
572575
TServerSettings serverSettings(pm.GetPort(2134));
573576
serverSettings.SetDomainName("Root");
@@ -584,7 +587,7 @@ Y_UNIT_TEST_SUITE (TTxDataShardReshuffleKMeansScan) {
584587
options.EnableOutOfOrder(true); // TODO(mbkkt) what is it?
585588
options.Shards(1);
586589

587-
CreateTmpTable(server, sender, options, "table-main");
590+
CreateBuildTable(server, sender, options, "table-main");
588591
// Upsert some initial values
589592
ExecSQL(server, sender,
590593
R"(
@@ -599,7 +602,7 @@ Y_UNIT_TEST_SUITE (TTxDataShardReshuffleKMeansScan) {
599602
"(40, 5, \"\x75\x75\3\", \"five\"),"
600603
"(41, 5, \"\x75\x75\3\", \"five\");");
601604

602-
auto create = [&] { CreateTmpTable(server, sender, options, "table-posting"); };
605+
auto create = [&] { CreateBuildTable(server, sender, options, "table-posting"); };
603606
create();
604607
auto recreate = [&] {
605608
DropTable(server, sender, "table-posting");
@@ -612,7 +615,7 @@ Y_UNIT_TEST_SUITE (TTxDataShardReshuffleKMeansScan) {
612615
"11\3",
613616
};
614617
auto posting = DoReshuffleKMeans(server, sender, 40, level,
615-
NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_TMP_TO_TMP,
618+
NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_BUILD_TO_BUILD,
616619
VectorIndexSettings::VECTOR_TYPE_UINT8, distance);
617620
UNIT_ASSERT_VALUES_EQUAL(posting, "__ydb_parent = 41, key = 4, embedding = \x65\x65\3, data = four\n"
618621
"__ydb_parent = 41, key = 5, embedding = \x75\x75\3, data = five\n"
@@ -627,7 +630,7 @@ Y_UNIT_TEST_SUITE (TTxDataShardReshuffleKMeansScan) {
627630
"mm\3",
628631
};
629632
auto posting = DoReshuffleKMeans(server, sender, 40, level,
630-
NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_TMP_TO_TMP,
633+
NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_BUILD_TO_BUILD,
631634
VectorIndexSettings::VECTOR_TYPE_UINT8, distance);
632635
UNIT_ASSERT_VALUES_EQUAL(posting, "__ydb_parent = 41, key = 1, embedding = \x30\x30\3, data = one\n"
633636
"__ydb_parent = 41, key = 2, embedding = \x31\x31\3, data = two\n"
@@ -636,13 +639,13 @@ Y_UNIT_TEST_SUITE (TTxDataShardReshuffleKMeansScan) {
636639
"__ydb_parent = 42, key = 5, embedding = \x75\x75\3, data = five\n");
637640
recreate();
638641
}
639-
for (auto similarity :
640-
{VectorIndexSettings::SIMILARITY_INNER_PRODUCT, VectorIndexSettings::SIMILARITY_COSINE}) {
642+
for (auto similarity : {VectorIndexSettings::SIMILARITY_INNER_PRODUCT, VectorIndexSettings::SIMILARITY_COSINE})
643+
{
641644
std::vector<TString> level = {
642645
"II\3",
643646
};
644647
auto posting = DoReshuffleKMeans(server, sender, 40, level,
645-
NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_TMP_TO_TMP,
648+
NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_BUILD_TO_BUILD,
646649
VectorIndexSettings::VECTOR_TYPE_UINT8, similarity);
647650
UNIT_ASSERT_VALUES_EQUAL(posting, "__ydb_parent = 41, key = 1, embedding = \x30\x30\3, data = one\n"
648651
"__ydb_parent = 41, key = 2, embedding = \x31\x31\3, data = two\n"
@@ -656,7 +659,7 @@ Y_UNIT_TEST_SUITE (TTxDataShardReshuffleKMeansScan) {
656659
"II\3",
657660
};
658661
auto posting = DoReshuffleKMeans(
659-
server, sender, 40, level, NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_TMP_TO_TMP,
662+
server, sender, 40, level, NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_BUILD_TO_BUILD,
660663
VectorIndexSettings::VECTOR_TYPE_UINT8, VectorIndexSettings::DISTANCE_COSINE);
661664
UNIT_ASSERT_VALUES_EQUAL(posting, "__ydb_parent = 41, key = 1, embedding = \x30\x30\3, data = one\n"
662665
"__ydb_parent = 41, key = 2, embedding = \x31\x31\3, data = two\n"

0 commit comments

Comments
 (0)