Merge pull request #9187 from Xuanwo/unwind-safe-operator

refactor: Simplify the global data registry logic

Author: mergify[bot]

Cargo.lock

@@ -180,9 +180,9 @@ async fn main_entrypoint() -> Result<()> {
 
     // Cluster register.
     {
-        let cluster_discovery = ClusterDiscovery::instance();
-        let register_to_metastore = cluster_discovery.register_to_metastore(&conf);
-        register_to_metastore.await?;
+        ClusterDiscovery::instance()
+            .register_to_metastore(&conf)
+            .await?;
         info!(
             "Databend query has been registered:{:?} to metasrv:{:?}.",
             conf.query.cluster_id, conf.meta.endpoints

src/binaries/query/main.rs

@@ -34,6 +34,7 @@ futures = "0.3.24"
 libc = "0.2.133"
 num_cpus = "1.13.1"
 once_cell = "1.15.0"
+parking_lot = "0.12"
 pin-project-lite = "0.2.9"
 pprof = { version = "0.10.1", features = [
     "flamegraph",
@@ -42,6 +43,7 @@ pprof = { version = "0.10.1", features = [
 ] }
 semver = "1.0.10"
 serde = { workspace = true }
+state = "0.5"
 tikv-jemalloc-ctl = { version = "0.5.0", optional = true }
 tikv-jemalloc-sys = "0.5.2"
 tokio = { version = "1.21.1", features = ["full"] }

src/common/base/Cargo.toml

@@ -15,33 +15,25 @@
 use std::sync::Arc;
 
 use common_exception::Result;
-use once_cell::sync::OnceCell;
 
-use crate::base::singleton_instance::Singleton;
+use super::GlobalInstance;
 use crate::base::Runtime;
 
 pub struct GlobalIORuntime;
 
-static GLOBAL_RUNTIME: OnceCell<Singleton<Arc<Runtime>>> = OnceCell::new();
-
 impl GlobalIORuntime {
-    pub fn init(num_cpus: usize, v: Singleton<Arc<Runtime>>) -> Result<()> {
+    pub fn init(num_cpus: usize) -> Result<()> {
         let thread_num = std::cmp::max(num_cpus, num_cpus::get() / 2);
         let thread_num = std::cmp::max(2, thread_num);
 
-        v.init(Arc::new(Runtime::with_worker_threads(
+        GlobalInstance::set(Arc::new(Runtime::with_worker_threads(
             thread_num,
             Some("IO-worker".to_owned()),
-        )?))?;
-
-        GLOBAL_RUNTIME.set(v.clone()).ok();
+        )?));
         Ok(())
     }
 
     pub fn instance() -> Arc<Runtime> {
-        match GLOBAL_RUNTIME.get() {
-            None => panic!("GlobalRuntime is not init"),
-            Some(global_runtime) => global_runtime.get(),
-        }
+        GlobalInstance::get()
     }
 }

src/common/base/src/base/global_runtime.rs

@@ -49,8 +49,7 @@ pub use shutdown_signal::signal_stream;
 pub use shutdown_signal::DummySignalStream;
 pub use shutdown_signal::SignalStream;
 pub use shutdown_signal::SignalType;
-pub use singleton_instance::Singleton;
-pub use singleton_instance::SingletonImpl;
+pub use singleton_instance::GlobalInstance;
 pub use stop_handle::StopHandle;
 pub use stoppable::Stoppable;
 pub use string_func::escape_for_key;