Skip to content

25-3: Renamed table should be present in partiton_stats (#28331) #28395

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
Nov 10, 2025
Merged

25-3: Renamed table should be present in partiton_stats (#28331) #28395

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
dff5a93
Renamed table should be present in partiton_stats (#28331)
azevaykin Nov 7, 2025
ac1c7ed
Build fix
azevaykin Nov 7, 2025
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
149 changes: 77 additions & 72 deletions ydb/core/sys_view/ut_kqp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,17 @@ using namespace NTestUtils;

namespace {

void FillRootTable(TTestEnv& env, ui16 tableNum = 0) {
TTableClient client(env.GetDriver());
auto session = client.CreateSession().GetValueSync().GetSession();
NKqp::AssertSuccessResult(session.ExecuteDataQuery(Sprintf(R"(
REPLACE INTO `Root/Table%u` (Key, Value) VALUES
(0u, "X"),
(1u, "Y"),
(2u, "Z");
)", tableNum), TTxControl::BeginTx().CommitTx()).GetValueSync());
}

void CreateRootTable(TTestEnv& env, ui64 partitionCount = 1, bool fillTable = false, ui16 tableNum = 0) {
env.GetClient().CreateTable("/Root", Sprintf(R"(
Name: "Table%u"
Expand All @@ -39,16 +50,23 @@ void CreateRootTable(TTestEnv& env, ui64 partitionCount = 1, bool fillTable = fa
UniformPartitionsCount: %lu
)", tableNum, partitionCount));

if (fillTable) {
TTableClient client(env.GetDriver());
auto session = client.CreateSession().GetValueSync().GetSession();
NKqp::AssertSuccessResult(session.ExecuteDataQuery(R"(
REPLACE INTO `Root/Table0` (Key, Value) VALUES
(0u, "X"),
(1u, "Y"),
(2u, "Z");
)", TTxControl::BeginTx().CommitTx()).GetValueSync());
}
if (fillTable)
FillRootTable(env, tableNum);
}

void CreateRootColumnTable(TTestEnv& env, ui64 partitionCount = 1, bool fillTable = false, ui16 tableNum = 0) {
NQuery::TQueryClient client(env.GetDriver());
auto result = client.ExecuteQuery(Sprintf(R"(
CREATE TABLE `/Root/Table%u` (
Key Int32 NOT NULL,
Value Utf8,
PRIMARY KEY(Key)
) WITH (STORE=COLUMN, AUTO_PARTITIONING_MIN_PARTITIONS_COUNT = %lu);
)", tableNum, partitionCount), NQuery::TTxControl::NoTx()).GetValueSync();
UNIT_ASSERT_C(result.IsSuccess(), result.GetIssues().ToString());

if (fillTable)
FillRootTable(env, tableNum);
}

void BreakLock(TSession& session, const TString& tableName) {
Expand Down Expand Up @@ -2646,68 +2664,27 @@ R"(CREATE TABLE `test_show_create` (
check.Uint64(1u); // LastTtlRowsProcessed
check.Uint64(1u); // LastTtlRowsErased
}

Y_UNIT_TEST(PartitionStatsAfterRemoveColumnTable) {
TTestEnv env;
NQuery::TQueryClient client(env.GetDriver());

{
auto result = client.ExecuteQuery(R"(
CREATE TABLE `/Root/test_table` (
key int not null,
value utf8,
PRIMARY KEY(key)
) WITH (STORE=COLUMN);
)", NQuery::TTxControl::NoTx()).GetValueSync();

UNIT_ASSERT_C(result.IsSuccess(), result.GetIssues().ToString());
}

{
auto result = client.ExecuteQuery(R"(
SELECT Path FROM `/Root/.sys/partition_stats`
GROUP BY Path;
)", NQuery::TTxControl::NoTx()).GetValueSync();
UNIT_ASSERT_C(result.IsSuccess(), result.GetIssues().ToString());
auto parser = result.GetResultSetParser(0);
bool existsPath = false;
while (parser.TryNextRow()) {
auto path = parser.ColumnParser("Path").GetOptionalUtf8();
UNIT_ASSERT(path);
if (*path == "/Root/test_table") {
existsPath = true;
break;
}
}
UNIT_ASSERT_C(existsPath, "Path /Root/test_table not found");
}

{
auto result = client.ExecuteQuery(R"(
DROP TABLE `/Root/test_table`
)", NQuery::TTxControl::NoTx()).GetValueSync();

UNIT_ASSERT_C(result.IsSuccess(), result.GetIssues().ToString());
}

{
auto result = client.ExecuteQuery(R"(
SELECT Path FROM `/Root/.sys/partition_stats`
GROUP BY Path;
)", NQuery::TTxControl::NoTx()).GetValueSync();
UNIT_ASSERT_C(result.IsSuccess(), result.GetIssues().ToString());
auto parser = result.GetResultSetParser(0);
bool existsPath = false;
while (parser.TryNextRow()) {
auto path = parser.ColumnParser("Path").GetOptionalUtf8();
UNIT_ASSERT(path);
if (*path == "/Root/test_table") {
existsPath = true;
break;
}
}
UNIT_ASSERT_C(!existsPath, "Path /Root/test_table found");
}

Y_UNIT_TEST_TWIN(PartitionStatsAfterDropTable, UseColumnTable) {
TTestEnv env({.DataShardStatsReportIntervalSeconds = 0});
if (UseColumnTable)
CreateRootColumnTable(env);
else
CreateRootTable(env);

TTableClient client(env.GetDriver());

WaitForStats(client, "/Root/.sys/partition_stats", "Path = '/Root/Table0'");

auto session = client.CreateSession().GetValueSync().GetSession();
auto result = session.ExecuteSchemeQuery(R"(
DROP TABLE `Root/Table0`;
)").GetValueSync();
UNIT_ASSERT_C(result.IsSuccess(), result.GetIssues().ToString());

// Verify Table0 is removed from partition_stats
auto table0Count = GetRowCount(client, "/Root/.sys/partition_stats", "Path = '/Root/Table0'");
UNIT_ASSERT_VALUES_EQUAL(table0Count, 0);
}

Y_UNIT_TEST(PartitionStatsLocksFields) {
Expand Down Expand Up @@ -2738,6 +2715,34 @@ R"(CREATE TABLE `test_show_create` (
check.Uint64(1); // LocksBroken
}

Y_UNIT_TEST_TWIN(PartitionStatsAfterRenameTable, UseColumnTable) {
TTestEnv env({.DataShardStatsReportIntervalSeconds = 0});
if (UseColumnTable)
CreateRootColumnTable(env);
else
CreateRootTable(env);

TTableClient client(env.GetDriver());
auto session = client.CreateSession().GetValueSync().GetSession();

WaitForStats(client, "/Root/.sys/partition_stats", "Path = '/Root/Table0'");

auto result = session.ExecuteSchemeQuery(R"(
ALTER TABLE `Root/Table0` RENAME TO `Root/Table1`;
)").GetValueSync();
UNIT_ASSERT_C(result.IsSuccess(), result.GetIssues().ToString());

WaitForStats(client, "/Root/.sys/partition_stats", "Path = '/Root/Table1'");

// Verify Table0 is no longer in partition_stats
auto table0Count = GetRowCount(client, "/Root/.sys/partition_stats", "Path = '/Root/Table0'");
UNIT_ASSERT_VALUES_EQUAL(table0Count, 0);

// Verify Table1 exists in partition_stats
auto table1Count = GetRowCount(client, "/Root/.sys/partition_stats", "Path = '/Root/Table1'");
UNIT_ASSERT_VALUES_EQUAL(table1Count, 1);
}

Y_UNIT_TEST(PartitionStatsFields) {
auto nowUs = TInstant::Now().MicroSeconds();

Expand Down
6 changes: 5 additions & 1 deletion ydb/core/tx/schemeshard/schemeshard__operation_move_table.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,10 @@ void MarkSrcDropped(NIceDb::TNiceDb& db,
context.SS->PersistDropStep(db, srcPath->PathId, txState.PlanStep, operationId);
if (srcPath->IsTable()) {
context.SS->Tables.at(srcPath->PathId)->DetachShardsStats();
context.SS->PersistRemoveTable(db, srcPath->PathId, context.Ctx);
} else if (srcPath->IsColumnTable()) {
context.SS->PersistColumnTableRemove(db, srcPath->PathId);
}
context.SS->PersistRemoveTable(db, srcPath->PathId, context.Ctx);
context.SS->PersistUserAttributes(db, srcPath->PathId, srcPath->UserAttrs, nullptr);

IncParentDirAlterVersionWithRepublish(operationId, srcPath, context);
Expand Down Expand Up @@ -279,11 +281,13 @@ class TPropose: public TSubOperationState {
context.SS->Tables[dstPath.Base()->PathId] = tableInfo;
context.SS->PersistTable(db, dstPath.Base()->PathId);
context.SS->PersistTablePartitionStats(db, dstPath.Base()->PathId, tableInfo);
context.SS->SetPartitioning(dstPath.Base()->PathId, tableInfo, TVector<TTableShardInfo>(tableInfo->GetPartitions()));
} else if (srcPath->IsColumnTable()) {
auto srcTable = context.SS->ColumnTables.GetVerified(srcPath.Base()->PathId);
auto tableInfo = context.SS->ColumnTables.BuildNew(dstPath.Base()->PathId, srcTable.GetPtr());
tableInfo->AlterVersion += 1;
context.SS->PersistColumnTable(db, dstPath.Base()->PathId, *tableInfo, false);
context.SS->SetPartitioning(dstPath.Base()->PathId, tableInfo.GetPtr());
} else {
Y_ABORT();
}
Expand Down
Loading