From 6e89847e11c89f42cfa47c7df32c36f7eca967f0 Mon Sep 17 00:00:00 2001 From: Gyubong Date: Mon, 23 Sep 2024 13:13:20 +0900 Subject: [PATCH] WIP --- Cargo.lock | 2 +- DEVELOPMENT.md | 7 +++++++ raft-rs | 2 +- raftify/src/request/common/confchange_request.rs | 3 +-- raftify/src/request/local_request_message.rs | 2 +- raftify/src/response/local_response_message.rs | 2 +- 6 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 DEVELOPMENT.md diff --git a/Cargo.lock b/Cargo.lock index 7a4523a5..d54932ba 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1318,7 +1318,7 @@ dependencies = [ [[package]] name = "jopemachine-raft" -version = "0.7.7" +version = "0.7.8" dependencies = [ "bytes", "fxhash", diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md new file mode 100644 index 00000000..47fb7a13 --- /dev/null +++ b/DEVELOPMENT.md @@ -0,0 +1,7 @@ +# Building from Source + +You can use this command to clone the repository: + +``` +❯ git clone --recursive https://github.com/lablup/raftify.git +``` diff --git a/raft-rs b/raft-rs index 747e3526..1dd5c767 160000 --- a/raft-rs +++ b/raft-rs @@ -1 +1 @@ -Subproject commit 747e3526ef29bc81cdbb61e48c2066fabc9b831e +Subproject commit 1dd5c767b0db5a604ca2e8958ccb8447bcaebafa diff --git a/raftify/src/request/common/confchange_request.rs b/raftify/src/request/common/confchange_request.rs index 6cd76303..231738f3 100644 --- a/raftify/src/request/common/confchange_request.rs +++ b/raftify/src/request/common/confchange_request.rs @@ -1,7 +1,6 @@ use std::net::SocketAddr; -use jopemachine_raft::eraftpb::{self, ConfChangeSingle, ConfChangeTransition, ConfChangeV2}; - +use crate::raft::eraftpb::{self, ConfChangeSingle, ConfChangeTransition, ConfChangeV2}; use crate::raft_service; #[derive(Debug, Clone)] diff --git a/raftify/src/request/local_request_message.rs b/raftify/src/request/local_request_message.rs index 42455ebd..84427cec 100644 --- a/raftify/src/request/local_request_message.rs +++ b/raftify/src/request/local_request_message.rs @@ -1,6 +1,6 @@ use std::{collections::HashMap, net::SocketAddr}; -use jopemachine_raft::eraftpb::Message as RaftMessage; +use crate::raft::eraftpb::Message as RaftMessage; use tokio::sync::oneshot::Sender; use crate::{ diff --git a/raftify/src/response/local_response_message.rs b/raftify/src/response/local_response_message.rs index 0a24d976..17c0666c 100644 --- a/raftify/src/response/local_response_message.rs +++ b/raftify/src/response/local_response_message.rs @@ -1,6 +1,6 @@ use std::{fmt, marker::PhantomData, sync::Arc}; -use jopemachine_raft::RawNode; +use crate::raft::RawNode; use tokio::sync::Mutex; use crate::{AbstractLogEntry, AbstractStateMachine, HeedStorage, Peers};