lib/wsrep-lib
1
0
Fork 0
mirror of https://github.com/codership/wsrep-lib.git synced 2025-04-27 18:56:49 +03:00
Code

Fixed compilation errors picked up by travis clang builds

Browse Source
This commit is contained in:
Teemu Ollakka 2019-01-19 18:08:49 +02:00
parent 869a706fa1
commit ae734a33f8
11 changed files with 38 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbsim/db_client_service.hpp
View File

@ -60,7 +60,7 @@ namespace db
enum wsrep::provider::status replay()
override;
void emergency_shutdown() { ::abort(); }
void emergency_shutdown() override { ::abort(); }
void debug_sync(const char*) override { }
void debug_crash(const char*) override { }
private:

2
dbsim/db_server.cpp
View File

@ -33,7 +33,7 @@ db::server::server(simulator& simulator,
, mutex_()
, cond_()
, server_service_(*this)
, server_state_(*this, server_service_,
, server_state_(server_service_,
name, address, "dbsim_" + name + "_data")
, last_client_id_(0)
, last_transaction_id_(0)

2
dbsim/db_server_service.hpp
View File

@ -43,7 +43,7 @@ namespace db
std::string sst_request() override;
void background_rollback(wsrep::client_state&) override;
void bootstrap() override;
void log_message(enum wsrep::log::level, const char* message);
void log_message(enum wsrep::log::level, const char* message) override;
void log_dummy_write_set(wsrep::client_state&, const wsrep::ws_meta&)
override;
void log_view(wsrep::high_priority_service*,

5
dbsim/db_server_state.hpp
View File

@ -32,8 +32,7 @@ namespace db
class server_state : public wsrep::server_state
{
public:
server_state(db::server& server,
wsrep::server_service& server_service,
server_state(wsrep::server_service& server_service,
const std::string& name,
const std::string& address,
const std::string& working_dir)
@ -50,12 +49,10 @@ namespace db
wsrep::server_state::rm_async)
, mutex_()
, cond_()
, server_(server)
{ }
private:
wsrep::default_mutex mutex_;
wsrep::default_condition_variable cond_;
db::server& server_;
};
}

4
src/wsrep_provider_v26.cpp
View File

@ -249,8 +249,7 @@ namespace
{
public:
const_ws_meta(const wsrep::ws_meta& ws_meta)
: ws_meta_(ws_meta)
, trx_meta_()
: trx_meta_()
{
std::memcpy(trx_meta_.gtid.uuid.data, ws_meta.group_id().data(),
sizeof(trx_meta_.gtid.uuid.data));
@ -268,7 +267,6 @@ namespace
const wsrep_trx_meta* native() const { return &trx_meta_; }
private:
const wsrep::ws_meta& ws_meta_;
wsrep_trx_meta_t trx_meta_;
};

2
test/mock_client_state.hpp
View File

@ -112,7 +112,7 @@ namespace wsrep
}
void cleanup_transaction() WSREP_OVERRIDE { }
size_t bytes_generated() const
size_t bytes_generated() const WSREP_OVERRIDE
{
return bytes_generated_;
}

2
test/mock_high_priority_service.hpp
View File

@ -43,7 +43,7 @@ namespace wsrep
int start_transaction(const wsrep::ws_handle&, const wsrep::ws_meta&)
WSREP_OVERRIDE;
const wsrep::transaction& transaction() const
const wsrep::transaction& transaction() const WSREP_OVERRIDE
{ return client_state_->transaction(); }
void adopt_transaction(const wsrep::transaction&) WSREP_OVERRIDE;
int apply_write_set(const wsrep::ws_meta&,

44
test/mock_provider.hpp
View File

@ -57,25 +57,27 @@ namespace wsrep
enum wsrep::provider::status
connect(const std::string&, const std::string&, const std::string&,
bool)
bool) WSREP_OVERRIDE
{ return wsrep::provider::success; }
int disconnect() { return 0; }
int capabilities() const { return 0; }
int desync() { return 0; }
int resync() { return 0; }
wsrep::seqno pause() { return wsrep::seqno(0); }
int resume() { return 0; }
int disconnect() WSREP_OVERRIDE { return 0; }
int capabilities() const WSREP_OVERRIDE { return 0; }
int desync() WSREP_OVERRIDE { return 0; }
int resync() WSREP_OVERRIDE { return 0; }
wsrep::seqno pause() WSREP_OVERRIDE { return wsrep::seqno(0); }
int resume() WSREP_OVERRIDE { return 0; }
enum wsrep::provider::status run_applier(wsrep::high_priority_service*)
WSREP_OVERRIDE
{
return wsrep::provider::success;
}
// Provider implemenatation interface
int start_transaction(wsrep::ws_handle&) { return 0; }
int start_transaction(wsrep::ws_handle&) WSREP_OVERRIDE { return 0; }
enum wsrep::provider::status
certify(wsrep::client_id client_id,
wsrep::ws_handle& ws_handle,
int flags,
wsrep::ws_meta& ws_meta)
WSREP_OVERRIDE
{
ws_handle = wsrep::ws_handle(ws_handle.transaction_id(), (void*)1);
wsrep::log_info() << "provider certify: "
@ -142,11 +144,14 @@ namespace wsrep
}
int append_key(wsrep::ws_handle&, const wsrep::key&)
WSREP_OVERRIDE
{ return 0; }
enum wsrep::provider::status
append_data(wsrep::ws_handle&, const wsrep::const_buffer&)
WSREP_OVERRIDE
{ return wsrep::provider::success; }
enum wsrep::provider::status rollback(const wsrep::transaction_id)
WSREP_OVERRIDE
{
++fragments_;
++rollback_fragments_;
@ -155,6 +160,7 @@ namespace wsrep
enum wsrep::provider::status
commit_order_enter(const wsrep::ws_handle& ws_handle,
const wsrep::ws_meta& ws_meta)
WSREP_OVERRIDE
{
BOOST_REQUIRE(ws_handle.opaque());
BOOST_REQUIRE(ws_meta.seqno().is_undefined() == false);
@ -163,6 +169,7 @@ namespace wsrep
int commit_order_leave(const wsrep::ws_handle& ws_handle,
const wsrep::ws_meta& ws_meta)
WSREP_OVERRIDE
{
BOOST_REQUIRE(ws_handle.opaque());
BOOST_REQUIRE(ws_meta.seqno().is_undefined() == false);
@ -170,6 +177,7 @@ namespace wsrep
}
int release(wsrep::ws_handle& )
WSREP_OVERRIDE
{
// BOOST_REQUIRE(ws_handle.opaque());
return release_result_;
@ -178,6 +186,7 @@ namespace wsrep
enum wsrep::provider::status replay(
const wsrep::ws_handle& ws_handle,
wsrep::high_priority_service* hps)
WSREP_OVERRIDE
{
wsrep::mock_high_priority_service& high_priority_service(
*static_cast<wsrep::mock_high_priority_service*>(hps));
@ -223,8 +232,10 @@ namespace wsrep
const wsrep::const_buffer&,
wsrep::ws_meta&,
int)
WSREP_OVERRIDE
{ return wsrep::provider::success; }
enum wsrep::provider::status leave_toi(wsrep::client_id)
WSREP_OVERRIDE
{ return wsrep::provider::success; }
std::pair<wsrep::gtid, enum wsrep::provider::status>
@ -236,22 +247,24 @@ namespace wsrep
enum wsrep::provider::status wait_for_gtid(const wsrep::gtid&,
int) const WSREP_OVERRIDE
{ return wsrep::provider::success; }
wsrep::gtid last_committed_gtid() const { return wsrep::gtid(); }
int sst_sent(const wsrep::gtid&, int) { return 0; }
int sst_received(const wsrep::gtid&, int) { return 0; }
wsrep::gtid last_committed_gtid() const WSREP_OVERRIDE
{ return wsrep::gtid(); }
int sst_sent(const wsrep::gtid&, int) WSREP_OVERRIDE { return 0; }
int sst_received(const wsrep::gtid&, int) WSREP_OVERRIDE { return 0; }
std::vector<status_variable> status() const
std::vector<status_variable> status() const WSREP_OVERRIDE
{
return std::vector<status_variable>();
}
void reset_status() { }
std::string options() const { return ""; }
void reset_status() WSREP_OVERRIDE { }
std::string options() const WSREP_OVERRIDE { return ""; }
enum wsrep::provider::status options(const std::string&)
WSREP_OVERRIDE
{ return wsrep::provider::success; }
std::string name() const WSREP_OVERRIDE { return "mock"; }
std::string version() const WSREP_OVERRIDE { return "0.0"; }
std::string vendor() const WSREP_OVERRIDE { return "mock"; }
void* native() const { return 0; }
void* native() const WSREP_OVERRIDE { return 0; }
//
// Methods to modify mock state
@ -266,6 +279,7 @@ namespace wsrep
bf_abort(wsrep::seqno bf_seqno,
wsrep::transaction_id trx_id,
wsrep::seqno& victim_seqno)
WSREP_OVERRIDE
{
bf_abort_map_.insert(std::make_pair(trx_id, bf_seqno));
if (bf_seqno.is_undefined() == false)

1
test/mock_server_state.hpp
View File

@ -150,6 +150,7 @@ namespace wsrep
}
void log_state_change(enum wsrep::server_state::state,
enum wsrep::server_state::state)
WSREP_OVERRIDE
{ }
bool sst_before_init() const WSREP_OVERRIDE
{ return sst_before_init_; }

3
test/mock_storage_service.cpp
View File

@ -25,8 +25,7 @@
wsrep::mock_storage_service::mock_storage_service(
wsrep::server_state& server_state,
wsrep::client_id client_id)
: server_state_(server_state)
, client_service_(client_state_)
: client_service_(client_state_)
, client_state_(server_state, client_service_, client_id,
wsrep::client_state::m_high_priority)
{

1
test/mock_storage_service.hpp
View File

@ -55,7 +55,6 @@ class mock_server_state;
void store_globals() WSREP_OVERRIDE { }
void reset_globals() WSREP_OVERRIDE { }
private:
wsrep::server_state& server_state_;
wsrep::mock_client_service client_service_;
wsrep::mock_client_state client_state_;
};