chore: per review

GreptimeTeam · May 16, 2024 · ece07ad · ece07ad
1 parent dfd71ca
commit ece07ad
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 18 deletions.
diff --git a/src/cmd/src/standalone.rs b/src/cmd/src/standalone.rs
@@ -436,8 +436,7 @@ impl StartCommand {
             fe_plugins.clone(),
             table_metadata_manager.clone(),
             catalog_manager.clone(),
-        )
-        .with_kv_backend(kv_backend.clone());
+        );
         let flownode = Arc::new(flow_builder.build().await);
 
         let builder =

diff --git a/src/flow/src/adapter.rs b/src/flow/src/adapter.rs
@@ -21,12 +21,11 @@ use std::sync::Arc;
 use std::time::Instant;
 
 use api::v1::{RowDeleteRequest, RowDeleteRequests, RowInsertRequest, RowInsertRequests};
-use catalog::kvbackend::KvBackendCatalogManager;
+use catalog::CatalogManagerRef;
 use common_base::Plugins;
 use common_error::ext::BoxedError;
 use common_frontend::handler::FrontendInvoker;
 use common_meta::key::TableMetadataManagerRef;
-use common_meta::kv_backend::KvBackendRef;
 use common_runtime::JoinHandle;
 use common_telemetry::{debug, info};
 use datatypes::schema::ColumnSchema;
@@ -86,9 +85,8 @@ pub struct FlownodeBuilder {
     flow_node_id: u32,
     opts: FlownodeOptions,
     plugins: Plugins,
-    kv_backend: Option<KvBackendRef>,
     table_meta: TableMetadataManagerRef,
-    catalog_manager: Arc<KvBackendCatalogManager>,
+    catalog_manager: CatalogManagerRef,
 }
 
 impl FlownodeBuilder {
@@ -98,26 +96,17 @@ impl FlownodeBuilder {
         opts: FlownodeOptions,
         plugins: Plugins,
         table_meta: TableMetadataManagerRef,
-        catalog_manager: Arc<KvBackendCatalogManager>,
+        catalog_manager: CatalogManagerRef,
     ) -> Self {
         Self {
             flow_node_id,
             opts,
             plugins,
-            kv_backend: None,
             table_meta,
             catalog_manager,
         }
     }
 
-    /// set kv backend
-    pub fn with_kv_backend(self, kv_backend: KvBackendRef) -> Self {
-        Self {
-            kv_backend: Some(kv_backend),
-            ..self
-        }
-    }
-
     /// TODO(discord9): error handling
     pub async fn build(self) -> FlownodeManager {
         let query_engine_factory = QueryEngineFactory::new_with_plugins(

diff --git a/tests-integration/src/standalone.rs b/tests-integration/src/standalone.rs
@@ -157,8 +157,7 @@ impl GreptimeDbStandaloneBuilder {
             plugins.clone(),
             table_metadata_manager.clone(),
             catalog_manager.clone(),
-        )
-        .with_kv_backend(kv_backend.clone());
+        );
         let flownode = Arc::new(flow_builder.build().await);
 
         let node_manager = Arc::new(StandaloneDatanodeManager {