chore: rename all datanode_manager to node_manager (#3813)

GreptimeTeam · Apr 28, 2024 · 3112ced · 3112ced
1 parent e410192
commit 3112ced
Show file tree

Hide file tree

Showing 36 changed files with 183 additions and 187 deletions.
diff --git a/src/client/src/client_manager.rs b/src/client/src/client_manager.rs
@@ -17,7 +17,7 @@ use std::sync::Arc;
 use std::time::Duration;
 
 use common_grpc::channel_manager::{ChannelConfig, ChannelManager};
-use common_meta::datanode_manager::{DatanodeRef, FlownodeRef, NodeManager};
+use common_meta::node_manager::{DatanodeRef, FlownodeRef, NodeManager};
 use common_meta::peer::Peer;
 use moka::future::{Cache, CacheBuilder};
 

diff --git a/src/client/src/region.rs b/src/client/src/region.rs
@@ -24,8 +24,8 @@ use async_trait::async_trait;
 use common_error::ext::{BoxedError, ErrorExt};
 use common_error::status_code::StatusCode;
 use common_grpc::flight::{FlightDecoder, FlightMessage};
-use common_meta::datanode_manager::Datanode;
 use common_meta::error::{self as meta_error, Result as MetaResult};
+use common_meta::node_manager::Datanode;
 use common_recordbatch::error::ExternalSnafu;
 use common_recordbatch::{RecordBatchStreamWrapper, SendableRecordBatchStream};
 use common_telemetry::error;

diff --git a/src/cmd/src/standalone.rs b/src/cmd/src/standalone.rs
@@ -21,12 +21,12 @@ use clap::Parser;
 use common_catalog::consts::MIN_USER_TABLE_ID;
 use common_config::{metadata_store_dir, KvBackendConfig};
 use common_meta::cache_invalidator::{CacheInvalidatorRef, MultiCacheInvalidator};
-use common_meta::datanode_manager::NodeManagerRef;
 use common_meta::ddl::table_meta::{TableMetadataAllocator, TableMetadataAllocatorRef};
 use common_meta::ddl::ProcedureExecutorRef;
 use common_meta::ddl_manager::DdlManager;
 use common_meta::key::{TableMetadataManager, TableMetadataManagerRef};
 use common_meta::kv_backend::KvBackendRef;
+use common_meta::node_manager::NodeManagerRef;
 use common_meta::region_keeper::MemoryRegionKeeper;
 use common_meta::sequence::SequenceBuilder;
 use common_meta::wal_options_allocator::{WalOptionsAllocator, WalOptionsAllocatorRef};
@@ -408,7 +408,7 @@ impl StartCommand {
             DatanodeBuilder::new(dn_opts, fe_plugins.clone()).with_kv_backend(kv_backend.clone());
         let datanode = builder.build().await.context(StartDatanodeSnafu)?;
 
-        let datanode_manager = Arc::new(StandaloneDatanodeManager(datanode.region_server()));
+        let node_manager = Arc::new(StandaloneDatanodeManager(datanode.region_server()));
 
         let table_id_sequence = Arc::new(
             SequenceBuilder::new("table_id", kv_backend.clone())
@@ -432,22 +432,18 @@ impl StartCommand {
         let ddl_task_executor = Self::create_ddl_task_executor(
             table_metadata_manager,
             procedure_manager.clone(),
-            datanode_manager.clone(),
+            node_manager.clone(),
             multi_cache_invalidator,
             table_meta_allocator,
         )
         .await?;
 
-        let mut frontend = FrontendBuilder::new(
-            kv_backend,
-            catalog_manager,
-            datanode_manager,
-            ddl_task_executor,
-        )
-        .with_plugin(fe_plugins.clone())
-        .try_build()
-        .await
-        .context(StartFrontendSnafu)?;
+        let mut frontend =
+            FrontendBuilder::new(kv_backend, catalog_manager, node_manager, ddl_task_executor)
+                .with_plugin(fe_plugins.clone())
+                .try_build()
+                .await
+                .context(StartFrontendSnafu)?;
 
         let servers = Services::new(fe_opts.clone(), Arc::new(frontend.clone()), fe_plugins)
             .build()
@@ -468,14 +464,14 @@ impl StartCommand {
     pub async fn create_ddl_task_executor(
         table_metadata_manager: TableMetadataManagerRef,
         procedure_manager: ProcedureManagerRef,
-        datanode_manager: NodeManagerRef,
+        node_manager: NodeManagerRef,
         cache_invalidator: CacheInvalidatorRef,
         table_meta_allocator: TableMetadataAllocatorRef,
     ) -> Result<ProcedureExecutorRef> {
         let procedure_executor: ProcedureExecutorRef = Arc::new(
             DdlManager::try_new(
                 procedure_manager,
-                datanode_manager,
+                node_manager,
                 cache_invalidator,
                 table_metadata_manager,
                 table_meta_allocator,

diff --git a/src/common/meta/src/ddl.rs b/src/common/meta/src/ddl.rs
@@ -20,10 +20,10 @@ use store_api::storage::{RegionNumber, TableId};
 
 use self::table_meta::TableMetadataAllocatorRef;
 use crate::cache_invalidator::CacheInvalidatorRef;
-use crate::datanode_manager::NodeManagerRef;
 use crate::error::Result;
 use crate::key::table_route::PhysicalTableRouteValue;
 use crate::key::TableMetadataManagerRef;
+use crate::node_manager::NodeManagerRef;
 use crate::region_keeper::MemoryRegionKeeperRef;
 use crate::rpc::ddl::{SubmitDdlTaskRequest, SubmitDdlTaskResponse};
 use crate::rpc::procedure::{MigrateRegionRequest, MigrateRegionResponse, ProcedureStateResponse};
@@ -95,7 +95,7 @@ pub struct TableMetadata {
 
 #[derive(Clone)]
 pub struct DdlContext {
-    pub datanode_manager: NodeManagerRef,
+    pub node_manager: NodeManagerRef,
     pub cache_invalidator: CacheInvalidatorRef,
     pub table_metadata_manager: TableMetadataManagerRef,
     pub memory_region_keeper: MemoryRegionKeeperRef,

diff --git a/src/common/meta/src/ddl/alter_logical_tables.rs b/src/common/meta/src/ddl/alter_logical_tables.rs
@@ -116,7 +116,7 @@ impl AlterLogicalTablesProcedure {
         let mut alter_region_tasks = Vec::with_capacity(leaders.len());
 
         for peer in leaders {
-            let requester = self.context.datanode_manager.datanode(&peer).await;
+            let requester = self.context.node_manager.datanode(&peer).await;
             let request = self.make_request(&peer, &physical_table_route.region_routes)?;
 
             alter_region_tasks.push(async move {

diff --git a/src/common/meta/src/ddl/alter_table.rs b/src/common/meta/src/ddl/alter_table.rs
@@ -105,7 +105,7 @@ impl AlterTableProcedure {
         let mut alter_region_tasks = Vec::with_capacity(leaders.len());
 
         for datanode in leaders {
-            let requester = self.context.datanode_manager.datanode(&datanode).await;
+            let requester = self.context.node_manager.datanode(&datanode).await;
             let regions = find_leader_regions(&physical_table_route.region_routes, &datanode);
 
             for region in regions {

diff --git a/src/common/meta/src/ddl/alter_table/region_request.rs b/src/common/meta/src/ddl/alter_table/region_request.rs
@@ -138,8 +138,8 @@ mod tests {
 
     #[tokio::test]
     async fn test_make_alter_region_request() {
-        let datanode_manager = Arc::new(MockDatanodeManager::new(()));
-        let ddl_context = new_ddl_context(datanode_manager);
+        let node_manager = Arc::new(MockDatanodeManager::new(()));
+        let ddl_context = new_ddl_context(node_manager);
         let cluster_id = 1;
         let table_id = 1024;
         let region_id = RegionId::new(table_id, 1);

diff --git a/src/common/meta/src/ddl/create_logical_tables.rs b/src/common/meta/src/ddl/create_logical_tables.rs
@@ -142,7 +142,7 @@ impl CreateLogicalTablesProcedure {
         let mut create_region_tasks = Vec::with_capacity(leaders.len());
 
         for peer in leaders {
-            let requester = self.context.datanode_manager.datanode(&peer).await;
+            let requester = self.context.node_manager.datanode(&peer).await;
             let request = self.make_request(&peer, region_routes)?;
 
             create_region_tasks.push(async move {

diff --git a/src/common/meta/src/ddl/create_table.rs b/src/common/meta/src/ddl/create_table.rs
@@ -222,7 +222,7 @@ impl CreateTableProcedure {
         let mut create_region_tasks = Vec::with_capacity(leaders.len());
 
         for datanode in leaders {
-            let requester = self.context.datanode_manager.datanode(&datanode).await;
+            let requester = self.context.node_manager.datanode(&datanode).await;
 
             let regions = find_leader_regions(region_routes, &datanode);
             let mut requests = Vec::with_capacity(regions.len());

diff --git a/src/common/meta/src/ddl/drop_database/cursor.rs b/src/common/meta/src/ddl/drop_database/cursor.rs
@@ -163,8 +163,8 @@ mod tests {
 
     #[tokio::test]
     async fn test_next_without_logical_tables() {
-        let datanode_manager = Arc::new(MockDatanodeManager::new(()));
-        let ddl_context = new_ddl_context(datanode_manager);
+        let node_manager = Arc::new(MockDatanodeManager::new(()));
+        let ddl_context = new_ddl_context(node_manager);
         create_physical_table(&ddl_context, 0, "phy").await;
         // It always starts from Logical
         let mut state = DropDatabaseCursor::new(DropTableTarget::Logical);
@@ -197,8 +197,8 @@ mod tests {
 
     #[tokio::test]
     async fn test_next_with_logical_tables() {
-        let datanode_manager = Arc::new(MockDatanodeManager::new(()));
-        let ddl_context = new_ddl_context(datanode_manager);
+        let node_manager = Arc::new(MockDatanodeManager::new(()));
+        let ddl_context = new_ddl_context(node_manager);
         let physical_table_id = create_physical_table(&ddl_context, 0, "phy").await;
         create_logical_table(ddl_context.clone(), 0, physical_table_id, "metric_0").await;
         // It always starts from Logical
@@ -228,8 +228,8 @@ mod tests {
 
     #[tokio::test]
     async fn test_reach_the_end() {
-        let datanode_manager = Arc::new(MockDatanodeManager::new(()));
-        let ddl_context = new_ddl_context(datanode_manager);
+        let node_manager = Arc::new(MockDatanodeManager::new(()));
+        let ddl_context = new_ddl_context(node_manager);
         let mut state = DropDatabaseCursor::new(DropTableTarget::Physical);
         let mut ctx = DropDatabaseContext {
             catalog: DEFAULT_CATALOG_NAME.to_string(),

diff --git a/src/common/meta/src/ddl/drop_database/executor.rs b/src/common/meta/src/ddl/drop_database/executor.rs
@@ -159,8 +159,8 @@ mod tests {
 
     #[tokio::test]
     async fn test_next_with_physical_table() {
-        let datanode_manager = Arc::new(MockDatanodeManager::new(NaiveDatanodeHandler));
-        let ddl_context = new_ddl_context(datanode_manager);
+        let node_manager = Arc::new(MockDatanodeManager::new(NaiveDatanodeHandler));
+        let ddl_context = new_ddl_context(node_manager);
         let physical_table_id = create_physical_table(&ddl_context, 0, "phy").await;
         let (_, table_route) = ddl_context
             .table_metadata_manager
@@ -209,8 +209,8 @@ mod tests {
 
     #[tokio::test]
     async fn test_next_logical_table() {
-        let datanode_manager = Arc::new(MockDatanodeManager::new(NaiveDatanodeHandler));
-        let ddl_context = new_ddl_context(datanode_manager);
+        let node_manager = Arc::new(MockDatanodeManager::new(NaiveDatanodeHandler));
+        let ddl_context = new_ddl_context(node_manager);
         let physical_table_id = create_physical_table(&ddl_context, 0, "phy").await;
         create_logical_table(ddl_context.clone(), 0, physical_table_id, "metric").await;
         let logical_table_id = physical_table_id + 1;
@@ -313,8 +313,8 @@ mod tests {
 
     #[tokio::test]
     async fn test_next_retryable_err() {
-        let datanode_manager = Arc::new(MockDatanodeManager::new(RetryErrorDatanodeHandler));
-        let ddl_context = new_ddl_context(datanode_manager);
+        let node_manager = Arc::new(MockDatanodeManager::new(RetryErrorDatanodeHandler));
+        let ddl_context = new_ddl_context(node_manager);
         let physical_table_id = create_physical_table(&ddl_context, 0, "phy").await;
         let (_, table_route) = ddl_context
             .table_metadata_manager

diff --git a/src/common/meta/src/ddl/drop_database/metadata.rs b/src/common/meta/src/ddl/drop_database/metadata.rs
@@ -108,8 +108,8 @@ mod tests {
 
     #[tokio::test]
     async fn test_next() {
-        let datanode_manager = Arc::new(MockDatanodeManager::new(()));
-        let ddl_context = new_ddl_context(datanode_manager);
+        let node_manager = Arc::new(MockDatanodeManager::new(()));
+        let ddl_context = new_ddl_context(node_manager);
         ddl_context
             .table_metadata_manager
             .schema_manager()

diff --git a/src/common/meta/src/ddl/drop_database/start.rs b/src/common/meta/src/ddl/drop_database/start.rs
@@ -85,8 +85,8 @@ mod tests {
 
     #[tokio::test]
     async fn test_schema_not_exists_err() {
-        let datanode_manager = Arc::new(MockDatanodeManager::new(()));
-        let ddl_context = new_ddl_context(datanode_manager);
+        let node_manager = Arc::new(MockDatanodeManager::new(()));
+        let ddl_context = new_ddl_context(node_manager);
         let mut step = DropDatabaseStart;
         let mut ctx = DropDatabaseContext {
             catalog: "foo".to_string(),
@@ -100,8 +100,8 @@ mod tests {
 
     #[tokio::test]
     async fn test_schema_not_exists() {
-        let datanode_manager = Arc::new(MockDatanodeManager::new(()));
-        let ddl_context = new_ddl_context(datanode_manager);
+        let node_manager = Arc::new(MockDatanodeManager::new(()));
+        let ddl_context = new_ddl_context(node_manager);
         let mut state = DropDatabaseStart;
         let mut ctx = DropDatabaseContext {
             catalog: "foo".to_string(),
@@ -116,8 +116,8 @@ mod tests {
 
     #[tokio::test]
     async fn test_next() {
-        let datanode_manager = Arc::new(MockDatanodeManager::new(()));
-        let ddl_context = new_ddl_context(datanode_manager);
+        let node_manager = Arc::new(MockDatanodeManager::new(()));
+        let ddl_context = new_ddl_context(node_manager);
         ddl_context
             .table_metadata_manager
             .schema_manager()

diff --git a/src/common/meta/src/ddl/drop_table/executor.rs b/src/common/meta/src/ddl/drop_table/executor.rs
@@ -175,7 +175,7 @@ impl DropTableExecutor {
         let table_id = self.table_id;
 
         for datanode in leaders {
-            let requester = ctx.datanode_manager.datanode(&datanode).await;
+            let requester = ctx.node_manager.datanode(&datanode).await;
             let regions = find_leader_regions(region_routes, &datanode);
             let region_ids = regions
                 .iter()
@@ -271,8 +271,8 @@ mod tests {
     #[tokio::test]
     async fn test_on_prepare() {
         // Drops if exists
-        let datanode_manager = Arc::new(MockDatanodeManager::new(()));
-        let ctx = new_ddl_context(datanode_manager);
+        let node_manager = Arc::new(MockDatanodeManager::new(()));
+        let ctx = new_ddl_context(node_manager);
         let executor = DropTableExecutor::new(
             TableName::new(DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME, "my_table"),
             1024,

diff --git a/src/common/meta/src/ddl/tests/alter_logical_tables.rs b/src/common/meta/src/ddl/tests/alter_logical_tables.rs
@@ -83,8 +83,8 @@ fn make_alter_logical_table_rename_task(
 
 #[tokio::test]
 async fn test_on_prepare_check_schema() {
-    let datanode_manager = Arc::new(MockDatanodeManager::new(()));
-    let ddl_context = new_ddl_context(datanode_manager);
+    let node_manager = Arc::new(MockDatanodeManager::new(()));
+    let ddl_context = new_ddl_context(node_manager);
     let cluster_id = 1;
     let tasks = vec![
         make_alter_logical_table_add_column_task(
@@ -107,8 +107,8 @@ async fn test_on_prepare_check_schema() {
 
 #[tokio::test]
 async fn test_on_prepare_check_alter_kind() {
-    let datanode_manager = Arc::new(MockDatanodeManager::new(()));
-    let ddl_context = new_ddl_context(datanode_manager);
+    let node_manager = Arc::new(MockDatanodeManager::new(()));
+    let ddl_context = new_ddl_context(node_manager);
     let cluster_id = 1;
     let tasks = vec![make_alter_logical_table_rename_task(
         "schema1",
@@ -125,8 +125,8 @@ async fn test_on_prepare_check_alter_kind() {
 #[tokio::test]
 async fn test_on_prepare_different_physical_table() {
     let cluster_id = 1;
-    let datanode_manager = Arc::new(MockDatanodeManager::new(()));
-    let ddl_context = new_ddl_context(datanode_manager);
+    let node_manager = Arc::new(MockDatanodeManager::new(()));
+    let ddl_context = new_ddl_context(node_manager);
 
     let phy1_id = create_physical_table(&ddl_context, cluster_id, "phy1").await;
     create_logical_table(ddl_context.clone(), cluster_id, phy1_id, "table1").await;
@@ -146,8 +146,8 @@ async fn test_on_prepare_different_physical_table() {
 #[tokio::test]
 async fn test_on_prepare_logical_table_not_exists() {
     let cluster_id = 1;
-    let datanode_manager = Arc::new(MockDatanodeManager::new(()));
-    let ddl_context = new_ddl_context(datanode_manager);
+    let node_manager = Arc::new(MockDatanodeManager::new(()));
+    let ddl_context = new_ddl_context(node_manager);
 
     // Creates physical table
     let phy_id = create_physical_table(&ddl_context, cluster_id, "phy").await;
@@ -168,8 +168,8 @@ async fn test_on_prepare_logical_table_not_exists() {
 #[tokio::test]
 async fn test_on_prepare() {
     let cluster_id = 1;
-    let datanode_manager = Arc::new(MockDatanodeManager::new(()));
-    let ddl_context = new_ddl_context(datanode_manager);
+    let node_manager = Arc::new(MockDatanodeManager::new(()));
+    let ddl_context = new_ddl_context(node_manager);
 
     // Creates physical table
     let phy_id = create_physical_table(&ddl_context, cluster_id, "phy").await;
@@ -192,8 +192,8 @@ async fn test_on_prepare() {
 #[tokio::test]
 async fn test_on_update_metadata() {
     let cluster_id = 1;
-    let datanode_manager = Arc::new(MockDatanodeManager::new(NaiveDatanodeHandler));
-    let ddl_context = new_ddl_context(datanode_manager);
+    let node_manager = Arc::new(MockDatanodeManager::new(NaiveDatanodeHandler));
+    let ddl_context = new_ddl_context(node_manager);
 
     // Creates physical table
     let phy_id = create_physical_table(&ddl_context, cluster_id, "phy").await;
@@ -229,8 +229,8 @@ async fn test_on_update_metadata() {
 #[tokio::test]
 async fn test_on_part_duplicate_alter_request() {
     let cluster_id = 1;
-    let datanode_manager = Arc::new(MockDatanodeManager::new(NaiveDatanodeHandler));
-    let ddl_context = new_ddl_context(datanode_manager);
+    let node_manager = Arc::new(MockDatanodeManager::new(NaiveDatanodeHandler));
+    let ddl_context = new_ddl_context(node_manager);
 
     // Creates physical table
     let phy_id = create_physical_table(&ddl_context, cluster_id, "phy").await;