Skip to content

Commit c90718e

Browse files
authored
Merge pull request #7767 from Xuanwo/remove-old-plan-parser
refactor: Old Planner Never See Again (Part 2)
2 parents 7367522 + 2866b6b commit c90718e

File tree

124 files changed

+47
-14252
lines changed

Some content is hidden

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

124 files changed

+47
-14252
lines changed

Cargo.lock

Lines changed: 0 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/binaries/query/main.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ use common_tracing::set_panic_hook;
2525
use databend_query::api::HttpService;
2626
use databend_query::api::RpcService;
2727
use databend_query::clusters::ClusterDiscovery;
28-
use databend_query::interpreters::AsyncInsertManager;
2928
use databend_query::metrics::MetricService;
3029
use databend_query::servers::HttpHandler;
3130
use databend_query::servers::HttpHandlerKind;
@@ -165,13 +164,6 @@ async fn main(_global_tracker: Arc<RuntimeTracker>) -> common_exception::Result<
165164
);
166165
}
167166

168-
// Async Insert Queue
169-
{
170-
let async_insert_queue = AsyncInsertManager::instance();
171-
async_insert_queue.start().await;
172-
info!("Databend async insert has been enabled.")
173-
}
174-
175167
// Print information to users.
176168
println!("Databend Query");
177169
println!();

src/query/catalog/src/table_context.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ use common_exception::Result;
2626
use common_functions::scalars::FunctionContext;
2727
use common_io::prelude::FormatSettings;
2828
use common_legacy_planners::Partitions;
29-
use common_legacy_planners::PlanNode;
3029
use common_legacy_planners::ReadDataSourcePlan;
3130
use common_meta_types::UserInfo;
3231
use common_settings::Settings;
@@ -87,7 +86,6 @@ pub trait TableContext: Send + Sync {
8786
fn apply_changed_settings(&self, changed_settings: Arc<Settings>) -> Result<()>;
8887
fn get_format_settings(&self) -> Result<FormatSettings>;
8988
fn get_tenant(&self) -> String;
90-
fn get_subquery_name(&self, _query: &PlanNode) -> String;
9189
/// Get the data accessor metrics.
9290
fn get_dal_metrics(&self) -> DalMetrics;
9391
/// Get the session running query.

src/query/legacy-planners/src/lib.rs

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
mod plan_aggregator_final;
16-
mod plan_aggregator_partial;
17-
mod plan_broadcast;
1815
mod plan_delete;
1916
mod plan_empty;
20-
mod plan_explain;
2117
mod plan_expression;
2218
mod plan_expression_action;
2319
mod plan_expression_chain;
@@ -26,46 +22,23 @@ mod plan_expression_common;
2622
mod plan_expression_function;
2723
mod plan_expression_literal;
2824
mod plan_expression_monotonicity;
29-
mod plan_expression_rewriter;
3025
mod plan_expression_sort;
3126
mod plan_expression_validator;
3227
mod plan_expression_visitor;
33-
mod plan_filter;
34-
mod plan_having;
35-
mod plan_insert_into;
36-
mod plan_limit;
37-
mod plan_limit_by;
38-
mod plan_node;
39-
mod plan_node_builder;
40-
mod plan_node_display;
41-
mod plan_node_display_indent;
4228
mod plan_node_extras;
43-
mod plan_node_rewriter;
4429
mod plan_node_stage;
4530
mod plan_node_stage_table;
4631
mod plan_node_statistics;
47-
mod plan_node_visitor;
4832
mod plan_partition;
49-
mod plan_projection;
5033
mod plan_read_datasource;
5134
mod plan_remote;
52-
mod plan_select;
5335
mod plan_setting;
5436
mod plan_sink;
55-
mod plan_sort;
56-
mod plan_subqueries_set;
5737
mod plan_table_recluster;
58-
mod plan_window_func;
5938

60-
pub use plan_aggregator_final::AggregatorFinalPlan;
61-
pub use plan_aggregator_partial::AggregatorPartialPlan;
62-
pub use plan_broadcast::BroadcastPlan;
6339
pub use plan_delete::DeletePlan;
6440
pub use plan_empty::EmptyPlan;
65-
pub use plan_explain::ExplainPlan;
66-
pub use plan_explain::ExplainType;
6741
pub use plan_expression::Expression;
68-
pub use plan_expression::ExpressionPlan;
6942
pub use plan_expression::Expressions;
7043
pub use plan_expression_action::*;
7144
pub use plan_expression_chain::ExpressionChain;
@@ -96,47 +69,27 @@ pub use plan_expression_function::sum;
9669
pub use plan_expression_literal::lit;
9770
pub use plan_expression_literal::lit_null;
9871
pub use plan_expression_monotonicity::ExpressionMonotonicityVisitor;
99-
pub use plan_expression_rewriter::ExpressionRewriter;
10072
pub use plan_expression_sort::sort;
10173
pub use plan_expression_validator::validate_clustering;
10274
pub use plan_expression_validator::validate_expression;
10375
pub use plan_expression_validator::validate_function_arg;
10476
pub use plan_expression_visitor::ExpressionVisitor;
10577
pub use plan_expression_visitor::Recursion;
106-
pub use plan_filter::FilterPlan;
107-
pub use plan_having::HavingPlan;
108-
pub use plan_insert_into::InsertInputSource;
109-
pub use plan_insert_into::InsertPlan;
110-
pub use plan_insert_into::InsertValueBlock;
111-
pub use plan_limit::LimitPlan;
112-
pub use plan_limit_by::LimitByPlan;
113-
pub use plan_node::PlanNode;
114-
pub use plan_node_builder::PlanBuilder;
11578
pub use plan_node_extras::Extras;
11679
pub use plan_node_extras::PrewhereInfo;
11780
pub use plan_node_extras::Projection;
118-
pub use plan_node_rewriter::PlanRewriter;
119-
pub use plan_node_rewriter::RewriteHelper;
12081
pub use plan_node_stage::StageKind;
121-
pub use plan_node_stage::StagePlan;
12282
pub use plan_node_stage_table::StageTableInfo;
12383
pub use plan_node_statistics::Statistics;
124-
pub use plan_node_visitor::PlanVisitor;
12584
pub use plan_partition::PartInfo;
12685
pub use plan_partition::PartInfoPtr;
12786
pub use plan_partition::Partitions;
128-
pub use plan_projection::ProjectionPlan;
12987
pub use plan_read_datasource::ReadDataSourcePlan;
13088
pub use plan_read_datasource::SourceInfo;
13189
pub use plan_remote::RemotePlan;
13290
pub use plan_remote::V1RemotePlan;
13391
pub use plan_remote::V2RemotePlan;
134-
pub use plan_select::SelectPlan;
13592
pub use plan_setting::SettingPlan;
13693
pub use plan_setting::VarValue;
137-
pub use plan_sink::SinkPlan;
13894
pub use plan_sink::SINK_SCHEMA;
139-
pub use plan_sort::SortPlan;
140-
pub use plan_subqueries_set::SubQueriesSetPlan;
14195
pub use plan_table_recluster::ReclusterTablePlan;
142-
pub use plan_window_func::WindowFuncPlan;

src/query/legacy-planners/src/plan_aggregator_final.rs

Lines changed: 0 additions & 39 deletions
This file was deleted.

src/query/legacy-planners/src/plan_aggregator_partial.rs

Lines changed: 0 additions & 38 deletions
This file was deleted.

src/query/legacy-planners/src/plan_broadcast.rs

Lines changed: 0 additions & 34 deletions
This file was deleted.

src/query/legacy-planners/src/plan_explain.rs

Lines changed: 0 additions & 43 deletions
This file was deleted.

0 commit comments

Comments
 (0)