chore: specify import style in rustfmt (#460)

Signed-off-by: Ruihang Xia <waynestxia@gmail.com>

Signed-off-by: Ruihang Xia <waynestxia@gmail.com>
This commit is contained in:
Ruihang Xia
2022-11-15 15:58:54 +08:00
committed by GitHub
parent ecb2d7692f
commit 1565c8d236
212 changed files with 773 additions and 1410 deletions
+2 -1
View File
@@ -32,7 +32,8 @@ impl<'a, E: ErrorExt + ?Sized> fmt::Debug for DebugFormat<'a, E> {
mod tests {
use std::any::Any;
use snafu::{prelude::*, Backtrace, GenerateImplicitData};
use snafu::prelude::*;
use snafu::{Backtrace, GenerateImplicitData};
use super::*;
+2 -1
View File
@@ -4,7 +4,8 @@ pub mod mock;
pub mod status_code;
pub mod prelude {
pub use snafu::{prelude::*, Backtrace, ErrorCompat};
pub use snafu::prelude::*;
pub use snafu::{Backtrace, ErrorCompat};
pub use crate::ext::{BoxedError, ErrorExt};
pub use crate::format::DebugFormat;
@@ -1,5 +1,4 @@
use common_function_macro::as_aggr_func_creator;
use common_function_macro::AggrFuncTypeStore;
use common_function_macro::{as_aggr_func_creator, AggrFuncTypeStore};
use static_assertions::{assert_fields, assert_impl_all};
#[as_aggr_func_creator]
@@ -5,8 +5,9 @@ use common_function_macro::{as_aggr_func_creator, AggrFuncTypeStore};
use common_query::error::{BadAccumulatorImplSnafu, CreateAccumulatorSnafu, Result};
use common_query::logical_plan::{Accumulator, AggregateFunctionCreator};
use common_query::prelude::*;
use datatypes::prelude::*;
use datatypes::vectors::ConstantVector;
use datatypes::{prelude::*, with_match_primitive_type_id};
use datatypes::with_match_primitive_type_id;
use snafu::ensure;
// https://numpy.org/doc/stable/reference/generated/numpy.argmax.html
@@ -5,8 +5,9 @@ use common_function_macro::{as_aggr_func_creator, AggrFuncTypeStore};
use common_query::error::{BadAccumulatorImplSnafu, CreateAccumulatorSnafu, Result};
use common_query::logical_plan::{Accumulator, AggregateFunctionCreator};
use common_query::prelude::*;
use datatypes::prelude::*;
use datatypes::vectors::ConstantVector;
use datatypes::{prelude::*, with_match_primitive_type_id};
use datatypes::with_match_primitive_type_id;
use snafu::ensure;
// // https://numpy.org/doc/stable/reference/generated/numpy.argmin.html
@@ -7,10 +7,11 @@ use common_query::error::{
};
use common_query::logical_plan::{Accumulator, AggregateFunctionCreator};
use common_query::prelude::*;
use datatypes::prelude::*;
use datatypes::types::PrimitiveType;
use datatypes::value::ListValue;
use datatypes::vectors::{ConstantVector, ListVector};
use datatypes::{prelude::*, with_match_primitive_type_id};
use datatypes::with_match_primitive_type_id;
use num_traits::AsPrimitive;
use snafu::{ensure, OptionExt, ResultExt};
@@ -7,8 +7,9 @@ use common_query::error::{
};
use common_query::logical_plan::{Accumulator, AggregateFunctionCreator};
use common_query::prelude::*;
use datatypes::prelude::*;
use datatypes::vectors::{ConstantVector, Float64Vector, UInt64Vector};
use datatypes::{prelude::*, with_match_primitive_type_id};
use datatypes::with_match_primitive_type_id;
use num_traits::AsPrimitive;
use snafu::{ensure, OptionExt};
@@ -8,10 +8,11 @@ use common_query::error::{
};
use common_query::logical_plan::{Accumulator, AggregateFunctionCreator};
use common_query::prelude::*;
use datatypes::prelude::*;
use datatypes::types::PrimitiveType;
use datatypes::value::ListValue;
use datatypes::vectors::{ConstantVector, Int64Vector, ListVector};
use datatypes::{prelude::*, with_match_primitive_type_id};
use datatypes::with_match_primitive_type_id;
use num_traits::AsPrimitive;
use snafu::{ensure, OptionExt, ResultExt};
@@ -1,7 +1,6 @@
//! functions registry
use std::collections::HashMap;
use std::sync::Arc;
use std::sync::RwLock;
use std::sync::{Arc, RwLock};
use once_cell::sync::Lazy;
@@ -2,8 +2,7 @@ use std::fmt;
use std::sync::Arc;
use common_query::prelude::{Signature, Volatility};
use datatypes::data_type::ConcreteDataType;
use datatypes::data_type::DataType;
use datatypes::data_type::{ConcreteDataType, DataType};
use datatypes::prelude::{Scalar, VectorRef};
use datatypes::with_match_primitive_type_id;
use num_traits::AsPrimitive;
@@ -3,16 +3,12 @@ use std::sync::Arc;
use arrow::array::PrimitiveArray;
use arrow::compute::cast::primitive_to_primitive;
use arrow::datatypes::DataType::Float64;
use datatypes::arrow;
use datatypes::data_type::DataType;
use datatypes::prelude::ScalarVector;
use datatypes::type_id::LogicalTypeId;
use datatypes::value::Value;
use datatypes::vectors::Float64Vector;
use datatypes::vectors::PrimitiveVector;
use datatypes::vectors::Vector;
use datatypes::vectors::VectorRef;
use datatypes::with_match_primitive_type_id;
use datatypes::vectors::{Float64Vector, PrimitiveVector, Vector, VectorRef};
use datatypes::{arrow, with_match_primitive_type_id};
use snafu::{ensure, Snafu};
#[derive(Debug, Snafu)]
@@ -247,10 +243,8 @@ pub fn interp(args: &[VectorRef]) -> Result<VectorRef> {
mod tests {
use std::sync::Arc;
use datatypes::{
prelude::ScalarVectorBuilder,
vectors::{Int32Vector, Int64Vector, PrimitiveVectorBuilder},
};
use datatypes::prelude::ScalarVectorBuilder;
use datatypes::vectors::{Int32Vector, Int64Vector, PrimitiveVectorBuilder};
use super::*;
#[test]
@@ -9,8 +9,7 @@ use arrow::scalar::PrimitiveScalar;
use common_query::error::{IntoVectorSnafu, UnsupportedInputDataTypeSnafu};
use common_query::prelude::{Signature, Volatility};
use datatypes::prelude::ConcreteDataType;
use datatypes::vectors::TimestampVector;
use datatypes::vectors::VectorRef;
use datatypes::vectors::{TimestampVector, VectorRef};
use snafu::ResultExt;
use crate::error::Result;
+1 -2
View File
@@ -1,9 +1,8 @@
use std::sync::Arc;
use common_query::error::{ExecuteFunctionSnafu, FromScalarValueSnafu};
use common_query::prelude::ScalarValue;
use common_query::prelude::{
ColumnarValue, ReturnTypeFunction, ScalarFunctionImplementation, ScalarUdf,
ColumnarValue, ReturnTypeFunction, ScalarFunctionImplementation, ScalarUdf, ScalarValue,
};
use datatypes::error::Error as DataTypeError;
use datatypes::prelude::{ConcreteDataType, VectorHelper};
+2 -5
View File
@@ -1,14 +1,11 @@
use std::sync::atomic::AtomicUsize;
use std::sync::atomic::Ordering;
use std::sync::atomic::{AtomicUsize, Ordering};
use std::sync::Arc;
use std::time::Duration;
use dashmap::mapref::entry::Entry;
use dashmap::DashMap;
use snafu::ResultExt;
use tonic::transport::Channel as InnerChannel;
use tonic::transport::Endpoint;
use tonic::transport::Uri;
use tonic::transport::{Channel as InnerChannel, Endpoint, Uri};
use tower::make::MakeConnection;
use crate::error;
+1 -2
View File
@@ -84,8 +84,7 @@ impl ErrorExt for Error {
#[cfg(test)]
mod tests {
use snafu::OptionExt;
use snafu::ResultExt;
use snafu::{OptionExt, ResultExt};
use super::*;
+2 -4
View File
@@ -4,7 +4,5 @@ pub mod physical;
pub mod writer;
pub use error::Error;
pub use physical::{
plan::{DefaultAsPlanImpl, MockExecution},
AsExcutionPlan,
};
pub use physical::plan::{DefaultAsPlanImpl, MockExecution};
pub use physical::AsExcutionPlan;
+2 -1
View File
@@ -1,7 +1,8 @@
mod expr;
pub mod plan;
use std::{result::Result, sync::Arc};
use std::result::Result;
use std::sync::Arc;
use datafusion::physical_plan::ExecutionPlan;
+8 -4
View File
@@ -1,7 +1,9 @@
use std::{result::Result, sync::Arc};
use std::result::Result;
use std::sync::Arc;
use api::v1::codec;
use datafusion::physical_plan::{expressions::Column as DfColumn, PhysicalExpr as DfPhysicalExpr};
use datafusion::physical_plan::expressions::Column as DfColumn;
use datafusion::physical_plan::PhysicalExpr as DfPhysicalExpr;
use snafu::OptionExt;
use crate::error::{EmptyPhysicalExprSnafu, Error, UnsupportedDfExprSnafu};
@@ -52,8 +54,10 @@ pub(crate) fn parse_df_physical_expr(
mod tests {
use std::sync::Arc;
use api::v1::codec::{physical_expr_node::ExprType::Column, PhysicalColumn, PhysicalExprNode};
use datafusion::physical_plan::{expressions::Column as DfColumn, PhysicalExpr};
use api::v1::codec::physical_expr_node::ExprType::Column;
use api::v1::codec::{PhysicalColumn, PhysicalExprNode};
use datafusion::physical_plan::expressions::Column as DfColumn;
use datafusion::physical_plan::PhysicalExpr;
use crate::physical::expr::{parse_df_physical_expr, parse_grpc_physical_expr};
+18 -21
View File
@@ -1,22 +1,20 @@
use std::{ops::Deref, result::Result, sync::Arc};
use std::ops::Deref;
use std::result::Result;
use std::sync::Arc;
use api::v1::codec::{
physical_plan_node::PhysicalPlanType, MockInputExecNode, PhysicalPlanNode, ProjectionExecNode,
};
use arrow::{
array::{PrimitiveArray, Utf8Array},
datatypes::{DataType, Field, Schema},
};
use api::v1::codec::physical_plan_node::PhysicalPlanType;
use api::v1::codec::{MockInputExecNode, PhysicalPlanNode, ProjectionExecNode};
use arrow::array::{PrimitiveArray, Utf8Array};
use arrow::datatypes::{DataType, Field, Schema};
use async_trait::async_trait;
use datafusion::{
execution::runtime_env::RuntimeEnv,
field_util::SchemaExt,
physical_plan::{
memory::MemoryStream, projection::ProjectionExec, ExecutionPlan, PhysicalExpr,
SendableRecordBatchStream, Statistics,
},
record_batch::RecordBatch,
use datafusion::execution::runtime_env::RuntimeEnv;
use datafusion::field_util::SchemaExt;
use datafusion::physical_plan::memory::MemoryStream;
use datafusion::physical_plan::projection::ProjectionExec;
use datafusion::physical_plan::{
ExecutionPlan, PhysicalExpr, SendableRecordBatchStream, Statistics,
};
use datafusion::record_batch::RecordBatch;
use snafu::{OptionExt, ResultExt};
use crate::error::{
@@ -211,12 +209,11 @@ mod tests {
use std::sync::Arc;
use api::v1::codec::PhysicalPlanNode;
use datafusion::physical_plan::{expressions::Column, projection::ProjectionExec};
use datafusion::physical_plan::expressions::Column;
use datafusion::physical_plan::projection::ProjectionExec;
use crate::physical::{
plan::{DefaultAsPlanImpl, MockExecution},
{AsExcutionPlan, ExecutionPlanRef},
};
use crate::physical::plan::{DefaultAsPlanImpl, MockExecution};
use crate::physical::{AsExcutionPlan, ExecutionPlanRef};
#[test]
fn test_convert_df_projection_with_bytes() {
+5 -6
View File
@@ -1,10 +1,8 @@
use std::collections::HashMap;
use api::v1::{
codec::InsertBatch,
column::{SemanticType, Values},
Column, ColumnDataType,
};
use api::v1::codec::InsertBatch;
use api::v1::column::{SemanticType, Values};
use api::v1::{Column, ColumnDataType};
use common_base::BitVec;
use snafu::ensure;
@@ -232,7 +230,8 @@ pub enum Precision {
#[cfg(test)]
mod tests {
use api::v1::{column::SemanticType, ColumnDataType};
use api::v1::column::SemanticType;
use api::v1::ColumnDataType;
use common_base::BitVec;
use super::LinesWriter;
+19 -29
View File
@@ -1,30 +1,24 @@
use std::collections::HashSet;
use std::{
collections::{hash_map::Entry, HashMap},
ops::Deref,
sync::Arc,
};
use std::collections::hash_map::Entry;
use std::collections::{HashMap, HashSet};
use std::ops::Deref;
use std::sync::Arc;
use api::helper::ColumnDataTypeWrapper;
use api::v1::{
codec::InsertBatch,
column::{SemanticType, Values},
AddColumns, Column, ColumnDataType,
};
use api::v1::{AddColumn, ColumnDef, CreateExpr};
use api::v1::codec::InsertBatch;
use api::v1::column::{SemanticType, Values};
use api::v1::{AddColumn, AddColumns, Column, ColumnDataType, ColumnDef, CreateExpr};
use common_base::BitVec;
use common_time::timestamp::Timestamp;
use common_time::Date;
use common_time::DateTime;
use common_time::{Date, DateTime};
use datatypes::data_type::ConcreteDataType;
use datatypes::prelude::{ValueRef, VectorRef};
use datatypes::schema::SchemaRef;
use datatypes::{data_type::ConcreteDataType, value::Value, vectors::VectorBuilder};
use datatypes::value::Value;
use datatypes::vectors::VectorBuilder;
use snafu::{ensure, OptionExt, ResultExt};
use table::metadata::TableId;
use table::{
requests::{AddColumnRequest, AlterKind, AlterTableRequest, InsertRequest},
Table,
};
use table::requests::{AddColumnRequest, AlterKind, AlterTableRequest, InsertRequest};
use table::Table;
use crate::error::{
ColumnDataTypeSnafu, ColumnNotFoundSnafu, CreateVectorSnafu, DecodeInsertSnafu,
@@ -455,20 +449,16 @@ mod tests {
use std::sync::Arc;
use api::helper::ColumnDataTypeWrapper;
use api::v1::{
codec::InsertBatch,
column::{self, SemanticType, Values},
insert_expr, Column, ColumnDataType,
};
use api::v1::codec::InsertBatch;
use api::v1::column::{self, SemanticType, Values};
use api::v1::{insert_expr, Column, ColumnDataType};
use common_base::BitVec;
use common_query::physical_plan::PhysicalPlanRef;
use common_query::prelude::Expr;
use common_time::timestamp::Timestamp;
use datatypes::{
data_type::ConcreteDataType,
schema::{ColumnSchema, SchemaBuilder, SchemaRef},
value::Value,
};
use datatypes::data_type::ConcreteDataType;
use datatypes::schema::{ColumnSchema, SchemaBuilder, SchemaRef};
use datatypes::value::Value;
use snafu::ResultExt;
use table::error::Result as TableResult;
use table::metadata::TableInfoRef;
+1 -2
View File
@@ -1,7 +1,6 @@
use datafusion_expr::ColumnarValue as DfColumnarValue;
use datatypes::prelude::ConcreteDataType;
use datatypes::vectors::Helper;
use datatypes::vectors::VectorRef;
use datatypes::vectors::{Helper, VectorRef};
use snafu::ResultExt;
use crate::error::{self, IntoVectorSnafu, Result};
+1 -2
View File
@@ -102,8 +102,7 @@ pub fn to_df_return_type(func: ReturnTypeFunction) -> DfReturnTypeFunction {
mod tests {
use std::sync::Arc;
use datatypes::prelude::ScalarVector;
use datatypes::prelude::Vector;
use datatypes::prelude::{ScalarVector, Vector};
use datatypes::vectors::BooleanVector;
use super::*;
@@ -9,8 +9,7 @@ use datafusion_common::Result as DfResult;
use datafusion_expr::Accumulator as DfAccumulator;
use datatypes::prelude::*;
use datatypes::value::ListValue;
use datatypes::vectors::Helper as VectorHelper;
use datatypes::vectors::VectorRef;
use datatypes::vectors::{Helper as VectorHelper, VectorRef};
use snafu::ResultExt;
use crate::error::{self, Error, FromScalarValueSnafu, IntoVectorSnafu, Result};
+5 -5
View File
@@ -60,12 +60,12 @@ mod tests {
use arrow::array::BooleanArray;
use arrow::datatypes::DataType;
use datafusion_expr::ColumnarValue as DfColumnarValue;
use datafusion_expr::ScalarUDF as DfScalarUDF;
use datafusion_expr::TypeSignature as DfTypeSignature;
use datafusion_expr::{
ColumnarValue as DfColumnarValue, ScalarUDF as DfScalarUDF,
TypeSignature as DfTypeSignature,
};
use datatypes::prelude::*;
use datatypes::vectors::BooleanVector;
use datatypes::vectors::VectorRef;
use datatypes::vectors::{BooleanVector, VectorRef};
use super::*;
use crate::error::Result;
+4 -3
View File
@@ -6,9 +6,10 @@ use std::fmt::{self, Debug, Formatter};
use std::sync::Arc;
use arrow::datatypes::DataType as ArrowDataType;
use datafusion_expr::AccumulatorFunctionImplementation as DfAccumulatorFunctionImplementation;
use datafusion_expr::AggregateUDF as DfAggregateUdf;
use datafusion_expr::StateTypeFunction as DfStateTypeFunction;
use datafusion_expr::{
AccumulatorFunctionImplementation as DfAccumulatorFunctionImplementation,
AggregateUDF as DfAggregateUdf, StateTypeFunction as DfStateTypeFunction,
};
use datatypes::prelude::*;
use crate::function::{
+1 -2
View File
@@ -1,8 +1,7 @@
//! Udf module contains foundational types that are used to represent UDFs.
//! It's modifed from datafusion.
use std::fmt;
use std::fmt::Debug;
use std::fmt::Formatter;
use std::fmt::{Debug, Formatter};
use std::sync::Arc;
use datafusion_expr::{
+1 -2
View File
@@ -4,8 +4,7 @@ use std::sync::Arc;
use async_trait::async_trait;
use common_recordbatch::adapter::{DfRecordBatchStreamAdapter, RecordBatchStreamAdapter};
use common_recordbatch::DfSendableRecordBatchStream;
use common_recordbatch::SendableRecordBatchStream;
use common_recordbatch::{DfSendableRecordBatchStream, SendableRecordBatchStream};
use datafusion::arrow::datatypes::SchemaRef as DfSchemaRef;
use datafusion::error::Result as DfResult;
pub use datafusion::execution::runtime_env::RuntimeEnv;
+1 -4
View File
@@ -2,8 +2,5 @@ pub use datafusion_common::ScalarValue;
pub use crate::columnar_value::ColumnarValue;
pub use crate::function::*;
pub use crate::logical_plan::create_udf;
pub use crate::logical_plan::AggregateFunction;
pub use crate::logical_plan::Expr;
pub use crate::logical_plan::ScalarUdf;
pub use crate::logical_plan::{create_udf, AggregateFunction, Expr, ScalarUdf};
pub use crate::signature::{Signature, TypeSignature, Volatility};
+4 -4
View File
@@ -5,14 +5,14 @@ use std::task::{Context, Poll};
use datafusion::arrow::datatypes::SchemaRef as DfSchemaRef;
use datafusion::physical_plan::RecordBatchStream as DfRecordBatchStream;
use datafusion_common::record_batch::RecordBatch as DfRecordBatch;
use datatypes::arrow::error::ArrowError;
use datatypes::arrow::error::Result as ArrowResult;
use datatypes::arrow::error::{ArrowError, Result as ArrowResult};
use datatypes::schema::{Schema, SchemaRef};
use snafu::ResultExt;
use crate::error::{self, Result};
use crate::DfSendableRecordBatchStream;
use crate::{RecordBatch, RecordBatchStream, SendableRecordBatchStream, Stream};
use crate::{
DfSendableRecordBatchStream, RecordBatch, RecordBatchStream, SendableRecordBatchStream, Stream,
};
/// Greptime SendableRecordBatchStream -> DataFusion RecordBatchStream
pub struct DfRecordBatchStreamAdapter {
+3 -3
View File
@@ -1,6 +1,7 @@
use futures::TryStreamExt;
use crate::{error::Result, RecordBatch, SendableRecordBatchStream};
use crate::error::Result;
use crate::{RecordBatch, SendableRecordBatchStream};
pub async fn collect(stream: SendableRecordBatchStream) -> Result<Vec<RecordBatch>> {
stream.try_collect::<Vec<_>>().await
@@ -16,8 +17,7 @@ mod tests {
use datafusion_common::record_batch::RecordBatch as DfRecordBatch;
use datatypes::arrow::array::UInt32Array;
use datatypes::arrow::datatypes::{DataType, Field, Schema as ArrowSchema};
use datatypes::schema::Schema;
use datatypes::schema::SchemaRef;
use datatypes::schema::{Schema, SchemaRef};
use futures::task::{Context, Poll};
use futures::Stream;
+5 -2
View File
@@ -1,6 +1,7 @@
use std::future::Future;
use std::sync::Arc;
use std::thread;
use std::{future::Future, time::Duration};
use std::time::Duration;
use metrics::{decrement_gauge, increment_gauge};
use snafu::ResultExt;
@@ -165,7 +166,9 @@ fn on_thread_unpark(thread_name: String) -> impl Fn() + 'static {
#[cfg(test)]
mod tests {
use std::{sync::Arc, thread, time::Duration};
use std::sync::Arc;
use std::thread;
use std::time::Duration;
use common_telemetry::metric;
use tokio::sync::oneshot;
+7 -13
View File
@@ -7,21 +7,17 @@ use datafusion::datasource::TableProvider;
use datafusion::logical_plan::{LogicalPlan, TableScan, ToDFSchema};
use datafusion::physical_plan::project_schema;
use prost::Message;
use snafu::ensure;
use snafu::{OptionExt, ResultExt};
use snafu::{ensure, OptionExt, ResultExt};
use substrait_proto::protobuf::expression::mask_expression::{StructItem, StructSelect};
use substrait_proto::protobuf::expression::MaskExpression;
use substrait_proto::protobuf::plan_rel::RelType as PlanRelType;
use substrait_proto::protobuf::read_rel::{NamedTable, ReadType};
use substrait_proto::protobuf::rel::RelType;
use substrait_proto::protobuf::PlanRel;
use substrait_proto::protobuf::ReadRel;
use substrait_proto::protobuf::Rel;
use substrait_proto::protobuf::{PlanRel, ReadRel, Rel};
use table::table::adapter::DfTableProviderAdapter;
use crate::error::Error;
use crate::error::{
DFInternalSnafu, DecodeRelSnafu, EmptyPlanSnafu, EncodeRelSnafu, InternalSnafu,
DFInternalSnafu, DecodeRelSnafu, EmptyPlanSnafu, EncodeRelSnafu, Error, InternalSnafu,
InvalidParametersSnafu, MissingFieldSnafu, SchemaNotMatchSnafu, TableNotFoundSnafu,
UnknownPlanSnafu, UnsupportedExprSnafu, UnsupportedPlanSnafu,
};
@@ -334,15 +330,13 @@ impl DFLogicalSubstraitConvertor {
#[cfg(test)]
mod test {
use catalog::local::LocalCatalogManager;
use catalog::{
local::{MemoryCatalogProvider, MemorySchemaProvider},
CatalogList, CatalogProvider, RegisterTableRequest,
};
use catalog::local::{LocalCatalogManager, MemoryCatalogProvider, MemorySchemaProvider};
use catalog::{CatalogList, CatalogProvider, RegisterTableRequest};
use common_catalog::consts::{DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME};
use datafusion::logical_plan::DFSchema;
use datatypes::schema::Schema;
use table::{requests::CreateTableRequest, test_util::EmptyTable, test_util::MockTableEngine};
use table::requests::CreateTableRequest;
use table::test_util::{EmptyTable, MockTableEngine};
use super::*;
use crate::schema::test::supported_types;
+1 -2
View File
@@ -8,8 +8,7 @@ use datatypes::prelude::ConcreteDataType;
use substrait_proto::protobuf::r#type::{self as s_type, Kind, Nullability};
use substrait_proto::protobuf::Type as SType;
use crate::error::Result;
use crate::error::{UnsupportedConcreteTypeSnafu, UnsupportedSubstraitTypeSnafu};
use crate::error::{Result, UnsupportedConcreteTypeSnafu, UnsupportedSubstraitTypeSnafu};
macro_rules! substrait_kind {
($desc:ident, $concrete_ty:ident) => {{
+2 -7
View File
@@ -3,12 +3,7 @@ mod macros;
pub mod metric;
mod panic_hook;
pub use common_error;
pub use logging::init_default_ut_logging;
pub use logging::init_global_logging;
pub use logging::{init_default_ut_logging, init_global_logging};
pub use metric::init_default_metrics_recorder;
pub use panic_hook::set_panic_hook;
pub use tracing;
pub use tracing_appender;
pub use tracing_futures;
pub use tracing_subscriber;
pub use {common_error, tracing, tracing_appender, tracing_futures, tracing_subscriber};
+4 -10
View File
@@ -1,24 +1,18 @@
//! logging stuffs, inspired by databend
use std::env;
use std::sync::Arc;
use std::sync::Mutex;
use std::sync::Once;
use std::sync::{Arc, Mutex, Once};
use once_cell::sync::Lazy;
use opentelemetry::global;
use opentelemetry::sdk::propagation::TraceContextPropagator;
pub use tracing::{event, span, Level};
use tracing_appender::non_blocking::WorkerGuard;
use tracing_appender::rolling::RollingFileAppender;
use tracing_appender::rolling::Rotation;
use tracing_bunyan_formatter::BunyanFormattingLayer;
use tracing_bunyan_formatter::JsonStorageLayer;
use tracing_appender::rolling::{RollingFileAppender, Rotation};
use tracing_bunyan_formatter::{BunyanFormattingLayer, JsonStorageLayer};
use tracing_log::LogTracer;
use tracing_subscriber::filter;
use tracing_subscriber::fmt::Layer;
use tracing_subscriber::layer::SubscriberExt;
use tracing_subscriber::EnvFilter;
use tracing_subscriber::Registry;
use tracing_subscriber::{filter, EnvFilter, Registry};
pub use crate::{debug, error, info, log, trace, warn};
+1 -2
View File
@@ -6,8 +6,7 @@ use serde::{Deserialize, Serialize};
use serde_json::Value;
use snafu::ResultExt;
use crate::error::Result;
use crate::error::{Error, ParseDateStrSnafu};
use crate::error::{Error, ParseDateStrSnafu, Result};
const UNIX_EPOCH_FROM_CE: i32 = 719_163;
+2 -1
View File
@@ -3,7 +3,8 @@ use std::cmp::Ordering;
use std::hash::{Hash, Hasher};
use std::str::FromStr;
use chrono::{offset::Local, DateTime, LocalResult, NaiveDateTime, TimeZone, Utc};
use chrono::offset::Local;
use chrono::{DateTime, LocalResult, NaiveDateTime, TimeZone, Utc};
use serde::{Deserialize, Serialize};
use crate::error::{Error, ParseTimestampSnafu};