Merge pull request #3879 from drmingdrmer/anyerr

[metasrv] refactor: use external anyerror as an error wrapper of any other error
databendlabs · Jan 17, 2022 · b62495a · b62495a
2 parents 52601af + a6f768b
commit b62495a
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 216 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/metasrv/Cargo.toml b/metasrv/Cargo.toml
@@ -41,6 +41,7 @@ common-metrics = { path = "../common/metrics" }
 # Github dependencies
 
 # Crates.io dependencies
+anyerror = "0.1.1"
 anyhow = "1.0.52"
 async-raft = { git = "https://github.com/datafuselabs/openraft", tag = "v0.6.2-alpha.14.1" }
 async-trait = "0.1.52"

diff --git a/metasrv/src/any_error/any_error_impl.rs b/metasrv/src/any_error/any_error_impl.rs
diff --git a/metasrv/src/any_error/mod.rs b/metasrv/src/any_error/mod.rs
diff --git a/metasrv/src/errors.rs b/metasrv/src/errors.rs
@@ -12,15 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use anyerror::AnyError;
 use common_exception::ErrorCode;
 use common_exception::SerializedError;
 use common_meta_types::NodeId;
 use serde::Deserialize;
 use serde::Serialize;
 use thiserror::Error;
 
-use crate::any_error::AnyError;
-
 /// Top level error MetaNode would return.
 #[derive(Error, Serialize, Deserialize, Debug, Clone, PartialEq)]
 pub enum MetaError {

diff --git a/metasrv/src/lib.rs b/metasrv/src/lib.rs
@@ -14,7 +14,6 @@
 
 #![feature(backtrace)]
 
-pub mod any_error;
 pub mod api;
 pub mod configs;
 pub mod errors;

diff --git a/metasrv/tests/it/any_error.rs b/metasrv/tests/it/any_error.rs
diff --git a/metasrv/tests/it/main.rs b/metasrv/tests/it/main.rs
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-mod any_error;
 mod api;
 mod configs;
 mod grpc;