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

Clean up some rsm client and coordinator code

Browse Source
This commit is contained in:
Tyler Neely 2022-08-19 15:17:33 +00:00
parent d42fa1fc87
commit 7d1318b4d7
3 changed files with 15 additions and 17 deletions
src
coordinator
coordinator_rsm.hpp
io/rsm
rsm_client.hpp
tests/simulation
sharded_map.cpp

10
src/io/rsm/coordinator_rsm.hpp → src/coordinator/coordinator_rsm.hpp
View File

@ -14,12 +14,10 @@
#include "coordinator/coordinator.hpp"
#include "io/rsm/raft.hpp"
namespace memgraph::io::rsm {
// TODO(tyler) don't
using namespace memgraph::coordinator;
namespace memgraph::coordinator {
template <typename IoImpl>
using CoordinatorRsm = io::rsm::Raft<IoImpl, Coordinator, WriteRequests, WriteResponses, ReadRequests, ReadResponses>;
using CoordinatorRsm =
memgraph::io::rsm::Raft<IoImpl, Coordinator, WriteRequests, WriteResponses, ReadRequests, ReadResponses>;
} // namespace memgraph::io::rsm
} // namespace memgraph::coordinator

6
src/io/rsm/rsm_client.hpp
View File

@ -9,6 +9,8 @@
// by the Apache License, Version 2.0, included in the file
// licenses/APL.txt.
#pragma once
#include <iostream>
#include <optional>
#include <vector>
@ -37,7 +39,7 @@ template <typename IoImpl, typename WriteRequestT, typename WriteResponseT, type
class RsmClient {
using ServerPool = std::vector<Address>;
IoImpl io_;
Io<IoImpl> io_;
Address leader_;
std::mt19937 cli_rng_{0};
@ -62,7 +64,7 @@ class RsmClient {
}
public:
RsmClient(IoImpl io, Address leader, ServerPool server_addrs)
RsmClient(Io<IoImpl> io, Address leader, ServerPool server_addrs)
: io_{io}, leader_{leader}, server_addrs_{server_addrs} {}
RsmClient() = delete;

16
tests/simulation/sharded_map.cpp
View File

@ -18,9 +18,10 @@
#include <thread>
#include <vector>
#include "coordinator/coordinator_client.hpp"
#include "coordinator/coordinator_rsm.hpp"
#include "io/address.hpp"
#include "io/errors.hpp"
#include "io/rsm/coordinator_rsm.hpp"
#include "io/rsm/raft.hpp"
#include "io/rsm/rsm_client.hpp"
#include "io/rsm/shard_rsm.hpp"
@ -28,10 +29,11 @@
#include "io/simulator/simulator_transport.hpp"
#include "utils/result.hpp"
using memgraph::coordinator::Address;
using memgraph::coordinator::AddressAndStatus;
using memgraph::coordinator::CompoundKey;
using memgraph::coordinator::Coordinator;
using memgraph::coordinator::CoordinatorClient;
using memgraph::coordinator::CoordinatorRsm;
using memgraph::coordinator::HlcRequest;
using memgraph::coordinator::HlcResponse;
using memgraph::coordinator::Shard;
@ -44,7 +46,6 @@ using memgraph::io::ResponseEnvelope;
using memgraph::io::ResponseFuture;
using memgraph::io::Time;
using memgraph::io::TimedOut;
using memgraph::io::rsm::CoordinatorRsm;
using memgraph::io::rsm::Raft;
using memgraph::io::rsm::ReadRequest;
using memgraph::io::rsm::ReadResponse;
@ -62,8 +63,8 @@ using memgraph::io::simulator::SimulatorStats;
using memgraph::io::simulator::SimulatorTransport;
using memgraph::utils::BasicResult;
using StorageClient = RsmClient<Io<SimulatorTransport>, StorageWriteRequest, StorageWriteResponse, StorageReadRequest,
StorageReadResponse>;
using StorageClient =
RsmClient<SimulatorTransport, StorageWriteRequest, StorageWriteResponse, StorageReadRequest, StorageReadResponse>;
namespace {
ShardMap CreateDummyShardmap(memgraph::coordinator::Address a_io_1, memgraph::coordinator::Address a_io_2,
@ -231,10 +232,7 @@ int main() {
// Have client contact coordinator RSM for a new transaction ID and
// also get the current shard map
using CoordinatorClient =
RsmClient<Io<SimulatorTransport>, memgraph::coordinator::WriteRequests, memgraph::coordinator::WriteResponses,
memgraph::coordinator::ReadRequests, memgraph::coordinator::ReadResponses>;
CoordinatorClient coordinator_client(cli_io, c_addrs[0], c_addrs);
CoordinatorClient<SimulatorTransport> coordinator_client(cli_io, c_addrs[0], c_addrs);
StorageClient shard_a_client(cli_io, a_addrs[0], a_addrs);
StorageClient shard_b_client(cli_io, b_addrs[0], b_addrs);