refactor:remove common_error::prelude (#1946)

* feat:Remove common_error::prelude

* fix merge error

* cr comment

* fix error
This commit is contained in:
Ben Baoyi
2023-07-13 10:36:36 +08:00
committed by GitHub
parent 16be56a743
commit 9ff7670adf
104 changed files with 179 additions and 150 deletions

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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};

View File

@@ -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};

View File

@@ -356,7 +356,7 @@ pub fn new_memory_catalog_manager() -> Result<Arc<MemoryCatalogManager>> {
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::*;

View File

@@ -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};

View File

@@ -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,

View File

@@ -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)]

View File

@@ -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;

View File

@@ -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))]

View File

@@ -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};

View File

@@ -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))]

View File

@@ -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)]

View File

@@ -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;

View File

@@ -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)]

View File

@@ -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))]

View File

@@ -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>;

View File

@@ -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>;

View File

@@ -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;

View File

@@ -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;

View File

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

View File

@@ -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};

View File

@@ -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;

View File

@@ -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::*;

View File

@@ -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};

View File

@@ -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::*;

View File

@@ -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;

View File

@@ -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)]

View File

@@ -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;

View File

@@ -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>;

View File

@@ -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>;

View File

@@ -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;

View File

@@ -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};

View File

@@ -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;

View File

@@ -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)]

View File

@@ -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;

View File

@@ -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<Error> for tonic::Status {
mod tests {
use std::str::FromStr;
use snafu::ResultExt;
use super::*;
#[test]

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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))]

View File

@@ -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;

View File

@@ -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)]

View File

@@ -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;

View File

@@ -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;

View File

@@ -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)]

View File

@@ -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;

View File

@@ -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};

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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))]

View File

@@ -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))]

View File

@@ -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;

View File

@@ -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;

View File

@@ -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::{

View File

@@ -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};

View File

@@ -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};

View File

@@ -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)]

View File

@@ -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};

View File

@@ -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))]

View File

@@ -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;

View File

@@ -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)]

View File

@@ -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;

View File

@@ -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;

View File

@@ -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};

View File

@@ -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;

View File

@@ -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};

View File

@@ -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))]

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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};

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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};

View File

@@ -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};

View File

@@ -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};

View File

@@ -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.

View File

@@ -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};

View File

@@ -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,

View File

@@ -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;

View File

@@ -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};

View File

@@ -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;

View File

@@ -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;

View File

@@ -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::{

View File

@@ -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;

View File

@@ -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<u8>,
}
use common_error::prelude::{ErrorExt, Snafu};
#[derive(Debug, Snafu)]
#[snafu(visibility(pub))]
pub struct Error {}

Some files were not shown because too many files have changed in this diff Show More