From 9ad6ddb26e05b70471c11e8ad78cc87723897fd5 Mon Sep 17 00:00:00 2001
From: "Lei, HUANG" <6406592+v0y4g3r@users.noreply.github.com>
Date: Tue, 13 Dec 2022 14:26:26 +0800
Subject: [PATCH] fix: remove useless metaclient field from datanode Instance
 (#744)

---
 src/datanode/src/instance.rs | 3 ---
 src/datanode/src/mock.rs     | 6 ++----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/datanode/src/instance.rs b/src/datanode/src/instance.rs
index 676d6dbb6a..88c3939d31 100644
--- a/src/datanode/src/instance.rs
+++ b/src/datanode/src/instance.rs
@@ -60,8 +60,6 @@ pub struct Instance {
     pub(crate) catalog_manager: CatalogManagerRef,
     pub(crate) script_executor: ScriptExecutor,
     pub(crate) table_id_provider: Option<TableIdProviderRef>,
-    #[allow(unused)]
-    pub(crate) meta_client: Option<Arc<MetaClient>>,
     pub(crate) heartbeat_task: Option<HeartbeatTask>,
 }
 
@@ -158,7 +156,6 @@ impl Instance {
             ),
             catalog_manager,
             script_executor,
-            meta_client,
             heartbeat_task,
             table_id_provider,
         })
diff --git a/src/datanode/src/mock.rs b/src/datanode/src/mock.rs
index 8282169025..b37d491690 100644
--- a/src/datanode/src/mock.rs
+++ b/src/datanode/src/mock.rs
@@ -40,7 +40,7 @@ impl Instance {
         use mito::table::test_util::{new_test_object_store, MockEngine, MockMitoEngine};
 
         let mock_info = meta_srv::mocks::mock_with_memstore().await;
-        let meta_client = Some(Arc::new(mock_meta_client(mock_info, 0).await));
+        let meta_client = Arc::new(mock_meta_client(mock_info, 0).await);
         let (_dir, object_store) = new_test_object_store("setup_mock_engine_and_table").await;
         let mock_engine = Arc::new(MockMitoEngine::new(
             TableEngineConfig::default(),
@@ -69,7 +69,7 @@ impl Instance {
         let heartbeat_task = Some(HeartbeatTask::new(
             0,
             "127.0.0.1:3302".to_string(),
-            meta_client.as_ref().unwrap().clone(),
+            meta_client,
         ));
 
         let table_id_provider = Some(catalog_manager.clone() as TableIdProviderRef);
@@ -78,7 +78,6 @@ impl Instance {
             sql_handler,
             catalog_manager,
             script_executor,
-            meta_client,
             heartbeat_task,
             table_id_provider,
         })
@@ -132,7 +131,6 @@ impl Instance {
             catalog_manager,
             script_executor,
             table_id_provider: Some(Arc::new(LocalTableIdProvider::default())),
-            meta_client: Some(meta_client),
             heartbeat_task: Some(heartbeat_task),
         })
     }