refactor: enumerate the childrens attribute of LogicalPlan

KipData · Dec 6, 2024 · 4013547 · 4013547
1 parent 04b4a70
commit 4013547
Show file tree

Hide file tree

Showing 47 changed files with 419 additions and 300 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,7 +2,7 @@
 
 [package]
 name          = "fnck_sql"
-version       = "0.0.6"
+version       = "0.0.7"
 edition       = "2021"
 authors       = ["Kould <[email protected]>", "Xwg <[email protected]>"]
 description   = "SQL as a Function for Rust"

diff --git a/benchmarks/query_benchmark.rs b/benchmarks/query_benchmark.rs
@@ -25,17 +25,20 @@ fn query_cases() -> Vec<(&'static str, &'static str)> {
 }
 
 fn init_fncksql_query_bench() -> Result<(), DatabaseError> {
-    let database = DataBaseBuilder::path(QUERY_BENCH_FNCK_SQL_PATH)
-        .build()?;
-    database.run("create table t1 (c1 int primary key, c2 int)")?.done()?;
+    let database = DataBaseBuilder::path(QUERY_BENCH_FNCK_SQL_PATH).build()?;
+    database
+        .run("create table t1 (c1 int primary key, c2 int)")?
+        .done()?;
     let pb = ProgressBar::new(TABLE_ROW_NUM);
     pb.set_style(
         ProgressStyle::default_bar()
             .template("[{elapsed_precise}] {bar:40.cyan/white} {pos}/{len} {msg}")
             .unwrap(),
     );
     for i in 0..TABLE_ROW_NUM {
-        database.run(format!("insert into t1 values({}, {})", i, i + 1).as_str())?.done()?;
+        database
+            .run(format!("insert into t1 values({}, {})", i, i + 1).as_str())?
+            .done()?;
         pb.set_position(i + 1);
     }
     pb.finish_with_message("Insert completed!");
@@ -106,9 +109,7 @@ fn query_on_execute(c: &mut Criterion) {
         let connection = sqlite::open(QUERY_BENCH_SQLITE_PATH.to_owned()).unwrap();
         c.bench_function(format!("SQLite: {} by '{}'", name, case).as_str(), |b| {
             b.iter(|| {
-                for row in connection
-                    .prepare(case)
-                    .unwrap() {
+                for row in connection.prepare(case).unwrap() {
                     let _ = row.unwrap();
                 }
             })

diff --git a/src/bin/server.rs b/src/bin/server.rs
@@ -173,10 +173,12 @@ impl SimpleQueryHandler for SessionBackend {
                 let mut guard = self.tx.lock();
 
                 let iter = if let Some(transaction) = guard.as_mut() {
-                    unsafe { transaction.as_mut().run(query) }.map(Box::new) as Result<Box<dyn ResultIter>, _>
+                    unsafe { transaction.as_mut().run(query) }.map(Box::new)
+                        as Result<Box<dyn ResultIter>, _>
                 } else {
                     self.inner.run(query).map(Box::new)
-                }.map_err(|e| PgWireError::ApiError(Box::new(e)))?;
+                }
+                .map_err(|e| PgWireError::ApiError(Box::new(e)))?;
 
                 let mut tuples = Vec::new();
                 for tuple in iter {

diff --git a/src/binder/alter_table.rs b/src/binder/alter_table.rs
@@ -9,7 +9,7 @@ use crate::planner::operator::alter_table::add_column::AddColumnOperator;
 use crate::planner::operator::alter_table::drop_column::DropColumnOperator;
 use crate::planner::operator::table_scan::TableScanOperator;
 use crate::planner::operator::Operator;
-use crate::planner::LogicalPlan;
+use crate::planner::{Childrens, LogicalPlan};
 use crate::storage::Transaction;
 
 impl<T: Transaction> Binder<'_, '_, T> {
@@ -43,7 +43,7 @@ impl<T: Transaction> Binder<'_, '_, T> {
                         if_not_exists: *if_not_exists,
                         column,
                     }),
-                    vec![plan],
+                    Childrens::Only(plan),
                 )
             }
             AlterTableOperation::DropColumn {
@@ -60,7 +60,7 @@ impl<T: Transaction> Binder<'_, '_, T> {
                         if_exists: *if_exists,
                         column_name,
                     }),
-                    vec![plan],
+                    Childrens::Only(plan),
                 )
             }
             AlterTableOperation::DropPrimaryKey => todo!(),

diff --git a/src/binder/analyze.rs b/src/binder/analyze.rs
@@ -3,7 +3,7 @@ use crate::errors::DatabaseError;
 use crate::planner::operator::analyze::AnalyzeOperator;
 use crate::planner::operator::table_scan::TableScanOperator;
 use crate::planner::operator::Operator;
-use crate::planner::LogicalPlan;
+use crate::planner::{Childrens, LogicalPlan};
 use crate::storage::Transaction;
 use sqlparser::ast::ObjectName;
 use std::sync::Arc;
@@ -31,7 +31,7 @@ impl<T: Transaction> Binder<'_, '_, T> {
                 table_name,
                 index_metas,
             }),
-            vec![scan_op],
+            Childrens::Only(scan_op),
         ))
     }
 }
diff --git a/src/binder/copy.rs b/src/binder/copy.rs
@@ -7,6 +7,7 @@ use crate::errors::DatabaseError;
 use crate::planner::operator::copy_from_file::CopyFromFileOperator;
 use crate::planner::operator::copy_to_file::CopyToFileOperator;
 use crate::planner::operator::Operator;
+use crate::planner::Childrens;
 use fnck_sql_serde_macros::ReferenceSerialization;
 use serde::{Deserialize, Serialize};
 use sqlparser::ast::{CopyOption, CopySource, CopyTarget};
@@ -98,7 +99,7 @@ impl<T: Transaction> Binder<'_, '_, T> {
                         target: ext_source,
                         schema_ref,
                     }),
-                    vec![],
+                    Childrens::None,
                 ))
             } else {
                 // COPY <dest_table> FROM <source_file>
@@ -108,7 +109,7 @@ impl<T: Transaction> Binder<'_, '_, T> {
                         schema_ref,
                         table: table_name.to_string(),
                     }),
-                    vec![],
+                    Childrens::None,
                 ))
             }
         } else {

diff --git a/src/binder/create_index.rs b/src/binder/create_index.rs
@@ -4,7 +4,7 @@ use crate::expression::ScalarExpression;
 use crate::planner::operator::create_index::CreateIndexOperator;
 use crate::planner::operator::table_scan::TableScanOperator;
 use crate::planner::operator::Operator;
-use crate::planner::LogicalPlan;
+use crate::planner::{Childrens, LogicalPlan};
 use crate::storage::Transaction;
 use crate::types::index::IndexType;
 use sqlparser::ast::{ObjectName, OrderByExpr};
@@ -60,7 +60,7 @@ impl<T: Transaction> Binder<'_, '_, T> {
                 if_not_exists,
                 ty,
             }),
-            vec![plan],
+            Childrens::Only(plan),
         ))
     }
 }
diff --git a/src/binder/create_table.rs b/src/binder/create_table.rs
@@ -10,7 +10,7 @@ use crate::errors::DatabaseError;
 use crate::expression::ScalarExpression;
 use crate::planner::operator::create_table::CreateTableOperator;
 use crate::planner::operator::Operator;
-use crate::planner::LogicalPlan;
+use crate::planner::{Childrens, LogicalPlan};
 use crate::storage::Transaction;
 use crate::types::LogicalType;
 
@@ -90,7 +90,7 @@ impl<T: Transaction> Binder<'_, '_, T> {
                 columns,
                 if_not_exists,
             }),
-            vec![],
+            Childrens::None,
         ))
     }
 

diff --git a/src/binder/create_view.rs b/src/binder/create_view.rs
@@ -5,7 +5,7 @@ use crate::errors::DatabaseError;
 use crate::expression::{AliasType, ScalarExpression};
 use crate::planner::operator::create_view::CreateViewOperator;
 use crate::planner::operator::Operator;
-use crate::planner::LogicalPlan;
+use crate::planner::{Childrens, LogicalPlan};
 use crate::storage::Transaction;
 use itertools::Itertools;
 use sqlparser::ast::{Ident, ObjectName, Query};
@@ -56,7 +56,7 @@ impl<T: Transaction> Binder<'_, '_, T> {
                 },
                 or_replace: *or_replace,
             }),
-            vec![],
+            Childrens::None,
         ))
     }
 }
diff --git a/src/binder/delete.rs b/src/binder/delete.rs
@@ -3,7 +3,7 @@ use crate::errors::DatabaseError;
 use crate::planner::operator::delete::DeleteOperator;
 use crate::planner::operator::table_scan::TableScanOperator;
 use crate::planner::operator::Operator;
-use crate::planner::LogicalPlan;
+use crate::planner::{Childrens, LogicalPlan};
 use crate::storage::Transaction;
 use itertools::Itertools;
 use sqlparser::ast::{Expr, TableAlias, TableFactor, TableWithJoins};
@@ -52,7 +52,7 @@ impl<T: Transaction> Binder<'_, '_, T> {
                     table_name,
                     primary_keys,
                 }),
-                vec![plan],
+                Childrens::Only(plan),
             ))
         } else {
             unreachable!("only table")

diff --git a/src/binder/describe.rs b/src/binder/describe.rs
@@ -2,7 +2,7 @@ use crate::binder::{lower_case_name, Binder};
 use crate::errors::DatabaseError;
 use crate::planner::operator::describe::DescribeOperator;
 use crate::planner::operator::Operator;
-use crate::planner::LogicalPlan;
+use crate::planner::{Childrens, LogicalPlan};
 use crate::storage::Transaction;
 use sqlparser::ast::ObjectName;
 use std::sync::Arc;
@@ -16,7 +16,7 @@ impl<T: Transaction> Binder<'_, '_, T> {
 
         Ok(LogicalPlan::new(
             Operator::Describe(DescribeOperator { table_name }),
-            vec![],
+            Childrens::None,
         ))
     }
 }
diff --git a/src/binder/drop_table.rs b/src/binder/drop_table.rs
@@ -2,7 +2,7 @@ use crate::binder::{lower_case_name, Binder};
 use crate::errors::DatabaseError;
 use crate::planner::operator::drop_table::DropTableOperator;
 use crate::planner::operator::Operator;
-use crate::planner::LogicalPlan;
+use crate::planner::{Childrens, LogicalPlan};
 use crate::storage::Transaction;
 use sqlparser::ast::ObjectName;
 use std::sync::Arc;
@@ -20,7 +20,7 @@ impl<T: Transaction> Binder<'_, '_, T> {
                 table_name,
                 if_exists: *if_exists,
             }),
-            vec![],
+            Childrens::None,
         ))
     }
 }
diff --git a/src/binder/drop_view.rs b/src/binder/drop_view.rs
@@ -2,7 +2,7 @@ use crate::binder::{lower_case_name, Binder};
 use crate::errors::DatabaseError;
 use crate::planner::operator::drop_view::DropViewOperator;
 use crate::planner::operator::Operator;
-use crate::planner::LogicalPlan;
+use crate::planner::{Childrens, LogicalPlan};
 use crate::storage::Transaction;
 use sqlparser::ast::ObjectName;
 use std::sync::Arc;
@@ -20,7 +20,7 @@ impl<T: Transaction> Binder<'_, '_, T> {
                 view_name,
                 if_exists: *if_exists,
             }),
-            vec![],
+            Childrens::None,
         ))
     }
 }
diff --git a/src/binder/explain.rs b/src/binder/explain.rs
@@ -1,11 +1,11 @@
 use crate::binder::Binder;
 use crate::errors::DatabaseError;
 use crate::planner::operator::Operator;
-use crate::planner::LogicalPlan;
+use crate::planner::{Childrens, LogicalPlan};
 use crate::storage::Transaction;
 
 impl<T: Transaction> Binder<'_, '_, T> {
     pub(crate) fn bind_explain(&mut self, plan: LogicalPlan) -> Result<LogicalPlan, DatabaseError> {
-        Ok(LogicalPlan::new(Operator::Explain, vec![plan]))
+        Ok(LogicalPlan::new(Operator::Explain, Childrens::Only(plan)))
     }
 }
diff --git a/src/binder/insert.rs b/src/binder/insert.rs
@@ -4,7 +4,7 @@ use crate::expression::ScalarExpression;
 use crate::planner::operator::insert::InsertOperator;
 use crate::planner::operator::values::ValuesOperator;
 use crate::planner::operator::Operator;
-use crate::planner::LogicalPlan;
+use crate::planner::{Childrens, LogicalPlan};
 use crate::storage::Transaction;
 use crate::types::tuple::SchemaRef;
 use crate::types::value::DataValue;
@@ -99,7 +99,7 @@ impl<T: Transaction> Binder<'_, '_, T> {
                 is_overwrite,
                 is_mapping_by_name,
             }),
-            vec![values_plan],
+            Childrens::Only(values_plan),
         ))
     }
 
@@ -110,7 +110,7 @@ impl<T: Transaction> Binder<'_, '_, T> {
     ) -> LogicalPlan {
         LogicalPlan::new(
             Operator::Values(ValuesOperator { rows, schema_ref }),
-            vec![],
+            Childrens::None,
         )
     }
 }
diff --git a/src/binder/select.rs b/src/binder/select.rs
@@ -27,7 +27,7 @@ use crate::planner::operator::insert::InsertOperator;
 use crate::planner::operator::join::JoinCondition;
 use crate::planner::operator::sort::{SortField, SortOperator};
 use crate::planner::operator::union::UnionOperator;
-use crate::planner::{LogicalPlan, SchemaOutput};
+use crate::planner::{Childrens, LogicalPlan, SchemaOutput};
 use crate::storage::Transaction;
 use crate::types::tuple::{Schema, SchemaRef};
 use crate::types::{ColumnId, LogicalType};
@@ -75,7 +75,7 @@ impl<'a: 'b, 'b, T: Transaction> Binder<'a, 'b, T> {
         orderby: &[OrderByExpr],
     ) -> Result<LogicalPlan, DatabaseError> {
         let mut plan = if select.from.is_empty() {
-            LogicalPlan::new(Operator::Dummy, vec![])
+            LogicalPlan::new(Operator::Dummy, Childrens::None)
         } else {
             let mut plan = self.bind_table_ref(&select.from[0])?;
 
@@ -152,7 +152,7 @@ impl<'a: 'b, 'b, T: Transaction> Binder<'a, 'b, T> {
                     is_overwrite: false,
                     is_mapping_by_name: true,
                 }),
-                vec![plan],
+                Childrens::Only(plan),
             )
         }
 
@@ -224,7 +224,13 @@ impl<'a: 'b, 'b, T: Transaction> Binder<'a, 'b, T> {
                     .collect_vec();
 
                 Ok(self.bind_distinct(
-                    LogicalPlan::new(union_op, vec![left_plan, right_plan]),
+                    LogicalPlan::new(
+                        union_op,
+                        Childrens::Twins {
+                            left: left_plan,
+                            right: right_plan,
+                        },
+                    ),
                     distinct_exprs,
                 ))
             }
@@ -669,7 +675,7 @@ impl<'a: 'b, 'b, T: Transaction> Binder<'a, 'b, T> {
 
         Ok(LogicalPlan::new(
             Operator::Project(ProjectOperator { exprs: select_list }),
-            vec![children],
+            Childrens::Only(children),
         ))
     }
 
@@ -681,7 +687,7 @@ impl<'a: 'b, 'b, T: Transaction> Binder<'a, 'b, T> {
                 sort_fields,
                 limit: None,
             }),
-            vec![children],
+            Childrens::Only(children),
         )
     }
 

diff --git a/src/binder/show.rs b/src/binder/show.rs
@@ -1,11 +1,11 @@
 use crate::binder::Binder;
 use crate::errors::DatabaseError;
 use crate::planner::operator::Operator;
-use crate::planner::LogicalPlan;
+use crate::planner::{Childrens, LogicalPlan};
 use crate::storage::Transaction;
 
 impl<T: Transaction> Binder<'_, '_, T> {
     pub(crate) fn bind_show_tables(&mut self) -> Result<LogicalPlan, DatabaseError> {
-        Ok(LogicalPlan::new(Operator::Show, vec![]))
+        Ok(LogicalPlan::new(Operator::Show, Childrens::None))
     }
 }
diff --git a/src/binder/truncate.rs b/src/binder/truncate.rs
@@ -2,7 +2,7 @@ use crate::binder::{lower_case_name, Binder};
 use crate::errors::DatabaseError;
 use crate::planner::operator::truncate::TruncateOperator;
 use crate::planner::operator::Operator;
-use crate::planner::LogicalPlan;
+use crate::planner::{Childrens, LogicalPlan};
 use crate::storage::Transaction;
 use sqlparser::ast::ObjectName;
 use std::sync::Arc;
@@ -16,7 +16,7 @@ impl<T: Transaction> Binder<'_, '_, T> {
 
         Ok(LogicalPlan::new(
             Operator::Truncate(TruncateOperator { table_name }),
-            vec![],
+            Childrens::None,
         ))
     }
 }