Skip to content

Commit 979dab1

Browse files
authored
refactor(optimizer): ir (#17685)
* refactor(optimizer): ir * add stats * add PropertyEnforcer for require_property wrapper * refine the hisogram to HistogramBuilder * memo_display -> Memo.display() * SExpr.get_udf_names -> ScalarExpr.get_udf_names
1 parent 981a7bf commit 979dab1

File tree

185 files changed

+1039
-797
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

185 files changed

+1039
-797
lines changed

src/query/service/src/interpreters/access/privilege_access.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ use databend_common_meta_app::principal::SYSTEM_TABLES_ALLOW_LIST;
3535
use databend_common_meta_app::tenant::Tenant;
3636
use databend_common_meta_types::seq_value::SeqV;
3737
use databend_common_sql::binder::MutationType;
38-
use databend_common_sql::optimizer::get_udf_names;
3938
use databend_common_sql::plans::InsertInputSource;
4039
use databend_common_sql::plans::Mutation;
4140
use databend_common_sql::plans::OptimizeCompactBlock;
@@ -1109,23 +1108,23 @@ impl AccessChecker for PrivilegeAccess {
11091108
let unmatched_evaluators = &plan.unmatched_evaluators;
11101109
for matched_evaluator in matched_evaluators {
11111110
if let Some(condition) = &matched_evaluator.condition {
1112-
let udf = get_udf_names(condition)?;
1111+
let udf = condition.get_udf_names()?;
11131112
self.validate_udf_access(udf).await?;
11141113
}
11151114
if let Some(updates) = &matched_evaluator.update {
11161115
for scalar in updates.values() {
1117-
let udf = get_udf_names(scalar)?;
1116+
let udf = scalar.get_udf_names()?;
11181117
self.validate_udf_access(udf).await?;
11191118
}
11201119
}
11211120
}
11221121
for unmatched_evaluator in unmatched_evaluators {
11231122
if let Some(condition) = &unmatched_evaluator.condition {
1124-
let udf = get_udf_names(condition)?;
1123+
let udf = condition.get_udf_names()?;
11251124
self.validate_udf_access(udf).await?;
11261125
}
11271126
for value in &unmatched_evaluator.values {
1128-
let udf = get_udf_names(value)?;
1127+
let udf = value.get_udf_names()?;
11291128
self.validate_udf_access(udf).await?;
11301129
}
11311130
}

src/query/service/src/interpreters/hook/compact_hook.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ use databend_common_pipeline_core::always_callback;
2424
use databend_common_pipeline_core::ExecutionInfo;
2525
use databend_common_pipeline_core::Pipeline;
2626
use databend_common_sql::executor::physical_plans::MutationKind;
27-
use databend_common_sql::optimizer::SExpr;
27+
use databend_common_sql::optimizer::ir::SExpr;
2828
use databend_common_sql::plans::OptimizeCompactBlock;
2929
use databend_common_sql::plans::ReclusterPlan;
3030
use databend_common_sql::plans::RelOperator;

src/query/service/src/interpreters/interpreter_explain.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ use databend_common_pipeline_core::ExecutionInfo;
3434
use databend_common_sql::binder::ExplainConfig;
3535
use databend_common_sql::executor::format_partial_tree;
3636
use databend_common_sql::executor::MutationBuildInfo;
37-
use databend_common_sql::optimizer::ColumnSet;
37+
use databend_common_sql::optimizer::ir::ColumnSet;
3838
use databend_common_sql::plans::Mutation;
3939
use databend_common_sql::BindContext;
4040
use databend_common_sql::FormatOptions;
@@ -61,7 +61,7 @@ use crate::schedulers::QueryFragmentsActions;
6161
use crate::sessions::QueryContext;
6262
use crate::sql::executor::PhysicalPlan;
6363
use crate::sql::executor::PhysicalPlanBuilder;
64-
use crate::sql::optimizer::SExpr;
64+
use crate::sql::optimizer::ir::SExpr;
6565
use crate::sql::plans::Plan;
6666

6767
pub struct ExplainInterpreter {

src/query/service/src/interpreters/interpreter_mutation.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ use databend_common_sql::executor::physical_plans::MutationKind;
3535
use databend_common_sql::executor::MutationBuildInfo;
3636
use databend_common_sql::executor::PhysicalPlan;
3737
use databend_common_sql::executor::PhysicalPlanBuilder;
38-
use databend_common_sql::optimizer::SExpr;
38+
use databend_common_sql::optimizer::ir::SExpr;
3939
use databend_common_sql::planner::MetadataRef;
4040
use databend_common_sql::plans;
4141
use databend_common_sql::plans::Mutation;

src/query/service/src/interpreters/interpreter_optimize_compact_block.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use databend_common_exception::ErrorCode;
2121
use databend_common_exception::Result;
2222
use databend_common_pipeline_core::ExecutionInfo;
2323
use databend_common_sql::executor::PhysicalPlanBuilder;
24-
use databend_common_sql::optimizer::SExpr;
24+
use databend_common_sql::optimizer::ir::SExpr;
2525
use databend_common_sql::plans::OptimizeCompactBlock;
2626
use databend_common_sql::MetadataRef;
2727

src/query/service/src/interpreters/interpreter_select.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ use crate::schedulers::build_query_pipeline;
5151
use crate::sessions::QueryContext;
5252
use crate::sessions::TableContext;
5353
use crate::sql::executor::PhysicalPlanBuilder;
54-
use crate::sql::optimizer::SExpr;
54+
use crate::sql::optimizer::ir::SExpr;
5555
use crate::sql::BindContext;
5656

5757
/// Interpret SQL query with new SQL planner

src/query/service/src/pipelines/processors/transforms/hash_join/transform_hash_join_probe.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use databend_common_exception::ErrorCode;
2121
use databend_common_exception::Result;
2222
use databend_common_expression::DataBlock;
2323
use databend_common_expression::FunctionContext;
24-
use databend_common_sql::optimizer::ColumnSet;
24+
use databend_common_sql::optimizer::ir::ColumnSet;
2525
use databend_common_sql::plans::JoinType;
2626

2727
use crate::pipelines::processors::transforms::hash_join::transform_hash_join_build::HashTableType;

src/query/service/src/pipelines/processors/transforms/transform_filter.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ use databend_common_expression::FunctionContext;
2525
use databend_common_functions::BUILTIN_FUNCTIONS;
2626
use databend_common_pipeline_transforms::processors::BlockingTransform;
2727
use databend_common_pipeline_transforms::processors::BlockingTransformer;
28-
use databend_common_sql::optimizer::ColumnSet;
28+
use databend_common_sql::optimizer::ir::ColumnSet;
2929

3030
use crate::pipelines::processors::InputPort;
3131
use crate::pipelines::processors::OutputPort;

src/query/service/src/test_kits/fuse.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ use databend_common_expression::DataBlock;
2626
use databend_common_expression::DataSchemaRef;
2727
use databend_common_expression::ScalarRef;
2828
use databend_common_expression::SendableDataBlockStream;
29-
use databend_common_sql::optimizer::SExpr;
29+
use databend_common_sql::optimizer::ir::SExpr;
3030
use databend_common_sql::plans::Mutation;
3131
use databend_common_storages_factory::Table;
3232
use databend_common_storages_fuse::io::MetaWriter;

src/query/service/tests/it/sql/planner/optimizer/agg_index_query_rewrite.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ use databend_common_expression::TableDataType;
2727
use databend_common_expression::TableField;
2828
use databend_common_expression::TableSchemaRefExt;
2929
use databend_common_meta_app::schema::CreateOption;
30+
use databend_common_sql::optimizer::ir::SExpr;
3031
use databend_common_sql::optimizer::OptimizerContext;
3132
use databend_common_sql::optimizer::RecursiveOptimizer;
3233
use databend_common_sql::optimizer::RuleID;
33-
use databend_common_sql::optimizer::SExpr;
3434
use databend_common_sql::optimizer::DEFAULT_REWRITE_RULES;
3535
use databend_common_sql::plans::AggIndexInfo;
3636
use databend_common_sql::plans::CreateTablePlan;

0 commit comments

Comments
 (0)