Move ListPlan

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

Author: Xuanwo

Cargo.lock

@@ -35,7 +35,6 @@ mod plan_having;
 mod plan_insert_into;
 mod plan_limit;
 mod plan_limit_by;
-mod plan_list;
 mod plan_node;
 mod plan_node_builder;
 mod plan_node_display;
@@ -153,7 +152,6 @@ pub use plan_insert_into::InsertPlan;
 pub use plan_insert_into::InsertValueBlock;
 pub use plan_limit::LimitPlan;
 pub use plan_limit_by::LimitByPlan;
-pub use plan_list::ListPlan;
 pub use plan_node::PlanNode;
 pub use plan_node_builder::PlanBuilder;
 pub use plan_node_extras::Extras;

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

@@ -10,6 +10,7 @@ edition = "2021"
 common-catalog = { path = "../catalog" }
 common-datavalues = { path = "../datavalues" }
 common-meta-app = {path = "../../meta/app"}
+common-meta-types = {path = "../../meta/types"}
 
 parking_lot = "0.12"
 serde = { version = "1", features = ["derive"]}

src/query/planner/Cargo.toml

@@ -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,12 @@
 // 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::fmt::Debug;
-use std::fmt::Formatter;
 use std::sync::Arc;
 
-use common_datavalues::prelude::ToDataType;
 use common_datavalues::prelude::*;
-use common_datavalues::DataField;
-use common_datavalues::DataSchema;
-use common_datavalues::DataSchemaRef;
 use common_meta_types::UserStageInfo;
 
-#[derive(serde::Serialize, serde::Deserialize, PartialEq, Eq, Clone)]
+#[derive(serde::Serialize, serde::Deserialize, PartialEq, Eq, Clone, Debug)]
 pub struct ListPlan {
     pub stage: UserStageInfo,
     pub path: String,
@@ -37,6 +30,7 @@ impl ListPlan {
         let md5 = DataField::new_nullable("md5", Vu8::to_data_type());
         let last_modified = DataField::new("last_modified", Vu8::to_data_type());
         let creator = DataField::new_nullable("creator", Vu8::to_data_type());
+
         Arc::new(DataSchema::new(vec![
             name,
             size,
@@ -46,14 +40,3 @@ impl ListPlan {
         ]))
     }
 }
-
-impl Debug for ListPlan {
-    // Ignore the schema.
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        write!(f, "List {:?}", self.stage)?;
-        if !self.pattern.is_empty() {
-            write!(f, " ,pattern:{:?}", self.pattern)?;
-        }
-        Ok(())
-    }
-}

src/query/legacy-planners/src/plan_list.rs renamed to src/query/planner/src/plans/list.rs

@@ -24,6 +24,9 @@ pub use drop_database::DropDatabasePlan;
 mod kill;
 pub use kill::KillPlan;
 
+mod list;
+pub use list::ListPlan;
+
 mod rename_database;
 pub use rename_database::RenameDatabaseEntity;
 pub use rename_database::RenameDatabasePlan;

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

@@ -19,7 +19,7 @@ use common_datavalues::DataSchemaRef;
 use common_datavalues::Series;
 use common_datavalues::SeriesFrom;
 use common_exception::Result;
-use common_legacy_planners::ListPlan;
+use common_planner::plans::ListPlan;
 
 use crate::interpreters::interpreter_common::list_files;
 use crate::interpreters::Interpreter;

src/query/service/src/interpreters/interpreter_list.rs

@@ -18,11 +18,11 @@ use common_ast::ast::CreateStageStmt;
 use common_exception::ErrorCode;
 use common_exception::Result;
 use common_legacy_planners::CreateUserStagePlan;
-use common_legacy_planners::ListPlan;
 use common_legacy_planners::RemoveUserStagePlan;
 use common_meta_types::OnErrorMode;
 use common_meta_types::StageType;
 use common_meta_types::UserStageInfo;
+use common_planner::plans::ListPlan;
 use common_storage::parse_uri_location;
 use common_storage::UriLocation;
 

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

@@ -65,7 +65,6 @@ use common_legacy_planners::DropViewPlan;
 use common_legacy_planners::ExistsTablePlan;
 use common_legacy_planners::GrantPrivilegePlan;
 use common_legacy_planners::GrantRolePlan;
-use common_legacy_planners::ListPlan;
 use common_legacy_planners::OptimizeTablePlan;
 use common_legacy_planners::ReclusterTablePlan;
 use common_legacy_planners::RemoveUserStagePlan;
@@ -82,6 +81,7 @@ use common_planner::plans::CallPlan;
 use common_planner::plans::CreateDatabasePlan;
 use common_planner::plans::DropDatabasePlan;
 use common_planner::plans::KillPlan;
+use common_planner::plans::ListPlan;
 use common_planner::plans::RenameDatabasePlan;
 use common_planner::plans::ShowCreateDatabasePlan;
 use common_planner::plans::UndropDatabasePlan;