rust/greptimedb
1
0
Fork 0
mirror of https://github.com/GreptimeTeam/greptimedb.git synced 2026-01-10 23:32:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove obj_name_to_tab_ref (#989)

Browse Source
This commit is contained in:
shuiyisong
2023-02-14 16:33:55 +08:00
committed by GitHub
parent 5e6f340dd9
commit 8491f65093
2 changed files with 13 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/frontend/src/instance.rs
View File

@@ -36,7 +36,6 @@ use common_query::Output;
use common_recordbatch::RecordBatches;
use common_telemetry::logging::{debug, info};
use datafusion::sql::sqlparser::ast::ObjectName;
use datafusion_common::TableReference;
use datanode::instance::sql::table_idents_to_full_name;
use datanode::instance::InstanceRef as DnInstanceRef;
use datatypes::schema::Schema;
@@ -45,7 +44,7 @@ use meta_client::client::{MetaClient, MetaClientBuilder};
use meta_client::MetaClientOpts;
use partition::manager::PartitionRuleManager;
use partition::route::TableRoutes;
use query::query_engine::options::QueryOptions;
use query::query_engine::options::{validate_catalog_and_schema, QueryOptions};
use servers::error as server_error;
use servers::interceptor::{SqlQueryInterceptor, SqlQueryInterceptorRef};
use servers::promql::{PromqlHandler, PromqlHandlerRef};
@@ -558,64 +557,34 @@ pub fn check_permission(
Statement::ShowCreateTable(_) | Statement::Alter(_) => {}
Statement::Insert(insert) => {
let (catalog, schema, _) =
table_idents_to_full_name(insert.table_name(), query_ctx.clone())
.map_err(BoxedError::new)
.context(ExternalSnafu)?;
validate_param(&catalog, &schema, query_ctx)?;
validate_param(insert.table_name(), query_ctx)?;
}
Statement::CreateTable(stmt) => {
let tab_ref = obj_name_to_tab_ref(&stmt.name)?;
validate_tab_ref(tab_ref, query_ctx)?;
validate_param(&stmt.name, query_ctx)?;
}
Statement::DropTable(drop_stmt) => {
let tab_ref = obj_name_to_tab_ref(drop_stmt.table_name())?;
validate_tab_ref(tab_ref, query_ctx)?;
validate_param(drop_stmt.table_name(), query_ctx)?;
}
Statement::ShowTables(stmt) => {
if let Some(database) = &stmt.database {
validate_param(&query_ctx.current_catalog(), database, query_ctx)?;
validate_catalog_and_schema(&query_ctx.current_catalog(), database, query_ctx)
.map_err(BoxedError::new)
.context(SqlExecInterceptedSnafu)?;
}
}
Statement::DescribeTable(stmt) => {
let tab_ref = obj_name_to_tab_ref(stmt.name())?;
validate_tab_ref(tab_ref, query_ctx)?;
validate_param(stmt.name(), query_ctx)?;
}
}
Ok(())
}
fn obj_name_to_tab_ref(obj: &ObjectName) -> Result<TableReference> {
match &obj.0[..] {
[table] => Ok(TableReference::Bare {
table: &table.value,
}),
[schema, table] => Ok(TableReference::Partial {
schema: &schema.value,
table: &table.value,
}),
[catalog, schema, table] => Ok(TableReference::Full {
catalog: &catalog.value,
schema: &schema.value,
table: &table.value,
}),
_ => error::InvalidSqlSnafu {
err_msg: format!(
"expect table name to be <catalog>.<schema>.<table>, <schema>.<table> or <table>, actual: {obj}",
),
}.fail(),
}
}
fn validate_tab_ref(tab_ref: TableReference, query_ctx: &QueryContextRef) -> Result<()> {
query::query_engine::options::validate_table_references(tab_ref, query_ctx)
fn validate_param(name: &ObjectName, query_ctx: &QueryContextRef) -> Result<()> {
let (catalog, schema, _) = table_idents_to_full_name(name, query_ctx.clone())
.map_err(BoxedError::new)
.context(SqlExecInterceptedSnafu)
}
.context(ExternalSnafu)?;
fn validate_param(catalog: &str, schema: &str, query_ctx: &QueryContextRef) -> Result<()> {
query::query_engine::options::validate_catalog_and_schema(catalog, schema, query_ctx)
validate_catalog_and_schema(&catalog, &schema, query_ctx)
.map_err(BoxedError::new)
.context(SqlExecInterceptedSnafu)
}

1
src/query/src/query_engine/options.rs
View File

@@ -23,6 +23,7 @@ pub struct QueryOptions {
pub disallow_cross_schema_query: bool,
}
// TODO(shuiyisong): remove one method after #559 is done
pub fn validate_catalog_and_schema(
catalog: &str,
schema: &str,