Merge pull request #9191 from BohuTANG/dev-runtime

refactor: move runtime related to base/runtime

Author: BohuTANG

src/binaries/query/main.rs

@@ -14,8 +14,8 @@
 
 use std::env;
 
-use common_base::base::Runtime;
-use common_base::base::GLOBAL_MEM_STAT;
+use common_base::runtime::Runtime;
+use common_base::runtime::GLOBAL_MEM_STAT;
 use common_config::Config;
 use common_config::DATABEND_COMMIT_VERSION;
 use common_config::QUERY_SEMVER;

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

@@ -12,37 +12,22 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-mod catch_unwind;
-mod global_runtime;
 mod net;
 mod profiling;
 mod progress;
-mod runtime;
-mod runtime_tracker;
 mod select;
 mod shutdown_signal;
 mod singleton_instance;
 mod stop_handle;
 mod stoppable;
 mod string;
-mod thread;
-mod thread_pool;
 mod uniq_id;
 
-pub use catch_unwind::catch_unwind;
-pub use global_runtime::GlobalIORuntime;
 pub use net::get_free_tcp_port;
 pub use net::get_free_udp_port;
 pub use profiling::Profiling;
 pub use progress::Progress;
 pub use progress::ProgressValues;
-pub use runtime::Dropper;
-pub use runtime::Runtime;
-pub use runtime::TrySpawn;
-pub use runtime_tracker::MemStat;
-pub use runtime_tracker::ThreadTracker;
-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;
@@ -59,10 +44,6 @@ pub use string::mask_string;
 pub use string::replace_nth_char;
 pub use string::unescape_for_key;
 pub use string::unescape_string;
-pub use thread::Thread;
-pub use thread::ThreadJoinHandle;
-pub use thread_pool::TaskJoinHandler;
-pub use thread_pool::ThreadPool;
 pub use tokio;
 pub use uniq_id::GlobalSequence;
 pub use uniq_id::GlobalUniqName;

src/common/base/src/lib.rs

@@ -25,3 +25,4 @@ pub mod base;
 pub mod containers;
 pub mod mem_allocator;
 pub mod rangemap;
+pub mod runtime;

src/common/base/src/mem_allocator/je_allocator.rs

@@ -40,7 +40,7 @@ pub mod linux_or_macos {
     use tikv_jemalloc_sys as ffi;
 
     use super::JEAllocator;
-    use crate::base::ThreadTracker;
+    use crate::runtime::ThreadTracker;
 
     impl<T> JEAllocator<T> {
         pub const FALLBACK: bool = false;

src/common/base/src/mem_allocator/mmap_allocator.rs

@@ -36,7 +36,7 @@ pub mod linux {
     use std::ptr::NonNull;
 
     use super::MmapAllocator;
-    use crate::base::ThreadTracker;
+    use crate::runtime::ThreadTracker;
 
     // MADV_POPULATE_WRITE is supported since Linux 5.14.
     const MADV_POPULATE_WRITE: i32 = 23;

src/common/base/src/mem_allocator/system_allocator.rs

@@ -18,7 +18,7 @@ use std::alloc::Layout;
 use std::alloc::System;
 use std::ptr::NonNull;
 
-use crate::base::ThreadTracker;
+use crate::runtime::ThreadTracker;
 
 #[derive(Debug, Clone, Copy, Default)]
 pub struct SystemAllocator;

src/common/base/src/base/catch_unwind.rs renamed to src/common/base/src/runtime/catch_unwind.rs

@@ -16,8 +16,8 @@ use std::sync::Arc;
 
 use common_exception::Result;
 
-use super::GlobalInstance;
-use crate::base::Runtime;
+use crate::base::GlobalInstance;
+use crate::runtime::Runtime;
 
 pub struct GlobalIORuntime;
 

src/common/base/src/base/global_runtime.rs renamed to src/common/base/src/runtime/global_runtime.rs

@@ -0,0 +1,35 @@
+// Copyright 2021 Datafuse Labs.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+mod catch_unwind;
+mod global_runtime;
+#[allow(clippy::module_inception)]
+mod runtime;
+mod runtime_tracker;
+mod thread;
+mod thread_pool;
+
+pub use catch_unwind::catch_unwind;
+pub use global_runtime::GlobalIORuntime;
+pub use runtime::Dropper;
+pub use runtime::Runtime;
+pub use runtime::TrySpawn;
+pub use runtime_tracker::MemStat;
+pub use runtime_tracker::ThreadTracker;
+pub use runtime_tracker::TrackedFuture;
+pub use runtime_tracker::GLOBAL_MEM_STAT;
+pub use thread::Thread;
+pub use thread::ThreadJoinHandle;
+pub use thread_pool::TaskJoinHandler;
+pub use thread_pool::ThreadPool;

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

@@ -28,8 +28,8 @@ use tokio::sync::OwnedSemaphorePermit;
 use tokio::sync::Semaphore;
 use tokio::task::JoinHandle;
 
-use crate::base::catch_unwind::CatchUnwindFuture;
-use crate::base::runtime_tracker::MemStat;
+use crate::runtime::catch_unwind::CatchUnwindFuture;
+use crate::runtime::MemStat;
 
 /// Methods to spawn tasks.
 pub trait TrySpawn {