Move role related plans

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

Author: Xuanwo

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

@@ -49,10 +49,6 @@ mod plan_partition;
 mod plan_projection;
 mod plan_read_datasource;
 mod plan_remote;
-mod plan_role_create;
-mod plan_role_drop;
-mod plan_role_grant;
-mod plan_role_revoke;
 mod plan_select;
 mod plan_setting;
 mod plan_sink;
@@ -159,10 +155,6 @@ pub use plan_read_datasource::SourceInfo;
 pub use plan_remote::RemotePlan;
 pub use plan_remote::V1RemotePlan;
 pub use plan_remote::V2RemotePlan;
-pub use plan_role_create::CreateRolePlan;
-pub use plan_role_drop::DropRolePlan;
-pub use plan_role_grant::GrantRolePlan;
-pub use plan_role_revoke::RevokeRolePlan;
 pub use plan_select::SelectPlan;
 pub use plan_setting::SettingPlan;
 pub use plan_setting::VarValue;

src/query/legacy-planners/src/plan_role_create.rs renamed to src/query/planner/src/plans/create_role.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_role_drop.rs renamed to src/query/planner/src/plans/drop_role.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_role_grant.rs renamed to src/query/planner/src/plans/grant_role.rs

@@ -18,12 +18,21 @@ pub use call::CallPlan;
 mod create_database;
 pub use create_database::CreateDatabasePlan;
 
+mod create_role;
+pub use create_role::CreateRolePlan;
+
 mod drop_database;
 pub use drop_database::DropDatabasePlan;
 
+mod drop_role;
+pub use drop_role::DropRolePlan;
+
 mod grant_privilege;
 pub use grant_privilege::GrantPrivilegePlan;
 
+mod grant_role;
+pub use grant_role::GrantRolePlan;
+
 mod kill;
 pub use kill::KillPlan;
 
@@ -37,6 +46,9 @@ pub use rename_database::RenameDatabasePlan;
 mod revoke_privilege;
 pub use revoke_privilege::RevokePrivilegePlan;
 
+mod revoke_role;
+pub use revoke_role::RevokeRolePlan;
+
 mod show_create_database;
 pub use show_create_database::ShowCreateDatabasePlan;
 

src/query/planner/src/plans/mod.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_role_revoke.rs renamed to src/query/planner/src/plans/revoke_role.rs

@@ -15,8 +15,8 @@
 use std::sync::Arc;
 
 use common_exception::Result;
-use common_legacy_planners::CreateRolePlan;
 use common_meta_types::RoleInfo;
+use common_planner::plans::CreateRolePlan;
 use common_users::UserApiProvider;
 
 use crate::interpreters::Interpreter;

src/query/service/src/interpreters/interpreter_role_create.rs

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

src/query/service/src/interpreters/interpreter_role_drop.rs

@@ -15,8 +15,8 @@
 use std::sync::Arc;
 
 use common_exception::Result;
-use common_legacy_planners::GrantRolePlan;
 use common_meta_types::PrincipalIdentity;
+use common_planner::plans::GrantRolePlan;
 use common_users::UserApiProvider;
 
 use crate::interpreters::Interpreter;

src/query/service/src/interpreters/interpreter_role_grant.rs

@@ -15,8 +15,8 @@
 use std::sync::Arc;
 
 use common_exception::Result;
-use common_legacy_planners::RevokeRolePlan;
 use common_meta_types::PrincipalIdentity;
+use common_planner::plans::RevokeRolePlan;
 use common_users::UserApiProvider;
 
 use crate::interpreters::Interpreter;