add Error test, fix clippy

s3select/api/src/query/dispatcher.rs

@@ -5,9 +5,9 @@ use async_trait::async_trait;
 use crate::QueryResult;
 
 use super::{
+    Query,
     execution::{Output, QueryStateMachine},
     logical_planner::Plan,
-    Query,
 };
 
 #[async_trait]

s3select/api/src/query/execution.rs

@@ -1,7 +1,7 @@
 use std::fmt::Display;
 use std::pin::Pin;
-use std::sync::atomic::{AtomicPtr, Ordering};
 use std::sync::Arc;
+use std::sync::atomic::{AtomicPtr, Ordering};
 use std::task::{Context, Poll};
 use std::time::{Duration, Instant};
 
@@ -13,9 +13,9 @@ use futures::{Stream, StreamExt, TryStreamExt};
 
 use crate::{QueryError, QueryResult};
 
+use super::Query;
 use super::logical_planner::Plan;
 use super::session::SessionCtx;
-use super::Query;
 
 pub type QueryExecutionRef = Arc<dyn QueryExecution>;
 

s3select/api/src/query/session.rs

@@ -1,14 +1,14 @@
 use std::sync::Arc;
 
 use datafusion::{
-    execution::{context::SessionState, runtime_env::RuntimeEnvBuilder, SessionStateBuilder},
+    execution::{SessionStateBuilder, context::SessionState, runtime_env::RuntimeEnvBuilder},
     parquet::data_type::AsBytes,
     prelude::SessionContext,
 };
-use object_store::{memory::InMemory, path::Path, ObjectStore};
+use object_store::{ObjectStore, memory::InMemory, path::Path};
 use tracing::error;
 
-use crate::{object_store::EcObjectStore, QueryError, QueryResult};
+use crate::{QueryError, QueryResult, object_store::EcObjectStore};
 
 use super::Context;
 

s3select/api/src/server/dbms.rs

@@ -1,12 +1,12 @@
 use async_trait::async_trait;
 
 use crate::{
+    QueryResult,
     query::{
+        Query,
         execution::{Output, QueryStateMachineRef},
         logical_planner::Plan,
-        Query,
     },
-    QueryResult,
 };
 
 pub struct QueryHandle {

s3select/query/src/data_source/table_source.rs

@@ -8,7 +8,7 @@ use async_trait::async_trait;
 use datafusion::arrow::datatypes::SchemaRef;
 use datafusion::common::Result as DFResult;
 use datafusion::datasource::listing::ListingTable;
-use datafusion::datasource::{provider_as_source, TableProvider};
+use datafusion::datasource::{TableProvider, provider_as_source};
 use datafusion::error::DataFusionError;
 use datafusion::logical_expr::{LogicalPlan, LogicalPlanBuilder, TableProviderFilterPushDown, TableSource};
 use datafusion::prelude::Expr;

s3select/query/src/dispatcher/manager.rs

@@ -6,7 +6,9 @@ use std::{
 };
 
 use api::{
+    QueryError, QueryResult,
     query::{
+        Query,
         ast::ExtStatement,
         dispatcher::QueryDispatcher,
         execution::{Output, QueryStateMachine},
@@ -14,9 +16,7 @@ use api::{
         logical_planner::{LogicalPlanner, Plan},
         parser::Parser,
         session::{SessionCtx, SessionCtxFactory},
-        Query,
     },
-    QueryError, QueryResult,
 };
 use async_trait::async_trait;
 use datafusion::{
@@ -37,7 +37,7 @@ use s3s::dto::{FileHeaderInfo, SelectObjectContentInput};
 
 use crate::{
     execution::factory::QueryExecutionFactoryRef,
-    metadata::{base_table::BaseTableProvider, ContextProviderExtension, MetadataProvider, TableHandleProviderRef},
+    metadata::{ContextProviderExtension, MetadataProvider, TableHandleProviderRef, base_table::BaseTableProvider},
     sql::logical::planner::DefaultLogicalPlanner,
 };
 

s3select/query/src/execution/factory.rs

@@ -1,13 +1,13 @@
 use std::sync::Arc;
 
 use api::{
+    QueryError,
     query::{
         execution::{QueryExecutionFactory, QueryExecutionRef, QueryStateMachineRef},
         logical_planner::Plan,
         optimizer::Optimizer,
         scheduler::SchedulerRef,
     },
-    QueryError,
 };
 use async_trait::async_trait;
 

s3select/query/src/execution/scheduler/local.rs

@@ -4,7 +4,7 @@ use api::query::scheduler::{ExecutionResults, Scheduler};
 use async_trait::async_trait;
 use datafusion::error::DataFusionError;
 use datafusion::execution::context::TaskContext;
-use datafusion::physical_plan::{execute_stream, ExecutionPlan};
+use datafusion::physical_plan::{ExecutionPlan, execute_stream};
 
 pub struct LocalScheduler {}
 

s3select/query/src/instance.rs

@@ -1,11 +1,11 @@
 use std::sync::Arc;
 
 use api::{
+    QueryResult,
     query::{
-        dispatcher::QueryDispatcher, execution::QueryStateMachineRef, logical_planner::Plan, session::SessionCtxFactory, Query,
+        Query, dispatcher::QueryDispatcher, execution::QueryStateMachineRef, logical_planner::Plan, session::SessionCtxFactory,
     },
     server::dbms::{DatabaseManagerSystem, QueryHandle},
-    QueryResult,
 };
 use async_trait::async_trait;
 use derive_builder::Builder;

s3select/query/src/metadata/mod.rs

@@ -10,7 +10,7 @@ use datafusion::logical_expr::{AggregateUDF, ScalarUDF, TableSource, WindowUDF};
 use datafusion::variable::VarType;
 use datafusion::{
     config::ConfigOptions,
-    sql::{planner::ContextProvider, TableReference},
+    sql::{TableReference, planner::ContextProvider},
 };
 
 use crate::data_source::table_source::{TableHandle, TableSourceAdapter};

s3select/query/src/sql/analyzer.rs

@@ -1,6 +1,6 @@
+use api::QueryResult;
 use api::query::analyzer::Analyzer;
 use api::query::session::SessionCtx;
-use api::QueryResult;
 use datafusion::logical_expr::LogicalPlan;
 use datafusion::optimizer::analyzer::Analyzer as DFAnalyzer;
 

s3select/query/src/sql/logical/optimizer.rs

@@ -1,22 +1,22 @@
 use std::sync::Arc;
 
 use api::{
-    query::{analyzer::AnalyzerRef, logical_planner::QueryPlan, session::SessionCtx},
     QueryResult,
+    query::{analyzer::AnalyzerRef, logical_planner::QueryPlan, session::SessionCtx},
 };
 use datafusion::{
     execution::SessionStateBuilder,
     logical_expr::LogicalPlan,
     optimizer::{
-        common_subexpr_eliminate::CommonSubexprEliminate, decorrelate_predicate_subquery::DecorrelatePredicateSubquery,
-        eliminate_cross_join::EliminateCrossJoin, eliminate_duplicated_expr::EliminateDuplicatedExpr,
-        eliminate_filter::EliminateFilter, eliminate_join::EliminateJoin, eliminate_limit::EliminateLimit,
-        eliminate_outer_join::EliminateOuterJoin, extract_equijoin_predicate::ExtractEquijoinPredicate,
-        filter_null_join_keys::FilterNullJoinKeys, propagate_empty_relation::PropagateEmptyRelation,
-        push_down_filter::PushDownFilter, push_down_limit::PushDownLimit,
+        OptimizerRule, common_subexpr_eliminate::CommonSubexprEliminate,
+        decorrelate_predicate_subquery::DecorrelatePredicateSubquery, eliminate_cross_join::EliminateCrossJoin,
+        eliminate_duplicated_expr::EliminateDuplicatedExpr, eliminate_filter::EliminateFilter, eliminate_join::EliminateJoin,
+        eliminate_limit::EliminateLimit, eliminate_outer_join::EliminateOuterJoin,
+        extract_equijoin_predicate::ExtractEquijoinPredicate, filter_null_join_keys::FilterNullJoinKeys,
+        propagate_empty_relation::PropagateEmptyRelation, push_down_filter::PushDownFilter, push_down_limit::PushDownLimit,
         replace_distinct_aggregate::ReplaceDistinctWithAggregate, scalar_subquery_to_join::ScalarSubqueryToJoin,
         simplify_expressions::SimplifyExpressions, single_distinct_to_groupby::SingleDistinctToGroupBy,
-        unwrap_cast_in_comparison::UnwrapCastInComparison, OptimizerRule,
+        unwrap_cast_in_comparison::UnwrapCastInComparison,
     },
 };
 use tracing::debug;

s3select/query/src/sql/optimizer.rs

@@ -1,11 +1,11 @@
 use std::sync::Arc;
 
 use api::{
-    query::{logical_planner::QueryPlan, optimizer::Optimizer, physical_planner::PhysicalPlanner, session::SessionCtx},
     QueryResult,
+    query::{logical_planner::QueryPlan, optimizer::Optimizer, physical_planner::PhysicalPlanner, session::SessionCtx},
 };
 use async_trait::async_trait;
-use datafusion::physical_plan::{displayable, ExecutionPlan};
+use datafusion::physical_plan::{ExecutionPlan, displayable};
 use tracing::debug;
 
 use super::{

s3select/query/src/sql/parser.rs

@@ -1,8 +1,8 @@
 use std::{collections::VecDeque, fmt::Display};
 
 use api::{
-    query::{ast::ExtStatement, parser::Parser as RustFsParser},
     ParserSnafu,
+    query::{ast::ExtStatement, parser::Parser as RustFsParser},
 };
 use datafusion::sql::sqlparser::{
     dialect::Dialect,

s3select/query/src/sql/physical/optimizer.rs

@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
-use api::query::session::SessionCtx;
 use api::QueryResult;
+use api::query::session::SessionCtx;
 use datafusion::physical_optimizer::PhysicalOptimizerRule;
 use datafusion::physical_plan::ExecutionPlan;
 

s3select/query/src/sql/physical/planner.rs

@@ -1,15 +1,15 @@
 use std::sync::Arc;
 
+use api::QueryResult;
 use api::query::physical_planner::PhysicalPlanner;
 use api::query::session::SessionCtx;
-use api::QueryResult;
 use async_trait::async_trait;
 use datafusion::execution::SessionStateBuilder;
 use datafusion::logical_expr::LogicalPlan;
+use datafusion::physical_optimizer::PhysicalOptimizerRule;
 use datafusion::physical_optimizer::aggregate_statistics::AggregateStatistics;
 use datafusion::physical_optimizer::coalesce_batches::CoalesceBatches;
 use datafusion::physical_optimizer::join_selection::JoinSelection;
-use datafusion::physical_optimizer::PhysicalOptimizerRule;
 use datafusion::physical_plan::ExecutionPlan;
 use datafusion::physical_planner::{
     DefaultPhysicalPlanner as DFDefaultPhysicalPlanner, ExtensionPlanner, PhysicalPlanner as DFPhysicalPlanner,

s3select/query/src/sql/planner.rs

@@ -1,10 +1,10 @@
 use api::{
+    QueryError, QueryResult,
     query::{
         ast::ExtStatement,
         logical_planner::{LogicalPlanner, Plan, QueryPlan},
         session::SessionCtx,
     },
-    QueryError, QueryResult,
 };
 use async_recursion::async_recursion;
 use async_trait::async_trait;