refactor:remove common_error::prelude (#1946)

* feat:Remove common_error::prelude

* fix merge error

* cr comment

* fix error

src/common/base/src/buffer.rs

@@ -16,7 +16,7 @@ use std::any::Any;
 use std::io::{Read, Write};
 
 use bytes::{Buf, BufMut, BytesMut};
-use common_error::prelude::ErrorExt;
+use common_error::ext::ErrorExt;
 use paste::paste;
 use snafu::{ensure, Location, ResultExt, Snafu};
 

src/common/catalog/src/error.rs

@@ -15,8 +15,8 @@
 use std::any::Any;
 
 use common_error::ext::ErrorExt;
-use common_error::prelude::{Snafu, StatusCode};
-use snafu::Location;
+use common_error::status_code::StatusCode;
+use snafu::{Location, Snafu};
 
 #[derive(Debug, Snafu)]
 #[snafu(visibility(pub))]

src/common/datasource/src/error.rs

@@ -15,9 +15,10 @@
 use std::any::Any;
 
 use arrow_schema::ArrowError;
-use common_error::prelude::*;
+use common_error::ext::ErrorExt;
+use common_error::status_code::StatusCode;
 use datafusion::parquet::errors::ParquetError;
-use snafu::Location;
+use snafu::{Location, Snafu};
 use url::ParseError;
 
 #[derive(Debug, Snafu)]

src/common/error/src/lib.rs

@@ -17,16 +17,7 @@ pub mod format;
 pub mod mock;
 pub mod status_code;
 
-pub mod prelude {
-    pub use snafu::prelude::*;
-    pub use snafu::{Backtrace, ErrorCompat};
-
-    pub use crate::ext::{BoxedError, ErrorExt};
-    pub use crate::format::DebugFormat;
-    pub use crate::status_code::StatusCode;
-
-    pub const INNER_ERROR_CODE: &str = "INNER_ERROR_CODE";
-    pub const INNER_ERROR_MSG: &str = "INNER_ERROR_MSG";
-}
+pub const INNER_ERROR_CODE: &str = "INNER_ERROR_CODE";
+pub const INNER_ERROR_MSG: &str = "INNER_ERROR_MSG";
 
 pub use snafu;

src/common/error/src/mock.rs

@@ -19,7 +19,8 @@ use std::fmt;
 
 use snafu::Location;
 
-use crate::prelude::*;
+use crate::ext::ErrorExt;
+use crate::status_code::StatusCode;
 
 /// A mock error mainly for test.
 #[derive(Debug)]

src/common/grpc-expr/src/error.rs

@@ -15,8 +15,8 @@
 use std::any::Any;
 
 use common_error::ext::ErrorExt;
-use common_error::prelude::{Snafu, StatusCode};
-use snafu::Location;
+use common_error::status_code::StatusCode;
+use snafu::{Location, Snafu};
 
 #[derive(Debug, Snafu)]
 #[snafu(visibility(pub))]

src/common/grpc/src/error.rs

@@ -15,7 +15,8 @@
 use std::any::Any;
 use std::io;
 
-use common_error::prelude::{ErrorExt, StatusCode};
+use common_error::ext::ErrorExt;
+use common_error::status_code::StatusCode;
 use snafu::{Location, Snafu};
 
 pub type Result<T> = std::result::Result<T, Error>;

src/common/mem-prof/src/error.rs

@@ -15,7 +15,8 @@
 use std::any::Any;
 use std::path::PathBuf;
 
-use common_error::prelude::{ErrorExt, StatusCode};
+use common_error::ext::ErrorExt;
+use common_error::status_code::StatusCode;
 use snafu::{Location, Snafu};
 
 pub type Result<T> = std::result::Result<T, Error>;

src/common/meta/src/error.rs

@@ -12,9 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use common_error::prelude::*;
+use common_error::ext::{BoxedError, ErrorExt};
+use common_error::status_code::StatusCode;
 use serde_json::error::Error as JsonError;
-use snafu::Location;
+use snafu::{Location, Snafu};
 use store_api::storage::RegionNumber;
 use table::metadata::TableId;
 

src/common/meta/src/kv_backend/memory.rs

@@ -21,7 +21,7 @@ use std::ops::Range;
 use std::sync::RwLock;
 
 use async_trait::async_trait;
-use common_error::prelude::ErrorExt;
+use common_error::ext::ErrorExt;
 use common_telemetry::timer;
 use serde::Serializer;
 

src/common/meta/src/kv_backend/txn.rs

@@ -14,7 +14,7 @@
 
 mod etcd;
 
-use common_error::prelude::ErrorExt;
+use common_error::ext::ErrorExt;
 
 use crate::rpc::store::{DeleteRangeResponse, PutResponse, RangeResponse};
 

src/common/pprof/src/lib.rs

@@ -15,7 +15,8 @@
 use std::any::Any;
 use std::time::Duration;
 
-use common_error::prelude::{ErrorExt, StatusCode};
+use common_error::ext::ErrorExt;
+use common_error::status_code::StatusCode;
 use prost::Message;
 use snafu::{Location, ResultExt, Snafu};
 

src/common/procedure/src/error.rs

@@ -16,8 +16,9 @@ use std::any::Any;
 use std::string::FromUtf8Error;
 use std::sync::Arc;
 
-use common_error::prelude::*;
-use snafu::Location;
+use common_error::ext::{BoxedError, ErrorExt};
+use common_error::status_code::StatusCode;
+use snafu::{Location, Snafu};
 
 use crate::procedure::ProcedureId;
 

src/common/procedure/src/local.rs

@@ -567,7 +567,7 @@ mod test_util {
 #[cfg(test)]
 mod tests {
     use common_error::mock::MockError;
-    use common_error::prelude::StatusCode;
+    use common_error::status_code::StatusCode;
     use common_test_util::temp_dir::create_temp_dir;
 
     use super::*;

src/common/procedure/src/local/runner.rs

@@ -455,7 +455,7 @@ mod tests {
     use async_trait::async_trait;
     use common_error::ext::PlainError;
     use common_error::mock::MockError;
-    use common_error::prelude::StatusCode;
+    use common_error::status_code::StatusCode;
     use common_test_util::temp_dir::create_temp_dir;
     use futures_util::future::BoxFuture;
     use futures_util::{FutureExt, TryStreamExt};

src/common/procedure/src/procedure.rs

@@ -308,7 +308,7 @@ pub type ProcedureManagerRef = Arc<dyn ProcedureManager>;
 #[cfg(test)]
 mod tests {
     use common_error::mock::MockError;
-    use common_error::prelude::StatusCode;
+    use common_error::status_code::StatusCode;
 
     use super::*;
 

src/common/procedure/src/store/state_store.rs

@@ -17,8 +17,8 @@ use std::sync::Arc;
 
 use async_stream::try_stream;
 use async_trait::async_trait;
-use common_error::ext::PlainError;
-use common_error::prelude::{BoxedError, StatusCode};
+use common_error::ext::{BoxedError, PlainError};
+use common_error::status_code::StatusCode;
 use futures::{Stream, StreamExt};
 use object_store::{EntryMode, Metakey, ObjectStore};
 use snafu::ResultExt;

src/common/query/src/error.rs

@@ -15,14 +15,15 @@
 use std::any::Any;
 
 use arrow::error::ArrowError;
-use common_error::prelude::*;
+use common_error::ext::{BoxedError, ErrorExt};
+use common_error::status_code::StatusCode;
 use common_recordbatch::error::Error as RecordbatchError;
 use datafusion_common::DataFusionError;
 use datatypes::arrow;
 use datatypes::arrow::datatypes::DataType as ArrowDatatype;
 use datatypes::error::Error as DataTypeError;
 use datatypes::prelude::ConcreteDataType;
-use snafu::Location;
+use snafu::{Location, Snafu};
 use statrs::StatsError;
 
 #[derive(Debug, Snafu)]

src/common/recordbatch/src/adapter.rs

@@ -245,8 +245,9 @@ impl Stream for AsyncRecordBatchStreamAdapter {
 
 #[cfg(test)]
 mod test {
+    use common_error::ext::BoxedError;
     use common_error::mock::MockError;
-    use common_error::prelude::{BoxedError, StatusCode};
+    use common_error::status_code::StatusCode;
     use datatypes::prelude::ConcreteDataType;
     use datatypes::schema::ColumnSchema;
     use datatypes::vectors::Int32Vector;

src/common/recordbatch/src/error.rs

@@ -15,10 +15,10 @@
 //! Error of record batch.
 use std::any::Any;
 
-use common_error::ext::BoxedError;
-use common_error::prelude::*;
+use common_error::ext::{BoxedError, ErrorExt};
+use common_error::status_code::StatusCode;
 use datatypes::prelude::ConcreteDataType;
-use snafu::Location;
+use snafu::{Location, Snafu};
 
 pub type Result<T> = std::result::Result<T, Error>;
 

src/common/runtime/src/error.rs

@@ -14,8 +14,8 @@
 
 use std::any::Any;
 
-use common_error::prelude::*;
-use snafu::Location;
+use common_error::ext::ErrorExt;
+use snafu::{Location, Snafu};
 use tokio::task::JoinError;
 
 pub type Result<T> = std::result::Result<T, Error>;

src/common/runtime/src/repeated_task.rs

@@ -16,7 +16,7 @@ use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Mutex;
 use std::time::Duration;
 
-use common_error::prelude::ErrorExt;
+use common_error::ext::ErrorExt;
 use common_telemetry::logging;
 use snafu::{ensure, ResultExt};
 use tokio::task::JoinHandle;

src/common/substrait/src/error.rs

@@ -14,7 +14,8 @@
 
 use std::any::Any;
 
-use common_error::prelude::{BoxedError, ErrorExt, StatusCode};
+use common_error::ext::{BoxedError, ErrorExt};
+use common_error::status_code::StatusCode;
 use datafusion::error::DataFusionError;
 use datatypes::prelude::ConcreteDataType;
 use prost::{DecodeError, EncodeError};

src/common/telemetry/src/macros.rs

@@ -235,7 +235,7 @@ macro_rules! trace {
 #[cfg(test)]
 mod tests {
     use common_error::mock::MockError;
-    use common_error::prelude::*;
+    use common_error::status_code::StatusCode;
 
     use crate::logging::Level;
 

src/common/time/src/error.rs

@@ -17,7 +17,7 @@ use std::num::{ParseIntError, TryFromIntError};
 
 use chrono::ParseError;
 use common_error::ext::ErrorExt;
-use common_error::prelude::StatusCode;
+use common_error::status_code::StatusCode;
 use snafu::{Location, Snafu};
 
 #[derive(Debug, Snafu)]