Skip to content

refactor: Cleanup planner to make space for saying goodbye #7711

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Sep 19, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/query/catalog/src/catalog.rs
Original file line number Diff line number Diff line change
Expand Up @@ -171,4 +171,6 @@ pub trait Catalog: DynClone + Send + Sync {
fn get_table_engines(&self) -> Vec<StorageDescription> {
unimplemented!()
}

fn is_case_insensitive_db(&self, db: &str) -> bool;
}
21 changes: 21 additions & 0 deletions src/query/catalog/src/cluster_info.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,24 @@ pub struct Cluster {
pub local_id: String,
pub nodes: Vec<Arc<NodeInfo>>,
}

impl Cluster {
/// If this cluster is empty?
///
/// # Note
///
/// Cluster empty means:
///
/// - There is no active node (is this possible?).
/// - There is only one node (myself).
///
/// # TODO
///
/// From @Xuanwo
///
/// Ideally, we should implement a cluster trait to replace `ClusterHelper`
/// defined in `databend-query`.
pub fn is_empty(&self) -> bool {
self.nodes.len() <= 1
}
}
16 changes: 8 additions & 8 deletions src/query/service/src/catalogs/default/database_catalog.rs
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,6 @@ impl DatabaseCatalog {
);
Ok(res)
}

pub fn is_case_insensitive_db(db: &str) -> bool {
db.to_uppercase() == "INFORMATION_SCHEMA"
}
}

#[async_trait::async_trait]
Expand All @@ -104,14 +100,18 @@ impl Catalog for DatabaseCatalog {
self
}

fn is_case_insensitive_db(&self, db: &str) -> bool {
db.to_uppercase() == "INFORMATION_SCHEMA"
}

async fn get_database(&self, tenant: &str, db_name: &str) -> Result<Arc<dyn Database>> {
if tenant.is_empty() {
return Err(ErrorCode::TenantIsEmpty(
"Tenant can not empty(while get database)",
));
}

let db_name = if Self::is_case_insensitive_db(db_name) {
let db_name = if self.is_case_insensitive_db(db_name) {
db_name.to_uppercase()
} else {
db_name.to_string()
Expand Down Expand Up @@ -243,7 +243,7 @@ impl Catalog for DatabaseCatalog {
));
}

let (db_name, table_name) = if Self::is_case_insensitive_db(db_name) {
let (db_name, table_name) = if self.is_case_insensitive_db(db_name) {
(db_name.to_uppercase(), table_name.to_uppercase())
} else {
(db_name.to_string(), table_name.to_string())
Expand Down Expand Up @@ -274,7 +274,7 @@ impl Catalog for DatabaseCatalog {
));
}

let db_name = if Self::is_case_insensitive_db(db_name) {
let db_name = if self.is_case_insensitive_db(db_name) {
db_name.to_uppercase()
} else {
db_name.to_string()
Expand Down Expand Up @@ -304,7 +304,7 @@ impl Catalog for DatabaseCatalog {
));
}

let db_name = if Self::is_case_insensitive_db(db_name) {
let db_name = if self.is_case_insensitive_db(db_name) {
db_name.to_uppercase()
} else {
db_name.to_string()
Expand Down
4 changes: 4 additions & 0 deletions src/query/service/src/catalogs/default/immutable_catalog.rs
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,10 @@ impl Catalog for ImmutableCatalog {
self
}

fn is_case_insensitive_db(&self, _: &str) -> bool {
unimplemented!()
}

async fn get_database(&self, _tenant: &str, db_name: &str) -> Result<Arc<dyn Database>> {
match db_name {
"system" => Ok(self.sys_db.clone()),
Expand Down
4 changes: 4 additions & 0 deletions src/query/service/src/catalogs/default/mutable_catalog.rs
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,10 @@ impl Catalog for MutableCatalog {
self
}

fn is_case_insensitive_db(&self, _: &str) -> bool {
unimplemented!()
}

async fn get_database(&self, tenant: &str, db_name: &str) -> Result<Arc<dyn Database>> {
let db_info = self
.ctx
Expand Down
1 change: 0 additions & 1 deletion src/query/service/src/interpreters/interpreter_select.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ use common_exception::Result;
use common_legacy_planners::PlanNode;
use common_legacy_planners::SelectPlan;

use crate::clusters::ClusterHelper;
use crate::interpreters::plan_schedulers;
use crate::interpreters::Interpreter;
use crate::optimizers::Optimizers;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ use common_datavalues::DataSchemaRef;
use common_exception::Result;

use super::plan_schedulers::schedule_query_v2;
use crate::clusters::ClusterHelper;
use crate::interpreters::Interpreter;
use crate::pipelines::PipelineBuildResult;
use crate::sessions::QueryContext;
Expand Down
1 change: 0 additions & 1 deletion src/query/service/src/optimizers/optimizer_scatters.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ use common_legacy_planners::StagePlan;
use common_legacy_planners::WindowFuncPlan;
use enum_extract::let_extract;

use crate::clusters::ClusterHelper;
use crate::optimizers::Optimizer;
use crate::sessions::QueryContext;
use crate::sessions::TableContext;
Expand Down
7 changes: 5 additions & 2 deletions src/query/service/src/sql/planner/binder/ddl/table.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ use common_legacy_planners::*;
use common_meta_app::schema::TableMeta;
use tracing::debug;

use crate::catalogs::DatabaseCatalog;
use crate::sql::binder::scalar::ScalarBinder;
use crate::sql::binder::Binder;
use crate::sql::binder::Visibility;
Expand Down Expand Up @@ -141,7 +140,11 @@ impl<'a> Binder {
.map(|ident| normalize_identifier(ident, &self.name_resolution_ctx).name)
.unwrap_or_else(|| self.ctx.get_current_database());

if DatabaseCatalog::is_case_insensitive_db(database.as_str()) {
if self
.ctx
.get_catalog(&self.ctx.get_current_catalog())?
.is_case_insensitive_db(database.as_str())
{
database = database.to_uppercase();
}

Expand Down
1 change: 0 additions & 1 deletion src/query/service/src/sql/planner/binder/insert.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ use common_datavalues::DataSchemaRefExt;
use common_exception::Result;
use tracing::debug;

use crate::clusters::ClusterHelper;
use crate::sql::binder::Binder;
use crate::sql::normalize_identifier;
use crate::sql::optimizer::optimize;
Expand Down
1 change: 0 additions & 1 deletion src/query/service/src/sql/planner/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ use common_exception::Result;
use parking_lot::RwLock;
pub use plans::ScalarExpr;

use crate::clusters::ClusterHelper;
use crate::sql::optimizer::optimize;
pub use crate::sql::planner::binder::BindContext;

Expand Down
4 changes: 4 additions & 0 deletions src/query/storages/hive/src/hive_catalog.rs
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,10 @@ impl Catalog for HiveCatalog {
self
}

fn is_case_insensitive_db(&self, _: &str) -> bool {
false
}

#[tracing::instrument(level = "info", skip(self))]
async fn get_database(&self, _tenant: &str, db_name: &str) -> Result<Arc<dyn Database>> {
let client = self.get_client()?;
Expand Down