From 057be91613e7f8f23cbf403b3af3db86e0959dad Mon Sep 17 00:00:00 2001 From: Francesco Mazzoli Date: Thu, 9 Nov 2023 13:38:32 +0000 Subject: [PATCH] `rocksDBStats` -> `rocksDBMetrics` --- cpp/cdc/CDC.cpp | 2 +- cpp/cdc/CDCDB.cpp | 8 ++++---- cpp/cdc/CDCDB.hpp | 2 +- cpp/core/RocksDBUtils.cpp | 2 +- cpp/core/RocksDBUtils.hpp | 2 +- cpp/shard/Shard.cpp | 2 +- cpp/shard/ShardDB.cpp | 8 ++++---- cpp/shard/ShardDB.hpp | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cpp/cdc/CDC.cpp b/cpp/cdc/CDC.cpp index 1fcea2a8..97011e25 100644 --- a/cpp/cdc/CDC.cpp +++ b/cpp/cdc/CDC.cpp @@ -799,7 +799,7 @@ public: } { _rocksDBStats.clear(); - _shared.db.rocksDBStats(_rocksDBStats); + _shared.db.rocksDBMetrics(_rocksDBStats); for (const auto& [name, value]: _rocksDBStats) { _metricsBuilder.measurement("eggsfs_cdc_rocksdb"); _metricsBuilder.fieldU64(name, value); diff --git a/cpp/cdc/CDCDB.cpp b/cpp/cdc/CDCDB.cpp index 57769c44..d8d2772a 100644 --- a/cpp/cdc/CDCDB.cpp +++ b/cpp/cdc/CDCDB.cpp @@ -1667,8 +1667,8 @@ struct CDCDBImpl { commitTransaction(*dbTxn); } - void rocksDBStats(std::unordered_map& stats) { - ::rocksDBStats(_env, _db, stats); + void rocksDBMetrics(std::unordered_map& stats) { + ::rocksDBMetrics(_env, _db, stats); } }; @@ -1700,6 +1700,6 @@ uint64_t CDCDB::lastAppliedLogEntry() { return ((CDCDBImpl*)_impl)->_lastAppliedLogEntry(); } -void CDCDB::rocksDBStats(std::unordered_map& values) { - return ((CDCDBImpl*)_impl)->rocksDBStats(values); +void CDCDB::rocksDBMetrics(std::unordered_map& values) { + return ((CDCDBImpl*)_impl)->rocksDBMetrics(values); } diff --git a/cpp/cdc/CDCDB.hpp b/cpp/cdc/CDCDB.hpp index 1741cced..110e5d40 100644 --- a/cpp/cdc/CDCDB.hpp +++ b/cpp/cdc/CDCDB.hpp @@ -132,5 +132,5 @@ public: // The index of the last log entry persisted to the DB uint64_t lastAppliedLogEntry(); - void rocksDBStats(std::unordered_map& values); + void rocksDBMetrics(std::unordered_map& values); }; \ No newline at end of file diff --git a/cpp/core/RocksDBUtils.cpp b/cpp/core/RocksDBUtils.cpp index b06fd328..ff870bd8 100644 --- a/cpp/core/RocksDBUtils.cpp +++ b/cpp/core/RocksDBUtils.cpp @@ -59,7 +59,7 @@ static const std::vector> rocksDBIntS {rocksdb::DB::Properties::kEstimatePendingCompactionBytes, "estimate_pending_compaction_bytes"}, }; -void rocksDBStats(Env& env, rocksdb::DB* db, std::unordered_map& stats) { +void rocksDBMetrics(Env& env, rocksdb::DB* db, std::unordered_map& stats) { for (const auto& [prop, name]: rocksDBIntStats) { uint64_t v; bool ok = db->GetIntProperty(prop, &v); diff --git a/cpp/core/RocksDBUtils.hpp b/cpp/core/RocksDBUtils.hpp index d94efdf2..83baaef2 100644 --- a/cpp/core/RocksDBUtils.hpp +++ b/cpp/core/RocksDBUtils.hpp @@ -380,4 +380,4 @@ struct InodeIdValue { std::shared_ptr CreateInt64AddOperator(); -void rocksDBStats(Env& env, rocksdb::DB* db, std::unordered_map& stats); \ No newline at end of file +void rocksDBMetrics(Env& env, rocksdb::DB* db, std::unordered_map& stats); \ No newline at end of file diff --git a/cpp/shard/Shard.cpp b/cpp/shard/Shard.cpp index 5db6be7a..dfd04adf 100644 --- a/cpp/shard/Shard.cpp +++ b/cpp/shard/Shard.cpp @@ -525,7 +525,7 @@ public: } { _rocksDBStats.clear(); - _shared.db.rocksDBStats(_rocksDBStats); + _shared.db.rocksDBMetrics(_rocksDBStats); for (const auto& [name, value]: _rocksDBStats) { _metricsBuilder.measurement("eggsfs_shard_rocksdb"); _metricsBuilder.tag("shard", _shid); diff --git a/cpp/shard/ShardDB.cpp b/cpp/shard/ShardDB.cpp index 292b6f90..65f60a5e 100644 --- a/cpp/shard/ShardDB.cpp +++ b/cpp/shard/ShardDB.cpp @@ -3687,8 +3687,8 @@ struct ShardDBImpl { return NO_ERROR; } - void rocksDBStats(std::unordered_map& stats) { - ::rocksDBStats(_env, _db, stats); + void rocksDBMetrics(std::unordered_map& stats) { + ::rocksDBMetrics(_env, _db, stats); } }; @@ -3826,6 +3826,6 @@ const std::array& ShardDB::secretKey() const { return ((ShardDBImpl*)_impl)->_secretKey; } -void ShardDB::rocksDBStats(std::unordered_map& stats) { - return ((ShardDBImpl*)_impl)->rocksDBStats(stats); +void ShardDB::rocksDBMetrics(std::unordered_map& stats) { + return ((ShardDBImpl*)_impl)->rocksDBMetrics(stats); } \ No newline at end of file diff --git a/cpp/shard/ShardDB.hpp b/cpp/shard/ShardDB.hpp index 895876a8..90db7c73 100644 --- a/cpp/shard/ShardDB.hpp +++ b/cpp/shard/ShardDB.hpp @@ -98,5 +98,5 @@ public: // For internal testing const std::array& secretKey() const; - void rocksDBStats(std::unordered_map& stats); + void rocksDBMetrics(std::unordered_map& stats); };