fix reviewer's suggestions

Author: ariesdevil

src/query/catalog/src/catalog/interface.rs

@@ -21,7 +21,6 @@ use common_meta_app::schema::CountTablesReq;
 use common_meta_app::schema::CreateDatabaseReply;
 use common_meta_app::schema::CreateDatabaseReq;
 use common_meta_app::schema::CreateTableReq;
-use common_meta_app::schema::DatabaseType;
 use common_meta_app::schema::DropDatabaseReq;
 use common_meta_app::schema::DropTableReply;
 use common_meta_app::schema::DropTableReq;
@@ -143,8 +142,7 @@ pub trait Catalog: DynClone + Send + Sync {
 
     async fn update_table_meta(
         &self,
-        tenant: &str,
-        db_type: DatabaseType,
+        table_info: &TableInfo,
         req: UpdateTableMetaReq,
     ) -> Result<UpdateTableMetaReply>;
 

src/query/service/src/catalogs/default/database_catalog.rs

@@ -23,7 +23,6 @@ use common_meta_app::schema::CountTablesReq;
 use common_meta_app::schema::CreateDatabaseReply;
 use common_meta_app::schema::CreateDatabaseReq;
 use common_meta_app::schema::CreateTableReq;
-use common_meta_app::schema::DatabaseType;
 use common_meta_app::schema::DropDatabaseReq;
 use common_meta_app::schema::DropTableReply;
 use common_meta_app::schema::DropTableReq;
@@ -462,12 +461,11 @@ impl Catalog for DatabaseCatalog {
 
     async fn update_table_meta(
         &self,
-        tenant: &str,
-        db_type: DatabaseType,
+        table_info: &TableInfo,
         req: UpdateTableMetaReq,
     ) -> Result<UpdateTableMetaReply> {
         self.mutable_catalog
-            .update_table_meta(tenant, db_type, req)
+            .update_table_meta(table_info, req)
             .await
     }
 

src/query/service/src/catalogs/default/immutable_catalog.rs

@@ -23,7 +23,6 @@ use common_meta_app::schema::CountTablesReq;
 use common_meta_app::schema::CreateDatabaseReply;
 use common_meta_app::schema::CreateDatabaseReq;
 use common_meta_app::schema::CreateTableReq;
-use common_meta_app::schema::DatabaseType;
 use common_meta_app::schema::DropDatabaseReq;
 use common_meta_app::schema::DropTableReply;
 use common_meta_app::schema::DropTableReq;
@@ -249,8 +248,7 @@ impl Catalog for ImmutableCatalog {
 
     async fn update_table_meta(
         &self,
-        _tenant: &str,
-        _db_type: DatabaseType,
+        _table_info: &TableInfo,
         req: UpdateTableMetaReq,
     ) -> Result<UpdateTableMetaReply> {
         Err(ErrorCode::Unimplemented(format!(

src/query/service/src/catalogs/default/mutable_catalog.rs

@@ -282,14 +282,15 @@ impl Catalog for MutableCatalog {
 
     async fn update_table_meta(
         &self,
-        tenant: &str,
-        db_type: DatabaseType,
+        table_info: &TableInfo,
         req: UpdateTableMetaReq,
     ) -> Result<UpdateTableMetaReply> {
-        match db_type {
+        match table_info.db_type.clone() {
             DatabaseType::NormalDB => Ok(self.ctx.meta.update_table_meta(req).await?),
             DatabaseType::ShareDB(share_ident) => {
-                let db = self.get_database(tenant, &share_ident.share_name).await?;
+                let db = self
+                    .get_database(&share_ident.tenant, &share_ident.share_name)
+                    .await?;
                 db.update_table_meta(req).await
             }
         }

src/query/service/tests/it/storages/fuse/operations/commit.rs

@@ -38,7 +38,6 @@ use common_meta_app::schema::CountTablesReq;
 use common_meta_app::schema::CreateDatabaseReply;
 use common_meta_app::schema::CreateDatabaseReq;
 use common_meta_app::schema::CreateTableReq;
-use common_meta_app::schema::DatabaseType;
 use common_meta_app::schema::DropDatabaseReq;
 use common_meta_app::schema::DropTableReply;
 use common_meta_app::schema::DropTableReq;
@@ -544,14 +543,13 @@ impl Catalog for FakedCatalog {
 
     async fn update_table_meta(
         &self,
-        tenant: &str,
-        db_type: DatabaseType,
+        table_info: &TableInfo,
         req: UpdateTableMetaReq,
     ) -> Result<UpdateTableMetaReply> {
         if let Some(e) = &self.error_injection {
             Err(e.clone())
         } else {
-            self.cat.update_table_meta(tenant, db_type, req).await
+            self.cat.update_table_meta(table_info, req).await
         }
     }
 

src/query/storages/fuse/fuse/src/fuse_table.rs

@@ -100,7 +100,7 @@ impl FuseTable {
             DatabaseType::ShareDB(share_ident) => create_share_table_operator(
                 ShareTableConfig::share_endpoint_address(),
                 ShareTableConfig::share_endpoint_token(),
-                &share_ident.share_name,
+                &share_ident.tenant,
                 &share_ident.share_name,
                 &table_info.name,
             ),

src/query/storages/fuse/fuse/src/operations/commit.rs

@@ -354,10 +354,7 @@ impl FuseTable {
         };
 
         // 3. let's roll
-        let tenant = ctx.get_tenant();
-        let reply = catalog
-            .update_table_meta(&tenant, table_info.db_type.clone(), req)
-            .await;
+        let reply = catalog.update_table_meta(table_info, req).await;
         match reply {
             Ok(_) => {
                 if let Some(snapshot_cache) = CacheManager::instance().get_table_snapshot_cache() {

src/query/storages/fuse/fuse/src/operations/revert.rs

@@ -53,10 +53,7 @@ impl FuseTable {
         };
 
         // 4. let's roll
-        let tenant = ctx.get_tenant();
-        let reply = catalog
-            .update_table_meta(&tenant, self.table_info.db_type.clone(), req)
-            .await;
+        let reply = catalog.update_table_meta(&self.table_info, req).await;
         if reply.is_ok() {
             // try keep the snapshot hit
             let snapshot_location = table_reverting_to.snapshot_loc().await?.ok_or_else(|| {

src/query/storages/fuse/fuse/src/operations/truncate.rs

@@ -72,15 +72,11 @@ impl FuseTable {
             let db_name = ctx.get_current_database();
 
             catalog
-                .update_table_meta(
-                    &tenant,
-                    self.table_info.db_type.clone(),
-                    UpdateTableMetaReq {
-                        table_id,
-                        seq: MatchSeq::Exact(table_version),
-                        new_table_meta,
-                    },
-                )
+                .update_table_meta(&self.table_info, UpdateTableMetaReq {
+                    table_id,
+                    seq: MatchSeq::Exact(table_version),
+                    new_table_meta,
+                })
                 .await?;
 
             catalog

src/query/storages/hive/hive/src/hive_catalog.rs

@@ -32,7 +32,6 @@ use common_meta_app::schema::CountTablesReq;
 use common_meta_app::schema::CreateDatabaseReply;
 use common_meta_app::schema::CreateDatabaseReq;
 use common_meta_app::schema::CreateTableReq;
-use common_meta_app::schema::DatabaseType;
 use common_meta_app::schema::DropDatabaseReq;
 use common_meta_app::schema::DropTableReply;
 use common_meta_app::schema::DropTableReq;
@@ -360,8 +359,7 @@ impl Catalog for HiveCatalog {
 
     async fn update_table_meta(
         &self,
-        _tenant: &str,
-        _db_type: DatabaseType,
+        _table_info: &TableInfo,
         _req: UpdateTableMetaReq,
     ) -> Result<UpdateTableMetaReply> {
         Err(ErrorCode::Unimplemented(