Move all stage related plans

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

Author: Xuanwo

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

@@ -55,10 +55,6 @@ mod plan_sink;
 mod plan_sort;
 mod plan_subqueries_set;
 mod plan_table_recluster;
-mod plan_user_stage_create;
-mod plan_user_stage_describe;
-mod plan_user_stage_drop;
-mod plan_user_stage_remove;
 mod plan_user_udf_alter;
 mod plan_user_udf_create;
 mod plan_user_udf_drop;
@@ -149,10 +145,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_stage_create::CreateUserStagePlan;
-pub use plan_user_stage_describe::DescribeUserStagePlan;
-pub use plan_user_stage_drop::DropUserStagePlan;
-pub use plan_user_stage_remove::RemoveUserStagePlan;
 pub use plan_user_udf_alter::AlterUserUDFPlan;
 pub use plan_user_udf_create::CreateUserUDFPlan;
 pub use plan_user_udf_drop::DropUserUDFPlan;

src/query/legacy-planners/src/plan_user_stage_describe.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,21 +11,20 @@
 // 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;
 use common_datavalues::DataSchemaRef;
 use common_meta_types::UserStageInfo;
 
 #[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)]
-pub struct CreateUserStagePlan {
+pub struct CreateStagePlan {
     pub if_not_exists: bool,
     pub tenant: String,
     pub user_stage_info: UserStageInfo,
 }
 
-impl CreateUserStagePlan {
+impl CreateStagePlan {
     pub fn schema(&self) -> DataSchemaRef {
         Arc::new(DataSchema::empty())
     }

src/query/legacy-planners/src/plan_user_stage_create.rs renamed to src/query/planner/src/plans/create_stage.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.
@@ -18,12 +18,12 @@ use common_datavalues::DataSchema;
 use common_datavalues::DataSchemaRef;
 
 #[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)]
-pub struct DropUserStagePlan {
+pub struct DropStagePlan {
     pub if_exists: bool,
     pub name: String,
 }
 
-impl DropUserStagePlan {
+impl DropStagePlan {
     pub fn schema(&self) -> DataSchemaRef {
         Arc::new(DataSchema::empty())
     }

src/query/legacy-planners/src/plan_user_stage_drop.rs renamed to src/query/planner/src/plans/drop_stage.rs

@@ -17,10 +17,12 @@ mod alter_user;
 mod call;
 mod create_database;
 mod create_role;
+mod create_stage;
 mod create_user;
 mod describe_table;
 mod drop_database;
 mod drop_role;
+mod drop_stage;
 mod drop_table;
 mod drop_table_cluster_key;
 mod drop_user;
@@ -30,6 +32,7 @@ mod grant_role;
 mod kill;
 mod list;
 mod optimize_table;
+mod remove_stage;
 mod rename_database;
 mod rename_table;
 mod revoke_privilege;
@@ -47,10 +50,12 @@ pub use alter_user::AlterUserPlan;
 pub use call::CallPlan;
 pub use create_database::CreateDatabasePlan;
 pub use create_role::CreateRolePlan;
+pub use create_stage::CreateStagePlan;
 pub use create_user::CreateUserPlan;
 pub use describe_table::DescribeTablePlan;
 pub use drop_database::DropDatabasePlan;
 pub use drop_role::DropRolePlan;
+pub use drop_stage::DropStagePlan;
 pub use drop_table::DropTablePlan;
 pub use drop_table_cluster_key::DropTableClusterKeyPlan;
 pub use drop_user::DropUserPlan;
@@ -61,6 +66,7 @@ pub use kill::KillPlan;
 pub use list::ListPlan;
 pub use optimize_table::OptimizeTableAction;
 pub use optimize_table::OptimizeTablePlan;
+pub use remove_stage::RemoveStagePlan;
 pub use rename_database::RenameDatabaseEntity;
 pub use rename_database::RenameDatabasePlan;
 pub use rename_table::RenameTableEntity;

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

@@ -19,13 +19,13 @@ use common_datavalues::DataSchemaRef;
 use common_meta_types::UserStageInfo;
 
 #[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)]
-pub struct RemoveUserStagePlan {
+pub struct RemoveStagePlan {
     pub stage: UserStageInfo,
     pub path: String,
     pub pattern: String,
 }
 
-impl RemoveUserStagePlan {
+impl RemoveStagePlan {
     pub fn schema(&self) -> DataSchemaRef {
         Arc::new(DataSchema::empty())
     }

src/query/legacy-planners/src/plan_user_stage_remove.rs renamed to src/query/planner/src/plans/remove_stage.rs

@@ -16,8 +16,8 @@ use std::sync::Arc;
 
 use common_exception::ErrorCode;
 use common_exception::Result;
-use common_legacy_planners::CreateUserStagePlan;
 use common_meta_types::StageType;
+use common_planner::plans::CreateStagePlan;
 use common_users::UserApiProvider;
 
 use crate::interpreters::Interpreter;
@@ -28,11 +28,11 @@ use crate::sessions::TableContext;
 #[derive(Debug)]
 pub struct CreateUserStageInterpreter {
     ctx: Arc<QueryContext>,
-    plan: CreateUserStagePlan,
+    plan: CreateStagePlan,
 }
 
 impl CreateUserStageInterpreter {
-    pub fn try_create(ctx: Arc<QueryContext>, plan: CreateUserStagePlan) -> Result<Self> {
+    pub fn try_create(ctx: Arc<QueryContext>, plan: CreateStagePlan) -> Result<Self> {
         Ok(CreateUserStageInterpreter { ctx, plan })
     }
 }

src/query/service/src/interpreters/interpreter_user_stage_create.rs

@@ -15,8 +15,8 @@
 use std::sync::Arc;
 
 use common_exception::Result;
-use common_legacy_planners::DropUserStagePlan;
 use common_meta_types::StageType;
+use common_planner::plans::DropStagePlan;
 use common_users::UserApiProvider;
 use tracing::info;
 
@@ -29,11 +29,11 @@ use crate::storages::stage::StageSourceHelper;
 #[derive(Debug)]
 pub struct DropUserStageInterpreter {
     ctx: Arc<QueryContext>,
-    plan: DropUserStagePlan,
+    plan: DropStagePlan,
 }
 
 impl DropUserStageInterpreter {
-    pub fn try_create(ctx: Arc<QueryContext>, plan: DropUserStagePlan) -> Result<Self> {
+    pub fn try_create(ctx: Arc<QueryContext>, plan: DropStagePlan) -> Result<Self> {
         Ok(DropUserStageInterpreter { ctx, plan })
     }
 }

src/query/service/src/interpreters/interpreter_user_stage_drop.rs

@@ -15,7 +15,7 @@
 use std::sync::Arc;
 
 use common_exception::Result;
-use common_legacy_planners::RemoveUserStagePlan;
+use common_planner::plans::RemoveStagePlan;
 
 use crate::interpreters::interpreter_common::list_files;
 use crate::interpreters::Interpreter;
@@ -27,11 +27,11 @@ use crate::storages::stage::StageSourceHelper;
 #[derive(Debug)]
 pub struct RemoveUserStageInterpreter {
     ctx: Arc<QueryContext>,
-    plan: RemoveUserStagePlan,
+    plan: RemoveStagePlan,
 }
 
 impl RemoveUserStageInterpreter {
-    pub fn try_create(ctx: Arc<QueryContext>, plan: RemoveUserStagePlan) -> Result<Self> {
+    pub fn try_create(ctx: Arc<QueryContext>, plan: RemoveStagePlan) -> Result<Self> {
         Ok(RemoveUserStageInterpreter { ctx, plan })
     }
 }

src/query/service/src/interpreters/interpreter_user_stage_remove.rs

@@ -17,12 +17,12 @@ use std::str::FromStr;
 use common_ast::ast::CreateStageStmt;
 use common_exception::ErrorCode;
 use common_exception::Result;
-use common_legacy_planners::CreateUserStagePlan;
-use common_legacy_planners::RemoveUserStagePlan;
 use common_meta_types::OnErrorMode;
 use common_meta_types::StageType;
 use common_meta_types::UserStageInfo;
+use common_planner::plans::CreateStagePlan;
 use common_planner::plans::ListPlan;
+use common_planner::plans::RemoveStagePlan;
 use common_storage::parse_uri_location;
 use common_storage::UriLocation;
 
@@ -55,7 +55,7 @@ impl<'a> Binder {
     ) -> Result<Plan> {
         let stage_name = format!("@{location}");
         let (stage, path) = parse_stage_location(&self.ctx, stage_name.as_str()).await?;
-        let plan_node = RemoveUserStagePlan {
+        let plan_node = RemoveStagePlan {
             path,
             stage,
             pattern: pattern.to_string(),
@@ -124,7 +124,7 @@ impl<'a> Binder {
             stage_info.copy_options.size_limit = *size_limit;
         }
 
-        Ok(Plan::CreateStage(Box::new(CreateUserStagePlan {
+        Ok(Plan::CreateStage(Box::new(CreateStagePlan {
             if_not_exists: *if_not_exists,
             tenant: self.ctx.get_tenant(),
             user_stage_info: stage_info,