chore: move query::Output to common-query module (#259)

* chore: move query::Output to common-query module

* chore: remove “query” dependency in client module

src/query/src/datafusion.rs

@@ -11,7 +11,7 @@ use catalog::CatalogListRef;
 use common_function::scalars::aggregate::AggregateFunctionMetaRef;
 use common_function::scalars::udf::create_udf;
 use common_function::scalars::FunctionRef;
-use common_query::prelude::ScalarUdf;
+use common_query::{prelude::ScalarUdf, Output};
 use common_recordbatch::{EmptyRecordBatchStream, SendableRecordBatchStream};
 use common_telemetry::timer;
 use snafu::{OptionExt, ResultExt};
@@ -31,7 +31,7 @@ use crate::{
     physical_planner::PhysicalPlanner,
     plan::{LogicalPlan, PhysicalPlan},
     planner::Planner,
-    Output, QueryEngine,
+    QueryEngine,
 };
 
 pub(crate) struct DatafusionQueryEngine {
@@ -220,12 +220,13 @@ mod tests {
     use catalog::{
         CatalogList, CatalogProvider, SchemaProvider, DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME,
     };
+    use common_query::Output;
     use common_recordbatch::util;
     use datafusion::field_util::FieldExt;
     use datafusion::field_util::SchemaExt;
     use table::table::numbers::NumbersTable;
 
-    use crate::query_engine::{Output, QueryEngineFactory, QueryEngineRef};
+    use crate::query_engine::{QueryEngineFactory, QueryEngineRef};
 
     fn create_test_engine() -> QueryEngineRef {
         let catalog_list = catalog::memory::new_memory_catalog_list().unwrap();

src/query/src/lib.rs

@@ -12,6 +12,4 @@ pub mod planner;
 pub mod query_engine;
 
 pub use crate::datafusion::plan_adapter::PhysicalPlanAdapter;
-pub use crate::query_engine::{
-    Output, QueryContext, QueryEngine, QueryEngineFactory, QueryEngineRef,
-};
+pub use crate::query_engine::{QueryContext, QueryEngine, QueryEngineFactory, QueryEngineRef};

src/query/src/query_engine.rs

@@ -7,7 +7,7 @@ use catalog::CatalogList;
 use common_function::scalars::aggregate::AggregateFunctionMetaRef;
 use common_function::scalars::{FunctionRef, FUNCTION_REGISTRY};
 use common_query::prelude::ScalarUdf;
-use common_recordbatch::{RecordBatches, SendableRecordBatchStream};
+use common_query::Output;
 use sql::statements::statement::Statement;
 
 use crate::datafusion::DatafusionQueryEngine;
@@ -16,13 +16,6 @@ use crate::plan::{LogicalPlan, PhysicalPlan};
 pub use crate::query_engine::context::QueryContext;
 pub use crate::query_engine::state::QueryEngineState;
 
-/// Sql output
-pub enum Output {
-    AffectedRows(usize),
-    RecordBatches(RecordBatches),
-    Stream(SendableRecordBatchStream),
-}
-
 #[async_trait::async_trait]
 pub trait QueryEngine: Send + Sync {
     fn name(&self) -> &str;

src/query/tests/argmax_test.rs

@@ -1,5 +1,6 @@
 use std::sync::Arc;
 mod function;
+use common_query::Output;
 use common_recordbatch::error::Result as RecordResult;
 use common_recordbatch::{util, RecordBatch};
 use datafusion::field_util::FieldExt;
@@ -9,7 +10,6 @@ use datatypes::prelude::*;
 use datatypes::types::PrimitiveElement;
 use function::{create_query_engine, get_numbers_from_table};
 use query::error::Result;
-use query::query_engine::Output;
 use query::QueryEngine;
 
 #[tokio::test]

src/query/tests/argmin_test.rs

@@ -1,6 +1,7 @@
 use std::sync::Arc;
 mod function;
 
+use common_query::Output;
 use common_recordbatch::error::Result as RecordResult;
 use common_recordbatch::{util, RecordBatch};
 use datafusion::field_util::FieldExt;
@@ -10,7 +11,6 @@ use datatypes::prelude::*;
 use datatypes::types::PrimitiveElement;
 use function::{create_query_engine, get_numbers_from_table};
 use query::error::Result;
-use query::query_engine::Output;
 use query::QueryEngine;
 
 #[tokio::test]

src/query/tests/function.rs

@@ -4,13 +4,14 @@ use catalog::memory::{MemoryCatalogList, MemoryCatalogProvider, MemorySchemaProv
 use catalog::{
     CatalogList, CatalogProvider, SchemaProvider, DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME,
 };
+use common_query::Output;
 use common_recordbatch::{util, RecordBatch};
 use datatypes::for_all_primitive_types;
 use datatypes::prelude::*;
 use datatypes::schema::{ColumnSchema, Schema};
 use datatypes::types::PrimitiveElement;
 use datatypes::vectors::PrimitiveVector;
-use query::query_engine::{Output, QueryEngineFactory};
+use query::query_engine::QueryEngineFactory;
 use query::QueryEngine;
 use rand::Rng;
 use test_util::MemTable;

src/query/tests/mean_test.rs

@@ -1,6 +1,7 @@
 use std::sync::Arc;
 mod function;
 
+use common_query::Output;
 use common_recordbatch::error::Result as RecordResult;
 use common_recordbatch::{util, RecordBatch};
 use datafusion::field_util::FieldExt;
@@ -13,7 +14,6 @@ use format_num::NumberFormat;
 use function::{create_query_engine, get_numbers_from_table};
 use num_traits::AsPrimitive;
 use query::error::Result;
-use query::query_engine::Output;
 use query::QueryEngine;
 
 #[tokio::test]

src/query/tests/my_sum_udaf_example.rs

@@ -13,6 +13,7 @@ use common_query::error::Result as QueryResult;
 use common_query::logical_plan::Accumulator;
 use common_query::logical_plan::AggregateFunctionCreator;
 use common_query::prelude::*;
+use common_query::Output;
 use common_recordbatch::{util, RecordBatch};
 use datafusion::arrow_print;
 use datafusion_common::record_batch::RecordBatch as DfRecordBatch;
@@ -24,7 +25,6 @@ use datatypes::vectors::PrimitiveVector;
 use datatypes::with_match_primitive_type_id;
 use num_traits::AsPrimitive;
 use query::error::Result;
-use query::query_engine::Output;
 use query::QueryEngineFactory;
 use test_util::MemTable;
 

src/query/tests/percentile_test.rs

@@ -4,6 +4,7 @@ use catalog::memory::{MemoryCatalogList, MemoryCatalogProvider, MemorySchemaProv
 use catalog::{
     CatalogList, CatalogProvider, SchemaProvider, DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME,
 };
+use common_query::Output;
 use common_recordbatch::error::Result as RecordResult;
 use common_recordbatch::{util, RecordBatch};
 use datafusion::field_util::FieldExt;
@@ -16,7 +17,6 @@ use datatypes::vectors::PrimitiveVector;
 use function::{create_query_engine, get_numbers_from_table};
 use num_traits::AsPrimitive;
 use query::error::Result;
-use query::query_engine::Output;
 use query::{QueryEngine, QueryEngineFactory};
 use test_util::MemTable;
 

src/query/tests/polyval_test.rs

@@ -1,6 +1,7 @@
 use std::sync::Arc;
 mod function;
 
+use common_query::Output;
 use common_recordbatch::error::Result as RecordResult;
 use common_recordbatch::{util, RecordBatch};
 use datafusion::field_util::FieldExt;
@@ -11,7 +12,6 @@ use datatypes::types::PrimitiveElement;
 use function::{create_query_engine, get_numbers_from_table};
 use num_traits::AsPrimitive;
 use query::error::Result;
-use query::query_engine::Output;
 use query::QueryEngine;
 
 #[tokio::test]

src/query/tests/query_engine_test.rs

@@ -8,6 +8,7 @@ use catalog::{
     CatalogList, CatalogProvider, SchemaProvider, DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME,
 };
 use common_query::prelude::{create_udf, make_scalar_function, Volatility};
+use common_query::Output;
 use common_recordbatch::error::Result as RecordResult;
 use common_recordbatch::{util, RecordBatch};
 use datafusion::field_util::FieldExt;
@@ -21,7 +22,7 @@ use datatypes::vectors::{Float32Vector, Float64Vector, PrimitiveVector, UInt32Ve
 use num::NumCast;
 use query::error::Result;
 use query::plan::LogicalPlan;
-use query::query_engine::{Output, QueryEngineFactory};
+use query::query_engine::QueryEngineFactory;
 use query::QueryEngine;
 use rand::Rng;
 use table::table::adapter::DfTableProviderAdapter;

src/query/tests/scipy_stats_norm_cdf_test.rs

@@ -1,6 +1,7 @@
 use std::sync::Arc;
 mod function;
 
+use common_query::Output;
 use common_recordbatch::error::Result as RecordResult;
 use common_recordbatch::{util, RecordBatch};
 use datafusion::field_util::FieldExt;
@@ -11,7 +12,6 @@ use datatypes::types::PrimitiveElement;
 use function::{create_query_engine, get_numbers_from_table};
 use num_traits::AsPrimitive;
 use query::error::Result;
-use query::query_engine::Output;
 use query::QueryEngine;
 use statrs::distribution::{ContinuousCDF, Normal};
 use statrs::statistics::Statistics;

src/query/tests/scipy_stats_norm_pdf.rs

@@ -1,6 +1,7 @@
 use std::sync::Arc;
 mod function;
 
+use common_query::Output;
 use common_recordbatch::error::Result as RecordResult;
 use common_recordbatch::{util, RecordBatch};
 use datafusion::field_util::FieldExt;
@@ -11,7 +12,6 @@ use datatypes::types::PrimitiveElement;
 use function::{create_query_engine, get_numbers_from_table};
 use num_traits::AsPrimitive;
 use query::error::Result;
-use query::query_engine::Output;
 use query::QueryEngine;
 use statrs::distribution::{Continuous, Normal};
 use statrs::statistics::Statistics;