fix(optimizer): manually import all plan nodes (#372)

skyzh · web-flow · commit 393aa1ed7e27 · 2022-01-28T09:05:04.000Z
Signed-off-by: Alex Chi &lt;iskyzh@gmail.com&gt;
diff --git a/src/optimizer/plan_nodes/dummy.rs b/src/optimizer/plan_nodes/dummy.rs
@@ -1,7 +1,9 @@
 // Copyright 2022 RisingLight Project Authors. Licensed under Apache-2.0.
 
 use std::fmt;
-use serde::{Serialize};
+
+use serde::Serialize;
+
 use super::*;
 
 /// A dummy plan.
diff --git a/src/optimizer/plan_nodes/logical_aggregate.rs b/src/optimizer/plan_nodes/logical_aggregate.rs
@@ -1,7 +1,8 @@
 // Copyright 2022 RisingLight Project Authors. Licensed under Apache-2.0.
 
 use std::fmt;
-use serde::{Serialize};
+
+use serde::Serialize;
 
 use super::*;
 use crate::binder::{BoundAggCall, BoundExpr};
diff --git a/src/optimizer/plan_nodes/logical_copy_from_file.rs b/src/optimizer/plan_nodes/logical_copy_from_file.rs
@@ -1,9 +1,10 @@
 // Copyright 2022 RisingLight Project Authors. Licensed under Apache-2.0.
 
 use std::fmt;
-use serde::{Serialize};
 use std::path::PathBuf;
 
+use serde::Serialize;
+
 use super::*;
 use crate::binder::statement::copy::FileFormat;
 use crate::types::DataType;
diff --git a/src/optimizer/plan_nodes/logical_copy_to_file.rs b/src/optimizer/plan_nodes/logical_copy_to_file.rs
@@ -2,7 +2,8 @@
 
 use std::fmt;
 use std::path::PathBuf;
-use serde::{Serialize};
+
+use serde::Serialize;
 
 use super::*;
 use crate::binder::statement::copy::FileFormat;
diff --git a/src/optimizer/plan_nodes/logical_create_table.rs b/src/optimizer/plan_nodes/logical_create_table.rs
@@ -1,8 +1,9 @@
 // Copyright 2022 RisingLight Project Authors. Licensed under Apache-2.0.
 
 use std::fmt;
-use serde::{Serialize};
+
 use itertools::Itertools;
+use serde::Serialize;
 
 use super::*;
 use crate::catalog::ColumnCatalog;
diff --git a/src/optimizer/plan_nodes/logical_delete.rs b/src/optimizer/plan_nodes/logical_delete.rs
@@ -1,7 +1,9 @@
 // Copyright 2022 RisingLight Project Authors. Licensed under Apache-2.0.
 
 use std::fmt;
-use serde::{Serialize};
+
+use serde::Serialize;
+
 use super::*;
 use crate::catalog::TableRefId;
 
diff --git a/src/optimizer/plan_nodes/logical_drop.rs b/src/optimizer/plan_nodes/logical_drop.rs
@@ -1,7 +1,9 @@
 // Copyright 2022 RisingLight Project Authors. Licensed under Apache-2.0.
 
 use std::fmt;
-use serde::{Serialize};
+
+use serde::Serialize;
+
 use super::*;
 use crate::binder::statement::drop::Object;
 
diff --git a/src/optimizer/plan_nodes/logical_explain.rs b/src/optimizer/plan_nodes/logical_explain.rs
@@ -1,7 +1,9 @@
 // Copyright 2022 RisingLight Project Authors. Licensed under Apache-2.0.
 
 use std::fmt;
-use serde::{Serialize};
+
+use serde::Serialize;
+
 use super::*;
 
 /// The logical plan of `EXPLAIN`.
diff --git a/src/optimizer/plan_nodes/logical_filter.rs b/src/optimizer/plan_nodes/logical_filter.rs
@@ -1,7 +1,9 @@
 // Copyright 2022 RisingLight Project Authors. Licensed under Apache-2.0.
 
 use std::fmt;
-use serde::{Serialize};
+
+use serde::Serialize;
+
 use super::*;
 use crate::binder::BoundExpr;
 use crate::optimizer::logical_plan_rewriter::ExprRewriter;
diff --git a/src/optimizer/plan_nodes/logical_insert.rs b/src/optimizer/plan_nodes/logical_insert.rs
@@ -1,8 +1,9 @@
 // Copyright 2022 RisingLight Project Authors. Licensed under Apache-2.0.
 
 use std::fmt;
-use serde::{Serialize};
+
 use itertools::Itertools;
+use serde::Serialize;
 
 use super::*;
 use crate::catalog::TableRefId;
diff --git a/src/optimizer/plan_nodes/logical_join.rs b/src/optimizer/plan_nodes/logical_join.rs
@@ -1,7 +1,9 @@
 // Copyright 2022 RisingLight Project Authors. Licensed under Apache-2.0.
 
 use std::fmt;
-use serde::{Serialize};
+
+use serde::Serialize;
+
 use super::*;
 use crate::binder::BoundJoinOperator;
 use crate::optimizer::logical_plan_rewriter::ExprRewriter;
diff --git a/src/optimizer/plan_nodes/logical_limit.rs b/src/optimizer/plan_nodes/logical_limit.rs
@@ -1,7 +1,9 @@
 // Copyright 2022 RisingLight Project Authors. Licensed under Apache-2.0.
 
 use std::fmt;
-use serde::{Serialize};
+
+use serde::Serialize;
+
 use super::*;
 
 /// The logical plan of limit operation.
diff --git a/src/optimizer/plan_nodes/logical_order.rs b/src/optimizer/plan_nodes/logical_order.rs
@@ -1,7 +1,8 @@
 // Copyright 2022 RisingLight Project Authors. Licensed under Apache-2.0.
 
 use std::fmt;
-use serde::{Serialize};
+
+use serde::Serialize;
 
 use super::*;
 use crate::binder::BoundOrderBy;
diff --git a/src/optimizer/plan_nodes/logical_projection.rs b/src/optimizer/plan_nodes/logical_projection.rs
@@ -1,7 +1,8 @@
 // Copyright 2022 RisingLight Project Authors. Licensed under Apache-2.0.
 
 use std::fmt;
-use serde::{Serialize};
+
+use serde::Serialize;
 
 use super::*;
 use crate::binder::BoundExpr;
diff --git a/src/optimizer/plan_nodes/logical_table_scan.rs b/src/optimizer/plan_nodes/logical_table_scan.rs
@@ -1,8 +1,9 @@
 // Copyright 2022 RisingLight Project Authors. Licensed under Apache-2.0.
 
 use std::fmt;
-use serde::{Serialize};
+
 use itertools::Itertools;
+use serde::Serialize;
 
 use super::*;
 use crate::catalog::{ColumnDesc, TableRefId};
diff --git a/src/optimizer/plan_nodes/logical_values.rs b/src/optimizer/plan_nodes/logical_values.rs
@@ -1,7 +1,8 @@
 // Copyright 2022 RisingLight Project Authors. Licensed under Apache-2.0.
 
 use std::fmt;
-use serde::{Serialize};
+
+use serde::Serialize;
 
 use super::*;
 use crate::binder::BoundExpr;
diff --git a/src/optimizer/plan_nodes/mod.rs b/src/optimizer/plan_nodes/mod.rs
@@ -11,12 +11,82 @@ use paste::paste;
 
 use crate::binder::BoundExpr;
 use crate::types::DataType;
-#[macro_use]
+
 mod plan_tree_node;
 pub use plan_tree_node::*;
 mod join_predicate;
 pub use join_predicate::*;
 
+// Import and use all plan nodes
+
+mod dummy;
+mod logical_aggregate;
+mod logical_copy_from_file;
+mod logical_copy_to_file;
+mod logical_create_table;
+mod logical_delete;
+mod logical_drop;
+mod logical_explain;
+mod logical_filter;
+mod logical_insert;
+mod logical_join;
+mod logical_limit;
+mod logical_order;
+mod logical_projection;
+mod logical_table_scan;
+mod logical_values;
+mod physical_copy_from_file;
+mod physical_copy_to_file;
+mod physical_create_table;
+mod physical_delete;
+mod physical_drop;
+mod physical_explain;
+mod physical_filter;
+mod physical_hash_agg;
+mod physical_hash_join;
+mod physical_insert;
+mod physical_limit;
+mod physical_nested_loop_join;
+mod physical_order;
+mod physical_projection;
+mod physical_simple_agg;
+mod physical_table_scan;
+mod physical_values;
+
+pub use dummy::*;
+pub use logical_aggregate::*;
+pub use logical_copy_from_file::*;
+pub use logical_copy_to_file::*;
+pub use logical_create_table::*;
+pub use logical_delete::*;
+pub use logical_drop::*;
+pub use logical_explain::*;
+pub use logical_filter::*;
+pub use logical_insert::*;
+pub use logical_join::*;
+pub use logical_limit::*;
+pub use logical_order::*;
+pub use logical_projection::*;
+pub use logical_table_scan::*;
+pub use logical_values::*;
+pub use physical_copy_from_file::*;
+pub use physical_copy_to_file::*;
+pub use physical_create_table::*;
+pub use physical_delete::*;
+pub use physical_drop::*;
+pub use physical_explain::*;
+pub use physical_filter::*;
+pub use physical_hash_agg::*;
+pub use physical_hash_join::*;
+pub use physical_insert::*;
+pub use physical_limit::*;
+pub use physical_nested_loop_join::*;
+pub use physical_order::*;
+pub use physical_projection::*;
+pub use physical_simple_agg::*;
+pub use physical_table_scan::*;
+pub use physical_values::*;
+
 /// The common trait over all plan nodes.
 pub trait PlanNode:
     WithPlanNodeType + PlanTreeNode + Debug + Display + Downcast + erased_serde::Serialize + Send + Sync
@@ -95,17 +165,6 @@ macro_rules! for_all_plan_nodes {
     };
 }
 
-/// Define module for each node.
-macro_rules! def_mod_and_use {
-    ([], $($node_name:ty),*) => {
-        $(paste! {
-            mod [<$node_name:snake>];
-            pub use [<$node_name:snake>]::*;
-        })*
-    }
-}
-for_all_plan_nodes! { def_mod_and_use }
-
 pub trait WithPlanNodeType {
     fn node_type(&self) -> PlanNodeType;
 }
diff --git a/src/optimizer/plan_nodes/physical_copy_from_file.rs b/src/optimizer/plan_nodes/physical_copy_from_file.rs
@@ -1,11 +1,10 @@
 // Copyright 2022 RisingLight Project Authors. Licensed under Apache-2.0.
 
 use std::fmt;
-use serde::{Serialize};
-
-use super::*;
 
+use serde::Serialize;
 
+use super::*;
 
 /// The physical plan of `COPY FROM`.
 #[derive(Debug, Clone, Serialize)]
diff --git a/src/optimizer/plan_nodes/physical_copy_to_file.rs b/src/optimizer/plan_nodes/physical_copy_to_file.rs
@@ -1,11 +1,10 @@
 // Copyright 2022 RisingLight Project Authors. Licensed under Apache-2.0.
 
 use std::fmt;
-use serde::{Serialize};
-
-use super::*;
 
+use serde::Serialize;
 
+use super::*;
 
 /// The physical plan of `COPY TO`.
 #[derive(Debug, Clone, Serialize)]
diff --git a/src/optimizer/plan_nodes/physical_create_table.rs b/src/optimizer/plan_nodes/physical_create_table.rs
@@ -1,13 +1,12 @@
 // Copyright 2022 RisingLight Project Authors. Licensed under Apache-2.0.
 
 use std::fmt;
-use serde::{Serialize};
+
 use itertools::Itertools;
+use serde::Serialize;
 
 use super::*;
 
-
-
 /// The physical plan of `CREATE TABLE`.
 #[derive(Debug, Clone, Serialize)]
 pub struct PhysicalCreateTable {
diff --git a/src/optimizer/plan_nodes/physical_delete.rs b/src/optimizer/plan_nodes/physical_delete.rs
@@ -1,9 +1,10 @@
 // Copyright 2022 RisingLight Project Authors. Licensed under Apache-2.0.
 
 use std::fmt;
-use serde::{Serialize};
-use super::*;
 
+use serde::Serialize;
+
+use super::*;
 
 /// The physical plan of `DELETE`.
 #[derive(Debug, Clone, Serialize)]
diff --git a/src/optimizer/plan_nodes/physical_drop.rs b/src/optimizer/plan_nodes/physical_drop.rs
@@ -1,9 +1,10 @@
 // Copyright 2022 RisingLight Project Authors. Licensed under Apache-2.0.
 
 use std::fmt;
-use serde::{Serialize};
-use super::*;
 
+use serde::Serialize;
+
+use super::*;
 
 /// The physical plan of `DROP`.
 #[derive(Debug, Clone, Serialize)]
diff --git a/src/optimizer/plan_nodes/physical_explain.rs b/src/optimizer/plan_nodes/physical_explain.rs
@@ -1,7 +1,9 @@
 // Copyright 2022 RisingLight Project Authors. Licensed under Apache-2.0.
 
 use std::fmt;
-use serde::{Serialize};
+
+use serde::Serialize;
+
 use super::*;
 
 /// The physical plan of `EXPLAIN`.
diff --git a/src/optimizer/plan_nodes/physical_filter.rs b/src/optimizer/plan_nodes/physical_filter.rs
@@ -1,9 +1,10 @@
 // Copyright 2022 RisingLight Project Authors. Licensed under Apache-2.0.
 
 use std::fmt;
-use serde::{Serialize};
-use super::*;
 
+use serde::Serialize;
+
+use super::*;
 
 /// The physical plan of filter operation.
 #[derive(Debug, Clone, Serialize)]
diff --git a/src/optimizer/plan_nodes/physical_hash_agg.rs b/src/optimizer/plan_nodes/physical_hash_agg.rs
@@ -1,9 +1,10 @@
 // Copyright 2022 RisingLight Project Authors. Licensed under Apache-2.0.
 
 use std::fmt;
-use serde::{Serialize};
-use super::*;
 
+use serde::Serialize;
+
+use super::*;
 
 /// The physical plan of hash aggregation.
 #[derive(Debug, Clone, Serialize)]
diff --git a/src/optimizer/plan_nodes/physical_insert.rs b/src/optimizer/plan_nodes/physical_insert.rs
@@ -1,13 +1,12 @@
 // Copyright 2022 RisingLight Project Authors. Licensed under Apache-2.0.
 
 use std::fmt;
-use serde::{Serialize};
+
 use itertools::Itertools;
+use serde::Serialize;
 
 use super::*;
 
-
-
 /// The physical plan of `INSERT`.
 #[derive(Debug, Clone, Serialize)]
 pub struct PhysicalInsert {
diff --git a/src/optimizer/plan_nodes/physical_limit.rs b/src/optimizer/plan_nodes/physical_limit.rs
diff --git a/src/optimizer/plan_nodes/physical_order.rs b/src/optimizer/plan_nodes/physical_order.rs
diff --git a/src/optimizer/plan_nodes/physical_projection.rs b/src/optimizer/plan_nodes/physical_projection.rs
diff --git a/src/optimizer/plan_nodes/physical_simple_agg.rs b/src/optimizer/plan_nodes/physical_simple_agg.rs
diff --git a/src/optimizer/plan_nodes/physical_table_scan.rs b/src/optimizer/plan_nodes/physical_table_scan.rs
diff --git a/src/optimizer/plan_nodes/physical_values.rs b/src/optimizer/plan_nodes/physical_values.rs
diff --git a/src/optimizer/plan_nodes/plan_tree_node.rs b/src/optimizer/plan_nodes/plan_tree_node.rs
