lib/wsrep-lib
1
0
Fork 0
mirror of https://github.com/codership/wsrep-lib.git synced 2025-07-28 20:02:00 +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

6
src/client_state.cpp
View File

@ -58,7 +58,7 @@ int wsrep::client_state::before_command()
wsrep::server_state::rm_async);
override_error(wsrep::e_deadlock_error);
lock.unlock();
client_service_.rollback(*this);
client_service_.rollback();
(void)transaction_.after_statement();
lock.lock();
assert(transaction_.state() ==
@ -96,7 +96,7 @@ void wsrep::client_state::after_command_before_result()
{
override_error(wsrep::e_deadlock_error);
lock.unlock();
client_service_.rollback(*this);
client_service_.rollback();
(void)transaction_.after_statement();
lock.lock();
assert(transaction_.state() == wsrep::transaction::s_aborted);
@ -116,7 +116,7 @@ void wsrep::client_state::after_command_after_result()
transaction_.state() == wsrep::transaction::s_must_abort)
{
lock.unlock();
client_service_.rollback(*this);
client_service_.rollback();
lock.lock();
assert(transaction_.state() == wsrep::transaction::s_aborted);
override_error(wsrep::e_deadlock_error);

4
src/transaction.cpp
View File

@ -709,7 +709,7 @@ int wsrep::transaction::certify_fragment(
lock.unlock();
wsrep::mutable_buffer data;
if (client_state_.prepare_fragment_for_replication(*this, data))
if (client_state_.prepare_fragment_for_replication(data))
{
lock.lock();
state(lock, s_must_abort);
@ -807,7 +807,7 @@ int wsrep::transaction::certify_commit(
lock.unlock();
if (client_state_.prepare_data_for_replication(*this))
if (client_state_.prepare_data_for_replication())
{
// Note: Error must be set by prepare_data_for_replication()
lock.lock();