Skip to content

Commit bf6f316

Browse files
committed
replace "indexImplTable" with NTableIndex::ImplTable
1 parent c6a245c commit bf6f316

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

ydb/core/grpc_services/rpc_describe_table.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
#include "service_table.h"
88
#include "rpc_common/rpc_common.h"
9+
#include <ydb/core/base/table_index.h>
910
#include <ydb/core/tx/schemeshard/schemeshard.h>
1011
#include <ydb/core/ydb_convert/table_description.h>
1112
#include <ydb/core/ydb_convert/ydb_convert.h>
@@ -153,7 +154,7 @@ class TDescribeTableRPC : public TRpcSchemeRequestActor<TDescribeTableRPC, TEvDe
153154
record->MutableOptions()->SetReturnPartitionStats(true);
154155
}
155156

156-
if (AppData(ctx)->AllowPrivateTableDescribeForTest || path.EndsWith("/indexImplTable")) {
157+
if (AppData(ctx)->AllowPrivateTableDescribeForTest || path.EndsWith(TStringBuilder() << "/" << NTableIndex::ImplTable)) {
157158
record->MutableOptions()->SetShowPrivateTable(true);
158159
}
159160

ydb/core/kqp/gateway/utils/scheme_helpers.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#include "scheme_helpers.h"
22

33
#include <ydb/core/base/path.h>
4+
#include <ydb/core/base/table_index.h>
45
#include <ydb/core/protos/external_sources.pb.h>
56

67
namespace NKikimr::NKqp::NSchemeHelpers {
@@ -46,7 +47,7 @@ bool SplitTablePath(const TString& tableName, const TString& database, std::pair
4647
}
4748

4849
TString CreateIndexTablePath(const TString& tableName, const TString& indexName) {
49-
return tableName + "/" + indexName + "/indexImplTable";
50+
return tableName + "/" + indexName + "/" + NTableIndex::ImplTable;
5051
}
5152

5253
bool SetDatabaseForLoginOperation(TString& result, bool getDomainLoginOnly, TMaybe<TString> domainName,

ydb/core/tx/schemeshard/schemeshard__operation_part.cpp

+1-3
Original file line numberDiff line numberDiff line change
@@ -152,10 +152,8 @@ ISubOperation::TPtr CascadeDropTableChildren(TVector<ISubOperation::TPtr>& resul
152152
}
153153

154154
for (auto& [implName, implPathId] : child.Base()->GetChildren()) {
155-
Y_ABORT_UNLESS(implName == "indexImplTable"
155+
Y_ABORT_UNLESS(NTableIndex::IsImplTable(implName)
156156
|| implName == "streamImpl"
157-
|| implName == NTableIndex::NTableVectorKmeansTreeIndex::LevelTable
158-
|| implName == NTableIndex::NTableVectorKmeansTreeIndex::PostingTable
159157
, "unexpected name %s", implName.c_str());
160158

161159
TPath implPath = child.Child(implName);

ydb/core/tx/schemeshard/schemeshard_build_index__progress.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ struct TSchemeShard::TIndexBuilder::TTxProgress: public TSchemeShard::TIndexBuil
321321
}
322322

323323
if (buildInfo->ImplTablePath.Empty() && buildInfo->IsBuildIndex()) {
324-
TPath implTable = TPath::Init(buildInfo->TablePathId, Self).Dive(buildInfo->IndexName).Dive("indexImplTable");
324+
TPath implTable = TPath::Init(buildInfo->TablePathId, Self).Dive(buildInfo->IndexName).Dive(NTableIndex::ImplTable);
325325
buildInfo->ImplTablePath = implTable.PathString();
326326

327327
TTableInfo::TPtr implTableInfo = Self->Tables.at(implTable.Base()->PathId);

0 commit comments

Comments
 (0)