Skip to content

Fixed Column Shard write stats #24736

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 4 commits into from
Sep 16, 2025
Merged

Fixed Column Shard write stats #24736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8dd1478
Fixed Column Shard write stats
neyrox Sep 11, 2025
bcd8be0
Unmute fixed ydb/core/kqp/ut/query KqpStats.CreateTableAsStats+IsOlap…
neyrox Sep 11, 2025
bd3cf1b
Merge branch 'main' into cs-write-stats-fix
neyrox Sep 12, 2025
056ccd8
Merge branch 'main' into cs-write-stats-fix
neyrox Sep 15, 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
1 change: 0 additions & 1 deletion .github/config/muted_ya.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ ydb/core/kqp/ut/olap KqpOlapSysView.StatsSysViewTable
ydb/core/kqp/ut/opt KqpKv.ReadRows_TimeoutCancelsReads
ydb/core/kqp/ut/query KqpAnalyze.AnalyzeTable+ColumnStore
ydb/core/kqp/ut/query KqpLimits.ComputeNodeMemoryLimit
ydb/core/kqp/ut/query KqpStats.CreateTableAsStats+IsOlap
ydb/core/kqp/ut/query KqpStats.DeferredEffects+UseSink
ydb/core/kqp/ut/scan KqpFlowControl.FlowControl_Unlimited
ydb/core/kqp/ut/scan KqpScan.StreamExecuteScanQueryClientTimeoutBruteForce
Expand Down
18 changes: 14 additions & 4 deletions ydb/core/kqp/ut/query/kqp_stats_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -916,11 +916,21 @@ Y_UNIT_TEST_TWIN(CreateTableAsStats, IsOlap) {
auto stats = NYdb::TProtoAccessor::GetProto(*result.GetStats());
Cerr << stats.DebugString() << Endl;
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(0).table_access(0).updates().rows(), 2);
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(0).table_access(0).updates().bytes(), 24);
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(0).table_access(0).partitions_count(), 1);
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(0).table_access(1).reads().rows(), 2);
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(0).table_access(1).reads().bytes(), 24);
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(0).table_access(1).partitions_count(), 1);

if (IsOlap) {
// size of serialized may be a little different (because of arrow)
UNIT_ASSERT_GE(stats.query_phases(0).table_access(0).updates().bytes(), 400);
UNIT_ASSERT_LE(stats.query_phases(0).table_access(0).updates().bytes(), 500);
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(0).table_access(1).reads().bytes(), 40);
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(0).table_access(0).partitions_count(), 2);
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(0).table_access(1).partitions_count(), 0);
} else {
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(0).table_access(0).updates().bytes(), 24);
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(0).table_access(1).reads().bytes(), 24);
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(0).table_access(0).partitions_count(), 1);
UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(0).table_access(1).partitions_count(), 1);
}
}

{
Expand Down
5 changes: 4 additions & 1 deletion ydb/core/tx/columnshard/blobs_action/common/statistics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,17 @@
namespace NKikimr::NColumnShard {

void AddTableAccessStatsToTxStats(NKikimrQueryStats::TTxStats& stats, ui64 pathId, ui64 rows, ui64 bytes,
NEvWrite::EModificationType modificationType) {
NEvWrite::EModificationType modificationType, ui64 shardId) {
auto tableStats = stats.AddTableAccessStats();
tableStats->MutableTableInfo()->SetPathId(pathId);
auto row = modificationType == NEvWrite::EModificationType::Delete ? tableStats->MutableEraseRow()
: tableStats->MutableUpdateRow();
row->SetCount(rows);
row->SetRows(rows);
row->SetBytes(bytes);

auto shardStats = stats.AddPerShardStats();
shardStats->SetShardId(shardId);
}

} // namespace NKikimr::NColumnShard
2 changes: 1 addition & 1 deletion ydb/core/tx/columnshard/blobs_action/common/statistics.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
namespace NKikimr::NColumnShard {

void AddTableAccessStatsToTxStats(NKikimrQueryStats::TTxStats& stats, ui64 pathId, ui64 rows, ui64 bytes,
NEvWrite::EModificationType modificationType);
NEvWrite::EModificationType modificationType, ui64 shardId);

} // namespace NKikimr::NColumnShard
4 changes: 3 additions & 1 deletion ydb/core/tx/columnshard/blobs_action/transaction/tx_blobs_written.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ bool TTxBlobsWritingFinished::DoExecute(TTransactionContext& txc, const TActorCo
if (operation->GetBehaviour() == EOperationBehaviour::NoTxWrite) {
LWPROBE(EvWriteResult, Self->TabletID(), writeMeta.GetSource().ToString(), 0, operation->GetCookie(), "no_tx_write", true, "");
auto ev = NEvents::TDataEvents::TEvWriteResult::BuildCompleted(Self->TabletID());
AddTableAccessStatsToTxStats(*ev->Record.MutableTxStats(), writeMeta.GetPathId().SchemeShardLocalPathId.GetRawValue(),
writeResult.GetRecordsCount(), writeResult.GetDataSize(), operation->GetModificationType(), Self->TabletID());
Results.emplace_back(std::move(ev), writeMeta.GetSource(), operation->GetCookie());
} else {
auto& info = Self->OperationsManager->GetLockVerified(operation->GetLockId());
Expand All @@ -84,7 +86,7 @@ bool TTxBlobsWritingFinished::DoExecute(TTransactionContext& txc, const TActorCo
LWPROBE(EvWriteResult, Self->TabletID(), writeMeta.GetSource().ToString(), 0, operation->GetCookie(), "tx_write", true, "");
auto ev = NEvents::TDataEvents::TEvWriteResult::BuildCompleted(Self->TabletID(), operation->GetLockId(), lock);
AddTableAccessStatsToTxStats(*ev->Record.MutableTxStats(), writeMeta.GetPathId().SchemeShardLocalPathId.GetRawValue(),
writeResult.GetRecordsCount(), writeResult.GetDataSize(), operation->GetModificationType());
writeResult.GetRecordsCount(), writeResult.GetDataSize(), operation->GetModificationType(), Self->TabletID());
Results.emplace_back(std::move(ev), writeMeta.GetSource(), operation->GetCookie());
}
}
Expand Down
Loading