refactor(planner): refine the file organization (#17687)

Author: BohuTANG

src/query/service/src/interpreters/interpreter_table_recluster.rs

@@ -54,10 +54,10 @@ use databend_common_sql::plans::set_update_stream_columns;
 use databend_common_sql::plans::BoundColumnRef;
 use databend_common_sql::plans::Plan;
 use databend_common_sql::plans::ReclusterPlan;
-use databend_common_sql::query_executor::QueryExecutor;
 use databend_common_sql::IdentifierNormalizer;
 use databend_common_sql::MetadataRef;
 use databend_common_sql::NameResolutionContext;
+use databend_common_sql::QueryExecutor;
 use databend_common_sql::ScalarExpr;
 use databend_common_sql::TypeChecker;
 use databend_enterprise_hilbert_clustering::get_hilbert_clustering_handler;

src/query/service/src/schedulers/scheduler.rs

@@ -17,7 +17,7 @@ use std::sync::Arc;
 use async_trait::async_trait;
 use databend_common_exception::Result;
 use databend_common_expression::DataBlock;
-use databend_common_sql::planner::query_executor::QueryExecutor;
+use databend_common_sql::planner::QueryExecutor;
 use databend_common_sql::Planner;
 use futures_util::TryStreamExt;
 

src/query/sql/src/planner/binder/bind_query/bind_select.rs

@@ -48,7 +48,7 @@ use log::warn;
 use crate::optimizer::ir::SExpr;
 use crate::planner::binder::BindContext;
 use crate::planner::binder::Binder;
-use crate::planner::query_executor::QueryExecutor;
+use crate::planner::QueryExecutor;
 use crate::AsyncFunctionRewriter;
 use crate::ColumnBinding;
 

src/query/sql/src/planner/binder/binder.rs

@@ -60,7 +60,7 @@ use crate::binder::wrap_cast;
 use crate::binder::ColumnBindingBuilder;
 use crate::normalize_identifier;
 use crate::optimizer::ir::SExpr;
-use crate::planner::query_executor::QueryExecutor;
+use crate::planner::QueryExecutor;
 use crate::plans::CreateFileFormatPlan;
 use crate::plans::CreateRolePlan;
 use crate::plans::DescConnectionPlan;

src/query/sql/src/planner/binder/udf.rs

@@ -35,8 +35,8 @@ use databend_common_meta_app::principal::UserDefinedFunction;
 
 use crate::normalize_identifier;
 use crate::optimizer::ir::SExpr;
+use crate::planner::expression::UDFValidator;
 use crate::planner::resolve_type_name_udf;
-use crate::planner::udf_validator::UDFValidator;
 use crate::plans::AlterUDFPlan;
 use crate::plans::CreateUDFPlan;
 use crate::plans::DropUDFPlan;

src/query/sql/src/planner/execution/mod.rs

@@ -0,0 +1,21 @@
+// Copyright 2021 Datafuse Labs
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+mod query_executor;
+mod stream_column;
+
+pub use query_executor::QueryExecutor;
+pub use stream_column::StreamContext;
+pub use stream_column::CURRENT_BLOCK_ID_COL_NAME;
+pub use stream_column::CURRENT_BLOCK_ROW_NUM_COL_NAME;

src/query/sql/src/planner/query_executor.rs renamed to src/query/sql/src/planner/execution/query_executor.rs

@@ -0,0 +1,19 @@
+// Copyright 2021 Datafuse Labs
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+mod expression_parser;
+mod udf_validator;
+
+pub use expression_parser::*;
+pub use udf_validator::UDFValidator;