Move CallPlan

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

Author: Xuanwo

Cargo.lock

@@ -15,7 +15,6 @@
 mod plan_aggregator_final;
 mod plan_aggregator_partial;
 mod plan_broadcast;
-mod plan_call;
 mod plan_copy;
 mod plan_database_create;
 mod plan_database_drop;
@@ -111,7 +110,6 @@ mod plan_window_func;
 pub use plan_aggregator_final::AggregatorFinalPlan;
 pub use plan_aggregator_partial::AggregatorPartialPlan;
 pub use plan_broadcast::BroadcastPlan;
-pub use plan_call::CallPlan;
 pub use plan_copy::CopyMode;
 pub use plan_copy::CopyPlan;
 pub use plan_copy::ValidationMode;

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

@@ -11,3 +11,4 @@ common-catalog = { path = "../catalog" }
 common-datavalues = { path = "../datavalues" }
 
 parking_lot = "0.12"
+serde = { version = "1", features = ["derive"]}

src/query/planner/Cargo.toml

@@ -29,3 +29,6 @@ pub use metadata::Metadata;
 pub use metadata::MetadataRef;
 pub use metadata::TableEntry;
 pub use metadata::DUMMY_TABLE_INDEX;
+
+// Plan will be used publicly.
+pub mod plans;

src/query/planner/src/lib.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_call.rs renamed to src/query/planner/src/plans/call.rs

@@ -0,0 +1,16 @@
+// 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.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+
+mod call;
+pub use call::CallPlan;

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

@@ -17,7 +17,7 @@ use std::sync::RwLock;
 
 use common_datavalues::DataSchemaRef;
 use common_exception::Result;
-use common_legacy_planners::CallPlan;
+use common_planner::plans::CallPlan;
 
 use super::Interpreter;
 use crate::pipelines::PipelineBuildResult;

src/query/service/src/interpreters/interpreter_call.rs

@@ -26,7 +26,6 @@ use common_ast::UDFValidator;
 use common_datavalues::DataTypeImpl;
 use common_exception::Result;
 use common_legacy_planners::AlterUserUDFPlan;
-use common_legacy_planners::CallPlan;
 use common_legacy_planners::CreateRolePlan;
 use common_legacy_planners::CreateUserUDFPlan;
 use common_legacy_planners::DropRolePlan;
@@ -36,6 +35,7 @@ use common_legacy_planners::DropUserUDFPlan;
 use common_legacy_planners::ShowGrantsPlan;
 use common_legacy_planners::UseDatabasePlan;
 use common_meta_types::UserDefinedFunction;
+use common_planner::plans::CallPlan;
 use common_planner::MetadataRef;
 pub use scalar::ScalarBinder;
 pub use scalar_common::*;

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

@@ -48,7 +48,6 @@ use common_legacy_planners::AlterTableClusterKeyPlan;
 use common_legacy_planners::AlterUserPlan;
 use common_legacy_planners::AlterUserUDFPlan;
 use common_legacy_planners::AlterViewPlan;
-use common_legacy_planners::CallPlan;
 use common_legacy_planners::CreateDatabasePlan;
 use common_legacy_planners::CreateRolePlan;
 use common_legacy_planners::CreateUserPlan;
@@ -85,6 +84,7 @@ use common_legacy_planners::TruncateTablePlan;
 use common_legacy_planners::UndropDatabasePlan;
 use common_legacy_planners::UndropTablePlan;
 use common_legacy_planners::UseDatabasePlan;
+use common_planner::plans::CallPlan;
 use common_planner::MetadataRef;
 pub use copy_v2::CopyPlanV2;
 pub use copy_v2::ValidationMode;