From a7a58faf2376a0364297456f11d80e7ebee7c411 Mon Sep 17 00:00:00 2001
From: Georgy Moshkin <gmoshkin@picodata.io>
Date: Fri, 14 Oct 2022 17:28:17 +0300
Subject: [PATCH] refactor(storage): Peers::persist_peer -> Peers::put
---
src/main.rs | 4 ++--
src/traft/mod.rs | 2 +-
src/traft/network.rs | 2 +-
src/traft/storage.rs | 10 +++++-----
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main.rs b/src/main.rs
index 2b7e3abb3f..2eb79d91ba 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -737,9 +737,9 @@ fn start_join(args: &args::Run, leader_address: String) {
let raft_id = resp.peer.raft_id;
start_transaction(|| -> Result<(), TntError> {
- storage.peers.persist_peer(&resp.peer).unwrap();
+ storage.peers.put(&resp.peer).unwrap();
for peer in resp.raft_group {
- storage.peers.persist_peer(&peer).unwrap();
+ storage.peers.put(&peer).unwrap();
}
storage.raft.persist_raft_id(raft_id).unwrap();
storage
diff --git a/src/traft/mod.rs b/src/traft/mod.rs
index 1ef16d1a7a..56dadca5a7 100644
--- a/src/traft/mod.rs
+++ b/src/traft/mod.rs
@@ -235,7 +235,7 @@ impl Op {
Self::EvalLua(op) => Box::new(op.result()),
Self::ReturnOne(op) => Box::new(op.result()),
Self::PersistPeer { peer } => {
- peers.persist_peer(peer).unwrap();
+ peers.put(peer).unwrap();
Box::new(peer.clone())
}
Self::Dml(op) => Box::new(op.result()),
diff --git a/src/traft/network.rs b/src/traft/network.rs
index 8256c5cd63..32e97a7410 100644
--- a/src/traft/network.rs
+++ b/src/traft/network.rs
@@ -564,7 +564,7 @@ inventory::submit!(crate::InnerTest {
let listen: String = l.eval("return box.info.listen").unwrap();
storage
- .persist_peer(&traft::Peer {
+ .put(&traft::Peer {
raft_id: 1337,
peer_address: listen.clone(),
..Default::default()
diff --git a/src/traft/storage.rs b/src/traft/storage.rs
index 79122da749..4e2aff819b 100644
--- a/src/traft/storage.rs
+++ b/src/traft/storage.rs
@@ -256,14 +256,14 @@ impl Peers {
}
#[inline]
- pub fn persist_peer(&self, peer: &traft::Peer) -> tarantool::Result<()> {
+ pub fn put(&self, peer: &traft::Peer) -> tarantool::Result<()> {
self.space_mut().replace(peer)?;
Ok(())
}
#[allow(dead_code)]
#[inline]
- pub fn delete_peer(&self, instance_id: &str) -> tarantool::Result<()> {
+ pub fn delete(&self, instance_id: &str) -> tarantool::Result<()> {
self.space_mut().delete(&[instance_id])?;
Ok(())
}
@@ -579,7 +579,7 @@ inventory::submit!(crate::InnerTest {
);
assert_err!(
- storage_peers.persist_peer(&traft::Peer {
+ storage_peers.put(&traft::Peer {
raft_id: 1,
instance_id: "i99".into(),
..Default::default()
@@ -611,8 +611,8 @@ inventory::submit!(crate::InnerTest {
..Default::default()
};
- storage_peers.persist_peer(&peer(10, "addr:collision")).unwrap();
- storage_peers.persist_peer(&peer(11, "addr:collision")).unwrap();
+ storage_peers.put(&peer(10, "addr:collision")).unwrap();
+ storage_peers.put(&peer(11, "addr:collision")).unwrap();
}
let peer_by_raft_id = |id: RaftId| storage_peers.get(&id).unwrap();
--
GitLab