chore: remove empty reply struct

databendlabs · Aug 29, 2024 · b473c21 · b473c21
1 parent 8a43c72
commit b473c21
Show file tree

Hide file tree

Showing 16 changed files with 51 additions and 127 deletions.
diff --git a/src/meta/api/src/schema_api.rs b/src/meta/api/src/schema_api.rs
@@ -29,7 +29,6 @@ use databend_common_meta_app::schema::CreateIndexReply;
 use databend_common_meta_app::schema::CreateIndexReq;
 use databend_common_meta_app::schema::CreateLockRevReply;
 use databend_common_meta_app::schema::CreateLockRevReq;
-use databend_common_meta_app::schema::CreateTableIndexReply;
 use databend_common_meta_app::schema::CreateTableIndexReq;
 use databend_common_meta_app::schema::CreateTableReply;
 use databend_common_meta_app::schema::CreateTableReq;
@@ -43,14 +42,12 @@ use databend_common_meta_app::schema::DropDatabaseReq;
 use databend_common_meta_app::schema::DropIndexReply;
 use databend_common_meta_app::schema::DropIndexReq;
 use databend_common_meta_app::schema::DropTableByIdReq;
-use databend_common_meta_app::schema::DropTableIndexReply;
 use databend_common_meta_app::schema::DropTableIndexReq;
 use databend_common_meta_app::schema::DropTableReply;
 use databend_common_meta_app::schema::DropVirtualColumnReply;
 use databend_common_meta_app::schema::DropVirtualColumnReq;
 use databend_common_meta_app::schema::ExtendLockRevReq;
 use databend_common_meta_app::schema::GcDroppedTableReq;
-use databend_common_meta_app::schema::GcDroppedTableResp;
 use databend_common_meta_app::schema::GetDatabaseReq;
 use databend_common_meta_app::schema::GetDictionaryReply;
 use databend_common_meta_app::schema::GetIndexReply;
@@ -259,25 +256,16 @@ pub trait SchemaApi: Send + Sync {
         req: SetTableColumnMaskPolicyReq,
     ) -> Result<SetTableColumnMaskPolicyReply, KVAppError>;
 
-    async fn create_table_index(
-        &self,
-        req: CreateTableIndexReq,
-    ) -> Result<CreateTableIndexReply, KVAppError>;
+    async fn create_table_index(&self, req: CreateTableIndexReq) -> Result<(), KVAppError>;
 
-    async fn drop_table_index(
-        &self,
-        req: DropTableIndexReq,
-    ) -> Result<DropTableIndexReply, KVAppError>;
+    async fn drop_table_index(&self, req: DropTableIndexReq) -> Result<(), KVAppError>;
 
     async fn get_drop_table_infos(
         &self,
         req: ListDroppedTableReq,
     ) -> Result<ListDroppedTableResp, KVAppError>;
 
-    async fn gc_drop_tables(
-        &self,
-        req: GcDroppedTableReq,
-    ) -> Result<GcDroppedTableResp, KVAppError>;
+    async fn gc_drop_tables(&self, req: GcDroppedTableReq) -> Result<(), KVAppError>;
 
     async fn list_lock_revisions(
         &self,

diff --git a/src/meta/api/src/schema_api_impl.rs b/src/meta/api/src/schema_api_impl.rs
@@ -82,7 +82,6 @@ use databend_common_meta_app::schema::CreateIndexReq;
 use databend_common_meta_app::schema::CreateLockRevReply;
 use databend_common_meta_app::schema::CreateLockRevReq;
 use databend_common_meta_app::schema::CreateOption;
-use databend_common_meta_app::schema::CreateTableIndexReply;
 use databend_common_meta_app::schema::CreateTableIndexReq;
 use databend_common_meta_app::schema::CreateTableReply;
 use databend_common_meta_app::schema::CreateTableReq;
@@ -106,15 +105,13 @@ use databend_common_meta_app::schema::DropDatabaseReq;
 use databend_common_meta_app::schema::DropIndexReply;
 use databend_common_meta_app::schema::DropIndexReq;
 use databend_common_meta_app::schema::DropTableByIdReq;
-use databend_common_meta_app::schema::DropTableIndexReply;
 use databend_common_meta_app::schema::DropTableIndexReq;
 use databend_common_meta_app::schema::DropTableReply;
 use databend_common_meta_app::schema::DropVirtualColumnReply;
 use databend_common_meta_app::schema::DropVirtualColumnReq;
 use databend_common_meta_app::schema::DroppedId;
 use databend_common_meta_app::schema::ExtendLockRevReq;
 use databend_common_meta_app::schema::GcDroppedTableReq;
-use databend_common_meta_app::schema::GcDroppedTableResp;
 use databend_common_meta_app::schema::GetDatabaseReq;
 use databend_common_meta_app::schema::GetDictionaryReply;
 use databend_common_meta_app::schema::GetIndexReply;
@@ -3290,10 +3287,7 @@ impl<KV: kvapi::KVApi<Error = MetaError> + ?Sized> SchemaApi for KV {
 
     #[logcall::logcall]
     #[fastrace::trace]
-    async fn create_table_index(
-        &self,
-        req: CreateTableIndexReq,
-    ) -> Result<CreateTableIndexReply, KVAppError> {
+    async fn create_table_index(&self, req: CreateTableIndexReq) -> Result<(), KVAppError> {
         debug!(req :? =(&req); "SchemaApi: {}", func_name!());
 
         let tbid = TableId {
@@ -3326,7 +3320,7 @@ impl<KV: kvapi::KVApi<Error = MetaError> + ?Sized> SchemaApi for KV {
                         )));
                     }
                     CreateOption::CreateIfNotExists => {
-                        return Ok(CreateTableIndexReply {});
+                        return Ok(());
                     }
                     CreateOption::CreateOrReplace => {}
                 }
@@ -3393,17 +3387,14 @@ impl<KV: kvapi::KVApi<Error = MetaError> + ?Sized> SchemaApi for KV {
             );
 
             if succ {
-                return Ok(CreateTableIndexReply {});
+                return Ok(());
             }
         }
     }
 
     #[logcall::logcall]
     #[fastrace::trace]
-    async fn drop_table_index(
-        &self,
-        req: DropTableIndexReq,
-    ) -> Result<DropTableIndexReply, KVAppError> {
+    async fn drop_table_index(&self, req: DropTableIndexReq) -> Result<(), KVAppError> {
         debug!(req :? =(&req); "SchemaApi: {}", func_name!());
 
         let tbid = TableId {
@@ -3455,7 +3446,7 @@ impl<KV: kvapi::KVApi<Error = MetaError> + ?Sized> SchemaApi for KV {
             );
 
             if succ {
-                return Ok(DropTableIndexReply {});
+                return Ok(());
             }
         }
     }
@@ -3638,10 +3629,7 @@ impl<KV: kvapi::KVApi<Error = MetaError> + ?Sized> SchemaApi for KV {
     }
 
     #[fastrace::trace]
-    async fn gc_drop_tables(
-        &self,
-        req: GcDroppedTableReq,
-    ) -> Result<GcDroppedTableResp, KVAppError> {
+    async fn gc_drop_tables(&self, req: GcDroppedTableReq) -> Result<(), KVAppError> {
         for drop_id in req.drop_ids {
             match drop_id {
                 DroppedId::Db(db_id, db_name) => {
@@ -3652,7 +3640,7 @@ impl<KV: kvapi::KVApi<Error = MetaError> + ?Sized> SchemaApi for KV {
                 }
             }
         }
-        Ok(GcDroppedTableResp {})
+        Ok(())
     }
 
     #[fastrace::trace]

diff --git a/src/meta/app/src/schema/mod.rs b/src/meta/app/src/schema/mod.rs
@@ -88,20 +88,17 @@ pub use ownership::Ownership;
 pub use sequence::*;
 pub use table::CommitTableMetaReply;
 pub use table::CommitTableMetaReq;
-pub use table::CreateTableIndexReply;
 pub use table::CreateTableIndexReq;
 pub use table::CreateTableReply;
 pub use table::CreateTableReq;
 pub use table::DBIdTableName;
 pub use table::DatabaseType;
 pub use table::DropTableByIdReq;
-pub use table::DropTableIndexReply;
 pub use table::DropTableIndexReq;
 pub use table::DropTableReply;
 pub use table::DroppedId;
 pub use table::EmptyProto;
 pub use table::GcDroppedTableReq;
-pub use table::GcDroppedTableResp;
 pub use table::GetTableCopiedFileReply;
 pub use table::GetTableCopiedFileReq;
 pub use table::GetTableReq;

diff --git a/src/meta/app/src/schema/table.rs b/src/meta/app/src/schema/table.rs
@@ -826,35 +826,20 @@ pub struct CreateTableIndexReq {
 
 impl Display for CreateTableIndexReq {
     fn fmt(&self, f: &mut Formatter) -> std::fmt::Result {
-        match self.create_option {
-            CreateOption::Create => {
-                write!(
-                    f,
-                    "create_table_index: {} ColumnIds: {:?}, SyncCreation: {:?}, Options: {:?}",
-                    self.name, self.column_ids, self.sync_creation, self.options,
-                )
-            }
-            CreateOption::CreateIfNotExists => {
-                write!(
-                    f,
-                    "create_table_index_if_not_exists: {} ColumnIds: {:?}, SyncCreation: {:?}, Options: {:?}",
-                    self.name, self.column_ids, self.sync_creation, self.options,
-                )
-            }
-            CreateOption::CreateOrReplace => {
-                write!(
-                    f,
-                    "create_or_replace_table_index: {} ColumnIds: {:?}, SyncCreation: {:?}, Options: {:?}",
-                    self.name, self.column_ids, self.sync_creation, self.options,
-                )
-            }
-        }
+        let typ = match self.create_option {
+            CreateOption::Create => "create_table_index",
+            CreateOption::CreateIfNotExists => "create_table_index_if_not_exists",
+            CreateOption::CreateOrReplace => "create_or_replace_table_index",
+        };
+
+        write!(
+            f,
+            "{}: {} ColumnIds: {:?}, SyncCreation: {:?}, Options: {:?}",
+            typ, self.name, self.column_ids, self.sync_creation, self.options,
+        )
     }
 }
 
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub struct CreateTableIndexReply {}
-
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct DropTableIndexReq {
     pub if_exists: bool,
@@ -872,9 +857,6 @@ impl Display for DropTableIndexReq {
     }
 }
 
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct DropTableIndexReply {}
-
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct GetTableReq {
     pub inner: TableNameIdent,
@@ -967,9 +949,6 @@ pub struct GcDroppedTableReq {
     pub drop_ids: Vec<DroppedId>,
 }
 
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct GcDroppedTableResp {}
-
 #[derive(Clone, Debug, Default, Eq, PartialEq)]
 pub struct TableIdToName {
     pub table_id: u64,

diff --git a/src/query/catalog/src/catalog/interface.rs b/src/query/catalog/src/catalog/interface.rs
@@ -33,7 +33,6 @@ use databend_common_meta_app::schema::CreateLockRevReply;
 use databend_common_meta_app::schema::CreateLockRevReq;
 use databend_common_meta_app::schema::CreateSequenceReply;
 use databend_common_meta_app::schema::CreateSequenceReq;
-use databend_common_meta_app::schema::CreateTableIndexReply;
 use databend_common_meta_app::schema::CreateTableIndexReq;
 use databend_common_meta_app::schema::CreateTableReply;
 use databend_common_meta_app::schema::CreateTableReq;
@@ -49,15 +48,13 @@ use databend_common_meta_app::schema::DropIndexReq;
 use databend_common_meta_app::schema::DropSequenceReply;
 use databend_common_meta_app::schema::DropSequenceReq;
 use databend_common_meta_app::schema::DropTableByIdReq;
-use databend_common_meta_app::schema::DropTableIndexReply;
 use databend_common_meta_app::schema::DropTableIndexReq;
 use databend_common_meta_app::schema::DropTableReply;
 use databend_common_meta_app::schema::DropVirtualColumnReply;
 use databend_common_meta_app::schema::DropVirtualColumnReq;
 use databend_common_meta_app::schema::DroppedId;
 use databend_common_meta_app::schema::ExtendLockRevReq;
 use databend_common_meta_app::schema::GcDroppedTableReq;
-use databend_common_meta_app::schema::GcDroppedTableResp;
 use databend_common_meta_app::schema::GetDictionaryReply;
 use databend_common_meta_app::schema::GetIndexReply;
 use databend_common_meta_app::schema::GetIndexReq;
@@ -273,7 +270,7 @@ pub trait Catalog: DynClone + Send + Sync + Debug {
         ))
     }
 
-    async fn gc_drop_tables(&self, _req: GcDroppedTableReq) -> Result<GcDroppedTableResp> {
+    async fn gc_drop_tables(&self, _req: GcDroppedTableReq) -> Result<()> {
         Err(ErrorCode::Unimplemented("'gc_drop_tables' not implemented"))
     }
 
@@ -414,9 +411,9 @@ pub trait Catalog: DynClone + Send + Sync + Debug {
         req: SetTableColumnMaskPolicyReq,
     ) -> Result<SetTableColumnMaskPolicyReply>;
 
-    async fn create_table_index(&self, req: CreateTableIndexReq) -> Result<CreateTableIndexReply>;
+    async fn create_table_index(&self, req: CreateTableIndexReq) -> Result<()>;
 
-    async fn drop_table_index(&self, req: DropTableIndexReq) -> Result<DropTableIndexReply>;
+    async fn drop_table_index(&self, req: DropTableIndexReq) -> Result<()>;
 
     async fn get_table_copied_file_info(
         &self,

diff --git a/src/query/ee/src/inverted_index/inverted_index_handler.rs b/src/query/ee/src/inverted_index/inverted_index_handler.rs
@@ -17,9 +17,7 @@ use std::sync::Arc;
 use databend_common_base::base::GlobalInstance;
 use databend_common_catalog::catalog::Catalog;
 use databend_common_exception::Result;
-use databend_common_meta_app::schema::CreateTableIndexReply;
 use databend_common_meta_app::schema::CreateTableIndexReq;
-use databend_common_meta_app::schema::DropTableIndexReply;
 use databend_common_meta_app::schema::DropTableIndexReq;
 use databend_enterprise_inverted_index::InvertedIndexHandler;
 use databend_enterprise_inverted_index::InvertedIndexHandlerWrapper;
@@ -33,7 +31,7 @@ impl InvertedIndexHandler for RealInvertedIndexHandler {
         &self,
         catalog: Arc<dyn Catalog>,
         req: CreateTableIndexReq,
-    ) -> Result<CreateTableIndexReply> {
+    ) -> Result<()> {
         catalog.create_table_index(req).await
     }
 
@@ -42,7 +40,7 @@ impl InvertedIndexHandler for RealInvertedIndexHandler {
         &self,
         catalog: Arc<dyn Catalog>,
         req: DropTableIndexReq,
-    ) -> Result<DropTableIndexReply> {
+    ) -> Result<()> {
         catalog.drop_table_index(req).await
     }
 }

diff --git a/src/query/ee_features/inverted_index/src/inverted_index_handler.rs b/src/query/ee_features/inverted_index/src/inverted_index_handler.rs
@@ -17,9 +17,7 @@ use std::sync::Arc;
 use databend_common_base::base::GlobalInstance;
 use databend_common_catalog::catalog::Catalog;
 use databend_common_exception::Result;
-use databend_common_meta_app::schema::CreateTableIndexReply;
 use databend_common_meta_app::schema::CreateTableIndexReq;
-use databend_common_meta_app::schema::DropTableIndexReply;
 use databend_common_meta_app::schema::DropTableIndexReq;
 
 #[async_trait::async_trait]
@@ -28,13 +26,13 @@ pub trait InvertedIndexHandler: Sync + Send {
         &self,
         catalog: Arc<dyn Catalog>,
         req: CreateTableIndexReq,
-    ) -> Result<CreateTableIndexReply>;
+    ) -> Result<()>;
 
     async fn do_drop_table_index(
         &self,
         catalog: Arc<dyn Catalog>,
         req: DropTableIndexReq,
-    ) -> Result<DropTableIndexReply>;
+    ) -> Result<()>;
 }
 
 pub struct InvertedIndexHandlerWrapper {
@@ -51,7 +49,7 @@ impl InvertedIndexHandlerWrapper {
         &self,
         catalog: Arc<dyn Catalog>,
         req: CreateTableIndexReq,
-    ) -> Result<CreateTableIndexReply> {
+    ) -> Result<()> {
         self.handler.do_create_table_index(catalog, req).await
     }
 
@@ -60,7 +58,7 @@ impl InvertedIndexHandlerWrapper {
         &self,
         catalog: Arc<dyn Catalog>,
         req: DropTableIndexReq,
-    ) -> Result<DropTableIndexReply> {
+    ) -> Result<()> {
         self.handler.do_drop_table_index(catalog, req).await
     }
 }

diff --git a/src/query/service/src/catalogs/default/database_catalog.rs b/src/query/service/src/catalogs/default/database_catalog.rs
@@ -39,7 +39,6 @@ use databend_common_meta_app::schema::CreateLockRevReply;
 use databend_common_meta_app::schema::CreateLockRevReq;
 use databend_common_meta_app::schema::CreateSequenceReply;
 use databend_common_meta_app::schema::CreateSequenceReq;
-use databend_common_meta_app::schema::CreateTableIndexReply;
 use databend_common_meta_app::schema::CreateTableIndexReq;
 use databend_common_meta_app::schema::CreateTableReply;
 use databend_common_meta_app::schema::CreateTableReq;
@@ -54,15 +53,13 @@ use databend_common_meta_app::schema::DropIndexReq;
 use databend_common_meta_app::schema::DropSequenceReply;
 use databend_common_meta_app::schema::DropSequenceReq;
 use databend_common_meta_app::schema::DropTableByIdReq;
-use databend_common_meta_app::schema::DropTableIndexReply;
 use databend_common_meta_app::schema::DropTableIndexReq;
 use databend_common_meta_app::schema::DropTableReply;
 use databend_common_meta_app::schema::DropVirtualColumnReply;
 use databend_common_meta_app::schema::DropVirtualColumnReq;
 use databend_common_meta_app::schema::DroppedId;
 use databend_common_meta_app::schema::ExtendLockRevReq;
 use databend_common_meta_app::schema::GcDroppedTableReq;
-use databend_common_meta_app::schema::GcDroppedTableResp;
 use databend_common_meta_app::schema::GetDictionaryReply;
 use databend_common_meta_app::schema::GetIndexReply;
 use databend_common_meta_app::schema::GetIndexReq;
@@ -534,12 +531,12 @@ impl Catalog for DatabaseCatalog {
     }
 
     #[async_backtrace::framed]
-    async fn create_table_index(&self, req: CreateTableIndexReq) -> Result<CreateTableIndexReply> {
+    async fn create_table_index(&self, req: CreateTableIndexReq) -> Result<()> {
         self.mutable_catalog.create_table_index(req).await
     }
 
     #[async_backtrace::framed]
-    async fn drop_table_index(&self, req: DropTableIndexReq) -> Result<DropTableIndexReply> {
+    async fn drop_table_index(&self, req: DropTableIndexReq) -> Result<()> {
         self.mutable_catalog.drop_table_index(req).await
     }
 
@@ -721,7 +718,7 @@ impl Catalog for DatabaseCatalog {
         self.mutable_catalog.get_drop_table_infos(req).await
     }
 
-    async fn gc_drop_tables(&self, req: GcDroppedTableReq) -> Result<GcDroppedTableResp> {
+    async fn gc_drop_tables(&self, req: GcDroppedTableReq) -> Result<()> {
         self.mutable_catalog.gc_drop_tables(req).await
     }