Merge branch 'master' of https://github.com/systemxlabs/bustubx

systemxlabs · Jan 28, 2024 · ef0bab4 · ef0bab4
2 parents d8705bd + 755d5e7
commit ef0bab4
Show file tree

Hide file tree

Showing 92 changed files with 74 additions and 61 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,24 +1,7 @@
-[package]
-name = "bustubx"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[lib]
-doctest = false
-
-[dependencies]
-sqlparser = "0.34.0"
-petgraph = "0.6.3"
-lazy_static = "1.4.0"
-itertools = "0.11.0"
-comfy-table = "7.0.1"
-derive-new = "0.5.9"
-tracing = "0.1"
-tracing-subscriber = "0.3"
-tracing-chrome = "0.7.1"
-thiserror = "1.0.56"
-
 [workspace]
-members = ["tests/sqllogictest"]
+members = [
+    "bustubx",
+    "bustubx-cli",
+    "tests/sqllogictest",
+]
+resolver = "2"
diff --git a/bustubx-cli/Cargo.toml b/bustubx-cli/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "bustubx-cli"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+bustubx = { path = "../bustubx" }
+tracing = "0.1"
+tracing-subscriber = "0.3"
+tracing-chrome = "0.7.1"
diff --git a/src/main.rs → bustubx-cli/src/main.rs b/src/main.rs → bustubx-cli/src/main.rs
@@ -1,24 +1,10 @@
-use std::io::{self, Write};
-
-use tracing::{debug, info, Level};
+use bustubx::database::Database;
+use std::io::Write;
+use tracing::info;
 use tracing_chrome::ChromeLayerBuilder;
-use tracing_subscriber::{
-    fmt, prelude::__tracing_subscriber_SubscriberExt, util::SubscriberInitExt,
-};
-
-use crate::database::Database;
-
-mod buffer;
-mod catalog;
-mod common;
-mod database;
-mod error;
-mod execution;
-mod expression;
-mod optimizer;
-mod parser;
-mod planner;
-mod storage;
+use tracing_subscriber::fmt;
+use tracing_subscriber::layer::SubscriberExt;
+use tracing_subscriber::util::SubscriberInitExt;
 
 fn main() {
     println!(":) Welcome to the bustubx, please input sql.");
@@ -39,9 +25,9 @@ fn main() {
     info!("database created");
     loop {
         print!(">");
-        io::stdout().flush().unwrap();
+        std::io::stdout().flush().unwrap();
         let mut input = String::new();
-        match io::stdin().read_line(&mut input) {
+        match std::io::stdin().read_line(&mut input) {
             Ok(_) => {
                 if input.trim() == "exit" {
                     break;

diff --git a/bustubx/Cargo.toml b/bustubx/Cargo.toml
@@ -0,0 +1,20 @@
+[package]
+name = "bustubx"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+doctest = false
+
+[dependencies]
+sqlparser = "0.34.0"
+petgraph = "0.6.3"
+lazy_static = "1.4.0"
+itertools = "0.11.0"
+comfy-table = "7.0.1"
+derive-new = "0.5.9"
+tracing = "0.1"
+tracing-subscriber = "0.3"
+tracing-chrome = "0.7.1"
+thiserror = "1.0.56"
+tempfile = "3"
diff --git a/src/buffer/buffer_pool.rs → bustubx/src/buffer/buffer_pool.rs b/src/buffer/buffer_pool.rs → bustubx/src/buffer/buffer_pool.rs
diff --git a/src/buffer/mod.rs → bustubx/src/buffer/mod.rs b/src/buffer/mod.rs → bustubx/src/buffer/mod.rs
diff --git a/src/buffer/replacer.rs → bustubx/src/buffer/replacer.rs b/src/buffer/replacer.rs → bustubx/src/buffer/replacer.rs
diff --git a/src/catalog/catalog.rs → bustubx/src/catalog/catalog.rs b/src/catalog/catalog.rs → bustubx/src/catalog/catalog.rs
diff --git a/src/catalog/column.rs → bustubx/src/catalog/column.rs b/src/catalog/column.rs → bustubx/src/catalog/column.rs
diff --git a/src/catalog/data_type.rs → bustubx/src/catalog/data_type.rs b/src/catalog/data_type.rs → bustubx/src/catalog/data_type.rs
diff --git a/src/catalog/mod.rs → bustubx/src/catalog/mod.rs b/src/catalog/mod.rs → bustubx/src/catalog/mod.rs
diff --git a/src/catalog/schema.rs → bustubx/src/catalog/schema.rs b/src/catalog/schema.rs → bustubx/src/catalog/schema.rs
diff --git a/src/common/config.rs → bustubx/src/common/config.rs b/src/common/config.rs → bustubx/src/common/config.rs
diff --git a/src/common/mod.rs → bustubx/src/common/mod.rs b/src/common/mod.rs → bustubx/src/common/mod.rs
diff --git a/src/common/rid.rs → bustubx/src/common/rid.rs b/src/common/rid.rs → bustubx/src/common/rid.rs
diff --git a/src/common/scalar.rs → bustubx/src/common/scalar.rs b/src/common/scalar.rs → bustubx/src/common/scalar.rs
diff --git a/src/common/table_ref.rs → bustubx/src/common/table_ref.rs b/src/common/table_ref.rs → bustubx/src/common/table_ref.rs
diff --git a/src/common/util.rs → bustubx/src/common/util.rs b/src/common/util.rs → bustubx/src/common/util.rs
diff --git a/src/database.rs → bustubx/src/database.rs b/src/database.rs → bustubx/src/database.rs
diff --git a/src/error.rs → bustubx/src/error.rs b/src/error.rs → bustubx/src/error.rs
diff --git a/src/execution/mod.rs → bustubx/src/execution/mod.rs b/src/execution/mod.rs → bustubx/src/execution/mod.rs
diff --git a/src/expression/alias.rs → bustubx/src/expression/alias.rs b/src/expression/alias.rs → bustubx/src/expression/alias.rs
diff --git a/src/expression/binary.rs → bustubx/src/expression/binary.rs b/src/expression/binary.rs → bustubx/src/expression/binary.rs
diff --git a/src/expression/column.rs → bustubx/src/expression/column.rs b/src/expression/column.rs → bustubx/src/expression/column.rs
diff --git a/src/expression/literal.rs → bustubx/src/expression/literal.rs b/src/expression/literal.rs → bustubx/src/expression/literal.rs
diff --git a/src/expression/mod.rs → bustubx/src/expression/mod.rs b/src/expression/mod.rs → bustubx/src/expression/mod.rs
diff --git a/src/lib.rs → bustubx/src/lib.rs b/src/lib.rs → bustubx/src/lib.rs
@@ -2,7 +2,7 @@ mod buffer;
 mod catalog;
 mod common;
 pub mod database;
-mod error;
+pub mod error;
 mod execution;
 mod expression;
 mod optimizer;

diff --git a/src/optimizer/heuristic/batch.rs → bustubx/src/optimizer/heuristic/batch.rs b/src/optimizer/heuristic/batch.rs → bustubx/src/optimizer/heuristic/batch.rs
diff --git a/src/optimizer/heuristic/graph.rs → bustubx/src/optimizer/heuristic/graph.rs b/src/optimizer/heuristic/graph.rs → bustubx/src/optimizer/heuristic/graph.rs
diff --git a/src/optimizer/heuristic/matcher.rs → bustubx/src/optimizer/heuristic/matcher.rs b/src/optimizer/heuristic/matcher.rs → bustubx/src/optimizer/heuristic/matcher.rs
diff --git a/src/optimizer/heuristic/mod.rs → bustubx/src/optimizer/heuristic/mod.rs b/src/optimizer/heuristic/mod.rs → bustubx/src/optimizer/heuristic/mod.rs
diff --git a/src/optimizer/heuristic/pattern.rs → bustubx/src/optimizer/heuristic/pattern.rs b/src/optimizer/heuristic/pattern.rs → bustubx/src/optimizer/heuristic/pattern.rs
diff --git a/src/optimizer/heuristic/rule.rs → bustubx/src/optimizer/heuristic/rule.rs b/src/optimizer/heuristic/rule.rs → bustubx/src/optimizer/heuristic/rule.rs
diff --git a/src/optimizer/mod.rs → bustubx/src/optimizer/mod.rs b/src/optimizer/mod.rs → bustubx/src/optimizer/mod.rs
diff --git a/src/optimizer/physical_optimizer.rs → bustubx/src/optimizer/physical_optimizer.rs b/src/optimizer/physical_optimizer.rs → bustubx/src/optimizer/physical_optimizer.rs
diff --git a/src/optimizer/physical_plan/create_index.rs → ...c/optimizer/physical_plan/create_index.rs b/src/optimizer/physical_plan/create_index.rs → ...c/optimizer/physical_plan/create_index.rs
diff --git a/src/optimizer/physical_plan/create_table.rs → ...c/optimizer/physical_plan/create_table.rs b/src/optimizer/physical_plan/create_table.rs → ...c/optimizer/physical_plan/create_table.rs
diff --git a/src/optimizer/physical_plan/filter.rs → ...ubx/src/optimizer/physical_plan/filter.rs b/src/optimizer/physical_plan/filter.rs → ...ubx/src/optimizer/physical_plan/filter.rs
diff --git a/src/optimizer/physical_plan/insert.rs → ...ubx/src/optimizer/physical_plan/insert.rs b/src/optimizer/physical_plan/insert.rs → ...ubx/src/optimizer/physical_plan/insert.rs
diff --git a/src/optimizer/physical_plan/limit.rs → bustubx/src/optimizer/physical_plan/limit.rs b/src/optimizer/physical_plan/limit.rs → bustubx/src/optimizer/physical_plan/limit.rs
diff --git a/src/optimizer/physical_plan/mod.rs → bustubx/src/optimizer/physical_plan/mod.rs b/src/optimizer/physical_plan/mod.rs → bustubx/src/optimizer/physical_plan/mod.rs
diff --git a/...timizer/physical_plan/nested_loop_join.rs → ...timizer/physical_plan/nested_loop_join.rs b/...timizer/physical_plan/nested_loop_join.rs → ...timizer/physical_plan/nested_loop_join.rs
diff --git a/src/optimizer/physical_plan/project.rs → ...bx/src/optimizer/physical_plan/project.rs b/src/optimizer/physical_plan/project.rs → ...bx/src/optimizer/physical_plan/project.rs
diff --git a/src/optimizer/physical_plan/sort.rs → bustubx/src/optimizer/physical_plan/sort.rs b/src/optimizer/physical_plan/sort.rs → bustubx/src/optimizer/physical_plan/sort.rs
diff --git a/src/optimizer/physical_plan/table_scan.rs → ...src/optimizer/physical_plan/table_scan.rs b/src/optimizer/physical_plan/table_scan.rs → ...src/optimizer/physical_plan/table_scan.rs
diff --git a/src/optimizer/physical_plan/values.rs → ...ubx/src/optimizer/physical_plan/values.rs b/src/optimizer/physical_plan/values.rs → ...ubx/src/optimizer/physical_plan/values.rs
diff --git a/src/optimizer/rule/dummy.rs → bustubx/src/optimizer/rule/dummy.rs b/src/optimizer/rule/dummy.rs → bustubx/src/optimizer/rule/dummy.rs
diff --git a/src/optimizer/rule/eliminate_limits.rs → ...bx/src/optimizer/rule/eliminate_limits.rs b/src/optimizer/rule/eliminate_limits.rs → ...bx/src/optimizer/rule/eliminate_limits.rs
diff --git a/...optimizer/rule/limit_project_transpose.rs → ...optimizer/rule/limit_project_transpose.rs b/...optimizer/rule/limit_project_transpose.rs → ...optimizer/rule/limit_project_transpose.rs
diff --git a/src/optimizer/rule/mod.rs → bustubx/src/optimizer/rule/mod.rs b/src/optimizer/rule/mod.rs → bustubx/src/optimizer/rule/mod.rs
diff --git a/src/optimizer/rule/push_limit_into_scan.rs → ...rc/optimizer/rule/push_limit_into_scan.rs b/src/optimizer/rule/push_limit_into_scan.rs → ...rc/optimizer/rule/push_limit_into_scan.rs
diff --git a/...optimizer/rule/push_limit_through_join.rs → ...optimizer/rule/push_limit_through_join.rs b/...optimizer/rule/push_limit_through_join.rs → ...optimizer/rule/push_limit_through_join.rs
diff --git a/src/parser/mod.rs → bustubx/src/parser/mod.rs b/src/parser/mod.rs → bustubx/src/parser/mod.rs
diff --git a/src/planner/bind_create_table.rs → bustubx/src/planner/bind_create_table.rs b/src/planner/bind_create_table.rs → bustubx/src/planner/bind_create_table.rs
diff --git a/src/planner/bind_insert.rs → bustubx/src/planner/bind_insert.rs b/src/planner/bind_insert.rs → bustubx/src/planner/bind_insert.rs
diff --git a/src/planner/bind_select.rs → bustubx/src/planner/bind_select.rs b/src/planner/bind_select.rs → bustubx/src/planner/bind_select.rs
diff --git a/src/planner/expr/alias.rs → bustubx/src/planner/expr/alias.rs b/src/planner/expr/alias.rs → bustubx/src/planner/expr/alias.rs
diff --git a/src/planner/expr/binary_op.rs → bustubx/src/planner/expr/binary_op.rs b/src/planner/expr/binary_op.rs → bustubx/src/planner/expr/binary_op.rs
diff --git a/src/planner/expr/column_ref.rs → bustubx/src/planner/expr/column_ref.rs b/src/planner/expr/column_ref.rs → bustubx/src/planner/expr/column_ref.rs
diff --git a/src/planner/expr/constant.rs → bustubx/src/planner/expr/constant.rs b/src/planner/expr/constant.rs → bustubx/src/planner/expr/constant.rs
diff --git a/src/planner/expr/mod.rs → bustubx/src/planner/expr/mod.rs b/src/planner/expr/mod.rs → bustubx/src/planner/expr/mod.rs
diff --git a/src/planner/logical_plan.rs → bustubx/src/planner/logical_plan.rs b/src/planner/logical_plan.rs → bustubx/src/planner/logical_plan.rs
diff --git a/src/planner/logical_plan_v2/create_table.rs → ...c/planner/logical_plan_v2/create_table.rs b/src/planner/logical_plan_v2/create_table.rs → ...c/planner/logical_plan_v2/create_table.rs
diff --git a/src/planner/logical_plan_v2/mod.rs → bustubx/src/planner/logical_plan_v2/mod.rs b/src/planner/logical_plan_v2/mod.rs → bustubx/src/planner/logical_plan_v2/mod.rs
diff --git a/src/planner/mod.rs → bustubx/src/planner/mod.rs b/src/planner/mod.rs → bustubx/src/planner/mod.rs
diff --git a/src/planner/operator/create_index.rs → bustubx/src/planner/operator/create_index.rs b/src/planner/operator/create_index.rs → bustubx/src/planner/operator/create_index.rs
diff --git a/src/planner/operator/create_table.rs → bustubx/src/planner/operator/create_table.rs b/src/planner/operator/create_table.rs → bustubx/src/planner/operator/create_table.rs
diff --git a/src/planner/operator/filter.rs → bustubx/src/planner/operator/filter.rs b/src/planner/operator/filter.rs → bustubx/src/planner/operator/filter.rs
diff --git a/src/planner/operator/insert.rs → bustubx/src/planner/operator/insert.rs b/src/planner/operator/insert.rs → bustubx/src/planner/operator/insert.rs
diff --git a/src/planner/operator/join.rs → bustubx/src/planner/operator/join.rs b/src/planner/operator/join.rs → bustubx/src/planner/operator/join.rs
diff --git a/src/planner/operator/limit.rs → bustubx/src/planner/operator/limit.rs b/src/planner/operator/limit.rs → bustubx/src/planner/operator/limit.rs
diff --git a/src/planner/operator/mod.rs → bustubx/src/planner/operator/mod.rs b/src/planner/operator/mod.rs → bustubx/src/planner/operator/mod.rs
diff --git a/src/planner/operator/project.rs → bustubx/src/planner/operator/project.rs b/src/planner/operator/project.rs → bustubx/src/planner/operator/project.rs
diff --git a/src/planner/operator/scan.rs → bustubx/src/planner/operator/scan.rs b/src/planner/operator/scan.rs → bustubx/src/planner/operator/scan.rs
diff --git a/src/planner/operator/sort.rs → bustubx/src/planner/operator/sort.rs b/src/planner/operator/sort.rs → bustubx/src/planner/operator/sort.rs
diff --git a/src/planner/operator/values.rs → bustubx/src/planner/operator/values.rs b/src/planner/operator/values.rs → bustubx/src/planner/operator/values.rs
diff --git a/src/planner/order_by.rs → bustubx/src/planner/order_by.rs b/src/planner/order_by.rs → bustubx/src/planner/order_by.rs
diff --git a/src/planner/plan_create_index.rs → bustubx/src/planner/plan_create_index.rs b/src/planner/plan_create_index.rs → bustubx/src/planner/plan_create_index.rs
diff --git a/src/planner/table_ref/base_table.rs → bustubx/src/planner/table_ref/base_table.rs b/src/planner/table_ref/base_table.rs → bustubx/src/planner/table_ref/base_table.rs
diff --git a/src/planner/table_ref/join.rs → bustubx/src/planner/table_ref/join.rs b/src/planner/table_ref/join.rs → bustubx/src/planner/table_ref/join.rs
diff --git a/src/planner/table_ref/mod.rs → bustubx/src/planner/table_ref/mod.rs b/src/planner/table_ref/mod.rs → bustubx/src/planner/table_ref/mod.rs
diff --git a/src/storage/disk_manager.rs → bustubx/src/storage/disk_manager.rs b/src/storage/disk_manager.rs → bustubx/src/storage/disk_manager.rs
diff --git a/src/storage/index.rs → bustubx/src/storage/index.rs b/src/storage/index.rs → bustubx/src/storage/index.rs
diff --git a/src/storage/index_page.rs → bustubx/src/storage/index_page.rs b/src/storage/index_page.rs → bustubx/src/storage/index_page.rs
diff --git a/src/storage/mod.rs → bustubx/src/storage/mod.rs b/src/storage/mod.rs → bustubx/src/storage/mod.rs
diff --git a/src/storage/page.rs → bustubx/src/storage/page.rs b/src/storage/page.rs → bustubx/src/storage/page.rs
diff --git a/src/storage/table_heap.rs → bustubx/src/storage/table_heap.rs b/src/storage/table_heap.rs → bustubx/src/storage/table_heap.rs
diff --git a/src/storage/table_page.rs → bustubx/src/storage/table_page.rs b/src/storage/table_page.rs → bustubx/src/storage/table_page.rs
diff --git a/src/storage/tuple.rs → bustubx/src/storage/tuple.rs b/src/storage/tuple.rs → bustubx/src/storage/tuple.rs
diff --git a/tests/sqllogictest/Cargo.toml b/tests/sqllogictest/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "sqllogictest"
+name = "bustubx-sqllogictest"
 version = "0.1.0"
 edition = "2021"
 
@@ -8,5 +8,5 @@ edition = "2021"
 [dependencies]
 sqllogictest = "0.13.0"
 tempfile = "3"
-bustubx = { path = "../.."}
+bustubx = { path = "../../bustubx" }
 async-trait = "0.1.77"
diff --git a/tests/sqllogictest/src/lib.rs b/tests/sqllogictest/src/lib.rs
@@ -1,5 +1,6 @@
 use bustubx::database::Database;
-use sqllogictest::DBOutput;
+use bustubx::error::BustubxError;
+use sqllogictest::{DBOutput, DefaultColumnType};
 use tempfile::TempDir;
 
 pub struct Bustubx {
@@ -17,8 +18,8 @@ impl Bustubx {
 
 #[async_trait::async_trait]
 impl sqllogictest::AsyncDB for &Bustubx {
-    type Error = ();
-    type ColumnType = ();
+    type Error = BustubxError;
+    type ColumnType = DefaultColumnType;
 
     async fn run(&mut self, sql: &str) -> Result<DBOutput<Self::ColumnType>, Self::Error> {
         todo!()