Merge pull request #9058 from drmingdrmer/50-tracker

chore(mem-tracker): rename tracker related terms to reflect their actual usage

Author: zhang2014

src/binaries/query/main.rs

@@ -15,7 +15,7 @@
 use std::env;
 
 use common_base::base::Runtime;
-use common_base::base::GLOBAL_TRACKER;
+use common_base::base::GLOBAL_MEM_STAT;
 use common_config::Config;
 use common_config::DATABEND_COMMIT_VERSION;
 use common_config::QUERY_SEMVER;
@@ -70,7 +70,7 @@ async fn main_entrypoint() -> Result<()> {
     if conf.query.max_memory_limit_enabled {
         let size = conf.query.max_server_memory_usage as i64;
         info!("Set memory limit: {}", size);
-        GLOBAL_TRACKER.set_limit(size);
+        GLOBAL_MEM_STAT.set_limit(size);
     }
 
     let tenant = conf.query.tenant_id.clone();

src/common/base/src/base/mod.rs

@@ -39,10 +39,10 @@ pub use progress::ProgressValues;
 pub use runtime::Dropper;
 pub use runtime::Runtime;
 pub use runtime::TrySpawn;
-pub use runtime_tracker::AsyncThreadTracker;
-pub use runtime_tracker::MemoryTracker;
+pub use runtime_tracker::MemStat;
 pub use runtime_tracker::ThreadTracker;
-pub use runtime_tracker::GLOBAL_TRACKER;
+pub use runtime_tracker::TrackedFuture;
+pub use runtime_tracker::GLOBAL_MEM_STAT;
 pub use select::select3;
 pub use select::Select3Output;
 pub use shutdown_signal::signal_stream;

src/common/base/src/base/runtime.rs

@@ -29,7 +29,7 @@ use tokio::sync::Semaphore;
 use tokio::task::JoinHandle;
 
 use crate::base::catch_unwind::CatchUnwindFuture;
-use crate::base::runtime_tracker::MemoryTracker;
+use crate::base::runtime_tracker::MemStat;
 
 /// Methods to spawn tasks.
 pub trait TrySpawn {
@@ -82,18 +82,14 @@ pub struct Runtime {
     handle: Handle,
 
     /// Memory tracker for this runtime
-    tracker: Arc<MemoryTracker>,
+    tracker: Arc<MemStat>,
 
     /// Use to receive a drop signal when dropper is dropped.
     _dropper: Dropper,
 }
 
 impl Runtime {
-    fn create(
-        name: Option<String>,
-        tracker: Arc<MemoryTracker>,
-        builder: &mut Builder,
-    ) -> Result<Self> {
+    fn create(name: Option<String>, tracker: Arc<MemStat>, builder: &mut Builder) -> Result<Self> {
         let runtime = builder
             .build()
             .map_err(|tokio_error| ErrorCode::TokioError(tokio_error.to_string()))?;
@@ -130,25 +126,25 @@ impl Runtime {
         })
     }
 
-    fn tracker_builder(mem_tracker: Arc<MemoryTracker>) -> tokio::runtime::Builder {
+    fn tracker_builder(mem_stat: Arc<MemStat>) -> tokio::runtime::Builder {
         let mut builder = tokio::runtime::Builder::new_multi_thread();
         builder
             .enable_all()
-            .on_thread_start(mem_tracker.on_start_thread());
+            .on_thread_start(mem_stat.on_start_thread());
 
         builder
     }
 
-    pub fn get_tracker(&self) -> Arc<MemoryTracker> {
+    pub fn get_tracker(&self) -> Arc<MemStat> {
         self.tracker.clone()
     }
 
     /// Spawns a new tokio runtime with a default thread count on a background
     /// thread and returns a `Handle` which can be used to spawn tasks via
     /// its executor.
     pub fn with_default_worker_threads() -> Result<Self> {
-        let mem_tracker = MemoryTracker::create();
-        let mut runtime_builder = Self::tracker_builder(mem_tracker.clone());
+        let mem_stat = MemStat::create();
+        let mut runtime_builder = Self::tracker_builder(mem_stat.clone());
 
         #[cfg(debug_assertions)]
         {
@@ -160,13 +156,13 @@ impl Runtime {
             }
         }
 
-        Self::create(None, mem_tracker, &mut runtime_builder)
+        Self::create(None, mem_stat, &mut runtime_builder)
     }
 
     #[allow(unused_mut)]
     pub fn with_worker_threads(workers: usize, mut thread_name: Option<String>) -> Result<Self> {
-        let mem_tracker = MemoryTracker::create();
-        let mut runtime_builder = Self::tracker_builder(mem_tracker.clone());
+        let mem_stat = MemStat::create();
+        let mut runtime_builder = Self::tracker_builder(mem_stat.clone());
 
         #[cfg(debug_assertions)]
         {
@@ -184,7 +180,7 @@ impl Runtime {
 
         Self::create(
             thread_name,
-            mem_tracker,
+            mem_stat,
             runtime_builder.worker_threads(workers),
         )
     }