Skip to content

misc: Propagate full IO stats (count/min/max) to runtime metrics #15408

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

Closed
rui-mo wants to merge 1 commit into from
Closed

misc: Propagate full IO stats (count/min/max) to runtime metrics #15408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions velox/common/base/RuntimeMetrics.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,14 @@ struct RuntimeMetric {
RuntimeCounter::Unit _unit = RuntimeCounter::Unit::kNone)
: unit(_unit), sum{value}, count{1}, min{value}, max{value} {}

explicit RuntimeMetric(
int64_t _sum,
int64_t _count,
int64_t _min,
int64_t _max,
RuntimeCounter::Unit _unit = RuntimeCounter::Unit::kNone)
: unit(_unit), sum{_sum}, count{_count}, min{_min}, max{_max} {}

void addValue(int64_t value);

/// Aggregate sets 'min' and 'max' to 'sum', also sets 'count' to 1 if
Expand Down
31 changes: 23 additions & 8 deletions velox/connectors/hive/HiveDataSource.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,11 @@ HiveDataSource::getRuntimeStats() {
{{"numPrefetch", RuntimeMetric(ioStats_->prefetch().count())},
{"prefetchBytes",
RuntimeMetric(
ioStats_->prefetch().sum(), RuntimeCounter::Unit::kBytes)},
ioStats_->prefetch().sum(),
ioStats_->prefetch().count(),
ioStats_->prefetch().min(),
ioStats_->prefetch().max(),
RuntimeCounter::Unit::kBytes)},
{"totalScanTime",
RuntimeMetric(ioStats_->totalScanTime(), RuntimeCounter::Unit::kNanos)},
{Connector::kTotalRemainingFilterTime,
Expand All @@ -475,33 +479,44 @@ HiveDataSource::getRuntimeStats() {
{"ioWaitWallNanos",
RuntimeMetric(
ioStats_->queryThreadIoLatency().sum() * 1000,
RuntimeCounter::Unit::kNanos)},
{"maxSingleIoWaitWallNanos",
RuntimeMetric(
ioStats_->queryThreadIoLatency().count(),
ioStats_->queryThreadIoLatency().min() * 1000,
ioStats_->queryThreadIoLatency().max() * 1000,
RuntimeCounter::Unit::kNanos)},
{"overreadBytes",
RuntimeMetric(
ioStats_->rawOverreadBytes(), RuntimeCounter::Unit::kBytes)}});
if (ioStats_->read().count() > 0) {
res.insert({"numStorageRead", RuntimeMetric(ioStats_->read().count())});
res.insert(
{"storageReadBytes",
RuntimeMetric(ioStats_->read().sum(), RuntimeCounter::Unit::kBytes)});
RuntimeMetric(
ioStats_->read().sum(),
ioStats_->read().count(),
ioStats_->read().min(),
ioStats_->read().max(),
RuntimeCounter::Unit::kBytes)});
}
if (ioStats_->ssdRead().count() > 0) {
res.insert({"numLocalRead", RuntimeMetric(ioStats_->ssdRead().count())});
res.insert(
{"localReadBytes",
RuntimeMetric(
ioStats_->ssdRead().sum(), RuntimeCounter::Unit::kBytes)});
ioStats_->ssdRead().sum(),
ioStats_->ssdRead().count(),
ioStats_->ssdRead().min(),
ioStats_->ssdRead().max(),
RuntimeCounter::Unit::kBytes)});
}
if (ioStats_->ramHit().count() > 0) {
res.insert({"numRamRead", RuntimeMetric(ioStats_->ramHit().count())});
res.insert(
{"ramReadBytes",
RuntimeMetric(
ioStats_->ramHit().sum(), RuntimeCounter::Unit::kBytes)});
ioStats_->ramHit().sum(),
ioStats_->ramHit().count(),
ioStats_->ramHit().min(),
ioStats_->ramHit().max(),
RuntimeCounter::Unit::kBytes)});
}
if (numBucketConversion_ > 0) {
res.insert({"numBucketConversion", RuntimeMetric(numBucketConversion_)});
Expand Down
4 changes: 3 additions & 1 deletion velox/dwio/common/Statistics.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,9 @@ struct RuntimeStatistics {
if (columnReaderStatistics.pageLoadTimeNs > 0) {
result.emplace(
"pageLoadTimeNs",
RuntimeMetric(columnReaderStatistics.pageLoadTimeNs));
RuntimeMetric(
columnReaderStatistics.pageLoadTimeNs,
RuntimeCounter::Unit::kNanos));
}
return result;
}
Expand Down
20 changes: 7 additions & 13 deletions velox/exec/tests/PrintPlanWithStatsTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,26 +210,24 @@ TEST_F(PrintPlanWithStatsTest, innerJoinWithTableScan) {
{" dynamicFiltersAccepted[ ]* sum: 1, count: 1, min: 1, max: 1, avg: 1"},
{" footerBufferOverread[ ]* sum: .+, count: 1, min: .+, max: .+"},
{" ioWaitWallNanos [ ]* sum: .+, count: .+ min: .+, max: .+"},
{" maxSingleIoWaitWallNanos[ ]*sum: .+, count: 1, min: .+, max: .+"},
{" numPrefetch [ ]* sum: .+, count: 1, min: .+, max: .+"},
{" numRamRead [ ]* sum: 60, count: 1, min: 60, max: 60, avg: 60"},
{" numStorageRead [ ]* sum: .+, count: 1, min: .+, max: .+"},
{" numStripes[ ]* sum: .+, count: 1, min: .+, max: .+"},
{" overreadBytes[ ]* sum: 0B, count: 1, min: 0B, max: 0B, avg: 0B"},
{" prefetchBytes [ ]* sum: .+, count: 1, min: .+, max: .+"},
{" prefetchBytes [ ]* sum: .+, count: .+, min: .+, max: .+"},
{" preloadSplitPrepareTimeNanos[ ]* sum: .+, count: .+, min: .+, max: .+, avg: .+"},
{" preloadedSplits[ ]+sum: .+, count: .+, min: .+, max: .+",
true},
{" processedSplits[ ]+sum: 20, count: 1, min: 20, max: 20, avg: 20"},
{" processedStrides[ ]+sum: 20, count: 1, min: 20, max: 20, avg: 20"},
{" processedUnits [ ]* sum: .+, count: .+, min: .+, max: .+"},
{" ramReadBytes [ ]* sum: .+, count: 1, min: .+, max: .+"},
{" ramReadBytes [ ]* sum: .+, count: .+, min: .+, max: .+"},
{" readyPreloadedSplits[ ]+sum: .+, count: .+, min: .+, max: .+",
true},
{" runningAddInputWallNanos\\s+sum: .+, count: 1, min: .+, max: .+"},
{" runningFinishWallNanos\\s+sum: .+, count: 1, min: .+, max: .+"},
{" runningGetOutputWallNanos\\s+sum: .+, count: 1, min: .+, max: .+"},
{" storageReadBytes [ ]* sum: .+, count: 1, min: .+, max: .+"},
{" storageReadBytes [ ]* sum: .+, count: .+, min: .+, max: .+"},
{" totalRemainingFilterWallNanos\\s+sum: .+, count: .+, min: .+, max: .+"},
{" totalScanTime [ ]* sum: .+, count: .+, min: .+, max: .+"},
{" unitLoadNanos[ ]* sum: .+, count: .+, min: .+, max: .+, avg: .+"},
Expand Down Expand Up @@ -308,10 +306,8 @@ TEST_F(PrintPlanWithStatsTest, partialAggregateWithTableScan) {
{" dataSourceReadWallNanos[ ]* sum: .+, count: .+, min: .+, max: .+"},
{" footerBufferOverread[ ]* sum: .+, count: 1, min: .+, max: .+"},
{" ioWaitWallNanos [ ]* sum: .+, count: .+ min: .+, max: .+"},
{" maxSingleIoWaitWallNanos[ ]*sum: .+, count: 1, min: .+, max: .+"},
{" numPrefetch [ ]* sum: .+, count: .+, min: .+, max: .+"},
{" numRamRead [ ]* sum: 7, count: 1, min: 7, max: 7, avg: 7"},
{" numStorageRead [ ]* sum: .+, count: 1, min: .+, max: .+"},
{" numStripes[ ]* sum: .+, count: 1, min: .+, max: .+"},
{" overreadBytes[ ]* sum: 0B, count: 1, min: 0B, max: 0B, avg: 0B"},

Expand All @@ -321,13 +317,13 @@ TEST_F(PrintPlanWithStatsTest, partialAggregateWithTableScan) {
{" processedUnits [ ]* sum: .+, count: .+, min: .+, max: .+"},
{" preloadedSplits[ ]+sum: .+, count: .+, min: .+, max: .+",
true},
{" ramReadBytes [ ]* sum: .+, count: 1, min: .+, max: .+"},
{" ramReadBytes [ ]* sum: .+, count: .+, min: .+, max: .+"},
{" readyPreloadedSplits[ ]+sum: .+, count: .+, min: .+, max: .+",
true},
{" runningAddInputWallNanos\\s+sum: .+, count: 1, min: .+, max: .+"},
{" runningFinishWallNanos\\s+sum: .+, count: 1, min: .+, max: .+"},
{" runningGetOutputWallNanos\\s+sum: .+, count: 1, min: .+, max: .+"},
{" storageReadBytes [ ]* sum: .+, count: 1, min: .+, max: .+"},
{" storageReadBytes [ ]* sum: .+, count: .+, min: .+, max: .+"},
{" totalRemainingFilterWallNanos\\s+sum: .+, count: .+, min: .+, max: .+"},
{" totalScanTime [ ]* sum: .+, count: .+, min: .+, max: .+"},
{" unitLoadNanos[ ]* sum: .+, count: .+, min: .+, max: .+, avg: .+"}});
Expand Down Expand Up @@ -385,10 +381,8 @@ TEST_F(PrintPlanWithStatsTest, tableWriterWithTableScan) {
{" dataSourceReadWallNanos[ ]* sum: .+, count: .+, min: .+, max: .+"},
{" footerBufferOverread[ ]* sum: .+, count: 1, min: .+, max: .+"},
{" ioWaitWallNanos [ ]* sum: .+, count: .+ min: .+, max: .+"},
{" maxSingleIoWaitWallNanos[ ]*sum: .+, count: 1, min: .+, max: .+"},
{" numPrefetch [ ]* sum: .+, count: .+, min: .+, max: .+"},
{" numRamRead [ ]* sum: 7, count: 1, min: 7, max: 7, avg: 7"},
{" numStorageRead [ ]* sum: .+, count: 1, min: .+, max: .+"},
{" numStripes[ ]* sum: .+, count: 1, min: .+, max: .+"},
{" overreadBytes[ ]* sum: 0B, count: 1, min: 0B, max: 0B, avg: 0B"},

Expand All @@ -398,13 +392,13 @@ TEST_F(PrintPlanWithStatsTest, tableWriterWithTableScan) {
{" processedUnits [ ]* sum: .+, count: .+, min: .+, max: .+"},
{" preloadedSplits[ ]+sum: .+, count: .+, min: .+, max: .+",
true},
{" ramReadBytes [ ]* sum: .+, count: 1, min: .+, max: .+"},
{" ramReadBytes [ ]* sum: .+, count: .+, min: .+, max: .+"},
{" readyPreloadedSplits[ ]+sum: .+, count: .+, min: .+, max: .+",
true},
{" runningAddInputWallNanos\\s+sum: .+, count: 1, min: .+, max: .+"},
{" runningFinishWallNanos\\s+sum: .+, count: 1, min: .+, max: .+"},
{" runningGetOutputWallNanos\\s+sum: .+, count: 1, min: .+, max: .+"},
{" storageReadBytes [ ]* sum: .+, count: 1, min: .+, max: .+"},
{" storageReadBytes [ ]* sum: .+, count: .+, min: .+, max: .+"},
{" totalRemainingFilterWallNanos\\s+sum: .+, count: .+, min: .+, max: .+"},
{" totalScanTime [ ]* sum: .+, count: .+, min: .+, max: .+"},
{" unitLoadNanos[ ]* sum: .+, count: .+, min: .+, max: .+, avg: .+"}});
Expand Down
4 changes: 2 additions & 2 deletions velox/exec/tests/TableScanTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5758,7 +5758,7 @@ TEST_F(TableScanTest, footerIOCount) {
.assertResults(
BaseVector::create<RowVector>(vector->type(), 0, pool()));
auto stats = getTableScanRuntimeStats(task);
ASSERT_EQ(stats.at("numStorageRead").sum, 1);
ASSERT_EQ(stats.at("storageReadBytes").count, 1);
ASSERT_GT(stats.at("footerBufferOverread").sum, 0);
}

Expand Down Expand Up @@ -5849,7 +5849,7 @@ TEST_F(TableScanTest, statsBasedFilterReorderDisabled) {
auto tableScanStats = getTableScanStats(task);
ASSERT_EQ(tableScanStats.customStats.count("storageReadBytes"), 1);
ASSERT_GT(tableScanStats.customStats["storageReadBytes"].sum, 0);
ASSERT_EQ(tableScanStats.customStats["storageReadBytes"].count, 1);
ASSERT_GT(tableScanStats.customStats["storageReadBytes"].count, 0);
ASSERT_EQ(tableScanStats.numSplits, numSplits);
}

Expand Down
Loading