lib/wsrep-lib
1
0
Fork 0
mirror of https://github.com/codership/wsrep-lib.git synced 2025-07-30 07:23:07 +03:00
Code Activity

Removing client_state dependency from client_service.

Browse Source
This commit is contained in:
Teemu Ollakka
2018-06-18 10:21:02 +03:00
parent af3119a58b
commit 03043d3f25
12 changed files with 159 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
test/client_state_fixture.hpp
View File

@ -17,7 +17,7 @@ namespace
{
replicating_client_fixture_sync_rm()
: sc("s1", "s1", wsrep::server_state::rm_sync)
, cc(sc, sc.client_service(), wsrep::client_id(1),
, cc(sc, wsrep::client_id(1),
wsrep::client_state::m_replicating)
, tc(cc.transaction())
{
@ -28,7 +28,7 @@ namespace
BOOST_REQUIRE(tc.state() == wsrep::transaction::s_executing);
}
wsrep::mock_server_state sc;
wsrep::mock_client_state cc;
wsrep::mock_client cc;
const wsrep::transaction& tc;
};
@ -36,7 +36,7 @@ namespace
{
replicating_client_fixture_async_rm()
: sc("s1", "s1", wsrep::server_state::rm_async)
, cc(sc, sc.client_service(), wsrep::client_id(1),
, cc(sc, wsrep::client_id(1),
wsrep::client_state::m_replicating)
, tc(cc.transaction())
{
@ -47,7 +47,7 @@ namespace
BOOST_REQUIRE(tc.state() == wsrep::transaction::s_executing);
}
wsrep::mock_server_state sc;
wsrep::mock_client_state cc;
wsrep::mock_client cc;
const wsrep::transaction& tc;
};
@ -55,11 +55,11 @@ namespace
{
replicating_client_fixture_2pc()
: sc("s1", "s1", wsrep::server_state::rm_sync)
, cc(sc, sc.client_service(), wsrep::client_id(1),
, cc(sc, wsrep::client_id(1),
wsrep::client_state::m_replicating)
, tc(cc.transaction())
{
sc.client_service().do_2pc_ = true;
cc.do_2pc_ = true;
BOOST_REQUIRE(cc.before_command() == 0);
BOOST_REQUIRE(cc.before_statement() == 0);
// Verify initial state
@ -67,7 +67,7 @@ namespace
BOOST_REQUIRE(tc.state() == wsrep::transaction::s_executing);
}
wsrep::mock_server_state sc;
wsrep::mock_client_state cc;
wsrep::mock_client cc;
const wsrep::transaction& tc;
};
@ -75,11 +75,11 @@ namespace
{
replicating_client_fixture_autocommit()
: sc("s1", "s1", wsrep::server_state::rm_sync)
, cc(sc, sc.client_service(), wsrep::client_id(1),
, cc(sc, wsrep::client_id(1),
wsrep::client_state::m_replicating)
, tc(cc.transaction())
{
sc.client_service().is_autocommit_ = true;
cc.is_autocommit_ = true;
BOOST_REQUIRE(cc.before_command() == 0);
BOOST_REQUIRE(cc.before_statement() == 0);
// Verify initial state
@ -87,7 +87,7 @@ namespace
BOOST_REQUIRE(tc.state() == wsrep::transaction::s_executing);
}
wsrep::mock_server_state sc;
wsrep::mock_client_state cc;
wsrep::mock_client cc;
const wsrep::transaction& tc;
};
@ -96,7 +96,7 @@ namespace
applying_client_fixture()
: sc("s1", "s1",
wsrep::server_state::rm_async)
, cc(sc, sc.client_service(),
, cc(sc,
wsrep::client_id(1),
wsrep::client_state::m_high_priority)
, tc(cc.transaction())
@ -115,7 +115,7 @@ namespace
BOOST_REQUIRE(tc.ordered() == true);
}
wsrep::mock_server_state sc;
wsrep::mock_client_state cc;
wsrep::mock_client cc;
const wsrep::transaction& tc;
};
@ -124,12 +124,12 @@ namespace
applying_client_fixture_2pc()
: sc("s1", "s1",
wsrep::server_state::rm_async)
, cc(sc, sc.client_service(),
, cc(sc,
wsrep::client_id(1),
wsrep::client_state::m_high_priority)
, tc(cc.transaction())
{
sc.client_service().do_2pc_ = true;
cc.do_2pc_ = true;
BOOST_REQUIRE(cc.before_command() == 0);
BOOST_REQUIRE(cc.before_statement() == 0);
wsrep::ws_handle ws_handle(1, (void*)1);
@ -144,7 +144,7 @@ namespace
BOOST_REQUIRE(tc.ordered() == true);
}
wsrep::mock_server_state sc;
wsrep::mock_client_state cc;
wsrep::mock_client cc;
const wsrep::transaction& tc;
};
@ -152,7 +152,8 @@ namespace
{
streaming_client_fixture_row()
: sc("s1", "s1", wsrep::server_state::rm_sync)
, cc(sc, sc.client_service(), wsrep::client_id(1),
, cc(sc,
wsrep::client_id(1),
wsrep::client_state::m_replicating)
, tc(cc.transaction())
{
@ -164,7 +165,7 @@ namespace
cc.enable_streaming(wsrep::streaming_context::row, 1);
}
wsrep::mock_server_state sc;
wsrep::mock_client_state cc;
wsrep::mock_client cc;
const wsrep::transaction& tc;
};
@ -172,7 +173,8 @@ namespace
{
streaming_client_fixture_byte()
: sc("s1", "s1", wsrep::server_state::rm_sync)
, cc(sc, sc.client_service(), wsrep::client_id(1),
, cc(sc,
wsrep::client_id(1),
wsrep::client_state::m_replicating)
, tc(cc.transaction())
{
@ -184,7 +186,7 @@ namespace
cc.enable_streaming(wsrep::streaming_context::bytes, 1);
}
wsrep::mock_server_state sc;
wsrep::mock_client_state cc;
wsrep::mock_client cc;
const wsrep::transaction& tc;
};
@ -192,7 +194,8 @@ namespace
{
streaming_client_fixture_statement()
: sc("s1", "s1", wsrep::server_state::rm_sync)
, cc(sc, sc.client_service(), wsrep::client_id(1),
, cc(sc,
wsrep::client_id(1),
wsrep::client_state::m_replicating)
, tc(cc.transaction())
{
@ -205,7 +208,7 @@ namespace
}
wsrep::mock_server_state sc;
wsrep::mock_client_state cc;
wsrep::mock_client cc;
const wsrep::transaction& tc;
};
}

25
test/mock_client_state.cpp
View File

@ -7,48 +7,47 @@
int wsrep::mock_client_service::apply(
wsrep::client_state& client_state WSREP_UNUSED,
const wsrep::const_buffer&)
{
assert(client_state.transaction().state() == wsrep::transaction::s_executing ||
client_state.transaction().state() == wsrep::transaction::s_replaying);
assert(client_state_.transaction().state() == wsrep::transaction::s_executing ||
client_state_.transaction().state() == wsrep::transaction::s_replaying);
return (fail_next_applying_ ? 1 : 0);
}
int wsrep::mock_client_service::commit(wsrep::client_state& client_state, const wsrep::ws_handle&, const wsrep::ws_meta&)
int wsrep::mock_client_service::commit(
const wsrep::ws_handle&, const wsrep::ws_meta&)
{
int ret(0);
if (do_2pc())
{
if (client_state.before_prepare())
if (client_state_.before_prepare())
{
ret = 1;
}
else if (client_state.after_prepare())
else if (client_state_.after_prepare())
{
ret = 1;
}
}
if (ret == 0 &&
(client_state.before_commit() ||
client_state.ordered_commit() ||
client_state.after_commit()))
(client_state_.before_commit() ||
client_state_.ordered_commit() ||
client_state_.after_commit()))
{
ret = 1;
}
return ret;
}
int wsrep::mock_client_service::rollback(
wsrep::client_state& client_state)
int wsrep::mock_client_service::rollback()
{
int ret(0);
if (client_state.before_rollback())
if (client_state_.before_rollback())
{
ret = 1;
}
else if (client_state.after_rollback())
else if (client_state_.after_rollback())
{
ret = 1;
}

62
test/mock_client_state.hpp
View File

@ -42,8 +42,8 @@ namespace wsrep
class mock_client_service : public wsrep::client_service
{
public:
mock_client_service(wsrep::provider& provider)
: wsrep::client_service(provider)
mock_client_service(wsrep::mock_client_state& client_state)
: wsrep::client_service(client_state.provider())
, is_autocommit_()
, do_2pc_()
, fail_next_applying_()
@ -53,16 +53,17 @@ namespace wsrep
, sync_point_enabled_()
, sync_point_action_()
, bytes_generated_()
, client_state_(client_state)
, replays_()
, aborts_()
{ }
int apply(wsrep::client_state&, const wsrep::const_buffer&) WSREP_OVERRIDE;
int apply(const wsrep::const_buffer&) WSREP_OVERRIDE;
int commit(wsrep::client_state&, const wsrep::ws_handle&, const wsrep::ws_meta&)
int commit(const wsrep::ws_handle&, const wsrep::ws_meta&)
WSREP_OVERRIDE;
int rollback(wsrep::client_state&) WSREP_OVERRIDE;
int rollback() WSREP_OVERRIDE;
bool is_autocommit() const WSREP_OVERRIDE
{ return is_autocommit_; }
@ -77,39 +78,37 @@ namespace wsrep
void emergency_shutdown() WSREP_OVERRIDE { ++aborts_; }
int append_fragment(const wsrep::transaction&,
int, const wsrep::const_buffer&) WSREP_OVERRIDE
int,
const wsrep::const_buffer&) WSREP_OVERRIDE
{ return 0; }
void remove_fragments(const wsrep::transaction& )
WSREP_OVERRIDE { }
void will_replay(const wsrep::transaction&)
void remove_fragments()
WSREP_OVERRIDE { }
void will_replay() WSREP_OVERRIDE { }
enum wsrep::provider::status
replay(wsrep::client_state& client_state,
wsrep::transaction& tc) WSREP_OVERRIDE
replay() WSREP_OVERRIDE
{
enum wsrep::provider::status ret(
provider_.replay(tc.ws_handle(), &client_state));
provider_.replay(const_cast<wsrep::ws_handle&>(
client_state_.transaction().ws_handle()),
&client_state_));
++replays_;
return ret;
}
void wait_for_replayers(
wsrep::client_state& client_state,
wsrep::unique_lock<wsrep::mutex>& lock)
WSREP_OVERRIDE
{
lock.unlock();
if (bf_abort_during_wait_)
{
wsrep_test::bf_abort_unordered(client_state);
wsrep_test::bf_abort_unordered(client_state_);
}
lock.lock();
}
int prepare_data_for_replication(
wsrep::client_state& client_state,
const wsrep::transaction&) WSREP_OVERRIDE
int prepare_data_for_replication() WSREP_OVERRIDE
{
if (error_during_prepare_data_)
{
@ -117,7 +116,7 @@ namespace wsrep
}
static const char buf[1] = { 1 };
wsrep::const_buffer data = wsrep::const_buffer(buf, 1);
return client_state.append_data(data);
return client_state_.append_data(data);
}
size_t bytes_generated() const
@ -125,10 +124,7 @@ namespace wsrep
return bytes_generated_;
}
int prepare_fragment_for_replication(
wsrep::client_state& client_state,
const wsrep::transaction&,
wsrep::mutable_buffer& buffer)
int prepare_fragment_for_replication(wsrep::mutable_buffer& buffer)
WSREP_OVERRIDE
{
if (error_during_prepare_data_)
@ -138,23 +134,22 @@ namespace wsrep
static const char buf[1] = { 1 };
buffer.push_back(&buf[0], &buf[1]);
wsrep::const_buffer data(buffer.data(), buffer.size());
return client_state.append_data(data);
return client_state_.append_data(data);
}
void store_globals() WSREP_OVERRIDE { }
void debug_sync(wsrep::client_state& client_state,
const char* sync_point) WSREP_OVERRIDE
void debug_sync(const char* sync_point) WSREP_OVERRIDE
{
if (sync_point_enabled_ == sync_point)
{
switch (sync_point_action_)
{
case spa_bf_abort_unordered:
wsrep_test::bf_abort_unordered(client_state);
wsrep_test::bf_abort_unordered(client_state_);
break;
case spa_bf_abort_ordered:
wsrep_test::bf_abort_ordered(client_state);
wsrep_test::bf_abort_ordered(client_state_);
break;
}
}
@ -190,10 +185,23 @@ namespace wsrep
size_t aborts() const { return aborts_; }
private:
wsrep::mock_client_state& client_state_;
size_t replays_;
size_t aborts_;
};
class mock_client
: public mock_client_state
, public mock_client_service
{
public:
mock_client(wsrep::server_state& server_state,
const wsrep::client_id& id,
enum wsrep::client_state::mode mode)
: mock_client_state(server_state, *this, id, mode)
, mock_client_service(static_cast<mock_client_state&>(*this))
{ }
};
}
#endif // WSREP_MOCK_CLIENT_CONTEXT_HPP

17
test/mock_server_state.hpp
View File

@ -24,21 +24,20 @@ namespace wsrep
, mutex_()
, cond_()
, provider_(*this)
, client_service_(provider_)
, last_client_id_(0)
{ }
wsrep::mock_provider& provider() const
{ return provider_; }
wsrep::client_state* local_client_state()
{
return new wsrep::mock_client_state(
*this, client_service_, ++last_client_id_,
return new wsrep::mock_client(
*this, ++last_client_id_,
wsrep::client_state::m_local);
}
wsrep::client_state* streaming_applier_client_state()
{
return new wsrep::mock_client_state(
*this, client_service_, ++last_client_id_,
return new wsrep::mock_client(
*this, ++last_client_id_,
wsrep::client_state::m_high_priority);
}
void release_client_state(wsrep::client_state* client_state)
@ -66,18 +65,10 @@ namespace wsrep
client_state.before_rollback();
client_state.after_rollback();
}
// void sst_received(const wsrep_gtid_t&, int) WSREP_OVERRIDE { }
// void on_apply(wsrep::transaction&) { }
// void on_commit(wsrep::transaction&) { }
wsrep::mock_client_service& client_service()
{
return client_service_;
}
private:
wsrep::default_mutex mutex_;
wsrep::default_condition_variable cond_;
mutable wsrep::mock_provider provider_;
wsrep::mock_client_service client_service_;
unsigned long long last_client_id_;
};
}

15
test/server_context_test.cpp
View File

@ -13,7 +13,7 @@ namespace
applying_server_fixture()
: sc("s1", "s1",
wsrep::server_state::rm_sync)
, cc(sc, sc.client_service(),
, cc(sc,
wsrep::client_id(1),
wsrep::client_state::m_high_priority)
, ws_handle(1, (void*)1)
@ -25,7 +25,7 @@ namespace
{
}
wsrep::mock_server_state sc;
wsrep::mock_client_state cc;
wsrep::mock_client cc;
wsrep::ws_handle ws_handle;
wsrep::ws_meta ws_meta;
};
@ -61,7 +61,7 @@ BOOST_FIXTURE_TEST_CASE(server_state_applying_2pc,
BOOST_FIXTURE_TEST_CASE(server_state_applying_1pc_rollback,
applying_server_fixture)
{
sc.client_service().fail_next_applying_ = true;
cc.fail_next_applying_ = true;
char buf[1] = { 1 };
BOOST_REQUIRE(sc.on_apply(cc, ws_handle, ws_meta,
wsrep::const_buffer(buf, 1)) == 1);
@ -74,7 +74,7 @@ BOOST_FIXTURE_TEST_CASE(server_state_applying_1pc_rollback,
BOOST_FIXTURE_TEST_CASE(server_state_applying_2pc_rollback,
applying_server_fixture)
{
sc.client_service().fail_next_applying_ = true;
cc.fail_next_applying_ = true;
char buf[1] = { 1 };
BOOST_REQUIRE(sc.on_apply(cc, ws_handle, ws_meta,
wsrep::const_buffer(buf, 1)) == 1);
@ -86,10 +86,9 @@ BOOST_AUTO_TEST_CASE(server_state_streaming)
{
wsrep::mock_server_state sc("s1", "s1",
wsrep::server_state::rm_sync);
wsrep::mock_client_state cc(sc,
sc.client_service(),
wsrep::client_id(1),
wsrep::client_state::m_high_priority);
wsrep::mock_client cc(sc,
wsrep::client_id(1),
wsrep::client_state::m_high_priority);
wsrep::ws_handle ws_handle(1, (void*)1);
wsrep::ws_meta ws_meta(wsrep::gtid(wsrep::id("1"), wsrep::seqno(1)),
wsrep::stid(wsrep::id("1"), 1, 1),

64
test/transaction_test.cpp
View File

@ -43,7 +43,7 @@ BOOST_FIXTURE_TEST_CASE(transaction_append_key_data,
BOOST_FIXTURE_TEST_CASE_TEMPLATE(transaction_1pc, T,
replicating_fixtures, T)
{
wsrep::client_state& cc(T::cc);
wsrep::mock_client& cc(T::cc);
const wsrep::transaction& tc(T::tc);
// Start a new transaction with ID 1
cc.start_transaction(1);
@ -85,7 +85,7 @@ BOOST_FIXTURE_TEST_CASE_TEMPLATE(transaction_1pc, T,
BOOST_FIXTURE_TEST_CASE_TEMPLATE(transaction_rollback, T,
replicating_fixtures, T)
{
wsrep::client_state& cc(T::cc);
wsrep::mock_client& cc(T::cc);
const wsrep::transaction& tc(T::tc);
// Start a new transaction with ID 1
@ -117,7 +117,7 @@ BOOST_FIXTURE_TEST_CASE_TEMPLATE(
transaction_1pc_bf_before_before_commit, T,
replicating_fixtures, T)
{
wsrep::client_state& cc(T::cc);
wsrep::mock_client& cc(T::cc);
const wsrep::transaction& tc(T::tc);
// Start a new transaction with ID 1
@ -159,7 +159,7 @@ BOOST_FIXTURE_TEST_CASE_TEMPLATE(
replicating_fixtures, T)
{
wsrep::mock_server_state& sc(T::sc);
wsrep::client_state& cc(T::cc);
wsrep::mock_client& cc(T::cc);
const wsrep::transaction& tc(T::tc);
// Start a new transaction with ID 1
@ -198,8 +198,7 @@ BOOST_FIXTURE_TEST_CASE_TEMPLATE(
transaction_1pc_bf_during_commit_wait_for_replayers, T,
replicating_fixtures, T)
{
wsrep::mock_server_state& sc(T::sc);
wsrep::mock_client_state& cc(T::cc);
wsrep::mock_client& cc(T::cc);
const wsrep::transaction& tc(T::tc);
// Start a new transaction with ID 1
@ -208,7 +207,7 @@ BOOST_FIXTURE_TEST_CASE_TEMPLATE(
BOOST_REQUIRE(tc.id() == wsrep::transaction_id(1));
BOOST_REQUIRE(tc.state() == wsrep::transaction::s_executing);
sc.client_service().bf_abort_during_wait_ = true;
cc.bf_abort_during_wait_ = true;
// Run before commit
BOOST_REQUIRE(cc.before_commit());
@ -237,8 +236,7 @@ BOOST_FIXTURE_TEST_CASE_TEMPLATE(
transaction_1pc_error_during_prepare_data, T,
replicating_fixtures, T)
{
wsrep::mock_server_state& sc(T::sc);
wsrep::mock_client_state& cc(T::cc);
wsrep::mock_client& cc(T::cc);
const wsrep::transaction& tc(T::tc);
// Start a new transaction with ID 1
@ -247,7 +245,7 @@ BOOST_FIXTURE_TEST_CASE_TEMPLATE(
BOOST_REQUIRE(tc.id() == wsrep::transaction_id(1));
BOOST_REQUIRE(tc.state() == wsrep::transaction::s_executing);
sc.client_service().error_during_prepare_data_ = true;
cc.error_during_prepare_data_ = true;
// Run before commit
BOOST_REQUIRE(cc.before_commit());
@ -277,8 +275,7 @@ BOOST_FIXTURE_TEST_CASE_TEMPLATE(
transaction_1pc_killed_before_certify, T,
replicating_fixtures, T)
{
wsrep::mock_server_state& sc(T::sc);
wsrep::mock_client_state& cc(T::cc);
wsrep::mock_client& cc(T::cc);
const wsrep::transaction& tc(T::tc);
// Start a new transaction with ID 1
@ -287,7 +284,7 @@ BOOST_FIXTURE_TEST_CASE_TEMPLATE(
BOOST_REQUIRE(tc.id() == wsrep::transaction_id(1));
BOOST_REQUIRE(tc.state() == wsrep::transaction::s_executing);
sc.client_service().killed_before_certify_ = true;
cc.killed_before_certify_ = true;
// Run before commit
BOOST_REQUIRE(cc.before_commit());
@ -360,7 +357,7 @@ BOOST_FIXTURE_TEST_CASE_TEMPLATE(
replicating_fixtures, T)
{
wsrep::mock_server_state& sc(T::sc);
wsrep::mock_client_state& cc(T::cc);
wsrep::mock_client& cc(T::cc);
const wsrep::transaction& tc(T::tc);
// Start a new transaction with ID 1
@ -389,7 +386,7 @@ BOOST_FIXTURE_TEST_CASE_TEMPLATE(
BOOST_REQUIRE(tc.ordered() == false);
BOOST_REQUIRE(tc.certified() == false);
BOOST_REQUIRE(cc.current_error() == wsrep::e_success);
BOOST_REQUIRE(sc.client_service().replays() == 1);
BOOST_REQUIRE(cc.replays() == 1);
}
//
@ -403,15 +400,15 @@ BOOST_FIXTURE_TEST_CASE_TEMPLATE(
replicating_fixtures, T)
{
wsrep::mock_server_state& sc(T::sc);
wsrep::mock_client_state& cc(T::cc);
wsrep::mock_client& cc(T::cc);
const wsrep::transaction& tc(T::tc);
cc.start_transaction(1);
BOOST_REQUIRE(tc.active());
BOOST_REQUIRE(tc.id() == wsrep::transaction_id(1));
BOOST_REQUIRE(tc.state() == wsrep::transaction::s_executing);
sc.client_service().sync_point_enabled_ = "wsrep_before_certification";
sc.client_service().sync_point_action_ = wsrep::mock_client_service::spa_bf_abort_unordered;
cc.sync_point_enabled_ = "wsrep_before_certification";
cc.sync_point_action_ = wsrep::mock_client_service::spa_bf_abort_unordered;
sc.provider().certify_result_ = wsrep::provider::error_certification_failed;
BOOST_REQUIRE(cc.before_commit());
BOOST_REQUIRE(tc.state() == wsrep::transaction::s_cert_failed);
@ -436,7 +433,7 @@ BOOST_FIXTURE_TEST_CASE_TEMPLATE(
replicating_fixtures, T)
{
wsrep::mock_server_state& sc(T::sc);
wsrep::client_state& cc(T::cc);
wsrep::mock_client& cc(T::cc);
const wsrep::transaction& tc(T::tc);
// Start a new transaction with ID 1
@ -477,7 +474,7 @@ BOOST_FIXTURE_TEST_CASE_TEMPLATE(
replicating_fixtures, T)
{
wsrep::mock_server_state& sc(T::sc);
wsrep::client_state& cc(T::cc);
wsrep::mock_client& cc(T::cc);
const wsrep::transaction& tc(T::tc);
// Start a new transaction with ID 1
@ -518,7 +515,7 @@ BOOST_FIXTURE_TEST_CASE_TEMPLATE(
replicating_fixtures, T)
{
wsrep::mock_server_state& sc(T::sc);
wsrep::client_state& cc(T::cc);
wsrep::mock_client& cc(T::cc);
const wsrep::transaction& tc(T::tc);
// Start a new transaction with ID 1
@ -559,7 +556,7 @@ BOOST_FIXTURE_TEST_CASE_TEMPLATE(
replicating_fixtures, T)
{
wsrep::mock_server_state& sc(T::sc);
wsrep::client_state& cc(T::cc);
wsrep::mock_client& cc(T::cc);
const wsrep::transaction& tc(T::tc);
// Start a new transaction with ID 1
@ -600,7 +597,7 @@ BOOST_FIXTURE_TEST_CASE_TEMPLATE(
replicating_fixtures, T)
{
wsrep::mock_server_state& sc(T::sc);
wsrep::client_state& cc(T::cc);
wsrep::mock_client& cc(T::cc);
const wsrep::transaction& tc(T::tc);
// Start a new transaction with ID 1
@ -641,7 +638,7 @@ BOOST_FIXTURE_TEST_CASE_TEMPLATE(
replicating_fixtures, T)
{
wsrep::mock_server_state& sc(T::sc);
wsrep::mock_client_state& cc(T::cc);
wsrep::mock_client& cc(T::cc);
const wsrep::transaction& tc(T::tc);
// Start a new transaction with ID 1
@ -672,7 +669,7 @@ BOOST_FIXTURE_TEST_CASE_TEMPLATE(
BOOST_REQUIRE(tc.ordered() == false);
BOOST_REQUIRE(tc.certified() == false);
BOOST_REQUIRE(cc.current_error() == wsrep::e_error_during_commit);
BOOST_REQUIRE(sc.client_service().aborts() == 1);
BOOST_REQUIRE(cc.aborts() == 1);
}
//
@ -683,7 +680,7 @@ BOOST_FIXTURE_TEST_CASE_TEMPLATE(
replicating_fixtures, T)
{
wsrep::mock_server_state& sc(T::sc);
wsrep::mock_client_state& cc(T::cc);
wsrep::mock_client& cc(T::cc);
const wsrep::transaction& tc(T::tc);
// Start a new transaction with ID 1
@ -724,8 +721,7 @@ BOOST_FIXTURE_TEST_CASE_TEMPLATE(
transaction_1pc_bf_abort_before_certify_regain_lock, T,
replicating_fixtures, T)
{
wsrep::mock_server_state& sc(T::sc);
wsrep::mock_client_state& cc(T::cc);
wsrep::mock_client& cc(T::cc);
const wsrep::transaction& tc(T::tc);
// Start a new transaction with ID 1
@ -734,8 +730,8 @@ BOOST_FIXTURE_TEST_CASE_TEMPLATE(
BOOST_REQUIRE(tc.id() == wsrep::transaction_id(1));
BOOST_REQUIRE(tc.state() == wsrep::transaction::s_executing);
sc.client_service().sync_point_enabled_ = "wsrep_after_certification";
sc.client_service().sync_point_action_ = wsrep::mock_client_service::spa_bf_abort_ordered;
cc.sync_point_enabled_ = "wsrep_after_certification";
cc.sync_point_action_ = wsrep::mock_client_service::spa_bf_abort_ordered;
// Run before commit
BOOST_REQUIRE(cc.before_commit());
BOOST_REQUIRE(tc.state() == wsrep::transaction::s_must_replay);
@ -750,7 +746,7 @@ BOOST_FIXTURE_TEST_CASE_TEMPLATE(
// Cleanup after statement
cc.after_statement();
BOOST_REQUIRE(sc.client_service().replays() == 1);
BOOST_REQUIRE(cc.replays() == 1);
BOOST_REQUIRE(tc.active() == false);
BOOST_REQUIRE(tc.ordered() == false);
BOOST_REQUIRE(tc.certified() == false);
@ -1129,7 +1125,7 @@ BOOST_FIXTURE_TEST_CASE(transaction_byte_streaming_1pc_commit,
streaming_client_fixture_byte)
{
BOOST_REQUIRE(cc.start_transaction(1) == 0);
sc.client_service().bytes_generated_ = 1;
cc.bytes_generated_ = 1;
BOOST_REQUIRE(cc.after_row() == 0);
BOOST_REQUIRE(tc.streaming_context_.fragments_certified() == 1);
BOOST_REQUIRE(cc.before_commit() == 0);
@ -1148,10 +1144,10 @@ BOOST_FIXTURE_TEST_CASE(transaction_byte_batch_streaming_1pc_commit,
cc.enable_streaming(
wsrep::streaming_context::bytes, 2) == 0);
BOOST_REQUIRE(cc.start_transaction(1) == 0);
sc.client_service().bytes_generated_ = 1;
cc.bytes_generated_ = 1;
BOOST_REQUIRE(cc.after_row() == 0);
BOOST_REQUIRE(tc.streaming_context_.fragments_certified() == 0);
sc.client_service().bytes_generated_ = 2;
cc.bytes_generated_ = 2;
BOOST_REQUIRE(cc.after_row() == 0);
BOOST_REQUIRE(tc.streaming_context_.fragments_certified() == 1);
BOOST_REQUIRE(cc.before_commit() == 0);