From 7dfceae09a537e82afe01f92ebf68a388a15db54 Mon Sep 17 00:00:00 2001 From: Xiaoxi Chen Date: Tue, 30 Jan 2024 23:30:22 -0700 Subject: [PATCH] apply clang Signed-off-by: Xiaoxi Chen --- src/include/homestore/replication/repl_dev.h | 2 +- src/include/homestore/replication_service.hpp | 1 - src/lib/replication/repl_dev/raft_repl_dev.h | 2 +- src/lib/replication/repl_dev/solo_repl_dev.h | 6 ++---- src/lib/replication/service/raft_repl_service.cpp | 2 -- src/tests/test_raft_repl_dev.cpp | 1 - 6 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/include/homestore/replication/repl_dev.h b/src/include/homestore/replication/repl_dev.h index bd38d1e48..55cbbd805 100644 --- a/src/include/homestore/replication/repl_dev.h +++ b/src/include/homestore/replication/repl_dev.h @@ -244,7 +244,7 @@ class ReplDev { /// @brief get replication status. If called on follower member /// this API can return empty result. - virtual std::vector get_replication_status() const = 0; + virtual std::vector< peer_info > get_replication_status() const = 0; /// @brief Gets the group_id this repldev is working for /// @return group_id diff --git a/src/include/homestore/replication_service.hpp b/src/include/homestore/replication_service.hpp index 19ee11701..d24722202 100644 --- a/src/include/homestore/replication_service.hpp +++ b/src/include/homestore/replication_service.hpp @@ -20,7 +20,6 @@ VENUM(repl_impl_type, uint8_t, solo // For single node - no replication ); - class ReplApplication; class ReplicationService { diff --git a/src/lib/replication/repl_dev/raft_repl_dev.h b/src/lib/replication/repl_dev/raft_repl_dev.h index e86d3d810..4c92d75af 100644 --- a/src/lib/replication/repl_dev/raft_repl_dev.h +++ b/src/lib/replication/repl_dev/raft_repl_dev.h @@ -78,7 +78,7 @@ class RaftReplDev : public ReplDev, AsyncReplResult<> become_leader() override; bool is_leader() const override; const replica_id_t get_leader_id() const override; - std::vector get_replication_status() const override; + std::vector< peer_info > get_replication_status() const override; group_id_t group_id() const override { return m_group_id; } std::string group_id_str() const { return boost::uuids::to_string(m_group_id); } std::string rdev_name() const { return m_rdev_name; } diff --git a/src/lib/replication/repl_dev/solo_repl_dev.h b/src/lib/replication/repl_dev/solo_repl_dev.h index 86d609477..68067243a 100644 --- a/src/lib/replication/repl_dev/solo_repl_dev.h +++ b/src/lib/replication/repl_dev/solo_repl_dev.h @@ -49,11 +49,10 @@ class SoloReplDev : public ReplDev { AsyncReplResult<> become_leader() override { return make_async_error(ReplServiceError::OK); } bool is_leader() const override { return true; } const replica_id_t get_leader_id() const override { return m_group_id; } - std::vector get_replication_status() const override { - return std::vector{peer_info {.id_ = m_group_id, .replication_idx_ = 0, .last_succ_resp_us_ = 0}}; + std::vector< peer_info > get_replication_status() const override { + return std::vector< peer_info >{peer_info{.id_ = m_group_id, .replication_idx_ = 0, .last_succ_resp_us_ = 0}}; } - uuid_t group_id() const override { return m_group_id; } uint32_t get_blk_size() const override; @@ -61,7 +60,6 @@ class SoloReplDev : public ReplDev { void cp_flush(CP* cp); void cp_cleanup(CP* cp); - private: void write_journal(repl_req_ptr_t rreq); void on_log_found(logstore_seq_num_t lsn, log_buffer buf, void* ctx); diff --git a/src/lib/replication/service/raft_repl_service.cpp b/src/lib/replication/service/raft_repl_service.cpp index 7ea9047ca..dde2da93c 100644 --- a/src/lib/replication/service/raft_repl_service.cpp +++ b/src/lib/replication/service/raft_repl_service.cpp @@ -270,8 +270,6 @@ AsyncReplResult<> RaftReplService::replace_member(group_id_t group_id, replica_i return make_async_error<>(ReplServiceError::NOT_IMPLEMENTED); } - - ///////////////////// RaftReplService CP Callbacks ///////////////////////////// std::unique_ptr< CPContext > RaftReplServiceCPHandler::on_switchover_cp(CP* cur_cp, CP* new_cp) { return nullptr; } diff --git a/src/tests/test_raft_repl_dev.cpp b/src/tests/test_raft_repl_dev.cpp index 03fc6e672..477c58e40 100644 --- a/src/tests/test_raft_repl_dev.cpp +++ b/src/tests/test_raft_repl_dev.cpp @@ -291,7 +291,6 @@ TEST_F(RaftReplDevTest, All_Append_Restart_Append) { g_helper->sync_for_cleanup_start(); } - TEST_F(RaftReplDevTest, All_ReplService) { LOGINFO("Homestore replica={} setup completed", g_helper->replica_num()); g_helper->sync_for_test_start();