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/datanode/Cargo.toml

@@ -25,6 +25,7 @@ catalog = { path = "../catalog" }
 common-base = { path = "../common/base" }
 common-error = { path = "../common/error" }
 common-grpc = { path = "../common/grpc" }
+common-query = { path = "../common/query" }
 common-recordbatch = { path = "../common/recordbatch" }
 common-runtime = { path = "../common/runtime" }
 common-telemetry = { path = "../common/telemetry" }

src/datanode/src/instance.rs

@@ -8,11 +8,12 @@ use async_trait::async_trait;
 use catalog::{CatalogManagerRef, DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME};
 use common_error::prelude::BoxedError;
 use common_error::status_code::StatusCode;
+use common_query::Output;
 use common_telemetry::logging::{error, info};
 use common_telemetry::timer;
 use log_store::fs::{config::LogConfig, log::LocalFileLogStore};
 use object_store::{backend::fs::Backend, util, ObjectStore};
-use query::query_engine::{Output, QueryEngineFactory, QueryEngineRef};
+use query::query_engine::{QueryEngineFactory, QueryEngineRef};
 use servers::query_handler::{GrpcAdminHandler, GrpcQueryHandler, SqlQueryHandler};
 use snafu::prelude::*;
 use sql::statements::statement::Statement;

src/datanode/src/script.rs

@@ -1,5 +1,5 @@
 use catalog::CatalogManagerRef;
-use query::Output;
+use common_query::Output;
 use query::QueryEngineRef;
 
 use crate::error::Result;

src/datanode/src/server/grpc/ddl.rs

@@ -3,9 +3,9 @@ use std::sync::Arc;
 use api::helper::ColumnDataTypeWrapper;
 use api::v1::{alter_expr::Kind, AdminResult, AlterExpr, ColumnDef, CreateExpr};
 use common_error::prelude::{ErrorExt, StatusCode};
+use common_query::Output;
 use datatypes::schema::{ColumnSchema, SchemaBuilder, SchemaRef};
 use futures::TryFutureExt;
-use query::Output;
 use snafu::prelude::*;
 use table::requests::{AlterKind, AlterTableRequest, CreateTableRequest};
 

src/datanode/src/server/grpc/plan.rs

@@ -2,9 +2,10 @@ use std::sync::Arc;
 
 use common_grpc::AsExcutionPlan;
 use common_grpc::DefaultAsPlanImpl;
+use common_query::Output;
 use datatypes::schema::Schema;
 use query::PhysicalPlanAdapter;
-use query::{plan::PhysicalPlan, Output, QueryEngineRef};
+use query::{plan::PhysicalPlan, QueryEngineRef};
 use snafu::ResultExt;
 
 use crate::error::Result;

src/datanode/src/server/grpc/select.rs

@@ -6,9 +6,9 @@ use arrow::array::{Array, BooleanArray, PrimitiveArray};
 use common_base::BitVec;
 use common_error::prelude::ErrorExt;
 use common_error::status_code::StatusCode;
+use common_query::Output;
 use common_recordbatch::{util, RecordBatch, SendableRecordBatchStream};
 use datatypes::arrow_array::{BinaryArray, StringArray};
-use query::Output;
 use snafu::{OptionExt, ResultExt};
 
 use crate::error::{self, ConversionSnafu, Result};

src/datanode/src/sql.rs

@@ -1,7 +1,7 @@
 //! sql handler
 
 use catalog::CatalogManagerRef;
-use query::query_engine::Output;
+use common_query::Output;
 use snafu::{OptionExt, ResultExt};
 use table::engine::{EngineContext, TableEngineRef};
 use table::requests::*;

src/datanode/src/sql/alter.rs

@@ -1,4 +1,4 @@
-use query::query_engine::Output;
+use common_query::Output;
 use snafu::prelude::*;
 use sql::statements::alter::{AlterTable, AlterTableOperation};
 use sql::statements::{column_def_to_schema, table_idents_to_full_name};

src/datanode/src/sql/create.rs

@@ -2,9 +2,9 @@ use std::collections::HashMap;
 use std::sync::Arc;
 
 use catalog::RegisterTableRequest;
+use common_query::Output;
 use common_telemetry::tracing::info;
 use datatypes::schema::SchemaBuilder;
-use query::query_engine::Output;
 use snafu::{OptionExt, ResultExt};
 use sql::ast::TableConstraint;
 use sql::statements::create_table::CreateTable;

src/datanode/src/sql/insert.rs

@@ -1,10 +1,10 @@
 use std::str::FromStr;
 
 use catalog::SchemaProviderRef;
+use common_query::Output;
 use datatypes::prelude::ConcreteDataType;
 use datatypes::prelude::VectorBuilder;
 use datatypes::value::Value;
-use query::query_engine::Output;
 use snafu::ensure;
 use snafu::OptionExt;
 use snafu::ResultExt;

src/datanode/src/tests/instance_test.rs

@@ -1,8 +1,8 @@
 use arrow::array::UInt64Array;
+use common_query::Output;
 use common_recordbatch::util;
 use datafusion::arrow_print;
 use datafusion_common::record_batch::RecordBatch as DfRecordBatch;
-use query::Output;
 
 use crate::error;
 use crate::instance::Instance;