Merge pull request #7685 from drmingdrmer/8-kv-app-err

refactor(meta): extract KVAppError from MetaError

Author: mergify[bot]

src/meta/api/src/kv_api.rs

@@ -18,9 +18,9 @@ use async_trait::async_trait;
 use common_base::base::replace_nth_char;
 use common_exception::ErrorCode;
 use common_meta_types::GetKVReply;
+use common_meta_types::KVAppError;
 use common_meta_types::ListKVReply;
 use common_meta_types::MGetKVReply;
-use common_meta_types::MetaError;
 use common_meta_types::TxnReply;
 use common_meta_types::TxnRequest;
 use common_meta_types::UpsertKVReply;
@@ -71,37 +71,37 @@ pub fn get_start_and_end_of_prefix(prefix: &str) -> common_exception::Result<(St
 
 #[async_trait]
 pub trait KVApi: Send + Sync {
-    async fn upsert_kv(&self, req: UpsertKVReq) -> Result<UpsertKVReply, MetaError>;
+    async fn upsert_kv(&self, req: UpsertKVReq) -> Result<UpsertKVReply, KVAppError>;
 
-    async fn get_kv(&self, key: &str) -> Result<GetKVReply, MetaError>;
+    async fn get_kv(&self, key: &str) -> Result<GetKVReply, KVAppError>;
 
     // mockall complains about AsRef... so we use String here
-    async fn mget_kv(&self, keys: &[String]) -> Result<MGetKVReply, MetaError>;
+    async fn mget_kv(&self, keys: &[String]) -> Result<MGetKVReply, KVAppError>;
 
-    async fn prefix_list_kv(&self, prefix: &str) -> Result<ListKVReply, MetaError>;
+    async fn prefix_list_kv(&self, prefix: &str) -> Result<ListKVReply, KVAppError>;
 
-    async fn transaction(&self, txn: TxnRequest) -> Result<TxnReply, MetaError>;
+    async fn transaction(&self, txn: TxnRequest) -> Result<TxnReply, KVAppError>;
 }
 
 #[async_trait]
 impl<U: KVApi, T: Deref<Target = U> + Send + Sync> KVApi for T {
-    async fn upsert_kv(&self, act: UpsertKVReq) -> Result<UpsertKVReply, MetaError> {
+    async fn upsert_kv(&self, act: UpsertKVReq) -> Result<UpsertKVReply, KVAppError> {
         self.deref().upsert_kv(act).await
     }
 
-    async fn get_kv(&self, key: &str) -> Result<GetKVReply, MetaError> {
+    async fn get_kv(&self, key: &str) -> Result<GetKVReply, KVAppError> {
         self.deref().get_kv(key).await
     }
 
-    async fn mget_kv(&self, key: &[String]) -> Result<MGetKVReply, MetaError> {
+    async fn mget_kv(&self, key: &[String]) -> Result<MGetKVReply, KVAppError> {
         self.deref().mget_kv(key).await
     }
 
-    async fn prefix_list_kv(&self, prefix: &str) -> Result<ListKVReply, MetaError> {
+    async fn prefix_list_kv(&self, prefix: &str) -> Result<ListKVReply, KVAppError> {
         self.deref().prefix_list_kv(prefix).await
     }
 
-    async fn transaction(&self, txn: TxnRequest) -> Result<TxnReply, MetaError> {
+    async fn transaction(&self, txn: TxnRequest) -> Result<TxnReply, KVAppError> {
         self.deref().transaction(txn).await
     }
 }

src/meta/api/src/schema_api.rs

@@ -52,7 +52,7 @@ use common_meta_app::schema::UpsertTableOptionReply;
 use common_meta_app::schema::UpsertTableOptionReq;
 use common_meta_types::GCDroppedDataReply;
 use common_meta_types::GCDroppedDataReq;
-use common_meta_types::MetaError;
+use common_meta_types::KVAppError;
 use common_meta_types::MetaId;
 
 /// SchemaApi defines APIs that provides schema storage, such as database, table.
@@ -63,80 +63,84 @@ pub trait SchemaApi: Send + Sync {
     async fn create_database(
         &self,
         req: CreateDatabaseReq,
-    ) -> Result<CreateDatabaseReply, MetaError>;
+    ) -> Result<CreateDatabaseReply, KVAppError>;
 
-    async fn drop_database(&self, req: DropDatabaseReq) -> Result<DropDatabaseReply, MetaError>;
+    async fn drop_database(&self, req: DropDatabaseReq) -> Result<DropDatabaseReply, KVAppError>;
 
     async fn undrop_database(
         &self,
         req: UndropDatabaseReq,
-    ) -> Result<UndropDatabaseReply, MetaError>;
+    ) -> Result<UndropDatabaseReply, KVAppError>;
 
-    async fn get_database(&self, req: GetDatabaseReq) -> Result<Arc<DatabaseInfo>, MetaError>;
+    async fn get_database(&self, req: GetDatabaseReq) -> Result<Arc<DatabaseInfo>, KVAppError>;
 
     async fn list_databases(
         &self,
         req: ListDatabaseReq,
-    ) -> Result<Vec<Arc<DatabaseInfo>>, MetaError>;
+    ) -> Result<Vec<Arc<DatabaseInfo>>, KVAppError>;
 
     async fn rename_database(
         &self,
         req: RenameDatabaseReq,
-    ) -> Result<RenameDatabaseReply, MetaError>;
+    ) -> Result<RenameDatabaseReply, KVAppError>;
 
     async fn get_database_history(
         &self,
         req: ListDatabaseReq,
-    ) -> Result<Vec<Arc<DatabaseInfo>>, MetaError>;
+    ) -> Result<Vec<Arc<DatabaseInfo>>, KVAppError>;
 
     // table
 
-    async fn create_table(&self, req: CreateTableReq) -> Result<CreateTableReply, MetaError>;
+    async fn create_table(&self, req: CreateTableReq) -> Result<CreateTableReply, KVAppError>;
 
-    async fn drop_table(&self, req: DropTableReq) -> Result<DropTableReply, MetaError>;
+    async fn drop_table(&self, req: DropTableReq) -> Result<DropTableReply, KVAppError>;
 
-    async fn undrop_table(&self, req: UndropTableReq) -> Result<UndropTableReply, MetaError>;
+    async fn undrop_table(&self, req: UndropTableReq) -> Result<UndropTableReply, KVAppError>;
 
-    async fn rename_table(&self, req: RenameTableReq) -> Result<RenameTableReply, MetaError>;
+    async fn rename_table(&self, req: RenameTableReq) -> Result<RenameTableReply, KVAppError>;
 
-    async fn get_table(&self, req: GetTableReq) -> Result<Arc<TableInfo>, MetaError>;
+    async fn get_table(&self, req: GetTableReq) -> Result<Arc<TableInfo>, KVAppError>;
 
-    async fn get_table_history(&self, req: ListTableReq) -> Result<Vec<Arc<TableInfo>>, MetaError>;
+    async fn get_table_history(&self, req: ListTableReq)
+    -> Result<Vec<Arc<TableInfo>>, KVAppError>;
 
-    async fn list_tables(&self, req: ListTableReq) -> Result<Vec<Arc<TableInfo>>, MetaError>;
+    async fn list_tables(&self, req: ListTableReq) -> Result<Vec<Arc<TableInfo>>, KVAppError>;
 
     async fn get_table_by_id(
         &self,
         table_id: MetaId,
-    ) -> Result<(TableIdent, Arc<TableMeta>), MetaError>;
+    ) -> Result<(TableIdent, Arc<TableMeta>), KVAppError>;
 
     async fn get_table_copied_file_info(
         &self,
         req: GetTableCopiedFileReq,
-    ) -> Result<GetTableCopiedFileReply, MetaError>;
+    ) -> Result<GetTableCopiedFileReply, KVAppError>;
 
     async fn upsert_table_copied_file_info(
         &self,
         req: UpsertTableCopiedFileReq,
-    ) -> Result<UpsertTableCopiedFileReply, MetaError>;
+    ) -> Result<UpsertTableCopiedFileReply, KVAppError>;
 
-    async fn truncate_table(&self, req: TruncateTableReq) -> Result<TruncateTableReply, MetaError>;
+    async fn truncate_table(&self, req: TruncateTableReq)
+    -> Result<TruncateTableReply, KVAppError>;
 
     async fn upsert_table_option(
         &self,
         req: UpsertTableOptionReq,
-    ) -> Result<UpsertTableOptionReply, MetaError>;
+    ) -> Result<UpsertTableOptionReply, KVAppError>;
 
     async fn update_table_meta(
         &self,
         req: UpdateTableMetaReq,
-    ) -> Result<UpdateTableMetaReply, MetaError>;
+    ) -> Result<UpdateTableMetaReply, KVAppError>;
 
     // gc dropped {table|db} which out of retention time.
-    async fn gc_dropped_data(&self, req: GCDroppedDataReq)
-    -> Result<GCDroppedDataReply, MetaError>;
+    async fn gc_dropped_data(
+        &self,
+        req: GCDroppedDataReq,
+    ) -> Result<GCDroppedDataReply, KVAppError>;
 
-    async fn count_tables(&self, req: CountTablesReq) -> Result<CountTablesReply, MetaError>;
+    async fn count_tables(&self, req: CountTablesReq) -> Result<CountTablesReply, KVAppError>;
 
     fn name(&self) -> String;
 }