Skip to content
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

feature(planner): Migrate DROP USER statement to new planner #5813

Merged
merged 1 commit into from
Jun 7, 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 common/ast/tests/it/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ fn test_statement() {
r#"insert into table t select * from t2;"#,
r#"select parse_json('{"k1": [0, 1, 2]}').k1[0];"#,
r#"create user 'test-e'@'localhost' identified by 'password';"#,
r#"drop user if exists 'test-j'@'localhost';"#,
];

for case in cases {
Expand Down Expand Up @@ -171,6 +172,7 @@ fn test_statement_error() {
r#"insert into t format"#,
r#"alter database system x rename to db"#,
r#"create user 'test-e'@'localhost' identified bi 'password';"#,
r#"drop usar if exists 'test-j'@'localhost';"#,
];

for case in cases {
Expand Down
10 changes: 10 additions & 0 deletions common/ast/tests/it/testdata/statement-error.txt
Original file line number Diff line number Diff line change
Expand Up @@ -113,3 +113,13 @@ error:
| ^^ expected `WITH`, `BY`, or `;`


---------- Input ----------
drop usar if exists 'test-j'@'localhost';
---------- Output ---------
error:
--> SQL:1:6
|
1 | drop usar if exists 'test-j'@'localhost';
| ^^^^ expected `DATABASE`, `SCHEMA`, `TABLE`, `VIEW`, `USER`, or `FUNCTION`


14 changes: 14 additions & 0 deletions common/ast/tests/it/testdata/statement.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2730,3 +2730,17 @@ CreateUser(
)


---------- Input ----------
drop user if exists 'test-j'@'localhost';
---------- Output ---------
DROP USER IF EXISTS 'test-j'@'localhost'
---------- AST ------------
DropUser {
if_exists: true,
user: UserIdentity {
username: "test-j",
hostname: "localhost",
},
}


2 changes: 2 additions & 0 deletions query/src/interpreters/interpreter_factory_v2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ use super::ShowMetricsInterpreter;
use super::ShowProcessListInterpreter;
use super::ShowSettingsInterpreter;
use crate::interpreters::CreateUserInterpreter;
use crate::interpreters::DropUserInterpreter;
use crate::sessions::QueryContext;
use crate::sql::plans::Plan;
use crate::sql::DfStatement;
Expand Down Expand Up @@ -76,6 +77,7 @@ impl InterpreterFactoryV2 {
Plan::CreateView(create_view) => {
CreateViewInterpreter::try_create(ctx, *create_view.clone())
}
Plan::DropUser(drop_user) => DropUserInterpreter::try_create(ctx, *drop_user.clone()),
}?;
Ok(inner)
}
Expand Down
3 changes: 2 additions & 1 deletion query/src/sql/optimizer/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ pub fn optimize(plan: Plan) -> Result<Plan> {
| Plan::ShowSettings
| Plan::CreateTable(_)
| Plan::CreateUser(_)
| Plan::CreateView(_) => Ok(plan),
| Plan::CreateView(_)
| Plan::DropUser(_) => Ok(plan),
}
}

Expand Down
9 changes: 9 additions & 0 deletions query/src/sql/planner/binder/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ use common_ast::ast::TimeTravelPoint;
use common_datavalues::DataTypeImpl;
use common_exception::ErrorCode;
use common_exception::Result;
use common_planners::DropUserPlan;

use self::subquery::SubqueryRewriter;
use super::plans::Plan;
Expand Down Expand Up @@ -121,6 +122,14 @@ impl<'a> Binder {
Ok(plan)
}

Statement::DropUser { if_exists, user } => {
let plan = DropUserPlan {
if_exists: *if_exists,
user: user.clone(),
};
Ok(Plan::DropUser(Box::new(plan)))
}

_ => Err(ErrorCode::UnImplement(format!(
"UnImplemented stmt {stmt} in binder"
))),
Expand Down
1 change: 1 addition & 0 deletions query/src/sql/planner/format/display_plan.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ impl Plan {
Plan::ShowSettings => Ok("SHOW SETTINGS".to_string()),
Plan::CreateUser(create_user) => Ok(format!("{:?}", create_user)),
Plan::CreateView(create_view) => Ok(format!("{:?}", create_view)),
Plan::DropUser(drop_user) => Ok(format!("{:?}", drop_user)),
}
}
}
2 changes: 2 additions & 0 deletions query/src/sql/planner/plans/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ use common_ast::ast::ExplainKind;
use common_planners::CreateTablePlan;
use common_planners::CreateUserPlan;
use common_planners::CreateViewPlan;
use common_planners::DropUserPlan;
pub use eval_scalar::EvalScalar;
pub use eval_scalar::ScalarItem;
pub use filter::FilterPlan;
Expand Down Expand Up @@ -81,4 +82,5 @@ pub enum Plan {

// DCL
CreateUser(Box<CreateUserPlan>),
DropUser(Box<DropUserPlan>),
}
Empty file.
14 changes: 14 additions & 0 deletions tests/suites/0_stateless/05_ddl/05_0007_ddl_drop_user_v2.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
set enable_planner_v2=1;
DROP USER 'test-j'@'localhost'; -- {ErrorCode 2201}
DROP USER IF EXISTS 'test-j'@'localhost';


CREATE USER 'test-j'@'localhost' IDENTIFIED BY 'password';
DROP USER 'test-j'@'localhost';
DROP USER IF EXISTS 'test-j'@'localhost';

CREATE USER 'test-l'@'localhost' IDENTIFIED WITH sha256_password BY 'password';
DROP USER 'test-l'@'localhost';
DROP USER IF EXISTS 'test-l'@'localhost';
DROP USER IF EXISTS 'test-l'@'localhost';
DROP USER IF EXISTS 'test-l'@'localhost';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be better to teardown with set enable_planner_v2=0;

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We has already migrate create user to planner v2. And in 05_0007_ddl_drop_user.sql the test is enable_planner_v2=0. I think if we migrate all statement to planner v2 we can delete old test.