From 9ff7670adfb56a80fe6ffeab8bdab9bcfe55543c Mon Sep 17 00:00:00 2001 From: Ben Baoyi <67940783+Gump9@users.noreply.github.com> Date: Thu, 13 Jul 2023 10:36:36 +0800 Subject: [PATCH] refactor:remove `common_error::prelude` (#1946) * feat:Remove common_error::prelude * fix merge error * cr comment * fix error --- src/api/src/error.rs | 2 +- src/catalog/src/error.rs | 4 ++-- src/catalog/src/information_schema.rs | 2 +- src/catalog/src/information_schema/columns.rs | 2 +- src/catalog/src/information_schema/tables.rs | 2 +- src/catalog/src/local/memory.rs | 2 +- src/catalog/src/remote/client.rs | 2 +- src/client/src/database.rs | 4 ++-- src/client/src/error.rs | 6 ++++-- src/cmd/src/cli/repl.rs | 2 +- src/cmd/src/error.rs | 5 +++-- src/common/base/src/buffer.rs | 2 +- src/common/catalog/src/error.rs | 4 ++-- src/common/datasource/src/error.rs | 5 +++-- src/common/error/src/lib.rs | 13 ++----------- src/common/error/src/mock.rs | 3 ++- src/common/grpc-expr/src/error.rs | 4 ++-- src/common/grpc/src/error.rs | 3 ++- src/common/mem-prof/src/error.rs | 3 ++- src/common/meta/src/error.rs | 5 +++-- src/common/meta/src/kv_backend/memory.rs | 2 +- src/common/meta/src/kv_backend/txn.rs | 2 +- src/common/pprof/src/lib.rs | 3 ++- src/common/procedure/src/error.rs | 5 +++-- src/common/procedure/src/local.rs | 2 +- src/common/procedure/src/local/runner.rs | 2 +- src/common/procedure/src/procedure.rs | 2 +- src/common/procedure/src/store/state_store.rs | 4 ++-- src/common/query/src/error.rs | 5 +++-- src/common/recordbatch/src/adapter.rs | 3 ++- src/common/recordbatch/src/error.rs | 6 +++--- src/common/runtime/src/error.rs | 4 ++-- src/common/runtime/src/repeated_task.rs | 2 +- src/common/substrait/src/error.rs | 3 ++- src/common/telemetry/src/macros.rs | 2 +- src/common/time/src/error.rs | 2 +- src/datanode/src/datanode.rs | 2 +- src/datanode/src/error.rs | 7 +++++-- src/datanode/src/instance.rs | 2 +- src/datanode/src/instance/sql.rs | 2 +- src/datanode/src/sql.rs | 2 +- src/datatypes/src/error.rs | 5 +++-- src/file-table-engine/src/engine/immutable.rs | 2 +- src/file-table-engine/src/error.rs | 5 +++-- src/file-table-engine/src/table/immutable.rs | 2 +- src/frontend/src/catalog.rs | 2 +- src/frontend/src/error.rs | 5 +++-- src/frontend/src/expr_factory.rs | 2 +- src/frontend/src/instance/distributed.rs | 2 +- src/frontend/src/instance/influxdb.rs | 2 +- src/frontend/src/instance/opentsdb.rs | 2 +- src/frontend/src/instance/prom_store.rs | 2 +- src/frontend/src/script.rs | 2 +- src/frontend/src/statement.rs | 2 +- src/frontend/src/statement/describe.rs | 2 +- src/frontend/src/table.rs | 2 +- src/log-store/src/error.rs | 4 ++-- src/meta-client/src/error.rs | 5 +++-- src/meta-srv/src/error.rs | 5 +++-- .../src/procedure/region_failover/failover_start.rs | 3 ++- src/meta-srv/src/procedure/state_store.rs | 2 +- src/meta-srv/src/service/store/etcd.rs | 2 +- src/mito/src/error.rs | 5 +++-- src/mito2/src/error.rs | 5 +++-- src/partition/src/error.rs | 3 ++- src/promql/src/error.rs | 5 +++-- src/query/src/datafusion.rs | 2 +- src/query/src/datafusion/error.rs | 5 +++-- src/query/src/dist_plan/merge_scan.rs | 2 +- src/query/src/error.rs | 3 ++- src/query/src/parser.rs | 3 +-- src/query/src/planner.rs | 2 +- src/query/src/tests/query_engine_test.rs | 2 +- src/script/src/error.rs | 4 ++-- src/script/src/python/engine.rs | 2 +- src/script/src/python/error.rs | 3 ++- src/script/src/table.rs | 2 +- src/servers/src/auth.rs | 3 +-- src/servers/src/error.rs | 6 ++++-- src/servers/src/grpc/handler.rs | 2 +- src/servers/src/grpc/prom_query_gateway.rs | 2 +- src/servers/src/http.rs | 2 +- src/servers/src/http/authorize.rs | 2 +- src/servers/src/interceptor.rs | 2 +- src/servers/src/mysql/handler.rs | 2 +- src/servers/src/postgres/auth_handler.rs | 2 +- src/servers/src/prometheus.rs | 2 +- src/servers/src/query_handler/grpc.rs | 3 ++- src/servers/src/query_handler/sql.rs | 3 ++- src/sql/src/error.rs | 5 +++-- src/storage/src/codec.rs | 2 +- src/storage/src/error.rs | 5 +++-- src/storage/src/metadata.rs | 5 +++-- src/storage/src/schema/projected.rs | 2 +- src/storage/src/schema/region.rs | 2 +- src/storage/src/schema/store.rs | 2 +- src/storage/src/wal.rs | 2 +- src/storage/src/write_batch.rs | 3 ++- src/store-api/src/logstore.rs | 2 +- src/store-api/src/logstore/entry_stream.rs | 5 ++--- src/table-procedure/src/error.rs | 5 +++-- src/table/src/error.rs | 5 +++-- src/table/src/metadata.rs | 4 +++- src/table/src/test_util/memtable.rs | 2 +- 104 files changed, 179 insertions(+), 150 deletions(-) diff --git a/src/api/src/error.rs b/src/api/src/error.rs index 09cff7defb..48f84b21cf 100644 --- a/src/api/src/error.rs +++ b/src/api/src/error.rs @@ -15,7 +15,7 @@ use std::any::Any; use common_error::ext::ErrorExt; -use common_error::prelude::StatusCode; +use common_error::status_code::StatusCode; use datatypes::prelude::ConcreteDataType; use snafu::prelude::*; use snafu::Location; diff --git a/src/catalog/src/error.rs b/src/catalog/src/error.rs index ffbdc79f0f..46cd6d82ed 100644 --- a/src/catalog/src/error.rs +++ b/src/catalog/src/error.rs @@ -16,10 +16,10 @@ use std::any::Any; use std::fmt::Debug; use common_error::ext::{BoxedError, ErrorExt}; -use common_error::prelude::{Snafu, StatusCode}; +use common_error::status_code::StatusCode; use datafusion::error::DataFusionError; use datatypes::prelude::ConcreteDataType; -use snafu::Location; +use snafu::{Location, Snafu}; use tokio::task::JoinError; use crate::DeregisterTableRequest; diff --git a/src/catalog/src/information_schema.rs b/src/catalog/src/information_schema.rs index 2304b5197c..0588675901 100644 --- a/src/catalog/src/information_schema.rs +++ b/src/catalog/src/information_schema.rs @@ -19,7 +19,7 @@ use std::any::Any; use std::sync::{Arc, Weak}; use async_trait::async_trait; -use common_error::prelude::BoxedError; +use common_error::ext::BoxedError; use common_recordbatch::{RecordBatchStreamAdaptor, SendableRecordBatchStream}; use datatypes::schema::SchemaRef; use futures_util::StreamExt; diff --git a/src/catalog/src/information_schema/columns.rs b/src/catalog/src/information_schema/columns.rs index 15d7dfa4e3..df67ff33e6 100644 --- a/src/catalog/src/information_schema/columns.rs +++ b/src/catalog/src/information_schema/columns.rs @@ -18,7 +18,7 @@ use arrow_schema::SchemaRef as ArrowSchemaRef; use common_catalog::consts::{ SEMANTIC_TYPE_FIELD, SEMANTIC_TYPE_PRIMARY_KEY, SEMANTIC_TYPE_TIME_INDEX, }; -use common_error::prelude::BoxedError; +use common_error::ext::BoxedError; use common_query::physical_plan::TaskContext; use common_recordbatch::adapter::RecordBatchStreamAdapter; use common_recordbatch::{RecordBatch, SendableRecordBatchStream}; diff --git a/src/catalog/src/information_schema/tables.rs b/src/catalog/src/information_schema/tables.rs index ff24ac1c2a..b3324eb92a 100644 --- a/src/catalog/src/information_schema/tables.rs +++ b/src/catalog/src/information_schema/tables.rs @@ -16,7 +16,7 @@ use std::sync::{Arc, Weak}; use arrow_schema::SchemaRef as ArrowSchemaRef; use common_catalog::consts::INFORMATION_SCHEMA_NAME; -use common_error::prelude::BoxedError; +use common_error::ext::BoxedError; use common_query::physical_plan::TaskContext; use common_recordbatch::adapter::RecordBatchStreamAdapter; use common_recordbatch::{RecordBatch, SendableRecordBatchStream}; diff --git a/src/catalog/src/local/memory.rs b/src/catalog/src/local/memory.rs index 507346302f..9fb8c8f0f0 100644 --- a/src/catalog/src/local/memory.rs +++ b/src/catalog/src/local/memory.rs @@ -356,7 +356,7 @@ pub fn new_memory_catalog_manager() -> Result> { mod tests { use common_catalog::consts::*; use common_error::ext::ErrorExt; - use common_error::prelude::StatusCode; + use common_error::status_code::StatusCode; use table::table::numbers::{NumbersTable, NUMBERS_TABLE_NAME}; use super::*; diff --git a/src/catalog/src/remote/client.rs b/src/catalog/src/remote/client.rs index cd15b7265d..001862d983 100644 --- a/src/catalog/src/remote/client.rs +++ b/src/catalog/src/remote/client.rs @@ -17,7 +17,7 @@ use std::fmt::Debug; use std::sync::Arc; use std::time::Duration; -use common_error::prelude::BoxedError; +use common_error::ext::BoxedError; use common_meta::error::Error::{CacheNotGet, GetKvCache}; use common_meta::error::{CacheNotGetSnafu, Error, MetaSrvSnafu, Result}; use common_meta::kv_backend::{KvBackend, KvBackendRef, TxnService}; diff --git a/src/client/src/database.rs b/src/client/src/database.rs index c3c9749fde..47ebad0c7b 100644 --- a/src/client/src/database.rs +++ b/src/client/src/database.rs @@ -22,13 +22,13 @@ use api::v1::{ PromRangeQuery, QueryRequest, RequestHeader, }; use arrow_flight::{FlightData, Ticket}; -use common_error::prelude::*; +use common_error::ext::{BoxedError, ErrorExt}; use common_grpc::flight::{flight_messages_to_recordbatches, FlightDecoder, FlightMessage}; use common_query::Output; use common_telemetry::{logging, timer}; use futures_util::{TryFutureExt, TryStreamExt}; use prost::Message; -use snafu::{ensure, ResultExt}; +use snafu::{ensure, OptionExt, ResultExt}; use crate::error::{ ConvertFlightDataSnafu, IllegalDatabaseResponseSnafu, IllegalFlightMessagesSnafu, diff --git a/src/client/src/error.rs b/src/client/src/error.rs index c45f686469..5ce5dd7702 100644 --- a/src/client/src/error.rs +++ b/src/client/src/error.rs @@ -15,8 +15,10 @@ use std::any::Any; use std::str::FromStr; -use common_error::prelude::*; -use snafu::Location; +use common_error::ext::{BoxedError, ErrorExt}; +use common_error::status_code::StatusCode; +use common_error::{INNER_ERROR_CODE, INNER_ERROR_MSG}; +use snafu::{Location, Snafu}; use tonic::{Code, Status}; #[derive(Debug, Snafu)] diff --git a/src/cmd/src/cli/repl.rs b/src/cmd/src/cli/repl.rs index 892bcc84e0..17fb7944e1 100644 --- a/src/cmd/src/cli/repl.rs +++ b/src/cmd/src/cli/repl.rs @@ -20,7 +20,7 @@ use catalog::remote::CachedMetaKvBackend; use client::client_manager::DatanodeClients; use client::{Client, Database, DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME}; use common_base::Plugins; -use common_error::prelude::ErrorExt; +use common_error::ext::ErrorExt; use common_meta::key::TableMetadataManager; use common_query::Output; use common_recordbatch::RecordBatches; diff --git a/src/cmd/src/error.rs b/src/cmd/src/error.rs index 2e90d3e301..d4386bc031 100644 --- a/src/cmd/src/error.rs +++ b/src/cmd/src/error.rs @@ -14,10 +14,11 @@ use std::any::Any; -use common_error::prelude::*; +use common_error::ext::ErrorExt; +use common_error::status_code::StatusCode; use config::ConfigError; use rustyline::error::ReadlineError; -use snafu::Location; +use snafu::{Location, Snafu}; #[derive(Debug, Snafu)] #[snafu(visibility(pub))] diff --git a/src/common/base/src/buffer.rs b/src/common/base/src/buffer.rs index 430157a62a..79b87d7f27 100644 --- a/src/common/base/src/buffer.rs +++ b/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}; diff --git a/src/common/catalog/src/error.rs b/src/common/catalog/src/error.rs index 3365e4cf45..2e97ba6ecc 100644 --- a/src/common/catalog/src/error.rs +++ b/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))] diff --git a/src/common/datasource/src/error.rs b/src/common/datasource/src/error.rs index f454910d80..b9c59cfbef 100644 --- a/src/common/datasource/src/error.rs +++ b/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)] diff --git a/src/common/error/src/lib.rs b/src/common/error/src/lib.rs index 507f1daaa9..36cd98d922 100644 --- a/src/common/error/src/lib.rs +++ b/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; diff --git a/src/common/error/src/mock.rs b/src/common/error/src/mock.rs index 27b2471045..a3f061fd66 100644 --- a/src/common/error/src/mock.rs +++ b/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)] diff --git a/src/common/grpc-expr/src/error.rs b/src/common/grpc-expr/src/error.rs index bb207e4575..37763fd972 100644 --- a/src/common/grpc-expr/src/error.rs +++ b/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))] diff --git a/src/common/grpc/src/error.rs b/src/common/grpc/src/error.rs index 3fc23a1a43..5b9f46c86d 100644 --- a/src/common/grpc/src/error.rs +++ b/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 = std::result::Result; diff --git a/src/common/mem-prof/src/error.rs b/src/common/mem-prof/src/error.rs index 1be0164269..df158e8dcb 100644 --- a/src/common/mem-prof/src/error.rs +++ b/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 = std::result::Result; diff --git a/src/common/meta/src/error.rs b/src/common/meta/src/error.rs index 382cd72b82..ef33c5c3b4 100644 --- a/src/common/meta/src/error.rs +++ b/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; diff --git a/src/common/meta/src/kv_backend/memory.rs b/src/common/meta/src/kv_backend/memory.rs index 2343764677..9b4a6f47b3 100644 --- a/src/common/meta/src/kv_backend/memory.rs +++ b/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; diff --git a/src/common/meta/src/kv_backend/txn.rs b/src/common/meta/src/kv_backend/txn.rs index fe4a55e705..4317ef5470 100644 --- a/src/common/meta/src/kv_backend/txn.rs +++ b/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}; diff --git a/src/common/pprof/src/lib.rs b/src/common/pprof/src/lib.rs index 81c0077f00..2a36c4970d 100644 --- a/src/common/pprof/src/lib.rs +++ b/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}; diff --git a/src/common/procedure/src/error.rs b/src/common/procedure/src/error.rs index 03183fbe85..29468a9f0b 100644 --- a/src/common/procedure/src/error.rs +++ b/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; diff --git a/src/common/procedure/src/local.rs b/src/common/procedure/src/local.rs index 7f4aa4df0d..8d33c49b02 100644 --- a/src/common/procedure/src/local.rs +++ b/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::*; diff --git a/src/common/procedure/src/local/runner.rs b/src/common/procedure/src/local/runner.rs index 0708b1838d..884e6288fb 100644 --- a/src/common/procedure/src/local/runner.rs +++ b/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}; diff --git a/src/common/procedure/src/procedure.rs b/src/common/procedure/src/procedure.rs index f2d95825e8..c20ddef2b2 100644 --- a/src/common/procedure/src/procedure.rs +++ b/src/common/procedure/src/procedure.rs @@ -308,7 +308,7 @@ pub type ProcedureManagerRef = Arc; #[cfg(test)] mod tests { use common_error::mock::MockError; - use common_error::prelude::StatusCode; + use common_error::status_code::StatusCode; use super::*; diff --git a/src/common/procedure/src/store/state_store.rs b/src/common/procedure/src/store/state_store.rs index a1ffb42238..35062057df 100644 --- a/src/common/procedure/src/store/state_store.rs +++ b/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; diff --git a/src/common/query/src/error.rs b/src/common/query/src/error.rs index fabdd1aa83..c320320407 100644 --- a/src/common/query/src/error.rs +++ b/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)] diff --git a/src/common/recordbatch/src/adapter.rs b/src/common/recordbatch/src/adapter.rs index 24d5c2af4a..6790bd39cf 100644 --- a/src/common/recordbatch/src/adapter.rs +++ b/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; diff --git a/src/common/recordbatch/src/error.rs b/src/common/recordbatch/src/error.rs index 9ef3d07481..49bfe02bf1 100644 --- a/src/common/recordbatch/src/error.rs +++ b/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 = std::result::Result; diff --git a/src/common/runtime/src/error.rs b/src/common/runtime/src/error.rs index e8d4300df6..bb69638a04 100644 --- a/src/common/runtime/src/error.rs +++ b/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 = std::result::Result; diff --git a/src/common/runtime/src/repeated_task.rs b/src/common/runtime/src/repeated_task.rs index 354c71054d..b3dcc781f1 100644 --- a/src/common/runtime/src/repeated_task.rs +++ b/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; diff --git a/src/common/substrait/src/error.rs b/src/common/substrait/src/error.rs index c673273440..64789ab112 100644 --- a/src/common/substrait/src/error.rs +++ b/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}; diff --git a/src/common/telemetry/src/macros.rs b/src/common/telemetry/src/macros.rs index 202032cd5f..7f5e38f18f 100644 --- a/src/common/telemetry/src/macros.rs +++ b/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; diff --git a/src/common/time/src/error.rs b/src/common/time/src/error.rs index fd0a2269f9..d9511a3f74 100644 --- a/src/common/time/src/error.rs +++ b/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)] diff --git a/src/datanode/src/datanode.rs b/src/datanode/src/datanode.rs index 6369c353ea..a3f0d4bda0 100644 --- a/src/datanode/src/datanode.rs +++ b/src/datanode/src/datanode.rs @@ -19,7 +19,7 @@ use std::time::Duration; use common_base::readable_size::ReadableSize; use common_base::Plugins; -use common_error::prelude::BoxedError; +use common_error::ext::BoxedError; pub use common_procedure::options::ProcedureConfig; use common_telemetry::info; use common_telemetry::logging::LoggingOptions; diff --git a/src/datanode/src/error.rs b/src/datanode/src/error.rs index a023e8871c..7b5fc5c6e5 100644 --- a/src/datanode/src/error.rs +++ b/src/datanode/src/error.rs @@ -14,10 +14,11 @@ use std::any::Any; -use common_error::prelude::*; +use common_error::ext::{BoxedError, ErrorExt}; +use common_error::status_code::StatusCode; use common_procedure::ProcedureId; use serde_json::error::Error as JsonError; -use snafu::Location; +use snafu::{Location, Snafu}; use store_api::storage::RegionNumber; use table::error::Error as TableError; @@ -592,6 +593,8 @@ impl From for tonic::Status { mod tests { use std::str::FromStr; + use snafu::ResultExt; + use super::*; #[test] diff --git a/src/datanode/src/instance.rs b/src/datanode/src/instance.rs index ceb6ec8543..0b117e0b32 100644 --- a/src/datanode/src/instance.rs +++ b/src/datanode/src/instance.rs @@ -24,7 +24,7 @@ use catalog::{CatalogManager, CatalogManagerRef, RegisterTableRequest}; use common_base::paths::{CLUSTER_DIR, WAL_DIR}; use common_base::Plugins; use common_catalog::consts::{DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME, MIN_USER_TABLE_ID}; -use common_error::prelude::BoxedError; +use common_error::ext::BoxedError; use common_grpc::channel_manager::{ChannelConfig, ChannelManager}; use common_meta::heartbeat::handler::parse_mailbox_message::ParseMailboxMessageHandler; use common_meta::heartbeat::handler::HandlerGroupExecutor; diff --git a/src/datanode/src/instance/sql.rs b/src/datanode/src/instance/sql.rs index 95b23d1e9c..cf54ce64af 100644 --- a/src/datanode/src/instance/sql.rs +++ b/src/datanode/src/instance/sql.rs @@ -15,7 +15,7 @@ use std::time::{Duration, SystemTime}; use async_trait::async_trait; -use common_error::prelude::BoxedError; +use common_error::ext::BoxedError; use common_query::Output; use common_telemetry::logging::info; use common_telemetry::timer; diff --git a/src/datanode/src/sql.rs b/src/datanode/src/sql.rs index d4b8400d76..41bdfe4305 100644 --- a/src/datanode/src/sql.rs +++ b/src/datanode/src/sql.rs @@ -13,7 +13,7 @@ // limitations under the License. use catalog::CatalogManagerRef; -use common_error::prelude::BoxedError; +use common_error::ext::BoxedError; use common_procedure::ProcedureManagerRef; use common_query::Output; use common_telemetry::error; diff --git a/src/datatypes/src/error.rs b/src/datatypes/src/error.rs index e7a399b41d..f12f3a1c9b 100644 --- a/src/datatypes/src/error.rs +++ b/src/datatypes/src/error.rs @@ -14,8 +14,9 @@ use std::any::Any; -use common_error::prelude::{ErrorExt, Snafu, StatusCode}; -use snafu::Location; +use common_error::ext::ErrorExt; +use common_error::status_code::StatusCode; +use snafu::{Location, Snafu}; #[derive(Debug, Snafu)] #[snafu(visibility(pub))] diff --git a/src/file-table-engine/src/engine/immutable.rs b/src/file-table-engine/src/engine/immutable.rs index e2c23b1425..ed51ce770e 100644 --- a/src/file-table-engine/src/engine/immutable.rs +++ b/src/file-table-engine/src/engine/immutable.rs @@ -17,7 +17,7 @@ use std::sync::{Arc, RwLock}; use async_trait::async_trait; use common_catalog::consts::IMMUTABLE_FILE_ENGINE; -use common_error::prelude::BoxedError; +use common_error::ext::BoxedError; use common_procedure::{BoxedProcedure, ProcedureManager}; use common_telemetry::{debug, logging}; use datatypes::schema::Schema; diff --git a/src/file-table-engine/src/error.rs b/src/file-table-engine/src/error.rs index 7544f147ab..08ac87096f 100644 --- a/src/file-table-engine/src/error.rs +++ b/src/file-table-engine/src/error.rs @@ -15,11 +15,12 @@ use std::any::Any; use common_datasource::file_format::Format; -use common_error::prelude::*; +use common_error::ext::{BoxedError, ErrorExt}; +use common_error::status_code::StatusCode; use datafusion::arrow::error::ArrowError; use datafusion::error::DataFusionError; use serde_json::error::Error as JsonError; -use snafu::Location; +use snafu::{Location, Snafu}; use table::metadata::{TableInfoBuilderError, TableMetaBuilderError}; #[derive(Debug, Snafu)] diff --git a/src/file-table-engine/src/table/immutable.rs b/src/file-table-engine/src/table/immutable.rs index 48f1eab249..04ebddbfc0 100644 --- a/src/file-table-engine/src/table/immutable.rs +++ b/src/file-table-engine/src/table/immutable.rs @@ -18,7 +18,7 @@ use std::sync::Arc; use async_trait::async_trait; use common_datasource::file_format::Format; use common_datasource::object_store::build_backend; -use common_error::prelude::BoxedError; +use common_error::ext::BoxedError; use common_recordbatch::SendableRecordBatchStream; use datatypes::schema::SchemaRef; use object_store::ObjectStore; diff --git a/src/frontend/src/catalog.rs b/src/frontend/src/catalog.rs index 94f24c255b..c0ad7e43b2 100644 --- a/src/frontend/src/catalog.rs +++ b/src/frontend/src/catalog.rs @@ -33,7 +33,7 @@ use catalog::{ }; use client::client_manager::DatanodeClients; use common_catalog::consts::{DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME, INFORMATION_SCHEMA_NAME}; -use common_error::prelude::BoxedError; +use common_error::ext::BoxedError; use common_meta::key::TableMetadataManagerRef; use common_meta::kv_backend::KvBackendRef; use common_meta::rpc::store::RangeRequest; diff --git a/src/frontend/src/error.rs b/src/frontend/src/error.rs index a8d579b74a..97ea18aa0f 100644 --- a/src/frontend/src/error.rs +++ b/src/frontend/src/error.rs @@ -15,11 +15,12 @@ use std::any::Any; use common_datasource::file_format::Format; -use common_error::prelude::*; +use common_error::ext::{BoxedError, ErrorExt}; +use common_error::status_code::StatusCode; use datafusion::parquet; use datatypes::arrow::error::ArrowError; use datatypes::value::Value; -use snafu::Location; +use snafu::{Location, Snafu}; use store_api::storage::RegionNumber; #[derive(Debug, Snafu)] diff --git a/src/frontend/src/expr_factory.rs b/src/frontend/src/expr_factory.rs index 98b81656da..af12ab7453 100644 --- a/src/frontend/src/expr_factory.rs +++ b/src/frontend/src/expr_factory.rs @@ -21,7 +21,7 @@ use api::v1::{ AddColumn, AddColumns, AlterExpr, Column, ColumnDataType, CreateTableExpr, DropColumn, DropColumns, RenameTable, }; -use common_error::prelude::BoxedError; +use common_error::ext::BoxedError; use datanode::instance::sql::table_idents_to_full_name; use datatypes::schema::ColumnSchema; use file_table_engine::table::immutable::ImmutableFileTableOptions; diff --git a/src/frontend/src/instance/distributed.rs b/src/frontend/src/instance/distributed.rs index a6b62d54ad..163f6655b4 100644 --- a/src/frontend/src/instance/distributed.rs +++ b/src/frontend/src/instance/distributed.rs @@ -33,7 +33,7 @@ use client::client_manager::DatanodeClients; use client::Database; use common_catalog::consts::{DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME}; use common_catalog::format_full_table_name; -use common_error::prelude::BoxedError; +use common_error::ext::BoxedError; use common_meta::key::TableMetadataManagerRef; use common_meta::peer::Peer; use common_meta::rpc::ddl::{DdlTask, SubmitDdlTaskRequest, SubmitDdlTaskResponse}; diff --git a/src/frontend/src/instance/influxdb.rs b/src/frontend/src/instance/influxdb.rs index 711e68fcab..26d5cad477 100644 --- a/src/frontend/src/instance/influxdb.rs +++ b/src/frontend/src/instance/influxdb.rs @@ -13,7 +13,7 @@ // limitations under the License. use async_trait::async_trait; -use common_error::prelude::BoxedError; +use common_error::ext::BoxedError; use servers::influxdb::InfluxdbRequest; use servers::query_handler::InfluxdbLineProtocolHandler; use session::context::QueryContextRef; diff --git a/src/frontend/src/instance/opentsdb.rs b/src/frontend/src/instance/opentsdb.rs index 9eea4c32d4..a6233e84a3 100644 --- a/src/frontend/src/instance/opentsdb.rs +++ b/src/frontend/src/instance/opentsdb.rs @@ -14,7 +14,7 @@ use api::v1::InsertRequests; use async_trait::async_trait; -use common_error::prelude::BoxedError; +use common_error::ext::BoxedError; use servers::error as server_error; use servers::opentsdb::codec::DataPoint; use servers::query_handler::OpentsdbProtocolHandler; diff --git a/src/frontend/src/instance/prom_store.rs b/src/frontend/src/instance/prom_store.rs index 149a8bdf80..e07242df9d 100644 --- a/src/frontend/src/instance/prom_store.rs +++ b/src/frontend/src/instance/prom_store.rs @@ -16,7 +16,7 @@ use api::prom_store::remote::read_request::ResponseType; use api::prom_store::remote::{Query, QueryResult, ReadRequest, ReadResponse, WriteRequest}; use async_trait::async_trait; use common_catalog::format_full_table_name; -use common_error::prelude::BoxedError; +use common_error::ext::BoxedError; use common_query::Output; use common_recordbatch::RecordBatches; use common_telemetry::logging; diff --git a/src/frontend/src/script.rs b/src/frontend/src/script.rs index d63efccc6e..bad8468032 100644 --- a/src/frontend/src/script.rs +++ b/src/frontend/src/script.rs @@ -56,7 +56,7 @@ mod dummy { #[cfg(feature = "python")] mod python { - use common_error::prelude::BoxedError; + use common_error::ext::BoxedError; use common_telemetry::logging::error; use script::manager::ScriptManager; use snafu::ResultExt; diff --git a/src/frontend/src/statement.rs b/src/frontend/src/statement.rs index 6eefad4b21..fea6fdf3a7 100644 --- a/src/frontend/src/statement.rs +++ b/src/frontend/src/statement.rs @@ -23,7 +23,7 @@ use std::collections::HashMap; use std::str::FromStr; use catalog::CatalogManagerRef; -use common_error::prelude::BoxedError; +use common_error::ext::BoxedError; use common_query::Output; use common_recordbatch::RecordBatches; use common_time::range::TimestampRange; diff --git a/src/frontend/src/statement/describe.rs b/src/frontend/src/statement/describe.rs index c98fa01ef5..7ad3ccbecd 100644 --- a/src/frontend/src/statement/describe.rs +++ b/src/frontend/src/statement/describe.rs @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -use common_error::prelude::BoxedError; +use common_error::ext::BoxedError; use common_query::Output; use datanode::instance::sql::table_idents_to_full_name; use session::context::QueryContextRef; diff --git a/src/frontend/src/table.rs b/src/frontend/src/table.rs index 5233910eb0..0e1fe35bbe 100644 --- a/src/frontend/src/table.rs +++ b/src/frontend/src/table.rs @@ -21,7 +21,7 @@ use api::v1::AlterExpr; use async_trait::async_trait; use catalog::helper::{TableGlobalKey, TableGlobalValue}; use client::Database; -use common_error::prelude::BoxedError; +use common_error::ext::BoxedError; use common_meta::key::{TableMetadataManagerRef, TableRouteKey}; use common_meta::rpc::store::{MoveValueRequest, PutRequest}; use common_meta::table_name::TableName; diff --git a/src/log-store/src/error.rs b/src/log-store/src/error.rs index 7cac957aed..1cffef526f 100644 --- a/src/log-store/src/error.rs +++ b/src/log-store/src/error.rs @@ -14,9 +14,9 @@ use std::any::Any; -use common_error::prelude::{ErrorExt, Snafu}; +use common_error::ext::ErrorExt; use common_runtime::error::Error as RuntimeError; -use snafu::Location; +use snafu::{Location, Snafu}; #[derive(Debug, Snafu)] #[snafu(visibility(pub))] diff --git a/src/meta-client/src/error.rs b/src/meta-client/src/error.rs index 1af04cd165..786f2fe601 100644 --- a/src/meta-client/src/error.rs +++ b/src/meta-client/src/error.rs @@ -12,8 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -use common_error::prelude::*; -use snafu::Location; +use common_error::ext::ErrorExt; +use common_error::status_code::StatusCode; +use snafu::{Location, Snafu}; #[derive(Debug, Snafu)] #[snafu(visibility(pub))] diff --git a/src/meta-srv/src/error.rs b/src/meta-srv/src/error.rs index 008e6a023f..eeb560b4dc 100644 --- a/src/meta-srv/src/error.rs +++ b/src/meta-srv/src/error.rs @@ -12,10 +12,11 @@ // 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 common_meta::peer::Peer; use common_runtime::JoinError; -use snafu::Location; +use snafu::{Location, Snafu}; use tokio::sync::mpsc::error::SendError; use tonic::codegen::http; use tonic::Code; diff --git a/src/meta-srv/src/procedure/region_failover/failover_start.rs b/src/meta-srv/src/procedure/region_failover/failover_start.rs index 27ec574f4b..20f33c26b2 100644 --- a/src/meta-srv/src/procedure/region_failover/failover_start.rs +++ b/src/meta-srv/src/procedure/region_failover/failover_start.rs @@ -13,7 +13,8 @@ // limitations under the License. use async_trait::async_trait; -use common_error::prelude::{ErrorExt, StatusCode}; +use common_error::ext::ErrorExt; +use common_error::status_code::StatusCode; use common_meta::ident::TableIdent; use common_meta::peer::Peer; use common_meta::RegionIdent; diff --git a/src/meta-srv/src/procedure/state_store.rs b/src/meta-srv/src/procedure/state_store.rs index bbb4baf99c..c2af6b3259 100644 --- a/src/meta-srv/src/procedure/state_store.rs +++ b/src/meta-srv/src/procedure/state_store.rs @@ -14,7 +14,7 @@ use async_stream::try_stream; use async_trait::async_trait; -use common_error::prelude::BoxedError; +use common_error::ext::BoxedError; use common_meta::rpc::store::{BatchDeleteRequest, PutRequest, RangeRequest}; use common_meta::util; use common_procedure::error::{ diff --git a/src/meta-srv/src/service/store/etcd.rs b/src/meta-srv/src/service/store/etcd.rs index 841a130887..1a6891da76 100644 --- a/src/meta-srv/src/service/store/etcd.rs +++ b/src/meta-srv/src/service/store/etcd.rs @@ -15,7 +15,6 @@ use std::any::Any; use std::sync::Arc; -use common_error::prelude::*; use common_meta::kv_backend::txn::{Txn as KvTxn, TxnResponse as KvTxnResponse}; use common_meta::kv_backend::{KvBackend, TxnService}; use common_meta::metrics::METRIC_META_TXN_REQUEST; @@ -31,6 +30,7 @@ use etcd_client::{ Client, Compare, CompareOp, DeleteOptions, GetOptions, PutOptions, Txn, TxnOp, TxnOpResponse, TxnResponse, }; +use snafu::{ensure, OptionExt, ResultExt}; use crate::error; use crate::error::{ConvertEtcdTxnObjectSnafu, Error, Result}; diff --git a/src/mito/src/error.rs b/src/mito/src/error.rs index 9bbb609203..8641e60359 100644 --- a/src/mito/src/error.rs +++ b/src/mito/src/error.rs @@ -14,8 +14,9 @@ use std::any::Any; -use common_error::prelude::*; -use snafu::Location; +use common_error::ext::ErrorExt; +use common_error::status_code::StatusCode; +use snafu::{Location, Snafu}; use store_api::storage::RegionNumber; use table::metadata::{TableInfoBuilderError, TableMetaBuilderError, TableVersion}; diff --git a/src/mito2/src/error.rs b/src/mito2/src/error.rs index b99734b103..baba14622b 100644 --- a/src/mito2/src/error.rs +++ b/src/mito2/src/error.rs @@ -15,8 +15,9 @@ use std::any::Any; use common_datasource::compression::CompressionType; -use common_error::prelude::*; -use snafu::Location; +use common_error::ext::ErrorExt; +use common_error::status_code::StatusCode; +use snafu::{Location, Snafu}; use store_api::manifest::ManifestVersion; #[derive(Debug, Snafu)] diff --git a/src/partition/src/error.rs b/src/partition/src/error.rs index 03e7799b54..d43def5e7e 100644 --- a/src/partition/src/error.rs +++ b/src/partition/src/error.rs @@ -14,7 +14,8 @@ use std::any::Any; -use common_error::prelude::*; +use common_error::ext::ErrorExt; +use common_error::status_code::StatusCode; use common_query::prelude::Expr; use datafusion_common::ScalarValue; use snafu::{Location, Snafu}; diff --git a/src/promql/src/error.rs b/src/promql/src/error.rs index 360ab227cf..90163d9326 100644 --- a/src/promql/src/error.rs +++ b/src/promql/src/error.rs @@ -14,10 +14,11 @@ use std::any::Any; -use common_error::prelude::*; +use common_error::ext::ErrorExt; +use common_error::status_code::StatusCode; use datafusion::error::DataFusionError; use promql_parser::parser::{Expr as PromExpr, TokenType}; -use snafu::Location; +use snafu::{Location, Snafu}; #[derive(Debug, Snafu)] #[snafu(visibility(pub))] diff --git a/src/query/src/datafusion.rs b/src/query/src/datafusion.rs index 06565ca870..b406ef3bff 100644 --- a/src/query/src/datafusion.rs +++ b/src/query/src/datafusion.rs @@ -23,7 +23,7 @@ use std::sync::Arc; use async_trait::async_trait; use common_base::Plugins; -use common_error::prelude::BoxedError; +use common_error::ext::BoxedError; use common_function::scalars::aggregate::AggregateFunctionMetaRef; use common_function::scalars::udf::create_udf; use common_function::scalars::FunctionRef; diff --git a/src/query/src/datafusion/error.rs b/src/query/src/datafusion/error.rs index 62f1abe077..2b1b1c74c5 100644 --- a/src/query/src/datafusion/error.rs +++ b/src/query/src/datafusion/error.rs @@ -14,9 +14,10 @@ use std::any::Any; -use common_error::prelude::*; +use common_error::ext::ErrorExt; +use common_error::status_code::StatusCode; use datafusion::error::DataFusionError; -use snafu::Location; +use snafu::{Location, Snafu}; /// Inner error of datafusion based query engine. #[derive(Debug, Snafu)] diff --git a/src/query/src/dist_plan/merge_scan.rs b/src/query/src/dist_plan/merge_scan.rs index cd292da620..c55e4deb83 100644 --- a/src/query/src/dist_plan/merge_scan.rs +++ b/src/query/src/dist_plan/merge_scan.rs @@ -20,7 +20,7 @@ use async_stream::try_stream; use client::client_manager::DatanodeClients; use client::Database; use common_base::bytes::Bytes; -use common_error::prelude::BoxedError; +use common_error::ext::BoxedError; use common_meta::peer::Peer; use common_meta::table_name::TableName; use common_query::physical_plan::TaskContext; diff --git a/src/query/src/error.rs b/src/query/src/error.rs index be5d0a1a2a..9e519c3cb7 100644 --- a/src/query/src/error.rs +++ b/src/query/src/error.rs @@ -14,7 +14,8 @@ use std::any::Any; -use common_error::prelude::*; +use common_error::ext::{BoxedError, ErrorExt}; +use common_error::status_code::StatusCode; use common_meta::table_name::TableName; use datafusion::error::DataFusionError; use datatypes::prelude::ConcreteDataType; diff --git a/src/query/src/parser.rs b/src/query/src/parser.rs index b2bc9b6580..a32c4ca270 100644 --- a/src/query/src/parser.rs +++ b/src/query/src/parser.rs @@ -18,8 +18,7 @@ use std::sync::Arc; use std::time::{Duration, SystemTime}; use chrono::DateTime; -use common_error::ext::PlainError; -use common_error::prelude::BoxedError; +use common_error::ext::{BoxedError, PlainError}; use common_error::status_code::StatusCode; use common_telemetry::timer; use promql_parser::parser::ast::{Extension as NodeExtension, ExtensionExpr}; diff --git a/src/query/src/planner.rs b/src/query/src/planner.rs index 2ec425c24c..b64d20b9ff 100644 --- a/src/query/src/planner.rs +++ b/src/query/src/planner.rs @@ -16,7 +16,7 @@ use std::sync::Arc; use async_trait::async_trait; use catalog::table_source::DfTableSourceProvider; -use common_error::prelude::BoxedError; +use common_error::ext::BoxedError; use datafusion::execution::context::SessionState; use datafusion_sql::planner::{ParserOptions, SqlToRel}; use promql::planner::PromPlanner; diff --git a/src/query/src/tests/query_engine_test.rs b/src/query/src/tests/query_engine_test.rs index c95d019cfc..5ed9d0b5f9 100644 --- a/src/query/src/tests/query_engine_test.rs +++ b/src/query/src/tests/query_engine_test.rs @@ -18,7 +18,7 @@ use catalog::local::MemoryCatalogManager; use catalog::RegisterTableRequest; use common_base::Plugins; use common_catalog::consts::{DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME, NUMBERS_TABLE_ID}; -use common_error::prelude::BoxedError; +use common_error::ext::BoxedError; use common_query::prelude::{create_udf, make_scalar_function, Volatility}; use common_query::Output; use common_recordbatch::{util, RecordBatch}; diff --git a/src/script/src/error.rs b/src/script/src/error.rs index ffa88035ce..9f4eb51b51 100644 --- a/src/script/src/error.rs +++ b/src/script/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))] diff --git a/src/script/src/python/engine.rs b/src/script/src/python/engine.rs index 1a34721d54..0fa23b1bae 100644 --- a/src/script/src/python/engine.rs +++ b/src/script/src/python/engine.rs @@ -20,7 +20,7 @@ use std::sync::Arc; use std::task::{Context, Poll}; use async_trait::async_trait; -use common_error::prelude::BoxedError; +use common_error::ext::BoxedError; use common_function::scalars::{Function, FUNCTION_REGISTRY}; use common_query::error::{PyUdfSnafu, UdfTempRecordBatchSnafu}; use common_query::prelude::Signature; diff --git a/src/script/src/python/error.rs b/src/script/src/python/error.rs index 124ccc634b..1b87592c5e 100644 --- a/src/script/src/python/error.rs +++ b/src/script/src/python/error.rs @@ -12,7 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -use common_error::prelude::{ErrorExt, StatusCode}; +use common_error::ext::ErrorExt; +use common_error::status_code::StatusCode; use console::{style, Style}; use datafusion::error::DataFusionError; use datatypes::arrow::error::ArrowError; diff --git a/src/script/src/table.rs b/src/script/src/table.rs index 00d95d2b83..c9cb1becca 100644 --- a/src/script/src/table.rs +++ b/src/script/src/table.rs @@ -22,7 +22,7 @@ use common_catalog::consts::{ DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME, MITO_ENGINE, SCRIPTS_TABLE_ID, }; use common_catalog::format_full_table_name; -use common_error::prelude::BoxedError; +use common_error::ext::BoxedError; use common_query::Output; use common_recordbatch::{util as record_util, RecordBatch}; use common_telemetry::logging; diff --git a/src/servers/src/auth.rs b/src/servers/src/auth.rs index 222a21af30..179b538aeb 100644 --- a/src/servers/src/auth.rs +++ b/src/servers/src/auth.rs @@ -14,8 +14,7 @@ use std::sync::Arc; -use common_error::ext::BoxedError; -use common_error::prelude::ErrorExt; +use common_error::ext::{BoxedError, ErrorExt}; use common_error::status_code::StatusCode; use secrecy::SecretString; use session::context::UserInfo; diff --git a/src/servers/src/error.rs b/src/servers/src/error.rs index 4f8c741f7d..cf6d974fc5 100644 --- a/src/servers/src/error.rs +++ b/src/servers/src/error.rs @@ -20,12 +20,14 @@ use axum::response::{IntoResponse, Response}; use axum::{http, Json}; use base64::DecodeError; use catalog; -use common_error::prelude::*; +use common_error::ext::{BoxedError, ErrorExt}; +use common_error::status_code::StatusCode; +use common_error::{INNER_ERROR_CODE, INNER_ERROR_MSG}; use common_telemetry::logging; use datatypes::prelude::ConcreteDataType; use query::parser::PromQuery; use serde_json::json; -use snafu::Location; +use snafu::{ErrorCompat, Location, Snafu}; use tonic::codegen::http::{HeaderMap, HeaderValue}; use tonic::metadata::MetadataMap; use tonic::Code; diff --git a/src/servers/src/grpc/handler.rs b/src/servers/src/grpc/handler.rs index 7839a322b6..ea8234fe8d 100644 --- a/src/servers/src/grpc/handler.rs +++ b/src/servers/src/grpc/handler.rs @@ -18,7 +18,7 @@ use std::time::Instant; use api::helper::request_type; use api::v1::auth_header::AuthScheme; use api::v1::{Basic, GreptimeRequest, RequestHeader}; -use common_error::prelude::ErrorExt; +use common_error::ext::ErrorExt; use common_error::status_code::StatusCode; use common_query::Output; use common_runtime::Runtime; diff --git a/src/servers/src/grpc/prom_query_gateway.rs b/src/servers/src/grpc/prom_query_gateway.rs index 3649deae2d..db982e886c 100644 --- a/src/servers/src/grpc/prom_query_gateway.rs +++ b/src/servers/src/grpc/prom_query_gateway.rs @@ -21,7 +21,7 @@ use api::v1::prometheus_gateway_server::PrometheusGateway; use api::v1::promql_request::Promql; use api::v1::{PromqlRequest, PromqlResponse, ResponseHeader}; use async_trait::async_trait; -use common_error::prelude::ErrorExt; +use common_error::ext::ErrorExt; use common_telemetry::timer; use common_time::util::current_time_rfc3339; use promql_parser::parser::ValueType; diff --git a/src/servers/src/http.rs b/src/servers/src/http.rs index db4b233716..87637dc078 100644 --- a/src/servers/src/http.rs +++ b/src/servers/src/http.rs @@ -40,7 +40,7 @@ use axum::middleware::{self, Next}; use axum::response::{Html, IntoResponse, Json}; use axum::{routing, BoxError, Extension, Router}; use common_base::readable_size::ReadableSize; -use common_error::prelude::ErrorExt; +use common_error::ext::ErrorExt; use common_error::status_code::StatusCode; use common_query::Output; use common_recordbatch::{util, RecordBatch}; diff --git a/src/servers/src/http/authorize.rs b/src/servers/src/http/authorize.rs index f831fbf0e5..7a0bad87b6 100644 --- a/src/servers/src/http/authorize.rs +++ b/src/servers/src/http/authorize.rs @@ -16,7 +16,7 @@ use std::marker::PhantomData; use axum::http::{self, Request, StatusCode}; use axum::response::Response; -use common_error::prelude::ErrorExt; +use common_error::ext::ErrorExt; use common_telemetry::warn; use futures::future::BoxFuture; use http_body::Body; diff --git a/src/servers/src/interceptor.rs b/src/servers/src/interceptor.rs index 197819e340..0612e9e51d 100644 --- a/src/servers/src/interceptor.rs +++ b/src/servers/src/interceptor.rs @@ -16,7 +16,7 @@ use std::borrow::Cow; use std::sync::Arc; use api::v1::greptime_request::Request; -use common_error::prelude::ErrorExt; +use common_error::ext::ErrorExt; use common_query::Output; use query::parser::PromQuery; use query::plan::LogicalPlan; diff --git a/src/servers/src/mysql/handler.rs b/src/servers/src/mysql/handler.rs index 7105ee7684..acfaedd0ee 100644 --- a/src/servers/src/mysql/handler.rs +++ b/src/servers/src/mysql/handler.rs @@ -19,7 +19,7 @@ use std::time::{Duration, Instant}; use async_trait::async_trait; use chrono::{NaiveDate, NaiveDateTime}; -use common_error::prelude::ErrorExt; +use common_error::ext::ErrorExt; use common_query::Output; use common_telemetry::{error, logging, timer, trace, warn}; use datatypes::prelude::ConcreteDataType; diff --git a/src/servers/src/postgres/auth_handler.rs b/src/servers/src/postgres/auth_handler.rs index 29d730151a..92dcca078f 100644 --- a/src/servers/src/postgres/auth_handler.rs +++ b/src/servers/src/postgres/auth_handler.rs @@ -15,7 +15,7 @@ use std::fmt::Debug; use async_trait::async_trait; -use common_error::prelude::ErrorExt; +use common_error::ext::ErrorExt; use futures::{Sink, SinkExt}; use metrics::increment_counter; use pgwire::api::auth::StartupHandler; diff --git a/src/servers/src/prometheus.rs b/src/servers/src/prometheus.rs index 6f13f103a1..293a702a96 100644 --- a/src/servers/src/prometheus.rs +++ b/src/servers/src/prometheus.rs @@ -22,7 +22,7 @@ use axum::body::BoxBody; use axum::extract::{Path, Query, State}; use axum::{middleware, routing, Form, Json, Router}; use common_catalog::consts::DEFAULT_SCHEMA_NAME; -use common_error::prelude::ErrorExt; +use common_error::ext::ErrorExt; use common_error::status_code::StatusCode; use common_query::Output; use common_recordbatch::RecordBatches; diff --git a/src/servers/src/query_handler/grpc.rs b/src/servers/src/query_handler/grpc.rs index c335b185df..ce99c31dde 100644 --- a/src/servers/src/query_handler/grpc.rs +++ b/src/servers/src/query_handler/grpc.rs @@ -16,9 +16,10 @@ use std::sync::Arc; use api::v1::greptime_request::Request; use async_trait::async_trait; -use common_error::prelude::*; +use common_error::ext::{BoxedError, ErrorExt}; use common_query::Output; use session::context::QueryContextRef; +use snafu::ResultExt; use crate::error::{self, Result}; diff --git a/src/servers/src/query_handler/sql.rs b/src/servers/src/query_handler/sql.rs index 3ae964c9cc..cc788ad272 100644 --- a/src/servers/src/query_handler/sql.rs +++ b/src/servers/src/query_handler/sql.rs @@ -15,11 +15,12 @@ use std::sync::Arc; use async_trait::async_trait; -use common_error::prelude::*; +use common_error::ext::{BoxedError, ErrorExt}; use common_query::Output; use query::parser::PromQuery; use query::plan::LogicalPlan; use session::context::QueryContextRef; +use snafu::ResultExt; use sql::statements::statement::Statement; use crate::error::{self, Result}; diff --git a/src/sql/src/error.rs b/src/sql/src/error.rs index d78f1c7875..a3c05694ac 100644 --- a/src/sql/src/error.rs +++ b/src/sql/src/error.rs @@ -14,11 +14,12 @@ use std::any::Any; -use common_error::prelude::*; +use common_error::ext::ErrorExt; +use common_error::status_code::StatusCode; use common_time::timestamp::TimeUnit; use common_time::Timestamp; use datatypes::prelude::{ConcreteDataType, Value}; -use snafu::Location; +use snafu::{Location, Snafu}; use sqlparser::parser::ParserError; use crate::ast::{Expr, Value as SqlValue}; diff --git a/src/storage/src/codec.rs b/src/storage/src/codec.rs index b0c34605cd..380aa1c83d 100644 --- a/src/storage/src/codec.rs +++ b/src/storage/src/codec.rs @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -use common_error::prelude::ErrorExt; +use common_error::ext::ErrorExt; pub trait Encoder { /// The type that is decoded. diff --git a/src/storage/src/error.rs b/src/storage/src/error.rs index 039698504f..4885f6fd66 100644 --- a/src/storage/src/error.rs +++ b/src/storage/src/error.rs @@ -17,13 +17,14 @@ use std::io::Error as IoError; use std::str::Utf8Error; use common_datasource::compression::CompressionType; -use common_error::prelude::*; +use common_error::ext::{BoxedError, ErrorExt}; +use common_error::status_code::StatusCode; use common_runtime::error::Error as RuntimeError; use datatypes::arrow::error::ArrowError; use datatypes::prelude::ConcreteDataType; use object_store::ErrorKind; use serde_json::error::Error as JsonError; -use snafu::Location; +use snafu::{Location, Snafu}; use store_api::manifest::action::ProtocolVersion; use store_api::manifest::ManifestVersion; use store_api::storage::{RegionId, SequenceNumber}; diff --git a/src/storage/src/metadata.rs b/src/storage/src/metadata.rs index 4f54d8c135..5f9d6b4fe3 100644 --- a/src/storage/src/metadata.rs +++ b/src/storage/src/metadata.rs @@ -17,11 +17,12 @@ use std::num::ParseIntError; use std::str::FromStr; use std::sync::Arc; -use common_error::prelude::*; +use common_error::ext::ErrorExt; +use common_error::status_code::StatusCode; use datatypes::data_type::ConcreteDataType; use datatypes::schema::{ColumnSchema, Metadata, COMMENT_KEY}; use serde::{Deserialize, Serialize}; -use snafu::{ensure, Location, OptionExt}; +use snafu::{ensure, Location, OptionExt, ResultExt, Snafu}; use store_api::storage::consts::{self, ReservedColumnId}; use store_api::storage::{ AddColumn, AlterOperation, AlterRequest, ColumnDescriptor, ColumnDescriptorBuilder, diff --git a/src/storage/src/schema/projected.rs b/src/storage/src/schema/projected.rs index e1c2de0882..6a20bd2fbc 100644 --- a/src/storage/src/schema/projected.rs +++ b/src/storage/src/schema/projected.rs @@ -17,10 +17,10 @@ use std::collections::{BTreeSet, HashMap}; use std::sync::Arc; use common_base::BitVec; -use common_error::prelude::*; use datatypes::prelude::ScalarVector; use datatypes::schema::{SchemaBuilder, SchemaRef}; use datatypes::vectors::{BooleanVector, UInt8Vector}; +use snafu::{ensure, ResultExt}; use store_api::storage::{Chunk, ColumnId, OpType}; use crate::error; diff --git a/src/storage/src/schema/region.rs b/src/storage/src/schema/region.rs index aa8de8587f..31754cc2a1 100644 --- a/src/storage/src/schema/region.rs +++ b/src/storage/src/schema/region.rs @@ -15,8 +15,8 @@ use std::fmt; use std::sync::Arc; -use common_error::prelude::*; use datatypes::schema::{Schema, SchemaBuilder, SchemaRef}; +use snafu::ResultExt; use crate::metadata::{self, ColumnMetadata, ColumnsMetadata, ColumnsMetadataRef, Result}; use crate::schema::{StoreSchema, StoreSchemaRef}; diff --git a/src/storage/src/schema/store.rs b/src/storage/src/schema/store.rs index 27401de405..69ac1a45b0 100644 --- a/src/storage/src/schema/store.rs +++ b/src/storage/src/schema/store.rs @@ -15,10 +15,10 @@ use std::collections::HashMap; use std::sync::Arc; -use common_error::prelude::*; use datatypes::arrow::datatypes::Schema as ArrowSchema; use datatypes::arrow::record_batch::RecordBatch; use datatypes::schema::{Schema, SchemaBuilder, SchemaRef}; +use snafu::{ensure, OptionExt, ResultExt}; use store_api::storage::consts; use crate::error::NewRecordBatchSnafu; diff --git a/src/storage/src/wal.rs b/src/storage/src/wal.rs index 1aa4dd93da..92b721f26d 100644 --- a/src/storage/src/wal.rs +++ b/src/storage/src/wal.rs @@ -15,7 +15,7 @@ use std::pin::Pin; use std::sync::Arc; -use common_error::prelude::BoxedError; +use common_error::ext::BoxedError; use common_telemetry::timer; use futures::{stream, Stream, TryStreamExt}; use prost::Message; diff --git a/src/storage/src/write_batch.rs b/src/storage/src/write_batch.rs index dd4ad897e4..83aaeee3e7 100644 --- a/src/storage/src/write_batch.rs +++ b/src/storage/src/write_batch.rs @@ -349,7 +349,8 @@ mod tests { use std::iter; use std::sync::Arc; - use common_error::prelude::*; + use common_error::ext::ErrorExt; + use common_error::status_code::StatusCode; use datatypes::prelude::ScalarVector; use datatypes::type_id::LogicalTypeId; use datatypes::vectors::{ diff --git a/src/store-api/src/logstore.rs b/src/store-api/src/logstore.rs index 459ca9f529..f00914015c 100644 --- a/src/store-api/src/logstore.rs +++ b/src/store-api/src/logstore.rs @@ -14,7 +14,7 @@ //! LogStore APIs. -use common_error::prelude::ErrorExt; +use common_error::ext::ErrorExt; use crate::logstore::entry::{Entry, Id}; use crate::logstore::entry_stream::SendableEntryStream; diff --git a/src/store-api/src/logstore/entry_stream.rs b/src/store-api/src/logstore/entry_stream.rs index c8e675a601..9e7e5f0cf4 100644 --- a/src/store-api/src/logstore/entry_stream.rs +++ b/src/store-api/src/logstore/entry_stream.rs @@ -14,7 +14,7 @@ use std::pin::Pin; -use common_error::prelude::ErrorExt; +use common_error::ext::ErrorExt; use futures::Stream; use crate::logstore::entry::Entry; @@ -34,6 +34,7 @@ mod tests { use std::task::{Context, Poll}; use futures::StreamExt; + use snafu::Snafu; use super::*; pub use crate::logstore::entry::Id; @@ -43,8 +44,6 @@ mod tests { data: Vec, } - use common_error::prelude::{ErrorExt, Snafu}; - #[derive(Debug, Snafu)] #[snafu(visibility(pub))] pub struct Error {} diff --git a/src/table-procedure/src/error.rs b/src/table-procedure/src/error.rs index 41d264c22f..a6aa0a441a 100644 --- a/src/table-procedure/src/error.rs +++ b/src/table-procedure/src/error.rs @@ -14,8 +14,9 @@ use std::any::Any; -use common_error::prelude::*; -use snafu::Location; +use common_error::ext::ErrorExt; +use common_error::status_code::StatusCode; +use snafu::{Location, Snafu}; #[derive(Debug, Snafu)] #[snafu(visibility(pub(crate)))] diff --git a/src/table/src/error.rs b/src/table/src/error.rs index 5351af03c4..d5e01f8568 100644 --- a/src/table/src/error.rs +++ b/src/table/src/error.rs @@ -14,10 +14,11 @@ use std::any::Any; -use common_error::prelude::*; +use common_error::ext::{BoxedError, ErrorExt}; +use common_error::status_code::StatusCode; use datafusion::error::DataFusionError; use datatypes::arrow::error::ArrowError; -use snafu::Location; +use snafu::{Location, Snafu}; use crate::metadata::TableId; diff --git a/src/table/src/metadata.rs b/src/table/src/metadata.rs index f41c79ebb2..fb8c84fb51 100644 --- a/src/table/src/metadata.rs +++ b/src/table/src/metadata.rs @@ -598,7 +598,9 @@ impl TryFrom for TableInfo { #[cfg(test)] mod tests { - use common_error::prelude::*; + + use common_error::ext::ErrorExt; + use common_error::status_code::StatusCode; use datatypes::data_type::ConcreteDataType; use datatypes::schema::{ColumnSchema, Schema, SchemaBuilder}; diff --git a/src/table/src/test_util/memtable.rs b/src/table/src/test_util/memtable.rs index 333593dff0..9ac83d64dc 100644 --- a/src/table/src/test_util/memtable.rs +++ b/src/table/src/test_util/memtable.rs @@ -17,7 +17,7 @@ use std::pin::Pin; use std::sync::Arc; use async_trait::async_trait; -use common_error::prelude::BoxedError; +use common_error::ext::BoxedError; use common_recordbatch::error::Result as RecordBatchResult; use common_recordbatch::{RecordBatch, RecordBatchStream, SendableRecordBatchStream}; use datatypes::prelude::*;