refactor: move tonbo to a sub-folder

tonbo-io · Aug 30, 2024 · fff7114 · fff7114
1 parent 6faa991
commit fff7114
Show file tree

Hide file tree

Showing 55 changed files with 101 additions and 102 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,100 +1,8 @@
-workspace = { members = ["tonbo_macros"] }
+[workspace]
+members = ["tonbo", "tonbo_macros"]
+resolver = "2"
 
-[package]
-description = "An embedded persistent KV database in Rust."
-documentation = "https://docs.rs/tonbo"
+[workspace.package]
 edition = "2021"
 license = "Apache-2.0"
-name = "tonbo"
-readme = "README.md"
-resolver = "2"
-version = "0.1.0"
-
-[package.metadata]
-msrv = "1.79.0"
-
-[features]
-bench = ["redb", "rocksdb", "sled"]
-datafusion = ["dep:async-trait", "dep:datafusion"]
-default = ["tokio"]
-load_tbl = []
-redb = ["dep:redb"]
-rocksdb = ["dep:rocksdb"]
-sled = ["dep:sled"]
-tokio = ["tokio/fs"]
-
-[[example]]
-name = "declare"
-required-features = ["tokio"]
-
-[[example]]
-name = "datafusion"
-required-features = ["datafusion"]
-
-[[bench]]
-harness = false
-name = "write_bench"
-required-features = ["bench"]
-
-[[bench]]
-harness = false
-name = "read_bench"
-required-features = ["bench"]
-
-[[bench]]
-harness = false
-name = "writes"
-path = "benches/criterion/writes.rs"
-required-features = ["sled"]
-
-[dependencies]
-arrow = "52"
-async-lock = "3"
-async-stream = "0.3"
-async-trait = { version = "0.1", optional = true }
-crc32fast = "1"
-crossbeam-skiplist = "0.1"
-datafusion = { version = "41", optional = true }
-flume = { version = "0.11", features = ["async"] }
-futures-core = "0.3"
-futures-io = "0.3"
-futures-util = "0.3"
-lockable = "0.0.8"
-once_cell = "1"
-parquet = { version = "52", features = ["async"] }
-pin-project-lite = "0.2"
-regex = "1"
-thiserror = "1"
-tokio = { version = "1", features = ["io-util"], default-features = false }
-tokio-util = { version = "0.7" }
-tonbo_macros = { version = "0.1.0", path = "tonbo_macros" }
-tracing = "0.1"
-ulid = "1"
-
-# Only used for benchmarks
-redb = { version = "2", optional = true }
-rocksdb = { version = "0.22", optional = true }
-sled = { version = "0.34", optional = true }
-
-[dev-dependencies]
-bincode = "1"
-comfy-table = "7"
-criterion = { version = "0.5", features = ["async_tokio", "html_reports"] }
-fastrand = "2"
-futures = { version = "0.3" }
-mimalloc = "0.1"
-serde = "1"
-tempfile = "3"
-tokio = { version = "1", features = ["full"] }
-trybuild = "1.0"
-
-[target.'cfg(unix)'.dev-dependencies]
-pprof = { version = "0.13", features = ["criterion", "flamegraph"] }
-
-[profile.release]
-codegen-units = 1
-lto = "thin"
-
-[profile.bench]
-debug = true
-inherits = "release"
+repository = "https://github.com/tonbo-io/tonbo"
diff --git a/tonbo/Cargo.toml b/tonbo/Cargo.toml
@@ -0,0 +1,90 @@
+[package]
+description = "An embedded persistent KV database in Rust."
+documentation = "https://docs.rs/tonbo"
+edition.workspace = true
+license.workspace = true
+name = "tonbo"
+readme = "../README.md"
+repository.workspace = true
+version = "0.1.0"
+
+[package.metadata]
+msrv = "1.79.0"
+
+[features]
+bench = ["redb", "rocksdb", "sled"]
+datafusion = ["dep:async-trait", "dep:datafusion"]
+default = ["tokio"]
+load_tbl = []
+redb = ["dep:redb"]
+rocksdb = ["dep:rocksdb"]
+sled = ["dep:sled"]
+tokio = ["tokio/fs"]
+
+[[example]]
+name = "declare"
+required-features = ["tokio"]
+
+[[example]]
+name = "datafusion"
+required-features = ["datafusion"]
+
+[[bench]]
+harness = false
+name = "write_bench"
+required-features = ["bench"]
+
+[[bench]]
+harness = false
+name = "read_bench"
+required-features = ["bench"]
+
+[[bench]]
+harness = false
+name = "writes"
+path = "benches/criterion/writes.rs"
+required-features = ["sled"]
+
+[dependencies]
+arrow = "52"
+async-lock = "3"
+async-stream = "0.3"
+async-trait = { version = "0.1", optional = true }
+crc32fast = "1"
+crossbeam-skiplist = "0.1"
+datafusion = { version = "41", optional = true }
+flume = { version = "0.11", features = ["async"] }
+futures-core = "0.3"
+futures-io = "0.3"
+futures-util = "0.3"
+lockable = "0.0.8"
+once_cell = "1"
+parquet = { version = "52", features = ["async"] }
+pin-project-lite = "0.2"
+regex = "1"
+thiserror = "1"
+tokio = { version = "1", features = ["io-util"], default-features = false }
+tokio-util = { version = "0.7" }
+tonbo_macros = { version = "0.1", path = "../tonbo_macros" }
+tracing = "0.1"
+ulid = "1"
+
+# Only used for benchmarks
+redb = { version = "2", optional = true }
+rocksdb = { version = "0.22", optional = true }
+sled = { version = "0.34", optional = true }
+
+[dev-dependencies]
+bincode = "1"
+comfy-table = "7"
+criterion = { version = "0.5", features = ["async_tokio", "html_reports"] }
+fastrand = "2"
+futures = { version = "0.3" }
+mimalloc = "0.1"
+serde = "1"
+tempfile = "3"
+tokio = { version = "1", features = ["full"] }
+trybuild = "1.0"
+
+[target.'cfg(unix)'.dev-dependencies]
+pprof = { version = "0.13", features = ["criterion", "flamegraph"] }
diff --git a/benches/common.rs → tonbo/benches/common.rs b/benches/common.rs → tonbo/benches/common.rs
diff --git a/benches/criterion/writes.rs → tonbo/benches/criterion/writes.rs b/benches/criterion/writes.rs → tonbo/benches/criterion/writes.rs
diff --git a/benches/read_bench.rs → tonbo/benches/read_bench.rs b/benches/read_bench.rs → tonbo/benches/read_bench.rs
diff --git a/benches/write_bench.rs → tonbo/benches/write_bench.rs b/benches/write_bench.rs → tonbo/benches/write_bench.rs
diff --git a/examples/README.md → tonbo/examples/README.md b/examples/README.md → tonbo/examples/README.md
diff --git a/examples/datafusion.rs → tonbo/examples/datafusion.rs b/examples/datafusion.rs → tonbo/examples/datafusion.rs
diff --git a/examples/declare.rs → tonbo/examples/declare.rs b/examples/declare.rs → tonbo/examples/declare.rs
diff --git a/src/compaction/mod.rs → tonbo/src/compaction/mod.rs b/src/compaction/mod.rs → tonbo/src/compaction/mod.rs
diff --git a/src/executor.rs → tonbo/src/executor.rs b/src/executor.rs → tonbo/src/executor.rs
diff --git a/src/fs/mod.rs → tonbo/src/fs/mod.rs b/src/fs/mod.rs → tonbo/src/fs/mod.rs
diff --git a/src/fs/tokio_fs.rs → tonbo/src/fs/tokio_fs.rs b/src/fs/tokio_fs.rs → tonbo/src/fs/tokio_fs.rs
diff --git a/src/inmem/immutable.rs → tonbo/src/inmem/immutable.rs b/src/inmem/immutable.rs → tonbo/src/inmem/immutable.rs
diff --git a/src/inmem/mod.rs → tonbo/src/inmem/mod.rs b/src/inmem/mod.rs → tonbo/src/inmem/mod.rs
diff --git a/src/inmem/mutable.rs → tonbo/src/inmem/mutable.rs b/src/inmem/mutable.rs → tonbo/src/inmem/mutable.rs
diff --git a/src/lib.rs → tonbo/src/lib.rs b/src/lib.rs → tonbo/src/lib.rs
diff --git a/src/ondisk/arrows.rs → tonbo/src/ondisk/arrows.rs b/src/ondisk/arrows.rs → tonbo/src/ondisk/arrows.rs
diff --git a/src/ondisk/mod.rs → tonbo/src/ondisk/mod.rs b/src/ondisk/mod.rs → tonbo/src/ondisk/mod.rs
diff --git a/src/ondisk/scan.rs → tonbo/src/ondisk/scan.rs b/src/ondisk/scan.rs → tonbo/src/ondisk/scan.rs
diff --git a/src/ondisk/sstable.rs → tonbo/src/ondisk/sstable.rs b/src/ondisk/sstable.rs → tonbo/src/ondisk/sstable.rs
diff --git a/src/option.rs → tonbo/src/option.rs b/src/option.rs → tonbo/src/option.rs
diff --git a/src/record/internal.rs → tonbo/src/record/internal.rs b/src/record/internal.rs → tonbo/src/record/internal.rs
diff --git a/src/record/key/mod.rs → tonbo/src/record/key/mod.rs b/src/record/key/mod.rs → tonbo/src/record/key/mod.rs
diff --git a/src/record/key/num.rs → tonbo/src/record/key/num.rs b/src/record/key/num.rs → tonbo/src/record/key/num.rs
diff --git a/src/record/key/str.rs → tonbo/src/record/key/str.rs b/src/record/key/str.rs → tonbo/src/record/key/str.rs
diff --git a/src/record/mod.rs → tonbo/src/record/mod.rs b/src/record/mod.rs → tonbo/src/record/mod.rs
diff --git a/src/record/str.rs → tonbo/src/record/str.rs b/src/record/str.rs → tonbo/src/record/str.rs
diff --git a/src/scope.rs → tonbo/src/scope.rs b/src/scope.rs → tonbo/src/scope.rs
diff --git a/src/serdes/arc.rs → tonbo/src/serdes/arc.rs b/src/serdes/arc.rs → tonbo/src/serdes/arc.rs
diff --git a/src/serdes/boolean.rs → tonbo/src/serdes/boolean.rs b/src/serdes/boolean.rs → tonbo/src/serdes/boolean.rs
diff --git a/src/serdes/mod.rs → tonbo/src/serdes/mod.rs b/src/serdes/mod.rs → tonbo/src/serdes/mod.rs
diff --git a/src/serdes/num.rs → tonbo/src/serdes/num.rs b/src/serdes/num.rs → tonbo/src/serdes/num.rs
diff --git a/src/serdes/option.rs → tonbo/src/serdes/option.rs b/src/serdes/option.rs → tonbo/src/serdes/option.rs
diff --git a/src/serdes/string.rs → tonbo/src/serdes/string.rs b/src/serdes/string.rs → tonbo/src/serdes/string.rs
diff --git a/src/stream/level.rs → tonbo/src/stream/level.rs b/src/stream/level.rs → tonbo/src/stream/level.rs
diff --git a/src/stream/merge.rs → tonbo/src/stream/merge.rs b/src/stream/merge.rs → tonbo/src/stream/merge.rs
diff --git a/src/stream/mod.rs → tonbo/src/stream/mod.rs b/src/stream/mod.rs → tonbo/src/stream/mod.rs
diff --git a/src/stream/package.rs → tonbo/src/stream/package.rs b/src/stream/package.rs → tonbo/src/stream/package.rs
diff --git a/src/stream/record_batch.rs → tonbo/src/stream/record_batch.rs b/src/stream/record_batch.rs → tonbo/src/stream/record_batch.rs
diff --git a/src/timestamp/mod.rs → tonbo/src/timestamp/mod.rs b/src/timestamp/mod.rs → tonbo/src/timestamp/mod.rs
diff --git a/src/timestamp/timestamped.rs → tonbo/src/timestamp/timestamped.rs b/src/timestamp/timestamped.rs → tonbo/src/timestamp/timestamped.rs
diff --git a/src/transaction.rs → tonbo/src/transaction.rs b/src/transaction.rs → tonbo/src/transaction.rs
diff --git a/src/trigger.rs → tonbo/src/trigger.rs b/src/trigger.rs → tonbo/src/trigger.rs
diff --git a/src/version/cleaner.rs → tonbo/src/version/cleaner.rs b/src/version/cleaner.rs → tonbo/src/version/cleaner.rs
diff --git a/src/version/edit.rs → tonbo/src/version/edit.rs b/src/version/edit.rs → tonbo/src/version/edit.rs
diff --git a/src/version/mod.rs → tonbo/src/version/mod.rs b/src/version/mod.rs → tonbo/src/version/mod.rs
diff --git a/src/version/set.rs → tonbo/src/version/set.rs b/src/version/set.rs → tonbo/src/version/set.rs
diff --git a/src/wal/checksum.rs → tonbo/src/wal/checksum.rs b/src/wal/checksum.rs → tonbo/src/wal/checksum.rs
diff --git a/src/wal/log.rs → tonbo/src/wal/log.rs b/src/wal/log.rs → tonbo/src/wal/log.rs
diff --git a/src/wal/mod.rs → tonbo/src/wal/mod.rs b/src/wal/mod.rs → tonbo/src/wal/mod.rs
diff --git a/src/wal/record_entry.rs → tonbo/src/wal/record_entry.rs b/src/wal/record_entry.rs → tonbo/src/wal/record_entry.rs
diff --git a/tests/01-simple-record.rs → tonbo/tests/01-simple-record.rs b/tests/01-simple-record.rs → tonbo/tests/01-simple-record.rs
diff --git a/tonbo_macros/Cargo.toml b/tonbo_macros/Cargo.toml
@@ -1,9 +1,10 @@
 [package]
-description = "TonboRecord macro"
+description = "Helpers of Tonbo"
 documentation = "https://docs.rs/tonbo_macros"
-edition = "2021"
-license = "Apache-2.0"
+edition.workspace = true
+license.workspace = true
 name = "tonbo_macros"
+repository.workspace = true
 version = "0.1.0"
 
 [dependencies]
@@ -12,5 +13,5 @@ quote = "1"
 syn = "2"
 
 [lib]
-path = "src/lib.rs"
+doctest = false
 proc-macro = true
diff --git a/tonbo_macros/src/lib.rs b/tonbo_macros/src/lib.rs
@@ -26,7 +26,7 @@ enum DataType {
 ///
 /// # Example
 ///
-/// ```
+/// ```no_run
 /// use tonbo::tonbo_record;
 ///
 /// #[tonbo_record(::serde::Serialize, ::serde::Deserialize)]