Move Privilege

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

Author: Xuanwo

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

@@ -46,8 +46,6 @@ mod plan_node_stage_table;
 mod plan_node_statistics;
 mod plan_node_visitor;
 mod plan_partition;
-mod plan_privilege_grant;
-mod plan_privilege_revoke;
 mod plan_projection;
 mod plan_read_datasource;
 mod plan_remote;
@@ -167,8 +165,6 @@ pub use plan_node_visitor::PlanVisitor;
 pub use plan_partition::PartInfo;
 pub use plan_partition::PartInfoPtr;
 pub use plan_partition::Partitions;
-pub use plan_privilege_grant::GrantPrivilegePlan;
-pub use plan_privilege_revoke::RevokePrivilegePlan;
 pub use plan_projection::ProjectionPlan;
 pub use plan_read_datasource::ReadDataSourcePlan;
 pub use plan_read_datasource::SourceInfo;

src/query/legacy-planners/src/plan_privilege_grant.rs renamed to src/query/planner/src/plans/grant_privilege.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/planner/src/plans/mod.rs

@@ -21,6 +21,9 @@ pub use create_database::CreateDatabasePlan;
 mod drop_database;
 pub use drop_database::DropDatabasePlan;
 
+mod grant_privilege;
+pub use grant_privilege::GrantPrivilegePlan;
+
 mod kill;
 pub use kill::KillPlan;
 
@@ -31,6 +34,9 @@ mod rename_database;
 pub use rename_database::RenameDatabaseEntity;
 pub use rename_database::RenameDatabasePlan;
 
+mod revoke_privilege;
+pub use revoke_privilege::RevokePrivilegePlan;
+
 mod show_create_database;
 pub use show_create_database::ShowCreateDatabasePlan;
 

src/query/legacy-planners/src/plan_privilege_revoke.rs renamed to src/query/planner/src/plans/revoke_privilege.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/service/src/interpreters/interpreter_privilege_grant.rs

@@ -15,10 +15,10 @@
 use std::sync::Arc;
 
 use common_exception::Result;
-use common_legacy_planners::GrantPrivilegePlan;
 use common_meta_types::GrantObject;
 use common_meta_types::PrincipalIdentity;
 use common_meta_types::UserPrivilegeSet;
+use common_planner::plans::GrantPrivilegePlan;
 use common_users::UserApiProvider;
 
 use crate::interpreters::interpreter_common::validate_grant_object_exists;

src/query/service/src/interpreters/interpreter_privilege_revoke.rs

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

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

@@ -21,14 +21,14 @@ use common_ast::ast::RevokeStmt;
 use common_exception::Result;
 use common_legacy_planners::AlterUserPlan;
 use common_legacy_planners::CreateUserPlan;
-use common_legacy_planners::GrantPrivilegePlan;
 use common_legacy_planners::GrantRolePlan;
-use common_legacy_planners::RevokePrivilegePlan;
 use common_legacy_planners::RevokeRolePlan;
 use common_meta_types::AuthInfo;
 use common_meta_types::GrantObject;
 use common_meta_types::UserOption;
 use common_meta_types::UserPrivilegeSet;
+use common_planner::plans::GrantPrivilegePlan;
+use common_planner::plans::RevokePrivilegePlan;
 use common_users::UserApiProvider;
 
 use crate::sql::plans::Plan;

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

@@ -63,13 +63,11 @@ use common_legacy_planners::DropUserStagePlan;
 use common_legacy_planners::DropUserUDFPlan;
 use common_legacy_planners::DropViewPlan;
 use common_legacy_planners::ExistsTablePlan;
-use common_legacy_planners::GrantPrivilegePlan;
 use common_legacy_planners::GrantRolePlan;
 use common_legacy_planners::OptimizeTablePlan;
 use common_legacy_planners::ReclusterTablePlan;
 use common_legacy_planners::RemoveUserStagePlan;
 use common_legacy_planners::RenameTablePlan;
-use common_legacy_planners::RevokePrivilegePlan;
 use common_legacy_planners::RevokeRolePlan;
 use common_legacy_planners::SettingPlan;
 use common_legacy_planners::ShowCreateTablePlan;
@@ -80,9 +78,11 @@ use common_legacy_planners::UseDatabasePlan;
 use common_planner::plans::CallPlan;
 use common_planner::plans::CreateDatabasePlan;
 use common_planner::plans::DropDatabasePlan;
+use common_planner::plans::GrantPrivilegePlan;
 use common_planner::plans::KillPlan;
 use common_planner::plans::ListPlan;
 use common_planner::plans::RenameDatabasePlan;
+use common_planner::plans::RevokePrivilegePlan;
 use common_planner::plans::ShowCreateDatabasePlan;
 use common_planner::plans::UndropDatabasePlan;
 use common_planner::MetadataRef;