Migrate user related plan

Signed-off-by: Xuanwo <github@xuanwo.io>

Author: Xuanwo

src/query/legacy-planners/src/lib.rs

@@ -55,9 +55,6 @@ mod plan_sink;
 mod plan_sort;
 mod plan_subqueries_set;
 mod plan_table_recluster;
-mod plan_user_alter;
-mod plan_user_create;
-mod plan_user_drop;
 mod plan_user_stage_create;
 mod plan_user_stage_describe;
 mod plan_user_stage_drop;
@@ -152,9 +149,6 @@ pub use plan_sink::SINK_SCHEMA;
 pub use plan_sort::SortPlan;
 pub use plan_subqueries_set::SubQueriesSetPlan;
 pub use plan_table_recluster::ReclusterTablePlan;
-pub use plan_user_alter::AlterUserPlan;
-pub use plan_user_create::CreateUserPlan;
-pub use plan_user_drop::DropUserPlan;
 pub use plan_user_stage_create::CreateUserStagePlan;
 pub use plan_user_stage_describe::DescribeUserStagePlan;
 pub use plan_user_stage_drop::DropUserStagePlan;

src/query/legacy-planners/src/plan_user_alter.rs renamed to src/query/planner/src/plans/alter_user.rs

@@ -1,4 +1,4 @@
-// Copyright 2021 Datafuse Labs.
+// Copyright 2022 Datafuse Labs.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -11,7 +11,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-
 use std::sync::Arc;
 
 use common_datavalues::DataSchema;

src/query/legacy-planners/src/plan_user_create.rs renamed to src/query/planner/src/plans/create_user.rs

@@ -1,4 +1,4 @@
-// Copyright 2021 Datafuse Labs.
+// Copyright 2022 Datafuse Labs.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

src/query/legacy-planners/src/plan_user_drop.rs renamed to src/query/planner/src/plans/drop_user.rs

@@ -1,4 +1,4 @@
-// Copyright 2021 Datafuse Labs.
+// Copyright 2022 Datafuse Labs.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -11,7 +11,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-
 use std::sync::Arc;
 
 use common_datavalues::DataSchema;

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

@@ -13,14 +13,17 @@
 // limitations under the License.
 
 mod alter_table_cluster_key;
+mod alter_user;
 mod call;
 mod create_database;
 mod create_role;
+mod create_user;
 mod describe_table;
 mod drop_database;
 mod drop_role;
 mod drop_table;
 mod drop_table_cluster_key;
+mod drop_user;
 mod exists_table;
 mod grant_privilege;
 mod grant_role;
@@ -40,14 +43,17 @@ mod undrop_table;
 mod use_database;
 
 pub use alter_table_cluster_key::AlterTableClusterKeyPlan;
+pub use alter_user::AlterUserPlan;
 pub use call::CallPlan;
 pub use create_database::CreateDatabasePlan;
 pub use create_role::CreateRolePlan;
+pub use create_user::CreateUserPlan;
 pub use describe_table::DescribeTablePlan;
 pub use drop_database::DropDatabasePlan;
 pub use drop_role::DropRolePlan;
 pub use drop_table::DropTablePlan;
 pub use drop_table_cluster_key::DropTableClusterKeyPlan;
+pub use drop_user::DropUserPlan;
 pub use exists_table::ExistsTablePlan;
 pub use grant_privilege::GrantPrivilegePlan;
 pub use grant_role::GrantRolePlan;

src/query/service/src/interpreters/interpreter_user_alter.rs

@@ -15,7 +15,7 @@
 use std::sync::Arc;
 
 use common_exception::Result;
-use common_legacy_planners::AlterUserPlan;
+use common_planner::plans::AlterUserPlan;
 use common_users::UserApiProvider;
 
 use crate::interpreters::Interpreter;

src/query/service/src/interpreters/interpreter_user_create.rs

@@ -15,10 +15,10 @@
 use std::sync::Arc;
 
 use common_exception::Result;
-use common_legacy_planners::CreateUserPlan;
 use common_meta_types::UserGrantSet;
 use common_meta_types::UserInfo;
 use common_meta_types::UserQuota;
+use common_planner::plans::CreateUserPlan;
 use common_users::UserApiProvider;
 
 use crate::interpreters::Interpreter;

src/query/service/src/interpreters/interpreter_user_drop.rs

@@ -15,7 +15,7 @@
 use std::sync::Arc;
 
 use common_exception::Result;
-use common_legacy_planners::DropUserPlan;
+use common_planner::plans::DropUserPlan;
 use common_users::UserApiProvider;
 
 use crate::interpreters::Interpreter;

src/query/service/src/sql/planner/binder/ddl/account.rs

@@ -19,12 +19,12 @@ use common_ast::ast::CreateUserStmt;
 use common_ast::ast::GrantStmt;
 use common_ast::ast::RevokeStmt;
 use common_exception::Result;
-use common_legacy_planners::AlterUserPlan;
-use common_legacy_planners::CreateUserPlan;
 use common_meta_types::AuthInfo;
 use common_meta_types::GrantObject;
 use common_meta_types::UserOption;
 use common_meta_types::UserPrivilegeSet;
+use common_planner::plans::AlterUserPlan;
+use common_planner::plans::CreateUserPlan;
 use common_planner::plans::GrantPrivilegePlan;
 use common_planner::plans::GrantRolePlan;
 use common_planner::plans::RevokePrivilegePlan;

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

@@ -27,13 +27,13 @@ use common_datavalues::DataTypeImpl;
 use common_exception::Result;
 use common_legacy_planners::AlterUserUDFPlan;
 use common_legacy_planners::CreateUserUDFPlan;
-use common_legacy_planners::DropUserPlan;
 use common_legacy_planners::DropUserStagePlan;
 use common_legacy_planners::DropUserUDFPlan;
 use common_meta_types::UserDefinedFunction;
 use common_planner::plans::CallPlan;
 use common_planner::plans::CreateRolePlan;
 use common_planner::plans::DropRolePlan;
+use common_planner::plans::DropUserPlan;
 use common_planner::plans::ShowGrantsPlan;
 use common_planner::plans::UseDatabasePlan;
 use common_planner::MetadataRef;