diff --git a/db/internal_stats.cc b/db/internal_stats.cc index 953d9e9a7..79d4420c0 100644 --- a/db/internal_stats.cc +++ b/db/internal_stats.cc @@ -865,7 +865,7 @@ void InternalStats::DumpCFMapStats(std::map* cf_stats) { } } -int InternalStats::DumpCFMapStats( +void InternalStats::DumpCFMapStats( std::map>* levels_stats, CompactionStats* compaction_stats_sum) { const VersionStorageInfo* vstorage = cfd_->current()->storage_info(); @@ -925,7 +925,6 @@ int InternalStats::DumpCFMapStats( PrepareLevelStats(&sum_stats, total_files, total_files_being_compacted, total_file_size, 0, w_amp, *compaction_stats_sum); (*levels_stats)[-1] = sum_stats; // -1 is for the Sum level - return num_levels_to_check; } void InternalStats::DumpCFStats(std::string* value) { @@ -937,8 +936,8 @@ void InternalStats::DumpCFStats(std::string* value) { // Print stats for each level std::map> levels_stats; CompactionStats compaction_stats_sum(0); - int levels = DumpCFMapStats(&levels_stats, &compaction_stats_sum); - for (int l = 0; l < levels; ++l) { + DumpCFMapStats(&levels_stats, &compaction_stats_sum); + for (int l = 0; l < number_levels_; ++l) { if (levels_stats.find(l) != levels_stats.end()) { PrintLevelStats(buf, sizeof(buf), "L" + ToString(l), levels_stats[l]); value->append(buf); diff --git a/db/internal_stats.h b/db/internal_stats.h index aade28bb3..d97069e3f 100644 --- a/db/internal_stats.h +++ b/db/internal_stats.h @@ -273,7 +273,7 @@ class InternalStats { private: void DumpDBStats(std::string* value); void DumpCFMapStats(std::map* cf_stats); - int DumpCFMapStats( + void DumpCFMapStats( std::map>* level_stats, CompactionStats* compaction_stats_sum); void DumpCFStats(std::string* value);