diff --git a/modules/console.cc b/modules/console.cc index b159840b3..3f22bf3db 100644 --- a/modules/console.cc +++ b/modules/console.cc @@ -1093,7 +1093,7 @@ try }; // Special branch for integer properties that RocksDB aggregates. - if(!empty(ticker)) + if(ticker && ticker != "-a") { out << ticker << ": " << db::ticker(database, ticker) << std::endl; return true; @@ -1109,8 +1109,16 @@ try if(!name) continue; - out << std::setw(48) << std::right << name - << " " << db::ticker(database, i) + const auto &val + { + db::ticker(database, i) + }; + + if(val == 0 && ticker != "-a") + continue; + + out << std::left << std::setw(48) << std::setfill('_') << name + << " " << val << std::endl; } @@ -1737,6 +1745,10 @@ try << " " << uuid(database) << std::endl; + out << std::left << std::setw(28) << std::setfill('_') << "errors " + << " " << db::property(database, "rocksdb.background-errors") + << std::endl; + out << std::left << std::setw(28) << std::setfill('_') << "columns " << " " << database.columns.size() << std::endl; @@ -1745,6 +1757,10 @@ try << " " << file_count(database) << std::endl; + out << std::left << std::setw(28) << std::setfill('_') << "sequence " + << " " << sequence(database) + << std::endl; + out << std::left << std::setw(28) << std::setfill('_') << "keys " << " " << db::property(database, "rocksdb.estimate-num-keys") << std::endl; @@ -1777,18 +1793,10 @@ try << " " << db::property(database, "rocksdb.num-deletes-active-mem-table") << std::endl; - out << std::left << std::setw(28) << std::setfill('_') << "lsm super sequence " + out << std::left << std::setw(28) << std::setfill('_') << "lsm sequence " << " " << db::property(database, "rocksdb.current-super-version-number") << std::endl; - out << std::left << std::setw(28) << std::setfill('_') << "sequence " - << " " << sequence(database) - << std::endl; - - out << std::left << std::setw(28) << std::setfill('_') << "errors " - << " " << db::property(database, "rocksdb.background-errors") - << std::endl; - return true; } catch(const std::out_of_range &e)