1

Author: wyxxxcat

be/src/cloud/cloud_base_compaction.cpp

@@ -24,6 +24,7 @@
 #include "cloud/cloud_meta_mgr.h"
 #include "cloud/config.h"
 #include "common/config.h"
+#include "common/metrics/doris_metrics.h"
 #include "core/value/vdatetime_value.h"
 #include "cpp/sync_point.h"
 #include "service/backend_options.h"

be/src/cloud/cloud_cumulative_compaction.cpp

@@ -24,6 +24,7 @@
 #include "cloud/config.h"
 #include "common/config.h"
 #include "common/logging.h"
+#include "common/metrics/doris_metrics.h"
 #include "common/status.h"
 #include "cpp/sync_point.h"
 #include "service/backend_options.h"

be/src/cloud/cloud_full_compaction.cpp

@@ -25,6 +25,7 @@
 #include "cloud/cloud_storage_engine.h"
 #include "cloud/config.h"
 #include "common/config.h"
+#include "common/metrics/doris_metrics.h"
 #include "common/status.h"
 #include "core/column/column.h"
 #include "cpp/sync_point.h"

be/src/cloud/cloud_tablet_mgr.cpp

@@ -26,11 +26,12 @@
 #include "cloud/cloud_storage_engine.h"
 #include "cloud/cloud_tablet.h"
 #include "cloud/config.h"
+#include "common/metrics/doris_metrics.h"
 #include "common/status.h"
+#include "cpp/lru_cache.h"
 #include "cpp/sync_point.h"
 #include "runtime/memory/cache_policy.h"
 #include "util/debug_points.h"
-#include "util/lru_cache.h"
 #include "util/stack_util.h"
 
 namespace doris {

be/src/cloud/cloud_txn_delete_bitmap_cache.h

@@ -19,13 +19,13 @@
 
 #include <mutex>
 
+#include "cpp/lru_cache.h"
 #include "storage/olap_common.h"
 #include "storage/partial_update_info.h"
 #include "storage/rowset/rowset.h"
 #include "storage/tablet/tablet_meta.h"
 #include "storage/txn/txn_manager.h"
 #include "util/countdown_latch.h"
-#include "util/lru_cache.h"
 
 namespace doris {
 

be/src/exec/scan/scanner.h

@@ -23,6 +23,7 @@
 #include <atomic>
 #include <vector>
 
+#include "common/metrics/doris_metrics.h"
 #include "common/status.h"
 #include "core/block/block.h"
 #include "runtime/exec_env.h"

be/src/exprs/function/function_java_udf.cpp

@@ -23,6 +23,7 @@
 #include <string>
 
 #include "common/exception.h"
+#include "common/metrics/doris_metrics.h"
 #include "core/block/block.h"
 #include "format/jni/jni_data_bridge.h"
 #include "jni.h"

be/src/load/channel/load_channel_mgr.h

@@ -30,13 +30,13 @@
 
 #include "common/compiler_util.h" // IWYU pragma: keep
 #include "common/status.h"
+#include "cpp/lru_cache.h"
 #include "load/channel/load_channel.h"
 #include "load/memtable/memtable_memory_limiter.h"
 #include "runtime/memory/lru_cache_policy.h"
 #include "runtime/memory/mem_tracker_limiter.h"
 #include "runtime/thread_context.h"
 #include "util/countdown_latch.h"
-#include "util/lru_cache.h"
 #include "util/uid_util.h"
 
 namespace doris {

be/src/load/channel/load_stream_mgr.cpp

@@ -19,14 +19,14 @@
 
 #include <brpc/stream.h>
 
+#include "cpp/lru_cache.h"
 #include "load/channel/load_channel.h"
 #include "load/channel/load_stream.h"
 #include "runtime/exec_env.h"
 #include "storage/rowset/rowset_factory.h"
 #include "storage/rowset/rowset_meta.h"
 #include "storage/storage_engine.h"
 #include "storage/tablet/tablet_manager.h"
-#include "util/lru_cache.h"
 #include "util/uid_util.h"
 
 namespace doris {

be/src/runtime/memory/lru_cache_policy.h

@@ -22,11 +22,12 @@
 #include <memory>
 
 #include "common/be_mock_util.h"
+#include "cpp/lru_cache.h"
 #include "runtime/memory/cache_policy.h"
 #include "runtime/memory/lru_cache_value_base.h"
 #include "runtime/memory/mem_tracker_limiter.h"
 #include "runtime/thread_context.h"
-#include "util/lru_cache.h"
+#include "util/be_lru_cache_metrics.h"
 #include "util/time.h"
 
 namespace doris {
@@ -40,9 +41,12 @@ class LRUCachePolicy : public CachePolicy {
             : CachePolicy(type, capacity, stale_sweep_time_s, enable_prune),
               _lru_cache_type(lru_cache_type) {
         if (check_capacity(capacity, num_shards)) {
-            _cache = std::shared_ptr<ShardedLRUCache>(
+            auto cache = std::shared_ptr<ShardedLRUCache>(
                     new ShardedLRUCache(type_string(type), capacity, lru_cache_type, num_shards,
                                         element_count_capacity, is_lru_k));
+            cache->set_metrics_recorder(
+                    create_be_lru_cache_metrics_recorder(type_string(type), cache.get()));
+            _cache = std::move(cache);
         } else {
             _cache = std::make_shared<doris::DummyLRUCache>();
         }
@@ -58,10 +62,13 @@ class LRUCachePolicy : public CachePolicy {
             : CachePolicy(type, capacity, stale_sweep_time_s, enable_prune),
               _lru_cache_type(lru_cache_type) {
         if (check_capacity(capacity, num_shards)) {
-            _cache = std::shared_ptr<ShardedLRUCache>(
+            auto cache = std::shared_ptr<ShardedLRUCache>(
                     new ShardedLRUCache(type_string(type), capacity, lru_cache_type, num_shards,
                                         cache_value_time_extractor, cache_value_check_timestamp,
                                         element_count_capacity, is_lru_k));
+            cache->set_metrics_recorder(
+                    create_be_lru_cache_metrics_recorder(type_string(type), cache.get()));
+            _cache = std::move(cache);
         } else {
             _cache = std::make_shared<doris::DummyLRUCache>();
         }
@@ -126,7 +133,7 @@ class LRUCachePolicy : public CachePolicy {
                     ->set_tracking_bytes(tracking_bytes, _mem_tracker, value_tracking_bytes,
                                          _value_mem_tracker);
         }
-        return _cache->insert(key, value, charge, priority);
+        return _cache->insert(key, value, charge, priority, cache_value_deleter<LRUCacheValueBase>);
     }
 
     void for_each_entry(const std::function<void(const LRUHandle*)>& visitor) {