Skip to content

Commit e649fb2

Browse files
dantengskydantengsky
committed
fix: cargo fmt
1 parent 4413798 commit e649fb2

File tree

8 files changed

+31
-19
lines changed

8 files changed

+31
-19
lines changed

‎src/query/ast/src/parser/statement.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -805,7 +805,9 @@ pub fn statement_body(i: Input) -> IResult<Statement> {
805805
parse_create_option(opt_or_replace.is_some(), opt_if_not_exists.is_some())?;
806806

807807
let engine = engine_opt.map(|(_, _, engine)| engine);
808-
let options = options_opt.map(|(_, _, options, _)| options).unwrap_or_default();
808+
let options = options_opt
809+
.map(|(_, _, options, _)| options)
810+
.unwrap_or_default();
809811

810812
let statement = Statement::CreateDatabase(CreateDatabaseStmt {
811813
create_option,

‎src/query/service/src/interpreters/interpreter_alter_database.rs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@
1414

1515
use std::sync::Arc;
1616

17+
use databend_common_catalog::table_context::TableContext;
1718
use databend_common_exception::Result;
1819
use databend_common_sql::plans::AlterDatabasePlan;
1920
use log::debug;
20-
use databend_common_catalog::table_context::TableContext;
21+
2122
use crate::interpreters::Interpreter;
2223
use crate::pipelines::PipelineBuildResult;
2324
use crate::sessions::QueryContext;
@@ -56,7 +57,7 @@ impl Interpreter for AlterDatabaseInterpreter {
5657

5758
if has_connection != has_path {
5859
return Err(databend_common_exception::ErrorCode::BadArguments(
59-
"DEFAULT_STORAGE_CONNECTION and DEFAULT_STORAGE_PATH options must be used together"
60+
"DEFAULT_STORAGE_CONNECTION and DEFAULT_STORAGE_PATH options must be used together",
6061
));
6162
}
6263

@@ -74,4 +75,4 @@ impl Interpreter for AlterDatabaseInterpreter {
7475

7576
Ok(PipelineBuildResult::create())
7677
}
77-
}
78+
}

‎src/query/service/src/interpreters/interpreter_factory.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ use crate::interpreters::interpreter_procedure_call::CallProcedureInterpreter;
6767
use crate::interpreters::interpreter_procedure_create::CreateProcedureInterpreter;
6868
use crate::interpreters::interpreter_procedure_drop::DropProcedureInterpreter;
6969
use crate::interpreters::interpreter_refresh_database_cache::RefreshDatabaseCacheInterpreter;
70-
use crate::interpreters::AlterDatabaseInterpreter;
7170
use crate::interpreters::interpreter_refresh_table_cache::RefreshTableCacheInterpreter;
7271
use crate::interpreters::interpreter_rename_warehouse::RenameWarehouseInterpreter;
7372
use crate::interpreters::interpreter_rename_warehouse_cluster::RenameWarehouseClusterInterpreter;
@@ -104,6 +103,7 @@ use crate::interpreters::interpreter_unassign_warehouse_nodes::UnassignWarehouse
104103
use crate::interpreters::interpreter_unset_workload_group_quotas::UnsetWorkloadGroupQuotasInterpreter;
105104
use crate::interpreters::interpreter_use_warehouse::UseWarehouseInterpreter;
106105
use crate::interpreters::interpreter_view_describe::DescribeViewInterpreter;
106+
use crate::interpreters::AlterDatabaseInterpreter;
107107
use crate::interpreters::AlterUserInterpreter;
108108
use crate::interpreters::CreateStreamInterpreter;
109109
use crate::interpreters::DescUserInterpreter;

‎src/query/service/src/interpreters/mod.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ pub(crate) mod common;
1818
mod hook;
1919
mod interpreter;
2020
mod interpreter_add_warehouse_cluster;
21+
mod interpreter_alter_database;
2122
mod interpreter_assign_warehouse_nodes;
2223
mod interpreter_catalog_create;
2324
mod interpreter_catalog_drop;
@@ -38,7 +39,6 @@ mod interpreter_data_mask_create;
3839
mod interpreter_data_mask_desc;
3940
mod interpreter_data_mask_drop;
4041
mod interpreter_database_create;
41-
mod interpreter_alter_database;
4242
mod interpreter_database_drop;
4343
mod interpreter_database_rename;
4444
mod interpreter_database_show_create;
@@ -191,6 +191,7 @@ pub use hook::HookOperator;
191191
pub use interpreter::interpreter_plan_sql;
192192
pub use interpreter::Interpreter;
193193
pub use interpreter::InterpreterPtr;
194+
pub use interpreter_alter_database::AlterDatabaseInterpreter;
194195
pub use interpreter_catalog_use::UseCatalogInterpreter;
195196
pub use interpreter_cluster_key_alter::AlterTableClusterKeyInterpreter;
196197
pub use interpreter_cluster_key_drop::DropTableClusterKeyInterpreter;
@@ -199,7 +200,6 @@ pub use interpreter_data_mask_create::CreateDataMaskInterpreter;
199200
pub use interpreter_data_mask_desc::DescDataMaskInterpreter;
200201
pub use interpreter_data_mask_drop::DropDataMaskInterpreter;
201202
pub use interpreter_database_create::CreateDatabaseInterpreter;
202-
pub use interpreter_alter_database::AlterDatabaseInterpreter;
203203
pub use interpreter_database_drop::DropDatabaseInterpreter;
204204
pub use interpreter_database_rename::RenameDatabaseInterpreter;
205205
pub use interpreter_database_show_create::ShowCreateDatabaseInterpreter;

‎src/query/sql/src/planner/binder/ddl/database.rs‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ use log::debug;
3636

3737
use crate::binder::Binder;
3838
use crate::planner::semantic::normalize_identifier;
39+
use crate::plans::AlterDatabasePlan;
3940
use crate::plans::CreateDatabasePlan;
4041
use crate::plans::DropDatabasePlan;
4142
use crate::plans::Plan;
4243
use crate::plans::RefreshDatabaseCachePlan;
43-
use crate::plans::AlterDatabasePlan;
4444
use crate::plans::RenameDatabaseEntity;
4545
use crate::plans::RenameDatabasePlan;
4646
use crate::plans::RewriteKind;
@@ -316,10 +316,8 @@ impl Binder {
316316
options: &[SQLProperty],
317317
) -> Result<DatabaseMeta> {
318318
// Validate database options - only allow specific connection-related options
319-
const VALID_DATABASE_OPTIONS: &[&str] = &[
320-
"DEFAULT_STORAGE_CONNECTION",
321-
"DEFAULT_STORAGE_PATH",
322-
];
319+
const VALID_DATABASE_OPTIONS: &[&str] =
320+
&["DEFAULT_STORAGE_CONNECTION", "DEFAULT_STORAGE_PATH"];
323321

324322
for property in options {
325323
if !VALID_DATABASE_OPTIONS.contains(&property.name.as_str()) {
@@ -332,18 +330,22 @@ impl Binder {
332330
}
333331

334332
// Validate that DEFAULT_STORAGE_CONNECTION and DEFAULT_STORAGE_PATH are used together
335-
let has_connection = options.iter().any(|p| p.name == "DEFAULT_STORAGE_CONNECTION");
333+
let has_connection = options
334+
.iter()
335+
.any(|p| p.name == "DEFAULT_STORAGE_CONNECTION");
336336
let has_path = options.iter().any(|p| p.name == "DEFAULT_STORAGE_PATH");
337337

338338
if has_connection && !has_path {
339339
return Err(ErrorCode::BadArguments(
340-
"DEFAULT_STORAGE_CONNECTION requires DEFAULT_STORAGE_PATH to be specified".to_string()
340+
"DEFAULT_STORAGE_CONNECTION requires DEFAULT_STORAGE_PATH to be specified"
341+
.to_string(),
341342
));
342343
}
343344

344345
if has_path && !has_connection {
345346
return Err(ErrorCode::BadArguments(
346-
"DEFAULT_STORAGE_PATH requires DEFAULT_STORAGE_CONNECTION to be specified".to_string()
347+
"DEFAULT_STORAGE_PATH requires DEFAULT_STORAGE_CONNECTION to be specified"
348+
.to_string(),
347349
));
348350
}
349351

‎src/query/sql/src/planner/binder/ddl/table.rs‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -553,9 +553,14 @@ impl Binder {
553553
// FUSE tables can inherit database connection defaults for external storage
554554
let engine = engine.unwrap_or(catalog.default_table_engine());
555555
if matches!(engine, Engine::Fuse) {
556-
if let Ok(database_info) = catalog.get_database(&self.ctx.get_tenant(), &database).await {
556+
if let Ok(database_info) = catalog
557+
.get_database(&self.ctx.get_tenant(), &database)
558+
.await
559+
{
557560
// Extract database-level default connection options
558-
if let Some(default_connection) = database_info.options().get("DEFAULT_STORAGE_CONNECTION") {
561+
if let Some(default_connection) =
562+
database_info.options().get("DEFAULT_STORAGE_CONNECTION")
563+
{
559564
options.insert("connection".to_string(), default_connection.clone());
560565
}
561566
if let Some(default_path) = database_info.options().get("DEFAULT_STORAGE_PATH") {

‎src/query/sql/src/planner/format/display_plan.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,9 @@ impl Plan {
274274
Plan::SetWorkloadGroupQuotas(_) => Ok("SetWorkloadGroupQuotas".to_string()),
275275
Plan::UnsetWorkloadGroupQuotas(_) => Ok("UnsetWorkloadGroupQuotas".to_string()),
276276
Plan::AlterRole(_) => Ok("AlterRole".to_string()),
277-
Plan::AlterDatabase(_) => {todo!()}
277+
Plan::AlterDatabase(_) => {
278+
todo!()
279+
}
278280
}
279281
}
280282
}

‎src/query/sql/src/planner/plans/plan.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ use crate::plans::AddTableColumnPlan;
3838
use crate::plans::AddTableConstraintPlan;
3939
use crate::plans::AddTableRowAccessPolicyPlan;
4040
use crate::plans::AddWarehouseClusterPlan;
41+
use crate::plans::AlterDatabasePlan;
4142
use crate::plans::AlterNetworkPolicyPlan;
4243
use crate::plans::AlterNotificationPlan;
4344
use crate::plans::AlterPasswordPolicyPlan;
@@ -133,7 +134,6 @@ use crate::plans::OptimizePurgePlan;
133134
use crate::plans::PresignPlan;
134135
use crate::plans::ReclusterPlan;
135136
use crate::plans::RefreshDatabaseCachePlan;
136-
use crate::plans::AlterDatabasePlan;
137137
use crate::plans::RefreshIndexPlan;
138138
use crate::plans::RefreshTableCachePlan;
139139
use crate::plans::RefreshTableIndexPlan;

0 commit comments

Comments
 (0)