Move UDF related plans

Xuanwo · Xuanwo · commit e0796f2ec6a5 · 2022-09-20T16:50:39.000+08:00
Signed-off-by: Xuanwo &lt;github@xuanwo.io&gt;
diff --git a/src/query/legacy-planners/src/lib.rs b/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_udf_alter;
-mod plan_user_udf_create;
-mod plan_user_udf_drop;
 mod plan_view_alter;
 mod plan_view_create;
 mod plan_view_drop;
@@ -145,9 +142,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_udf_alter::AlterUserUDFPlan;
-pub use plan_user_udf_create::CreateUserUDFPlan;
-pub use plan_user_udf_drop::DropUserUDFPlan;
 pub use plan_view_alter::AlterViewPlan;
 pub use plan_view_create::CreateViewPlan;
 pub use plan_view_drop::DropViewPlan;
diff --git a/src/query/planner/src/plans/alter_udf.rs b/src/query/planner/src/plans/alter_udf.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,19 +11,18 @@
 // 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::UserDefinedFunction;
 
 #[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)]
-pub struct AlterUserUDFPlan {
+pub struct AlterUDFPlan {
     pub udf: UserDefinedFunction,
 }
 
-impl AlterUserUDFPlan {
+impl AlterUDFPlan {
     pub fn schema(&self) -> DataSchemaRef {
         Arc::new(DataSchema::empty())
     }
diff --git a/src/query/planner/src/plans/create_udf.rs b/src/query/planner/src/plans/create_udf.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.
@@ -19,12 +19,12 @@ use common_datavalues::DataSchemaRef;
 use common_meta_types::UserDefinedFunction;
 
 #[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)]
-pub struct CreateUserUDFPlan {
+pub struct CreateUDFPlan {
     pub if_not_exists: bool,
     pub udf: UserDefinedFunction,
 }
 
-impl CreateUserUDFPlan {
+impl CreateUDFPlan {
     pub fn schema(&self) -> DataSchemaRef {
         Arc::new(DataSchema::empty())
     }
diff --git a/src/query/planner/src/plans/drop_udf.rs b/src/query/planner/src/plans/drop_udf.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,19 +11,18 @@
 // 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;
 
 #[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)]
-pub struct DropUserUDFPlan {
+pub struct DropUDFPlan {
     pub if_exists: bool,
     pub name: String,
 }
 
-impl DropUserUDFPlan {
+impl DropUDFPlan {
     pub fn schema(&self) -> DataSchemaRef {
         Arc::new(DataSchema::empty())
     }
diff --git a/src/query/planner/src/plans/mod.rs b/src/query/planner/src/plans/mod.rs
@@ -13,18 +13,21 @@
 // limitations under the License.
 
 mod alter_table_cluster_key;
+mod alter_udf;
 mod alter_user;
 mod call;
 mod create_database;
 mod create_role;
 mod create_stage;
+mod create_udf;
 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_udf;
 mod drop_user;
 mod exists_table;
 mod grant_privilege;
@@ -46,18 +49,21 @@ mod undrop_table;
 mod use_database;
 
 pub use alter_table_cluster_key::AlterTableClusterKeyPlan;
+pub use alter_udf::AlterUDFPlan;
 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_udf::CreateUDFPlan;
 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_udf::DropUDFPlan;
 pub use drop_user::DropUserPlan;
 pub use exists_table::ExistsTablePlan;
 pub use grant_privilege::GrantPrivilegePlan;
diff --git a/src/query/service/src/interpreters/interpreter_user_udf_alter.rs b/src/query/service/src/interpreters/interpreter_user_udf_alter.rs
@@ -15,7 +15,7 @@
 use std::sync::Arc;
 
 use common_exception::Result;
-use common_legacy_planners::AlterUserUDFPlan;
+use common_planner::plans::AlterUDFPlan;
 use common_users::UserApiProvider;
 
 use crate::interpreters::Interpreter;
@@ -26,11 +26,11 @@ use crate::sessions::TableContext;
 #[derive(Debug)]
 pub struct AlterUserUDFInterpreter {
     ctx: Arc<QueryContext>,
-    plan: AlterUserUDFPlan,
+    plan: AlterUDFPlan,
 }
 
 impl AlterUserUDFInterpreter {
-    pub fn try_create(ctx: Arc<QueryContext>, plan: AlterUserUDFPlan) -> Result<Self> {
+    pub fn try_create(ctx: Arc<QueryContext>, plan: AlterUDFPlan) -> Result<Self> {
         Ok(AlterUserUDFInterpreter { ctx, plan })
     }
 }
diff --git a/src/query/service/src/interpreters/interpreter_user_udf_create.rs b/src/query/service/src/interpreters/interpreter_user_udf_create.rs
@@ -15,7 +15,7 @@
 use std::sync::Arc;
 
 use common_exception::Result;
-use common_legacy_planners::CreateUserUDFPlan;
+use common_planner::plans::CreateUDFPlan;
 use common_users::UserApiProvider;
 
 use crate::interpreters::Interpreter;
@@ -26,11 +26,11 @@ use crate::sessions::TableContext;
 #[derive(Debug)]
 pub struct CreateUserUDFInterpreter {
     ctx: Arc<QueryContext>,
-    plan: CreateUserUDFPlan,
+    plan: CreateUDFPlan,
 }
 
 impl CreateUserUDFInterpreter {
-    pub fn try_create(ctx: Arc<QueryContext>, plan: CreateUserUDFPlan) -> Result<Self> {
+    pub fn try_create(ctx: Arc<QueryContext>, plan: CreateUDFPlan) -> Result<Self> {
         Ok(CreateUserUDFInterpreter { ctx, plan })
     }
 }
diff --git a/src/query/service/src/interpreters/interpreter_user_udf_drop.rs b/src/query/service/src/interpreters/interpreter_user_udf_drop.rs
@@ -15,7 +15,7 @@
 use std::sync::Arc;
 
 use common_exception::Result;
-use common_legacy_planners::DropUserUDFPlan;
+use common_planner::plans::DropUDFPlan;
 use common_users::UserApiProvider;
 
 use crate::interpreters::Interpreter;
@@ -26,11 +26,11 @@ use crate::sessions::TableContext;
 #[derive(Debug)]
 pub struct DropUserUDFInterpreter {
     ctx: Arc<QueryContext>,
-    plan: DropUserUDFPlan,
+    plan: DropUDFPlan,
 }
 
 impl DropUserUDFInterpreter {
-    pub fn try_create(ctx: Arc<QueryContext>, plan: DropUserUDFPlan) -> Result<Self> {
+    pub fn try_create(ctx: Arc<QueryContext>, plan: DropUDFPlan) -> Result<Self> {
         Ok(DropUserUDFInterpreter { ctx, plan })
     }
 }
diff --git a/src/query/service/src/sql/planner/binder/mod.rs b/src/query/service/src/sql/planner/binder/mod.rs
@@ -25,14 +25,14 @@ use common_ast::Dialect;
 use common_ast::UDFValidator;
 use common_datavalues::DataTypeImpl;
 use common_exception::Result;
-use common_legacy_planners::AlterUserUDFPlan;
-use common_legacy_planners::CreateUserUDFPlan;
-use common_legacy_planners::DropUserUDFPlan;
 use common_meta_types::UserDefinedFunction;
+use common_planner::plans::AlterUDFPlan;
 use common_planner::plans::CallPlan;
 use common_planner::plans::CreateRolePlan;
+use common_planner::plans::CreateUDFPlan;
 use common_planner::plans::DropRolePlan;
 use common_planner::plans::DropStagePlan;
+use common_planner::plans::DropUDFPlan;
 use common_planner::plans::DropUserPlan;
 use common_planner::plans::ShowGrantsPlan;
 use common_planner::plans::UseDatabasePlan;
@@ -264,7 +264,7 @@ impl<'a> Binder {
                     description: description.clone().unwrap_or_default(),
                 };
 
-                Plan::CreateUDF(Box::new(CreateUserUDFPlan {
+                Plan::CreateUDF(Box::new(CreateUDFPlan {
                     if_not_exists: *if_not_exists,
                     udf
                 }))
@@ -288,14 +288,14 @@ impl<'a> Binder {
                     description: description.clone().unwrap_or_default(),
                 };
 
-                Plan::AlterUDF(Box::new(AlterUserUDFPlan {
+                Plan::AlterUDF(Box::new(AlterUDFPlan {
                     udf,
                 }))
             }
             Statement::DropUDF {
                 if_exists,
                 udf_name,
-            } => Plan::DropUDF(Box::new(DropUserUDFPlan {
+            } => Plan::DropUDF(Box::new(DropUDFPlan {
                 if_exists: *if_exists,
                 name: udf_name.to_string(),
             })),
diff --git a/src/query/service/src/sql/planner/plans/mod.rs b/src/query/service/src/sql/planner/plans/mod.rs
@@ -44,28 +44,28 @@ use common_datavalues::DataSchema;
 use common_datavalues::DataSchemaRef;
 use common_datavalues::DataSchemaRefExt;
 use common_datavalues::StringType;
-use common_legacy_planners::AlterUserUDFPlan;
 use common_legacy_planners::AlterViewPlan;
-use common_legacy_planners::CreateUserUDFPlan;
 use common_legacy_planners::CreateViewPlan;
 use common_legacy_planners::DeletePlan;
-use common_legacy_planners::DropUserUDFPlan;
 use common_legacy_planners::DropViewPlan;
 use common_legacy_planners::ReclusterTablePlan;
 use common_legacy_planners::SettingPlan;
 use common_planner::plans::AlterTableClusterKeyPlan;
+use common_planner::plans::AlterUDFPlan;
 use common_planner::plans::AlterUserPlan;
 use common_planner::plans::CallPlan;
 use common_planner::plans::CreateDatabasePlan;
 use common_planner::plans::CreateRolePlan;
 use common_planner::plans::CreateStagePlan;
+use common_planner::plans::CreateUDFPlan;
 use common_planner::plans::CreateUserPlan;
 use common_planner::plans::DescribeTablePlan;
 use common_planner::plans::DropDatabasePlan;
 use common_planner::plans::DropRolePlan;
 use common_planner::plans::DropStagePlan;
 use common_planner::plans::DropTableClusterKeyPlan;
 use common_planner::plans::DropTablePlan;
+use common_planner::plans::DropUDFPlan;
 use common_planner::plans::DropUserPlan;
 use common_planner::plans::ExistsTablePlan;
 use common_planner::plans::GrantPrivilegePlan;
@@ -182,9 +182,9 @@ pub enum Plan {
     DropUser(Box<DropUserPlan>),
 
     // UDF
-    CreateUDF(Box<CreateUserUDFPlan>),
-    AlterUDF(Box<AlterUserUDFPlan>),
-    DropUDF(Box<DropUserUDFPlan>),
+    CreateUDF(Box<CreateUDFPlan>),
+    AlterUDF(Box<AlterUDFPlan>),
+    DropUDF(Box<DropUDFPlan>),
 
     // Role
     CreateRole(Box<CreateRolePlan>),

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`use std::sync::Arc;`
`16`	`16`
`17`	`17`	`use common_exception::Result;`
`18`		`-use common_legacy_planners::AlterUserUDFPlan;`
	`18`	`+use common_planner::plans::AlterUDFPlan;`
`19`	`19`	`use common_users::UserApiProvider;`
`20`	`20`
`21`	`21`	`use crate::interpreters::Interpreter;`
`@@ -26,11 +26,11 @@ use crate::sessions::TableContext;`
`26`	`26`	`#[derive(Debug)]`
`27`	`27`	`pub struct AlterUserUDFInterpreter {`
`28`	`28`	`ctx: Arc<QueryContext>,`
`29`		`- plan: AlterUserUDFPlan,`
	`29`	`+ plan: AlterUDFPlan,`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`impl AlterUserUDFInterpreter {`
`33`		`- pub fn try_create(ctx: Arc<QueryContext>, plan: AlterUserUDFPlan) -> Result<Self> {`
	`33`	`+ pub fn try_create(ctx: Arc<QueryContext>, plan: AlterUDFPlan) -> Result<Self> {`
`34`	`34`	`Ok(AlterUserUDFInterpreter { ctx, plan })`
`35`	`35`	`}`
`36`	`36`	`}`