chore: improve the code

GreptimeTeam · Jan 12, 2023 · b5487c9 · b5487c9
1 parent 0163e93
commit b5487c9
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 17 deletions.
diff --git a/src/catalog/src/lib.rs b/src/catalog/src/lib.rs
@@ -98,7 +98,7 @@ pub trait CatalogManager: CatalogList {
     async fn register_schema(&self, request: RegisterSchemaRequest) -> Result<bool>;
 
     /// Rename a table to [RenameTableRequest::new_table_name], returns whether the table is renamed.
-    async fn rename_table(&self, request: RenameTableRequest, table_id: TableId) -> Result<bool>;
+    async fn rename_table(&self, request: RenameTableRequest) -> Result<bool>;
 
     /// Register a system table, should be called before starting the manager.
     async fn register_system_table(&self, request: RegisterSystemTableRequest)
@@ -151,6 +151,7 @@ pub struct RenameTableRequest {
     pub schema: String,
     pub table_name: String,
     pub new_table_name: String,
+    pub table_id: TableId,
 }
 
 #[derive(Clone)]

diff --git a/src/catalog/src/local/manager.rs b/src/catalog/src/local/manager.rs
@@ -380,7 +380,7 @@ impl CatalogManager for LocalCatalogManager {
         }
     }
 
-    async fn rename_table(&self, request: RenameTableRequest, table_id: TableId) -> Result<bool> {
+    async fn rename_table(&self, request: RenameTableRequest) -> Result<bool> {
         let started = self.init_lock.lock().await;
 
         ensure!(
@@ -411,7 +411,7 @@ impl CatalogManager for LocalCatalogManager {
                 catalog_name.clone(),
                 schema_name.clone(),
                 request.new_table_name.clone(),
-                table_id,
+                request.table_id,
             )
             .await?;
         Ok(schema

diff --git a/src/catalog/src/local/memory.rs b/src/catalog/src/local/memory.rs
@@ -92,7 +92,7 @@ impl CatalogManager for MemoryCatalogManager {
             .map(|v| v.is_none())
     }
 
-    async fn rename_table(&self, request: RenameTableRequest, _table_id: TableId) -> Result<bool> {
+    async fn rename_table(&self, request: RenameTableRequest) -> Result<bool> {
         let catalogs = self.catalogs.write().unwrap();
         let catalog = catalogs
             .get(&request.catalog)
@@ -456,11 +456,9 @@ mod tests {
             schema: DEFAULT_SCHEMA_NAME.to_string(),
             table_name: table_name.to_string(),
             new_table_name: new_table_name.to_string(),
+            table_id,
         };
-        assert!(catalog
-            .rename_table(rename_table_req, table_id)
-            .await
-            .unwrap());
+        assert!(catalog.rename_table(rename_table_req).await.unwrap());
         assert!(!schema.table_exist(table_name).unwrap());
         assert!(schema.table_exist(new_table_name).unwrap());
 

diff --git a/src/catalog/src/remote/manager.rs b/src/catalog/src/remote/manager.rs
@@ -449,7 +449,7 @@ impl CatalogManager for RemoteCatalogManager {
         Ok(true)
     }
 
-    async fn rename_table(&self, _request: RenameTableRequest, _table_id: TableId) -> Result<bool> {
+    async fn rename_table(&self, _request: RenameTableRequest) -> Result<bool> {
         UnimplementedSnafu {
             operation: "rename table",
         }

diff --git a/src/catalog/tests/local_catalog_tests.rs b/src/catalog/tests/local_catalog_tests.rs
@@ -62,9 +62,10 @@ mod tests {
             schema: DEFAULT_SCHEMA_NAME.to_string(),
             table_name: table_name.to_string(),
             new_table_name: new_table_name.to_string(),
+            table_id,
         };
         assert!(catalog_manager
-            .rename_table(rename_table_req, table_id)
+            .rename_table(rename_table_req)
             .await
             .unwrap());
 

diff --git a/src/datanode/src/sql/alter.rs b/src/datanode/src/sql/alter.rs
@@ -59,9 +59,10 @@ impl SqlHandler {
                 schema: table_info.schema_name.clone(),
                 table_name,
                 new_table_name: table_info.name.clone(),
+                table_id: table_info.ident.table_id,
             };
             self.catalog_manager
-                .rename_table(rename_table_req, table_info.ident.table_id)
+                .rename_table(rename_table_req)
                 .await
                 .context(error::RenameTableSnafu)?;
         }

diff --git a/src/frontend/src/catalog.rs b/src/frontend/src/catalog.rs
@@ -30,7 +30,6 @@ use catalog::{
 use futures::StreamExt;
 use meta_client::rpc::TableName;
 use snafu::prelude::*;
-use table::metadata::TableId;
 use table::TableRef;
 
 use crate::datanode::DatanodeClients;
@@ -98,11 +97,7 @@ impl CatalogManager for FrontendCatalogManager {
         unimplemented!()
     }
 
-    async fn rename_table(
-        &self,
-        _request: RenameTableRequest,
-        _table_id: TableId,
-    ) -> catalog_err::Result<bool> {
+    async fn rename_table(&self, _request: RenameTableRequest) -> catalog_err::Result<bool> {
         unimplemented!()
     }