Merge pull request #7603 from Xuanwo/move-optimizer-into-planner

refactor: Move optimizer into planner

Author: mergify[bot]

src/query/service/src/sql/common/mod.rs

@@ -19,6 +19,7 @@ use common_exception::Result;
 use common_legacy_planners::Expression;
 
 use crate::sql::executor::util::format_field_name;
+use crate::sql::planner::IndexType;
 use crate::sql::plans::AggregateFunction;
 use crate::sql::plans::AndExpr;
 use crate::sql::plans::BoundColumnRef;
@@ -28,7 +29,6 @@ use crate::sql::plans::ConstantExpr;
 use crate::sql::plans::FunctionCall;
 use crate::sql::plans::OrExpr;
 use crate::sql::plans::Scalar;
-use crate::sql::IndexType;
 use crate::sql::MetadataRef;
 
 pub trait FiledNameFormat {

src/query/service/src/sql/executor/expression_builder.rs

@@ -30,7 +30,7 @@ use super::Project;
 use super::Sort;
 use super::TableScan;
 use super::UnionAll;
-use crate::sql::IndexType;
+use crate::sql::planner::IndexType;
 use crate::sql::MetadataRef;
 use crate::sql::DUMMY_TABLE_INDEX;
 

src/query/service/src/sql/executor/format.rs

@@ -33,9 +33,9 @@ use super::physical_scalar::PhysicalScalar;
 use super::AggregateFunctionDesc;
 use super::SortDesc;
 use crate::sql::optimizer::ColumnSet;
+use crate::sql::planner::IndexType;
 use crate::sql::plans::JoinType;
 use crate::sql::ColumnBinding;
-use crate::sql::IndexType;
 
 pub type ColumnID = String;
 

src/query/service/src/sql/executor/physical_plan.rs

@@ -18,7 +18,7 @@ use common_datavalues::DataValue;
 use common_exception::Result;
 
 use super::ColumnID;
-use crate::sql::IndexType;
+use crate::sql::planner::IndexType;
 use crate::sql::MetadataRef;
 
 /// Serializable and desugared representation of `Scalar`.

src/query/service/src/sql/executor/physical_scalar.rs

@@ -18,8 +18,8 @@ use once_cell::sync::Lazy;
 use regex::Regex;
 
 use crate::sql::optimizer::SExpr;
+use crate::sql::planner::IndexType;
 use crate::sql::plans::Operator;
-use crate::sql::IndexType;
 
 /// Check if all plans in an expression are physical plans
 pub fn check_physical(expression: &SExpr) -> bool {

src/query/service/src/sql/executor/util.rs

@@ -12,17 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-mod common;
 pub mod executor;
 mod metrics;
-pub mod optimizer;
 mod parsers;
 mod plan_parser;
 pub mod planner;
 mod sql_parser;
 mod sql_statement;
 pub mod statements;
-pub use common::*;
 use common_legacy_parser::sql_common;
 use common_storages_util::table_option_keys;
 pub use plan_parser::PlanParser;

src/query/service/src/sql/mod.rs

@@ -28,9 +28,9 @@ use common_exception::Result;
 use parking_lot::RwLock;
 
 use super::AggregateInfo;
-use crate::sql::common::IndexType;
 use crate::sql::normalize_identifier;
 use crate::sql::optimizer::SExpr;
+use crate::sql::planner::IndexType;
 use crate::sql::plans::Scalar;
 use crate::sql::NameResolutionContext;
 

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

@@ -20,14 +20,14 @@ use crate::sql::binder::Binder;
 use crate::sql::binder::ColumnBinding;
 use crate::sql::optimizer::SExpr;
 use crate::sql::planner::semantic::GroupingChecker;
+use crate::sql::planner::IndexType;
 use crate::sql::plans::Aggregate;
 use crate::sql::plans::AggregateMode;
 use crate::sql::plans::BoundColumnRef;
 use crate::sql::plans::EvalScalar;
 use crate::sql::plans::Scalar;
 use crate::sql::plans::ScalarItem;
 use crate::sql::BindContext;
-use crate::sql::IndexType;
 
 impl Binder {
     pub(super) fn bind_distinct(

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

@@ -31,6 +31,7 @@ use crate::sql::planner::binder::Binder;
 use crate::sql::planner::binder::ColumnBinding;
 use crate::sql::planner::semantic::normalize_identifier;
 use crate::sql::planner::semantic::GroupingChecker;
+use crate::sql::planner::IndexType;
 use crate::sql::plans::BoundColumnRef;
 use crate::sql::plans::EvalScalar;
 use crate::sql::plans::Project;
@@ -39,7 +40,6 @@ use crate::sql::plans::ScalarExpr;
 use crate::sql::plans::ScalarItem;
 use crate::sql::plans::SubqueryExpr;
 use crate::sql::plans::SubqueryType;
-use crate::sql::IndexType;
 
 impl<'a> Binder {
     pub(super) fn analyze_projection(