Skip to content

Rename tmp index impl tables to build index impl tables #9868

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
Sep 30, 2024
Merged

Rename tmp index impl tables to build index impl tables #9868

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
951e5fb
Rename tmp index impl tables to build index impl tables
MBkkt Sep 27, 2024
d74aa94
Rename tmp index impl tables to build index impl tables
MBkkt Sep 27, 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
6 changes: 3 additions & 3 deletions ydb/core/base/table_index.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,9 @@ bool IsImplTable(std::string_view tableName) {
return Contains(ImplTables, tableName);
}

bool IsTmpImplTable(std::string_view tableName) {
// all impl tables that ends with "tmp" should be used only for index creation and dropped when index build is finished
return tableName.ends_with("tmp");
bool IsBuildImplTable(std::string_view tableName) {
// all impl tables that ends with "build" should be used only for index creation and dropped when index build is finished
return tableName.ends_with("build");
}

}
2 changes: 1 addition & 1 deletion ydb/core/base/table_index.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ TTableColumns CalcTableImplDescription(NKikimrSchemeOp::EIndexType type, const T

TVector<TString> GetImplTables(NKikimrSchemeOp::EIndexType indexType);
bool IsImplTable(std::string_view tableName);
bool IsTmpImplTable(std::string_view tableName);
bool IsBuildImplTable(std::string_view tableName);

}
4 changes: 2 additions & 2 deletions ydb/core/base/table_vector_index.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ inline constexpr const char* LevelTable_EmbeddingColumn = "__ydb_embedding";
inline constexpr const char* PostingTable = "indexImplPostingTable";
inline constexpr const char* PostingTable_ParentIdColumn = LevelTable_ParentIdColumn;

inline constexpr const char* TmpPostingTableSuffix0 = "0tmp";
inline constexpr const char* TmpPostingTableSuffix1 = "1tmp";
inline constexpr const char* BuildPostingTableSuffix0 = "0build";
inline constexpr const char* BuildPostingTableSuffix1 = "1build";

}
6 changes: 3 additions & 3 deletions ydb/core/protos/tx_datashard.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1509,10 +1509,10 @@ message TEvLocalKMeansRequest {
UNSPECIFIED = 0;
SAMPLE = 1;
KMEANS = 2;
UPLOAD_MAIN_TO_TMP = 3;
UPLOAD_MAIN_TO_BUILD = 3;
UPLOAD_MAIN_TO_POSTING = 4;
UPLOAD_TMP_TO_TMP = 5;
UPLOAD_TMP_TO_POSTING = 6;
UPLOAD_BUILD_TO_BUILD = 5;
UPLOAD_BUILD_TO_POSTING = 6;
DONE = 7;
};
optional EState Upload = 11;
Expand Down
40 changes: 20 additions & 20 deletions ydb/core/tx/datashard/datashard_ut_local_kmeans.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ Y_UNIT_TEST_SUITE (TTxDataShardLocalKMeansScan) {
CreateShardedTable(server, sender, "/Root", "table-posting", options);
}

static void CreateTmpTable(Tests::TServer::TPtr server, TActorId sender, TShardedTableOptions options,
static void CreateBuildTable(Tests::TServer::TPtr server, TActorId sender, TShardedTableOptions options,
const char* name)
{
options.AllowSystemColumnNames(true);
Expand Down Expand Up @@ -402,7 +402,7 @@ Y_UNIT_TEST_SUITE (TTxDataShardLocalKMeansScan) {
}
}

Y_UNIT_TEST (MainToTmp) {
Y_UNIT_TEST (MainToBuild) {
TPortManager pm;
TServerSettings serverSettings(pm.GetPort(2134));
serverSettings.SetDomainName("Root");
Expand Down Expand Up @@ -434,7 +434,7 @@ Y_UNIT_TEST_SUITE (TTxDataShardLocalKMeansScan) {

auto create = [&] {
CreateLevelTable(server, sender, options);
CreateTmpTable(server, sender, options, "table-posting");
CreateBuildTable(server, sender, options, "table-posting");
};
create();
auto recreate = [&] {
Expand All @@ -449,7 +449,7 @@ Y_UNIT_TEST_SUITE (TTxDataShardLocalKMeansScan) {
seed = 0;
for (auto distance : {VectorIndexSettings::DISTANCE_MANHATTAN, VectorIndexSettings::DISTANCE_EUCLIDEAN}) {
auto [level, posting] =
DoLocalKMeans(server, sender, 0, seed, k, NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_MAIN_TO_TMP,
DoLocalKMeans(server, sender, 0, seed, k, NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_MAIN_TO_BUILD,
VectorIndexSettings::VECTOR_TYPE_UINT8, distance);
UNIT_ASSERT_VALUES_EQUAL(level, "__ydb_parent = 0, __ydb_id = 1, __ydb_embedding = mm\3\n"
"__ydb_parent = 0, __ydb_id = 2, __ydb_embedding = 11\3\n");
Expand All @@ -464,7 +464,7 @@ Y_UNIT_TEST_SUITE (TTxDataShardLocalKMeansScan) {
seed = 111;
for (auto distance : {VectorIndexSettings::DISTANCE_MANHATTAN, VectorIndexSettings::DISTANCE_EUCLIDEAN}) {
auto [level, posting] =
DoLocalKMeans(server, sender, 0, seed, k, NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_MAIN_TO_TMP,
DoLocalKMeans(server, sender, 0, seed, k, NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_MAIN_TO_BUILD,
VectorIndexSettings::VECTOR_TYPE_UINT8, distance);
UNIT_ASSERT_VALUES_EQUAL(level, "__ydb_parent = 0, __ydb_id = 1, __ydb_embedding = 11\3\n"
"__ydb_parent = 0, __ydb_id = 2, __ydb_embedding = mm\3\n");
Expand All @@ -479,7 +479,7 @@ Y_UNIT_TEST_SUITE (TTxDataShardLocalKMeansScan) {
for (auto similarity :
{VectorIndexSettings::SIMILARITY_INNER_PRODUCT, VectorIndexSettings::SIMILARITY_COSINE}) {
auto [level, posting] =
DoLocalKMeans(server, sender, 0, seed, k, NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_MAIN_TO_TMP,
DoLocalKMeans(server, sender, 0, seed, k, NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_MAIN_TO_BUILD,
VectorIndexSettings::VECTOR_TYPE_UINT8, similarity);
UNIT_ASSERT_VALUES_EQUAL(level, "__ydb_parent = 0, __ydb_id = 1, __ydb_embedding = II\3\n");
UNIT_ASSERT_VALUES_EQUAL(posting, "__ydb_parent = 1, key = 1, embedding = \x30\x30\3, data = one\n"
Expand All @@ -492,7 +492,7 @@ Y_UNIT_TEST_SUITE (TTxDataShardLocalKMeansScan) {
seed = 13;
{
auto [level, posting] =
DoLocalKMeans(server, sender, 0, seed, k, NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_MAIN_TO_TMP,
DoLocalKMeans(server, sender, 0, seed, k, NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_MAIN_TO_BUILD,
VectorIndexSettings::VECTOR_TYPE_UINT8, VectorIndexSettings::DISTANCE_COSINE);
UNIT_ASSERT_VALUES_EQUAL(level, "__ydb_parent = 0, __ydb_id = 1, __ydb_embedding = II\3\n");
UNIT_ASSERT_VALUES_EQUAL(posting, "__ydb_parent = 1, key = 1, embedding = \x30\x30\3, data = one\n"
Expand All @@ -504,7 +504,7 @@ Y_UNIT_TEST_SUITE (TTxDataShardLocalKMeansScan) {
}
}

Y_UNIT_TEST (TmpToPosting) {
Y_UNIT_TEST (BuildToPosting) {
TPortManager pm;
TServerSettings serverSettings(pm.GetPort(2134));
serverSettings.SetDomainName("Root");
Expand All @@ -521,7 +521,7 @@ Y_UNIT_TEST_SUITE (TTxDataShardLocalKMeansScan) {
options.EnableOutOfOrder(true); // TODO(mbkkt) what is it?
options.Shards(1);

CreateTmpTable(server, sender, options, "table-main");
CreateBuildTable(server, sender, options, "table-main");
// Upsert some initial values
ExecSQL(server, sender,
R"(
Expand Down Expand Up @@ -553,7 +553,7 @@ Y_UNIT_TEST_SUITE (TTxDataShardLocalKMeansScan) {
seed = 0;
for (auto distance : {VectorIndexSettings::DISTANCE_MANHATTAN, VectorIndexSettings::DISTANCE_EUCLIDEAN}) {
auto [level, posting] = DoLocalKMeans(server, sender, 40, seed, k,
NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_TMP_TO_POSTING,
NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_BUILD_TO_POSTING,
VectorIndexSettings::VECTOR_TYPE_UINT8, distance);
UNIT_ASSERT_VALUES_EQUAL(level, "__ydb_parent = 40, __ydb_id = 41, __ydb_embedding = mm\3\n"
"__ydb_parent = 40, __ydb_id = 42, __ydb_embedding = 11\3\n");
Expand All @@ -568,7 +568,7 @@ Y_UNIT_TEST_SUITE (TTxDataShardLocalKMeansScan) {
seed = 111;
for (auto distance : {VectorIndexSettings::DISTANCE_MANHATTAN, VectorIndexSettings::DISTANCE_EUCLIDEAN}) {
auto [level, posting] = DoLocalKMeans(server, sender, 40, seed, k,
NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_TMP_TO_POSTING,
NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_BUILD_TO_POSTING,
VectorIndexSettings::VECTOR_TYPE_UINT8, distance);
UNIT_ASSERT_VALUES_EQUAL(level, "__ydb_parent = 40, __ydb_id = 41, __ydb_embedding = 11\3\n"
"__ydb_parent = 40, __ydb_id = 42, __ydb_embedding = mm\3\n");
Expand All @@ -583,7 +583,7 @@ Y_UNIT_TEST_SUITE (TTxDataShardLocalKMeansScan) {
for (auto similarity :
{VectorIndexSettings::SIMILARITY_INNER_PRODUCT, VectorIndexSettings::SIMILARITY_COSINE}) {
auto [level, posting] = DoLocalKMeans(server, sender, 40, seed, k,
NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_TMP_TO_POSTING,
NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_BUILD_TO_POSTING,
VectorIndexSettings::VECTOR_TYPE_UINT8, similarity);
UNIT_ASSERT_VALUES_EQUAL(level, "__ydb_parent = 40, __ydb_id = 41, __ydb_embedding = II\3\n");
UNIT_ASSERT_VALUES_EQUAL(posting, "__ydb_parent = 41, key = 1, data = one\n"
Expand All @@ -596,7 +596,7 @@ Y_UNIT_TEST_SUITE (TTxDataShardLocalKMeansScan) {
seed = 13;
{
auto [level, posting] = DoLocalKMeans(
server, sender, 40, seed, k, NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_TMP_TO_POSTING,
server, sender, 40, seed, k, NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_BUILD_TO_POSTING,
VectorIndexSettings::VECTOR_TYPE_UINT8, VectorIndexSettings::DISTANCE_COSINE);
UNIT_ASSERT_VALUES_EQUAL(level, "__ydb_parent = 40, __ydb_id = 41, __ydb_embedding = II\3\n");
UNIT_ASSERT_VALUES_EQUAL(posting, "__ydb_parent = 41, key = 1, data = one\n"
Expand All @@ -608,7 +608,7 @@ Y_UNIT_TEST_SUITE (TTxDataShardLocalKMeansScan) {
}
}

Y_UNIT_TEST (TmpToTmp) {
Y_UNIT_TEST (BuildToBuild) {
TPortManager pm;
TServerSettings serverSettings(pm.GetPort(2134));
serverSettings.SetDomainName("Root");
Expand All @@ -625,7 +625,7 @@ Y_UNIT_TEST_SUITE (TTxDataShardLocalKMeansScan) {
options.EnableOutOfOrder(true); // TODO(mbkkt) what is it?
options.Shards(1);

CreateTmpTable(server, sender, options, "table-main");
CreateBuildTable(server, sender, options, "table-main");
// Upsert some initial values
ExecSQL(server, sender,
R"(
Expand All @@ -642,7 +642,7 @@ Y_UNIT_TEST_SUITE (TTxDataShardLocalKMeansScan) {

auto create = [&] {
CreateLevelTable(server, sender, options);
CreateTmpTable(server, sender, options, "table-posting");
CreateBuildTable(server, sender, options, "table-posting");
};
create();
auto recreate = [&] {
Expand All @@ -657,7 +657,7 @@ Y_UNIT_TEST_SUITE (TTxDataShardLocalKMeansScan) {
seed = 0;
for (auto distance : {VectorIndexSettings::DISTANCE_MANHATTAN, VectorIndexSettings::DISTANCE_EUCLIDEAN}) {
auto [level, posting] =
DoLocalKMeans(server, sender, 40, seed, k, NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_TMP_TO_TMP,
DoLocalKMeans(server, sender, 40, seed, k, NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_BUILD_TO_BUILD,
VectorIndexSettings::VECTOR_TYPE_UINT8, distance);
UNIT_ASSERT_VALUES_EQUAL(level, "__ydb_parent = 40, __ydb_id = 41, __ydb_embedding = mm\3\n"
"__ydb_parent = 40, __ydb_id = 42, __ydb_embedding = 11\3\n");
Expand All @@ -672,7 +672,7 @@ Y_UNIT_TEST_SUITE (TTxDataShardLocalKMeansScan) {
seed = 111;
for (auto distance : {VectorIndexSettings::DISTANCE_MANHATTAN, VectorIndexSettings::DISTANCE_EUCLIDEAN}) {
auto [level, posting] =
DoLocalKMeans(server, sender, 40, seed, k, NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_TMP_TO_TMP,
DoLocalKMeans(server, sender, 40, seed, k, NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_BUILD_TO_BUILD,
VectorIndexSettings::VECTOR_TYPE_UINT8, distance);
UNIT_ASSERT_VALUES_EQUAL(level, "__ydb_parent = 40, __ydb_id = 41, __ydb_embedding = 11\3\n"
"__ydb_parent = 40, __ydb_id = 42, __ydb_embedding = mm\3\n");
Expand All @@ -687,7 +687,7 @@ Y_UNIT_TEST_SUITE (TTxDataShardLocalKMeansScan) {
for (auto similarity :
{VectorIndexSettings::SIMILARITY_INNER_PRODUCT, VectorIndexSettings::SIMILARITY_COSINE}) {
auto [level, posting] =
DoLocalKMeans(server, sender, 40, seed, k, NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_TMP_TO_TMP,
DoLocalKMeans(server, sender, 40, seed, k, NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_BUILD_TO_BUILD,
VectorIndexSettings::VECTOR_TYPE_UINT8, similarity);
UNIT_ASSERT_VALUES_EQUAL(level, "__ydb_parent = 40, __ydb_id = 41, __ydb_embedding = II\3\n");
UNIT_ASSERT_VALUES_EQUAL(posting, "__ydb_parent = 41, key = 1, embedding = \x30\x30\3, data = one\n"
Expand All @@ -700,7 +700,7 @@ Y_UNIT_TEST_SUITE (TTxDataShardLocalKMeansScan) {
seed = 13;
{
auto [level, posting] =
DoLocalKMeans(server, sender, 40, seed, k, NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_TMP_TO_TMP,
DoLocalKMeans(server, sender, 40, seed, k, NKikimrTxDataShard::TEvLocalKMeansRequest::UPLOAD_BUILD_TO_BUILD,
VectorIndexSettings::VECTOR_TYPE_UINT8, VectorIndexSettings::DISTANCE_COSINE);
UNIT_ASSERT_VALUES_EQUAL(level, "__ydb_parent = 40, __ydb_id = 41, __ydb_embedding = II\3\n");
UNIT_ASSERT_VALUES_EQUAL(posting, "__ydb_parent = 41, key = 1, embedding = \x30\x30\3, data = one\n"
Expand Down
Loading
Loading