Use a human readable size for level report
Summary: Current ``` ** Compaction Stats [default] ** Level Files Size(MB} Score Read(GB} Rn(GB} Rnp1(GB} Write(GB} Wnew(GB} Moved(GB} W-Amp Rd(MB/s} Wr(MB/s} Comp(sec} Comp(cnt} Avg(sec} KeyIn KeyDrop ---------------------------------------------------------------------------------------------------------------------------------------------------------- L0 2/0 49.02 0.5 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 76.1 1 2 0.322 0 0 Sum 2/0 49.02 0.0 0.0 0.0 0.0 0.0 0.0 0.0 1.0 0.0 76.1 1 2 0.322 0 0 Int 0/0 0.00 0.0 0.0 0.0 0.0 0.0 0.0 0.0 1.0 0.0 76.1 1 2 0.322 0 0 ``` New ``` ** Compaction Stats [default] ** Level Files Size Score Read(GB) Rn(GB) Rnp1(GB) Write(GB) Wnew(GB) Moved(GB) W-Amp Rd(MB/s) Wr(MB/s) Comp(sec) Comp(cnt) Avg(sec) KeyIn Key Closes https://github.com/facebook/rocksdb/pull/2055 Differential Revision: D4804576 Pulled By: IslamAbdelRahman fbshipit-source-id: 719be6a
This commit is contained in:
Islam AbdelRahman
Facebook Github Bot
parent
ce64b8b719
commit
c50e3750dc
@ -31,20 +31,20 @@ const std::map<LevelStatType, LevelStat> InternalStats::compaction_level_stats =
|
||||
{LevelStatType::NUM_FILES, LevelStat{"NumFiles", "Files"}},
|
||||
{LevelStatType::COMPACTED_FILES,
|
||||
LevelStat{"CompactedFiles", "CompactedFiles"}},
|
||||
{LevelStatType::SIZE_MB, LevelStat{"SizeMB", "Size(MB}"}},
|
||||
{LevelStatType::SIZE_BYTES, LevelStat{"SizeBytes", "Size"}},
|
||||
{LevelStatType::SCORE, LevelStat{"Score", "Score"}},
|
||||
{LevelStatType::READ_GB, LevelStat{"ReadGB", "Read(GB}"}},
|
||||
{LevelStatType::RN_GB, LevelStat{"RnGB", "Rn(GB}"}},
|
||||
{LevelStatType::RNP1_GB, LevelStat{"Rnp1GB", "Rnp1(GB}"}},
|
||||
{LevelStatType::WRITE_GB, LevelStat{"WriteGB", "Write(GB}"}},
|
||||
{LevelStatType::W_NEW_GB, LevelStat{"WnewGB", "Wnew(GB}"}},
|
||||
{LevelStatType::MOVED_GB, LevelStat{"MovedGB", "Moved(GB}"}},
|
||||
{LevelStatType::READ_GB, LevelStat{"ReadGB", "Read(GB)"}},
|
||||
{LevelStatType::RN_GB, LevelStat{"RnGB", "Rn(GB)"}},
|
||||
{LevelStatType::RNP1_GB, LevelStat{"Rnp1GB", "Rnp1(GB)"}},
|
||||
{LevelStatType::WRITE_GB, LevelStat{"WriteGB", "Write(GB)"}},
|
||||
{LevelStatType::W_NEW_GB, LevelStat{"WnewGB", "Wnew(GB)"}},
|
||||
{LevelStatType::MOVED_GB, LevelStat{"MovedGB", "Moved(GB)"}},
|
||||
{LevelStatType::WRITE_AMP, LevelStat{"WriteAmp", "W-Amp"}},
|
||||
{LevelStatType::READ_MBPS, LevelStat{"ReadMBps", "Rd(MB/s}"}},
|
||||
{LevelStatType::WRITE_MBPS, LevelStat{"WriteMBps", "Wr(MB/s}"}},
|
||||
{LevelStatType::COMP_SEC, LevelStat{"CompSec", "Comp(sec}"}},
|
||||
{LevelStatType::COMP_COUNT, LevelStat{"CompCount", "Comp(cnt}"}},
|
||||
{LevelStatType::AVG_SEC, LevelStat{"AvgSec", "Avg(sec}"}},
|
||||
{LevelStatType::READ_MBPS, LevelStat{"ReadMBps", "Rd(MB/s)"}},
|
||||
{LevelStatType::WRITE_MBPS, LevelStat{"WriteMBps", "Wr(MB/s)"}},
|
||||
{LevelStatType::COMP_SEC, LevelStat{"CompSec", "Comp(sec)"}},
|
||||
{LevelStatType::COMP_COUNT, LevelStat{"CompCount", "Comp(cnt)"}},
|
||||
{LevelStatType::AVG_SEC, LevelStat{"AvgSec", "Avg(sec)"}},
|
||||
{LevelStatType::KEY_IN, LevelStat{"KeyIn", "KeyIn"}},
|
||||
{LevelStatType::KEY_DROP, LevelStat{"KeyDrop", "KeyDrop"}},
|
||||
};
|
||||
@ -64,7 +64,7 @@ void PrintLevelStatsHeader(char* buf, size_t len, const std::string& cf_name) {
|
||||
buf + written_size, len - written_size,
|
||||
"Level %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s\n",
|
||||
// Note that we skip COMPACTED_FILES and merge it with Files column
|
||||
hdr(LevelStatType::NUM_FILES), hdr(LevelStatType::SIZE_MB),
|
||||
hdr(LevelStatType::NUM_FILES), hdr(LevelStatType::SIZE_BYTES),
|
||||
hdr(LevelStatType::SCORE), hdr(LevelStatType::READ_GB),
|
||||
hdr(LevelStatType::RN_GB), hdr(LevelStatType::RNP1_GB),
|
||||
hdr(LevelStatType::WRITE_GB), hdr(LevelStatType::W_NEW_GB),
|
||||
@ -91,7 +91,7 @@ void PrepareLevelStats(std::map<LevelStatType, double>* level_stats,
|
||||
|
||||
(*level_stats)[LevelStatType::NUM_FILES] = num_files;
|
||||
(*level_stats)[LevelStatType::COMPACTED_FILES] = being_compacted;
|
||||
(*level_stats)[LevelStatType::SIZE_MB] = total_file_size / kMB;
|
||||
(*level_stats)[LevelStatType::SIZE_BYTES] = total_file_size;
|
||||
(*level_stats)[LevelStatType::SCORE] = score;
|
||||
(*level_stats)[LevelStatType::READ_GB] = bytes_read / kGB;
|
||||
(*level_stats)[LevelStatType::RN_GB] =
|
||||
@ -117,7 +117,10 @@ void PrepareLevelStats(std::map<LevelStatType, double>* level_stats,
|
||||
void PrintLevelStats(char* buf, size_t len, const std::string& name,
|
||||
const std::map<LevelStatType, double>& stat_value) {
|
||||
snprintf(buf, len,
|
||||
"%4s %6d/%-3d %8.2f %5.1f " /* Level, Files, Size(MB), Score */
|
||||
"%4s " /* Level */
|
||||
"%6d/%-3d " /* Files */
|
||||
"%8s " /* Size */
|
||||
"%5.1f " /* Score */
|
||||
"%8.1f " /* Read(GB) */
|
||||
"%7.1f " /* Rn(GB) */
|
||||
"%8.1f " /* Rnp1(GB) */
|
||||
@ -135,7 +138,9 @@ void PrintLevelStats(char* buf, size_t len, const std::string& name,
|
||||
name.c_str(),
|
||||
static_cast<int>(stat_value.at(LevelStatType::NUM_FILES)),
|
||||
static_cast<int>(stat_value.at(LevelStatType::COMPACTED_FILES)),
|
||||
stat_value.at(LevelStatType::SIZE_MB),
|
||||
BytesToHumanString(
|
||||
static_cast<uint64_t>(stat_value.at(LevelStatType::SIZE_BYTES)))
|
||||
.c_str(),
|
||||
stat_value.at(LevelStatType::SCORE),
|
||||
stat_value.at(LevelStatType::READ_GB),
|
||||
stat_value.at(LevelStatType::RN_GB),
|
||||
@ -978,6 +983,7 @@ void InternalStats::DumpCFStats(std::string* value) {
|
||||
value->append(buf);
|
||||
}
|
||||
}
|
||||
|
||||
// Print sum of level stats
|
||||
PrintLevelStats(buf, sizeof(buf), "Sum", levels_stats[-1]);
|
||||
value->append(buf);
|
||||
|
||||
@ -53,7 +53,7 @@ enum class LevelStatType {
|
||||
INVALID = 0,
|
||||
NUM_FILES,
|
||||
COMPACTED_FILES,
|
||||
SIZE_MB,
|
||||
SIZE_BYTES,
|
||||
SCORE,
|
||||
READ_GB,
|
||||
RN_GB,
|
||||
|
||||
@ -112,6 +112,25 @@ std::string NumberToHumanString(int64_t num) {
|
||||
return std::string(buf);
|
||||
}
|
||||
|
||||
std::string BytesToHumanString(uint64_t bytes) {
|
||||
const char* size_name[] = {"KB", "MB", "GB", "TB"};
|
||||
double final_size = static_cast<double>(bytes);
|
||||
size_t size_idx;
|
||||
|
||||
// always start with KB
|
||||
final_size /= 1024;
|
||||
size_idx = 0;
|
||||
|
||||
while (size_idx < 3 && final_size >= 1024) {
|
||||
final_size /= 1024;
|
||||
size_idx++;
|
||||
}
|
||||
|
||||
char buf[20];
|
||||
snprintf(buf, sizeof(buf), "%.2f %s", final_size, size_name[size_idx]);
|
||||
return std::string(buf);
|
||||
}
|
||||
|
||||
std::string EscapeString(const Slice& value) {
|
||||
std::string r;
|
||||
AppendEscapedStringTo(&r, value);
|
||||
|
||||
@ -79,6 +79,10 @@ extern std::string NumberToString(uint64_t num);
|
||||
// for num >= 10.000.000.000, prints "xxG"
|
||||
extern std::string NumberToHumanString(int64_t num);
|
||||
|
||||
// Return a human-readable version of bytes
|
||||
// ex: 1048576 -> 1.00 GB
|
||||
extern std::string BytesToHumanString(uint64_t bytes);
|
||||
|
||||
// Return a human-readable version of "value".
|
||||
// Escapes any non-printable characters found in "value".
|
||||
extern std::string EscapeString(const Slice& value);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user