Skip to content
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

Fix table stats aggregation for OLAP tables #8417

Merged
merged 7 commits into from
Aug 29, 2024
Merged

Fix table stats aggregation for OLAP tables #8417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a428c00
Fix table stats aggregation for OLAP tables
swalrus1 Aug 28, 2024
1ccaf05
ашч
swalrus1 Aug 28, 2024
5698095
fix
swalrus1 Aug 28, 2024
73111d4
fix
swalrus1 Aug 28, 2024
b6c11a1
fix
swalrus1 Aug 28, 2024
e4c7316
clean up
swalrus1 Aug 28, 2024
e6715c3
fix PartCount
swalrus1 Aug 29, 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
5 changes: 3 additions & 2 deletions ydb/core/tx/schemeshard/olap/table/table.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,9 @@ struct TColumnTableInfo {
Stats.UpdateShardStats(shardIdx, newStats);
}

void UpdateTableStats(const TPathId& pathId, const TPartitionStats& newStats) {
Stats.UpdateTableStats(pathId, newStats);
void UpdateTableStats(const TShardIdx shardIdx, const TPathId& pathId, const TPartitionStats& newStats) {
Stats.TableStats[pathId].Aggregated.PartCount = GetColumnShards().size();
Stats.UpdateTableStats(shardIdx, pathId, newStats);
}

TConclusion<std::shared_ptr<NOlap::NAlter::ISSEntity>> BuildEntity(const TPathId& pathId, const NOlap::NAlter::TEntityInitializationContext& iContext) const;
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/tx/schemeshard/schemeshard__table_stats.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ bool TTxStoreTableStats::PersistSingleStats(const TPathId& pathId,
"add stats for exists table with pathId=" << tablePathId);

auto columnTable = Self->ColumnTables.TakeVerified(tablePathId);
columnTable->UpdateTableStats(tablePathId, newTableStats);
columnTable->UpdateTableStats(shardIdx, tablePathId, newTableStats);
} else {
LOG_WARN_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD,
"failed add stats for table with pathId=" << tablePathId);
Expand Down
33 changes: 5 additions & 28 deletions ydb/core/tx/schemeshard/schemeshard_info_types.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1673,7 +1673,7 @@ void TTableInfo::UpdateShardStats(TShardIdx datashardIdx, const TPartitionStats&
Stats.UpdateShardStats(datashardIdx, newStats);
}

void TAggregatedStats::UpdateShardStats(TShardIdx datashardIdx, const TPartitionStats& newStats) {
void TTableAggregatedStats::UpdateShardStats(TShardIdx datashardIdx, const TPartitionStats& newStats) {
// Ignore stats from unknown datashard (it could have been split)
if (!PartitionStats.contains(datashardIdx))
return;
Expand Down Expand Up @@ -1763,33 +1763,10 @@ void TAggregatedStats::UpdateShardStats(TShardIdx datashardIdx, const TPartition
}
}

void TAggregatedStats::UpdateTableStats(const TPathId& pathId, const TPartitionStats& newStats) {
if (!TableStats.contains(pathId)) {
TableStats[pathId] = newStats;
return;
}

TPartitionStats& oldStats = TableStats[pathId];

if (newStats.SeqNo <= oldStats.SeqNo) {
// Ignore outdated message
return;
}

if (newStats.SeqNo.Generation > oldStats.SeqNo.Generation) {
// Reset incremental counter baselines if tablet has restarted
oldStats.ImmediateTxCompleted = 0;
oldStats.PlannedTxCompleted = 0;
oldStats.TxRejectedByOverload = 0;
oldStats.TxRejectedBySpace = 0;
oldStats.RowUpdates = 0;
oldStats.RowDeletes = 0;
oldStats.RowReads = 0;
oldStats.RangeReads = 0;
oldStats.RangeReadRows = 0;
}
TableStats[pathId].RowCount += (newStats.RowCount - oldStats.RowCount);
TableStats[pathId].DataSize += (newStats.DataSize - oldStats.DataSize);
void TAggregatedStats::UpdateTableStats(TShardIdx shardIdx, const TPathId& pathId, const TPartitionStats& newStats) {
auto& tableStats = TableStats[pathId];
tableStats.PartitionStats[shardIdx]; // insert if none
tableStats.UpdateShardStats(shardIdx, newStats);
}

void TTableInfo::RegisterSplitMergeOp(TOperationId opId, const TTxState& txState) {
Expand Down
10 changes: 7 additions & 3 deletions ydb/core/tx/schemeshard/schemeshard_info_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,14 +321,18 @@ struct TPartitionStats {
ui64 CPU = 0;
};

struct TAggregatedStats {
struct TTableAggregatedStats {
TPartitionStats Aggregated;
THashMap<TShardIdx, TPartitionStats> PartitionStats;
THashMap<TPathId, TPartitionStats> TableStats;
size_t PartitionStatsUpdated = 0;

void UpdateShardStats(TShardIdx datashardIdx, const TPartitionStats& newStats);
void UpdateTableStats(const TPathId& pathId, const TPartitionStats& newStats);
};

struct TAggregatedStats : public TTableAggregatedStats {
THashMap<TPathId, TTableAggregatedStats> TableStats;

void UpdateTableStats(TShardIdx datashardIdx, const TPathId& pathId, const TPartitionStats& newStats);
};

struct TSubDomainInfo;
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/tx/schemeshard/schemeshard_path_describer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,7 @@ void TPathDescriber::DescribeColumnTable(TPathId pathId, TPathElement::TPtr path
description->MutableSchema()->SetVersion(description->GetSchema().GetVersion() + description->GetSchemaPresetVersionAdj());
}
if (tableInfo->GetStats().TableStats.contains(pathId)) {
FillTableStats(*pathDescription, tableInfo->GetStats().TableStats.at(pathId));
FillTableStats(*pathDescription, tableInfo->GetStats().TableStats.at(pathId).Aggregated);
} else {
FillTableStats(*pathDescription, TPartitionStats());
}
Expand Down
Loading