support drop user plan v2

common/ast/tests/it/parser.rs

@@ -105,6 +105,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 {
@@ -170,6 +171,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 {

common/ast/tests/it/testdata/statement-error.txt

@@ -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`
+
+

common/ast/tests/it/testdata/statement.txt

@@ -2615,3 +2615,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",
+    },
+}
+
+

query/src/interpreters/interpreter_factory_v2.rs

@@ -24,6 +24,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;
@@ -71,6 +72,7 @@ impl InterpreterFactoryV2 {
             Plan::CreateUser(create_user) => {
                 CreateUserInterpreter::try_create(ctx, *create_user.clone())
             }
+            Plan::DropUser(drop_user) => DropUserInterpreter::try_create(ctx, *drop_user.clone()),
         }?;
         Ok(inner)
     }

query/src/sql/optimizer/mod.rs

@@ -61,7 +61,8 @@ pub fn optimize(plan: Plan) -> Result<Plan> {
         | Plan::ShowProcessList
         | Plan::ShowSettings
         | Plan::CreateTable(_)
-        | Plan::CreateUser(_) => Ok(plan),
+        | Plan::CreateUser(_)
+        | Plan::DropUser(_) => Ok(plan),
     }
 }
 

query/src/sql/planner/binder/mod.rs

@@ -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;
@@ -117,6 +118,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"
             ))),

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

@@ -31,6 +31,7 @@ impl Plan {
             Plan::ShowProcessList => Ok("SHOW PROCESSLIST".to_string()),
             Plan::ShowSettings => Ok("SHOW SETTINGS".to_string()),
             Plan::CreateUser(create_user) => Ok(format!("{:?}", create_user)),
+            Plan::DropUser(drop_user) => Ok(format!("{:?}", drop_user)),
         }
     }
 }

query/src/sql/planner/plans/mod.rs

@@ -33,6 +33,7 @@ pub use apply::CrossApply;
 use common_ast::ast::ExplainKind;
 use common_planners::CreateTablePlan;
 use common_planners::CreateUserPlan;
+use common_planners::DropUserPlan;
 pub use eval_scalar::EvalScalar;
 pub use eval_scalar::ScalarItem;
 pub use filter::FilterPlan;
@@ -79,4 +80,5 @@ pub enum Plan {
 
     // DCL
     CreateUser(Box<CreateUserPlan>),
+    DropUser(Box<DropUserPlan>),
 }

tests/suites/0_stateless/05_ddl/05_0007_ddl_drop_user_v2.sql

@@ -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';