Reconstruct project structure

lablup · Jan 3, 2024 · 83704a0 · 83704a0
1 parent d61b642
commit 83704a0
Show file tree

Hide file tree

Showing 38 changed files with 93 additions and 61 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-/target
+target
 node-*
 
 logs

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,40 +1,30 @@
-[package]
-name = "raftify"
-version = "0.1.0"
-authors = ["Lablup Inc."]
-edition = "2021"
-license = "MIT/Apache-2.0"
-repository = "https://github.com/lablup/raftify"
-description = "Experimental High level Raft framework"
-keywords = ["raft", "distributed-systems", "ha"]
-
-[dependencies]
-async-trait = "0.1.48"
-bincode = "1.3"
-bytes = "1.5.0"
-heed = "0.20.0-alpha.9"
-heed-traits = "0.20.0-alpha.9"
-log = { version = "0.4", features = ["std"] }
-parking_lot = "0.12.1"
-prost = "0.11"
-raft = { git = "https://github.com/jopemachine/raft-rs", features = ["prost-codec", "default-logger"], default-features = false }
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-slog = "2"
-slog-stdlog = "4"
-thiserror = "1.0"
-tokio = { version = "1.4", features = ["full"] }
-tonic = "0.9.2"
-built = "0.5"
-clap = "3.0"
-
-[build-dependencies]
-tonic-build = "0.9.2"
-built = "0.5"
-
 [workspace]
+resolver = "2"
 members = [
+    "raftify",
     "binding/python",
     "examples/memstore",
     "harness"
 ]
+default-members = [
+    "raftify",
+    "binding/python",
+    "examples/memstore",
+    "harness"
+]
+
+[workspace.package]
+version = "0.1.2"
+authors = ["Lablup Inc."]
+edition = "2021"
+description = """
+Experimental High level Raft framework
+"""
+license = "MIT/Apache-2.0"
+repository = "https://github.com/lablup/raftify"
+keywords = ["raft", "distributed-systems", "ha"]
+categories = ["distributed-systems", "database-implementations"]
+homepage = "https://github.com/lablup/raftify"
+
+[workspace.dependencies]
+raftify = { path = "raftify" }
diff --git a/binding/python/Cargo.toml b/binding/python/Cargo.toml
@@ -1,27 +1,27 @@
 [package]
 name = "raftify-py"
-version = "0.1.0"
-authors = ["Lablup Inc."]
-license = "Apache-2.0"
-repository = "https://github.com/lablup/raftify"
+
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
+keywords.workspace = true
+categories.workspace = true
+homepage.workspace = true
+description.workspace = true
 readme = "./README.md"
-homepage = "https://github.com/lablup/raftify"
-description = """
-Experimental Async Raft framework for Python application
-"""
-keywords = ["raft", "distributed-systems", "consensus-algorithm", "replication", "distributed-database"]
-categories = ["distributed-systems", "database-implementations"]
-edition = "2021"
 
 [features]
 default = []
 include-python-workspace = []
 
 [dependencies]
+raftify.workspace = true
+
 pyo3 = { git = "https://github.com/jopemachine/pyo3", features = ["extension-module", "multiple-pymethods"] }
 tokio = { version = "1.4", features = ["full"] }
 async-trait = "0.1.48"
-raftify = { path = "../../", default-features = false }
 slog = { version = "2.2", features = ["max_level_trace", "release_max_level_trace"] }
 slog-envlogger = "2.1.0"
 slog-term = "2.9.0"

diff --git a/examples/memstore/Cargo.toml b/examples/memstore/Cargo.toml
@@ -1,9 +1,12 @@
 [package]
 name = "memstore"
-version = "0.1.0"
-authors = ["Lablup Inc."]
-edition = "2021"
-description = "raftify memstore example"
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
+description.workspace = true
+keywords.workspace = true
 
 [[bin]]
 name = "raftify-cli"
@@ -14,12 +17,13 @@ name = "raftify-client-example"
 path = "src/client/main.rs"
 
 [dependencies]
+raftify.workspace = true
+
 actix-rt = "2.0"
 actix-web = "4.0.0"
 async-trait = "0.1.48"
 bincode = "1.3"
 log = { version = "0.4", features = ["std"] }
-raftify = { path = "../../" }
 serde = { version = "1.0", features = ["derive"] }
 slog-async = "2"
 slog-term = "2"

diff --git a/harness/Cargo.toml b/harness/Cargo.toml
@@ -1,17 +1,21 @@
 [package]
 name = "harness"
-version = "0.1.0"
-authors = ["Lablup Inc."]
-description = "Testing harness for raftify."
-edition = "2021"
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
+description.workspace = true
+keywords.workspace = true
 
 [dependencies]
+raftify.workspace = true
+
 actix-rt = "2.0"
 actix-web = "4.0.0"
 async-trait = "0.1.48"
 bincode = "1.3"
 log = { version = "0.4", features = ["std"] }
-raftify = { path = "../" }
 serde = { version = "1.0", features = ["derive"] }
 slog-async = "2"
 slog-term = "2"

diff --git a/raftify/Cargo.toml b/raftify/Cargo.toml
@@ -0,0 +1,33 @@
+[package]
+name = "raftify"
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
+description.workspace = true
+keywords.workspace = true
+
+[dependencies]
+async-trait = "0.1.48"
+bincode = "1.3"
+bytes = "1.5.0"
+heed = "0.20.0-alpha.9"
+heed-traits = "0.20.0-alpha.9"
+log = { version = "0.4", features = ["std"] }
+parking_lot = "0.12.1"
+prost = "0.11"
+raft = { git = "https://github.com/jopemachine/raft-rs", features = ["prost-codec", "default-logger"], default-features = false }
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+slog = "2"
+slog-stdlog = "4"
+thiserror = "1.0"
+tokio = { version = "1.4", features = ["full"] }
+tonic = "0.9.2"
+built = "0.5"
+clap = "3.0"
+
+[build-dependencies]
+tonic-build = "0.9.2"
+built = "0.5"
diff --git a/build.rs → raftify/build.rs b/build.rs → raftify/build.rs
diff --git a/proto/eraftpb.proto → raftify/proto/eraftpb.proto b/proto/eraftpb.proto → raftify/proto/eraftpb.proto
diff --git a/proto/raft_service.proto → raftify/proto/raft_service.proto b/proto/raft_service.proto → raftify/proto/raft_service.proto
diff --git a/src/cli/commands/debug.rs → raftify/src/cli/commands/debug.rs b/src/cli/commands/debug.rs → raftify/src/cli/commands/debug.rs
diff --git a/src/cli/commands/mod.rs → raftify/src/cli/commands/mod.rs b/src/cli/commands/mod.rs → raftify/src/cli/commands/mod.rs
diff --git a/src/cli/mod.rs → raftify/src/cli/mod.rs b/src/cli/mod.rs → raftify/src/cli/mod.rs
diff --git a/src/config.rs → raftify/src/config.rs b/src/config.rs → raftify/src/config.rs
diff --git a/src/deserializer.rs → raftify/src/deserializer.rs b/src/deserializer.rs → raftify/src/deserializer.rs
diff --git a/src/error.rs → raftify/src/error.rs b/src/error.rs → raftify/src/error.rs
diff --git a/src/follower_role.rs → raftify/src/follower_role.rs b/src/follower_role.rs → raftify/src/follower_role.rs
diff --git a/src/lib.rs → raftify/src/lib.rs b/src/lib.rs → raftify/src/lib.rs
diff --git a/src/log_entry/mod.rs → raftify/src/log_entry/mod.rs b/src/log_entry/mod.rs → raftify/src/log_entry/mod.rs
diff --git a/src/peer.rs → raftify/src/peer.rs b/src/peer.rs → raftify/src/peer.rs
diff --git a/src/peers.rs → raftify/src/peers.rs b/src/peers.rs → raftify/src/peers.rs
diff --git a/src/raft_client.rs → raftify/src/raft_client.rs b/src/raft_client.rs → raftify/src/raft_client.rs
diff --git a/src/raft_facade.rs → raftify/src/raft_facade.rs b/src/raft_facade.rs → raftify/src/raft_facade.rs
diff --git a/src/raft_node/bootstrap.rs → raftify/src/raft_node/bootstrap.rs b/src/raft_node/bootstrap.rs → raftify/src/raft_node/bootstrap.rs
diff --git a/src/raft_node/mod.rs → raftify/src/raft_node/mod.rs b/src/raft_node/mod.rs → raftify/src/raft_node/mod.rs
diff --git a/src/raft_node/response_sender.rs → raftify/src/raft_node/response_sender.rs b/src/raft_node/response_sender.rs → raftify/src/raft_node/response_sender.rs
diff --git a/src/raft_node/utils.rs → raftify/src/raft_node/utils.rs b/src/raft_node/utils.rs → raftify/src/raft_node/utils.rs
diff --git a/src/raft_server.rs → raftify/src/raft_server.rs b/src/raft_server.rs → raftify/src/raft_server.rs
diff --git a/src/raft_service.rs → raftify/src/raft_service.rs b/src/raft_service.rs → raftify/src/raft_service.rs
diff --git a/src/request_message.rs → raftify/src/request_message.rs b/src/request_message.rs → raftify/src/request_message.rs
diff --git a/src/response_message.rs → raftify/src/response_message.rs b/src/response_message.rs → raftify/src/response_message.rs
diff --git a/src/state_machine/mod.rs → raftify/src/state_machine/mod.rs b/src/state_machine/mod.rs → raftify/src/state_machine/mod.rs
diff --git a/src/storage/constant.rs → raftify/src/storage/constant.rs b/src/storage/constant.rs → raftify/src/storage/constant.rs
diff --git a/src/storage/heed.rs → raftify/src/storage/heed.rs b/src/storage/heed.rs → raftify/src/storage/heed.rs
diff --git a/src/storage/mod.rs → raftify/src/storage/mod.rs b/src/storage/mod.rs → raftify/src/storage/mod.rs
diff --git a/src/storage/utils.rs → raftify/src/storage/utils.rs b/src/storage/utils.rs → raftify/src/storage/utils.rs
diff --git a/src/utils.rs → raftify/src/utils.rs b/src/utils.rs → raftify/src/utils.rs
diff --git a/rust-toolchain b/rust-toolchain
@@ -0,0 +1 @@
+1.72.1