tursom/memgraph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix clang tidy

Browse Source
This commit is contained in:
antoniofilipovic 2024-02-27 15:53:45 +01:00 committed by Antonio Filipovic
parent cfb33847ef
commit 1f38d78528
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/coordination/coordinator_instance.cpp
View File

@ -37,14 +37,13 @@ CoordinatorInstance::CoordinatorInstance()
client_succ_cb_ = [](CoordinatorInstance *self, std::string_view repl_instance_name) -> void { client_succ_cb_ = [](CoordinatorInstance *self, std::string_view repl_instance_name) -> void {
auto lock = std::unique_lock{self->coord_instance_lock_}; auto lock = std::unique_lock{self->coord_instance_lock_};
auto &repl_instance = self->FindReplicationInstance(repl_instance_name); auto &repl_instance = self->FindReplicationInstance(repl_instance_name);
std::invoke(repl_instance.GetSuccessCallback(), self, repl_instance_name);
std::invoke(repl_instance.GetSuccessCallback(), self, repl_instance);
}; };
client_fail_cb_ = [](CoordinatorInstance *self, std::string_view repl_instance_name) -> void { client_fail_cb_ = [](CoordinatorInstance *self, std::string_view repl_instance_name) -> void {
auto lock = std::unique_lock{self->coord_instance_lock_}; auto lock = std::unique_lock{self->coord_instance_lock_};
auto &repl_instance = self->FindReplicationInstance(repl_instance_name); auto &repl_instance = self->FindReplicationInstance(repl_instance_name);
std::invoke(repl_instance.GetFailCallback(), self, repl_instance); std::invoke(repl_instance.GetFailCallback(), self, repl_instance_name);
}; };
} }
@ -271,7 +270,8 @@ auto CoordinatorInstance::RegisterReplicationInstance(CoordinatorClientConfig co
return RegisterInstanceCoordinatorStatus::SUCCESS; return RegisterInstanceCoordinatorStatus::SUCCESS;
} }
void CoordinatorInstance::MainFailCallback(ReplicationInstance &repl_instance) { void CoordinatorInstance::MainFailCallback(std::string_view repl_instance_name) {
auto &repl_instance = FindReplicationInstance(repl_instance_name);
repl_instance.OnFailPing(); repl_instance.OnFailPing();
const auto &repl_instance_uuid = repl_instance.GetMainUUID(); const auto &repl_instance_uuid = repl_instance.GetMainUUID();
MG_ASSERT(repl_instance_uuid.has_value(), "Instance must have uuid set"); MG_ASSERT(repl_instance_uuid.has_value(), "Instance must have uuid set");
@ -282,8 +282,8 @@ void CoordinatorInstance::MainFailCallback(ReplicationInstance &repl_instance) {
} }
} }
void CoordinatorInstance::MainSuccessCallback(ReplicationInstance &repl_instance) { void CoordinatorInstance::MainSuccessCallback(std::string_view repl_instance_name) {
const auto &repl_instance_name = repl_instance.InstanceName(); auto &repl_instance = FindReplicationInstance(repl_instance_name);
spdlog::trace("Instance {} performing main successful callback", repl_instance_name); spdlog::trace("Instance {} performing main successful callback", repl_instance_name);
if (repl_instance.IsAlive()) { if (repl_instance.IsAlive()) {
@ -320,8 +320,8 @@ void CoordinatorInstance::MainSuccessCallback(ReplicationInstance &repl_instance
} }
} }
void CoordinatorInstance::ReplicaSuccessCallback(ReplicationInstance &repl_instance) { void CoordinatorInstance::ReplicaSuccessCallback(std::string_view repl_instance_name) {
const auto &repl_instance_name = repl_instance.InstanceName(); auto &repl_instance = FindReplicationInstance(repl_instance_name);
if (!repl_instance.IsReplica()) { if (!repl_instance.IsReplica()) {
spdlog::error("Aborting replica callback since instance {} is not replica anymore", repl_instance_name); spdlog::error("Aborting replica callback since instance {} is not replica anymore", repl_instance_name);
return; return;
@ -339,8 +339,8 @@ void CoordinatorInstance::ReplicaSuccessCallback(ReplicationInstance &repl_insta
repl_instance.OnSuccessPing(); repl_instance.OnSuccessPing();
} }
void CoordinatorInstance::ReplicaFailCallback(ReplicationInstance &repl_instance) { void CoordinatorInstance::ReplicaFailCallback(std::string_view repl_instance_name) {
const auto &repl_instance_name = repl_instance.InstanceName(); auto &repl_instance = FindReplicationInstance(repl_instance_name);
if (!repl_instance.IsReplica()) { if (!repl_instance.IsReplica()) {
spdlog::error("Aborting replica fail callback since instance {} is not replica anymore", repl_instance_name); spdlog::error("Aborting replica fail callback since instance {} is not replica anymore", repl_instance_name);
return; return;

8
src/coordination/include/coordination/coordinator_instance.hpp
View File

@ -54,13 +54,13 @@ class CoordinatorInstance {
auto FindReplicationInstance(std::string_view replication_instance_name) -> ReplicationInstance &; auto FindReplicationInstance(std::string_view replication_instance_name) -> ReplicationInstance &;
void MainFailCallback(ReplicationInstance &); void MainFailCallback(std::string_view);
void MainSuccessCallback(ReplicationInstance &); void MainSuccessCallback(std::string_view);
void ReplicaSuccessCallback(ReplicationInstance &); void ReplicaSuccessCallback(std::string_view);
void ReplicaFailCallback(ReplicationInstance &); void ReplicaFailCallback(std::string_view);
static auto ChooseMostUpToDateInstance(const std::vector<InstanceNameDbHistories> &) -> NewMainRes; static auto ChooseMostUpToDateInstance(const std::vector<InstanceNameDbHistories> &) -> NewMainRes;

2
src/coordination/include/coordination/replication_instance.hpp
View File

@ -27,7 +27,7 @@ namespace memgraph::coordination {
class CoordinatorInstance; class CoordinatorInstance;
class ReplicationInstance; class ReplicationInstance;
using HealthCheckInstanceCallback = void (CoordinatorInstance::*)(ReplicationInstance &); using HealthCheckInstanceCallback = void (CoordinatorInstance::*)(std::string_view);
class ReplicationInstance { class ReplicationInstance {
public: public: