Merge branch 'master' into delete_io

Author: yuezato

src/lib.rs

@@ -8,8 +8,6 @@
 #![warn(missing_docs)]
 #[cfg(test)]
 extern crate fibers;
-extern crate futures;
-extern crate prometrics;
 #[macro_use]
 extern crate trackable;
 
@@ -23,6 +21,7 @@ pub mod log;
 pub mod message;
 pub mod metrics;
 pub mod node;
+pub mod test_dsl;
 
 mod error;
 mod io;

src/log/history.rs

@@ -71,7 +71,7 @@ impl LogHistory {
     pub fn get_record(&self, index: LogIndex) -> Option<&HistoryRecord> {
         for r in self.records.iter().rev() {
             if r.head.index <= index {
-                return Some(&r);
+                return Some(r);
             }
         }
         None

src/node_state/common/mod.rs

@@ -233,6 +233,12 @@ where
         &mut self.io
     }
 
+    /// 自身の所有権を放棄して、
+    /// 代わりに`IO`のインスタンスを返す.
+    pub fn release_io(self) -> IO {
+        self.io
+    }
+
     /// 指定範囲のローカルログをロードする.
     pub fn load_log(&mut self, start: LogIndex, end: Option<LogIndex>) -> IO::LoadLog {
         self.io.load_log(start, end)

src/node_state/leader/appender.rs

@@ -42,7 +42,7 @@ impl<IO: Io> LogAppender<IO> {
             let suffix = self.in_progress.take().expect("Never fails");
             track!(common.handle_log_appended(&suffix))?;
 
-            let pendings = mem::replace(&mut self.pendings, Vec::new());
+            let pendings = mem::take(&mut self.pendings);
             if !pendings.is_empty() {
                 self.append(common, pendings);
             }

src/node_state/leader/follower.rs

@@ -156,7 +156,7 @@ impl<IO: Io> FollowersManager<IO> {
         }
 
         // Delete
-        self.followers = mem::replace(&mut self.followers, BTreeMap::new())
+        self.followers = mem::take(&mut self.followers)
             .into_iter()
             .filter(|&(ref id, _)| config.is_known_node(id))
             .collect();

src/node_state/leader/mod.rs

@@ -58,7 +58,7 @@ impl<IO: Io> Leader<IO> {
         message: Message,
     ) -> Result<NextState<IO>> {
         if let Message::AppendEntriesReply(reply) = message {
-            let updated = self.followers.handle_append_entries_reply(&common, &reply);
+            let updated = self.followers.handle_append_entries_reply(common, &reply);
 
             track!(self.followers.log_sync(common, &reply))?;
 

src/replicated_log.rs

@@ -274,6 +274,12 @@ impl<IO: Io> ReplicatedLog<IO> {
     pub unsafe fn io_mut(&mut self) -> &mut IO {
         self.node.common.io_mut()
     }
+
+    /// このReplicatedLogの所有権を放棄し、
+    /// その代わりに内部で使われているIOインスタンスを取得する.
+    pub fn release_io(self) -> IO {
+        self.node.common.release_io()
+    }
 }
 impl<IO: Io> Stream for ReplicatedLog<IO> {
     type Item = Event;