Commit 67e063eb authored by Teemu Ollakka's avatar Teemu Ollakka Committed by Jan Lindström

Update wsrep-lib. (#1426)

This commit updates the wsrep-lib. The changes are a cleanup in
client_state TOI processing and stub methods for future extensions.
parent 8fa759a5
...@@ -509,6 +509,14 @@ int Wsrep_applier_service::apply_write_set(const wsrep::ws_meta& ws_meta, ...@@ -509,6 +509,14 @@ int Wsrep_applier_service::apply_write_set(const wsrep::ws_meta& ws_meta,
DBUG_RETURN(ret); DBUG_RETURN(ret);
} }
int Wsrep_applier_service::apply_nbo_begin(const wsrep::ws_meta& ws_meta,
const wsrep::const_buffer& data,
wsrep::mutable_buffer& err)
{
DBUG_ENTER("Wsrep_applier_service::apply_nbo_begin");
DBUG_RETURN(0);
}
void Wsrep_applier_service::after_apply() void Wsrep_applier_service::after_apply()
{ {
DBUG_ENTER("Wsrep_applier_service::after_apply"); DBUG_ENTER("Wsrep_applier_service::after_apply");
......
...@@ -86,6 +86,8 @@ class Wsrep_applier_service : public Wsrep_high_priority_service ...@@ -86,6 +86,8 @@ class Wsrep_applier_service : public Wsrep_high_priority_service
~Wsrep_applier_service(); ~Wsrep_applier_service();
int apply_write_set(const wsrep::ws_meta&, const wsrep::const_buffer&, int apply_write_set(const wsrep::ws_meta&, const wsrep::const_buffer&,
wsrep::mutable_buffer&); wsrep::mutable_buffer&);
int apply_nbo_begin(const wsrep::ws_meta&, const wsrep::const_buffer& data,
wsrep::mutable_buffer& err);
void after_apply(); void after_apply();
bool is_replaying() const { return false; } bool is_replaying() const { return false; }
bool check_exit_status() const; bool check_exit_status() const;
...@@ -98,6 +100,12 @@ class Wsrep_replayer_service : public Wsrep_high_priority_service ...@@ -98,6 +100,12 @@ class Wsrep_replayer_service : public Wsrep_high_priority_service
~Wsrep_replayer_service(); ~Wsrep_replayer_service();
int apply_write_set(const wsrep::ws_meta&, const wsrep::const_buffer&, int apply_write_set(const wsrep::ws_meta&, const wsrep::const_buffer&,
wsrep::mutable_buffer&); wsrep::mutable_buffer&);
int apply_nbo_begin(const wsrep::ws_meta&, const wsrep::const_buffer& data,
wsrep::mutable_buffer& err)
{
DBUG_ASSERT(0); /* DDL should never cause replaying */
return 0;
}
void after_apply() { } void after_apply() { }
bool is_replaying() const { return true; } bool is_replaying() const { return true; }
void replay_status(enum wsrep::provider::status status) void replay_status(enum wsrep::provider::status status)
......
...@@ -1885,9 +1885,7 @@ static int wsrep_TOI_begin(THD *thd, const char *db, const char *table, ...@@ -1885,9 +1885,7 @@ static int wsrep_TOI_begin(THD *thd, const char *db, const char *table,
wsrep::client_state& cs(thd->wsrep_cs()); wsrep::client_state& cs(thd->wsrep_cs());
int ret= cs.enter_toi_local(key_array, int ret= cs.enter_toi_local(key_array,
wsrep::const_buffer(buff.ptr, buff.len), wsrep::const_buffer(buff.ptr, buff.len));
wsrep::provider::flag::start_transaction |
wsrep::provider::flag::commit);
if (ret) if (ret)
{ {
......
Subproject commit 9b25cebdf11e6da25d83e513a2e4b6db0515abad Subproject commit 90157ed1b0f8b3f0d1eb3d60ac93ce6d8da7ad77
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment