fix bug

OpenAtomFoundation · Jul 19, 2024 · b9fc80a · b9fc80a
1 parent 7260661
commit b9fc80a
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/include/pika_repl_client.h b/include/pika_repl_client.h
@@ -21,7 +21,7 @@
 #include "include/pika_repl_client_thread.h"
 
 #include "net/include/thread_pool.h"
-#include "pika_inner_message.pb. h"
+#include "pika_inner_message.pb.h"
 
 
 struct ReplClientTaskArg {

diff --git a/src/pika_conf.cc b/src/pika_conf.cc
@@ -696,7 +696,7 @@ int PikaConf::Load() {
 
   // rocksdb_statistics_tickers
   std::string open_tickers;
-  GetConfStr("open-rocksdb-statistics-tickers", &open_tickers);
+  GetConfStr("enable-db-statistics", &open_tickers);
   enable_db_statistics_ = open_tickers == "yes";
 
   db_statistics_level_ = 0;

diff --git a/src/pika_server.cc b/src/pika_server.cc
@@ -1416,6 +1416,9 @@ void PikaServer::InitStorageOptions() {
     storage_options_.table_options.pin_top_level_index_and_filter = true; 
     storage_options_.table_options.optimize_filters_for_memory = true;
   }
+  // For statistics
+  storage_options_.enable_db_statistics = g_pika_conf->enable_db_statistics();
+  storage_options_.db_statistics_level = g_pika_conf->db_statistics_level();
 }
 
 storage::Status PikaServer::RewriteStorageOptions(const storage::OptionType& option_type,

diff --git a/src/storage/include/storage/storage.h b/src/storage/include/storage/storage.h
@@ -69,6 +69,8 @@ struct StorageOptions {
   size_t block_cache_size = 0;
   bool share_block_cache = false;
   size_t statistics_max_size = 0;
+  int db_statistics_level = 0;
+  bool enable_db_statistics = false;
   size_t small_compaction_threshold = 5000;
   size_t small_compaction_duration_threshold = 10000;
   Status ResetOptions(const OptionType& option_type, const std::unordered_map<std::string, std::string>& options_map);

diff --git a/src/storage/src/redis.cc b/src/storage/src/redis.cc
@@ -7,10 +7,9 @@
 
 #include "rocksdb/env.h"
 
-#include "include/pika_server.h"
-#include "src/base_filter.h"
-#include "src/lists_filter.h"
 #include "src/redis.h"
+#include "src/lists_filter.h"
+#include "src/base_filter.h"
 #include "src/zsets_filter.h"
 
 namespace storage {
@@ -67,9 +66,9 @@ Status Redis::Open(const StorageOptions& storage_options, const std::string& db_
 
   rocksdb::DBOptions db_ops(storage_options.options);
   db_ops.create_missing_column_families = true;
-  if (g_pika_conf->enable_db_statistics()) {
+  if (storage_options.enable_db_statistics) {
     db_statistics_ = rocksdb::CreateDBStatistics();
-    db_statistics_->set_stats_level(static_cast<rocksdb::StatsLevel>(g_pika_conf->db_statistics_level()));
+    db_statistics_->set_stats_level(static_cast<rocksdb::StatsLevel>(storage_options.db_statistics_level));
     db_ops.statistics = db_statistics_;
   }
 
@@ -381,6 +380,7 @@ void Redis::GetRocksDBInfo(std::string& info, const char* prefix) {
     write_aggregated_int_property(rocksdb::DB::Properties::kBlobCacheUsage, "blob_cache_usage");
     write_aggregated_int_property(rocksdb::DB::Properties::kBlobCachePinnedUsage, "blob_cache_pinned_usage");
 
+    //rocksdb ticker
     {
       // memtables num
       write_ticker_count(rocksdb::Tickers::MEMTABLE_HIT, "memtable_hit");