From 6127c59a81cb178a3bbdbce88c1face01187adec Mon Sep 17 00:00:00 2001
From: chejinge <945997690@qq.com>
Date: Sat, 14 Sep 2024 11:36:32 +0800
Subject: [PATCH] fix:caculate memory (#2899)

Co-authored-by: chejinge <chejinge@360.cn>
---
 src/pika_admin.cc | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/pika_admin.cc b/src/pika_admin.cc
index 357300416..7e6c9d132 100644
--- a/src/pika_admin.cc
+++ b/src/pika_admin.cc
@@ -1403,12 +1403,8 @@ void InfoCmd::InfoData(std::string& info) {
   uint64_t total_background_errors = 0;
   uint64_t total_memtable_usage = 0;
   uint64_t total_table_reader_usage = 0;
-  uint64_t total_redis_cache_usage = 0;
-  uint64_t total_block_cache_usage = 0;
   uint64_t memtable_usage = 0;
   uint64_t table_reader_usage = 0;
-  uint64_t redis_cache_usage  = 0;
-  uint64_t block_cache_usage = 0;
   std::shared_lock db_rwl(g_pika_server->dbs_rw_);
   for (const auto& db_item : g_pika_server->dbs_) {
     if (!db_item.second) {
@@ -1419,14 +1415,10 @@ void InfoCmd::InfoData(std::string& info) {
     db_item.second->DBLockShared();
     db_item.second->storage()->GetUsage(storage::PROPERTY_TYPE_ROCKSDB_CUR_SIZE_ALL_MEM_TABLES, &memtable_usage);
     db_item.second->storage()->GetUsage(storage::PROPERTY_TYPE_ROCKSDB_ESTIMATE_TABLE_READER_MEM, &table_reader_usage);
-    db_item.second->storage()->GetUsage(storage::PROPERTY_TYPE_ROCKSDB_BlOCK_CACHE_USAGE, &block_cache_usage);
     db_item.second->storage()->GetUsage(storage::PROPERTY_TYPE_ROCKSDB_BACKGROUND_ERRORS, &background_errors);
-    redis_cache_usage = db_item.second->GetCacheInfo().used_memory;
     db_item.second->DBUnlockShared();
     total_memtable_usage += memtable_usage;
     total_table_reader_usage += table_reader_usage;
-    total_block_cache_usage += block_cache_usage;
-    total_redis_cache_usage += redis_cache_usage;
     for (const auto& item : background_errors) {
       if (item.second != 0) {
         db_fatal_msg_stream << (total_background_errors != 0 ? "," : "");
@@ -1436,12 +1428,11 @@ void InfoCmd::InfoData(std::string& info) {
     }
   }
 
-  tmp_stream << "used_memory:" << (total_memtable_usage + total_table_reader_usage + total_redis_cache_usage + total_block_cache_usage) << "\r\n";
-  tmp_stream << "used_memory_human:" << ((total_memtable_usage + total_table_reader_usage + total_redis_cache_usage + total_block_cache_usage) >> 20) << "M\r\n";
+  tmp_stream << "used_memory:" << (total_memtable_usage + total_table_reader_usage) << "\r\n";
+  tmp_stream << "used_memory_human:" << ((total_memtable_usage + total_table_reader_usage) >> 20) << "M\r\n";
+
   tmp_stream << "db_memtable_usage:" << total_memtable_usage << "\r\n";
   tmp_stream << "db_tablereader_usage:" << total_table_reader_usage << "\r\n";
-  tmp_stream << "db_block_cache_usage:" << total_block_cache_usage << "\r\n";
-  tmp_stream << "db_redis_cache_usage:" << total_redis_cache_usage << "\r\n";
   tmp_stream << "db_fatal:" << (total_background_errors != 0 ? "1" : "0") << "\r\n";
   tmp_stream << "db_fatal_msg:" << (total_background_errors != 0 ? db_fatal_msg_stream.str() : "nullptr") << "\r\n";