mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-03-30 20:05:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions1

Revert MDEV-17099 Preliminary changes for Galera XA support ()

Browse source 
This reverts commit 2b5f4b3ed6
due to build failures.
This commit is contained in:
Marko Mäkelä 2019-10-28 16:16:21 +02:00
parent 9afbb1069a
commit 8f46e3833c
9 changed files with 12 additions and 25 deletions

4
sql/log.cc
View file

@ -10768,13 +10768,13 @@ bool wsrep_stmt_rollback_is_safe(THD* thd)
binlog_cache_data * trx_cache = &cache_mngr->trx_cache;
if (thd->wsrep_sr().fragments_certified() > 0 &&
(trx_cache->get_prev_position() == MY_OFF_T_UNDEF ||
trx_cache->get_prev_position() < thd->wsrep_sr().log_position()))
trx_cache->get_prev_position() < thd->wsrep_sr().bytes_certified()))
{
WSREP_DEBUG("statement rollback is not safe for streaming replication"
" pre-stmt_pos: %llu, frag repl pos: %zu\n"
"Thread: %llu, SQL: %s",
trx_cache->get_prev_position(),
thd->wsrep_sr().log_position(),
thd->wsrep_sr().bytes_certified(),
thd->thread_id, thd->query());
ret = false;
}

4
sql/wsrep_binlog.cc
View file

@ -123,7 +123,7 @@ static int wsrep_write_cache_inc(THD* const thd,
DBUG_ENTER("wsrep_write_cache_inc");
my_off_t const saved_pos(my_b_tell(cache));
if (reinit_io_cache(cache, READ_CACHE, thd->wsrep_sr().log_position(), 0, 0))
if (reinit_io_cache(cache, READ_CACHE, thd->wsrep_sr().bytes_certified(), 0, 0))
{
WSREP_ERROR("failed to initialize io-cache");
DBUG_RETURN(1);;
@ -158,7 +158,7 @@ static int wsrep_write_cache_inc(THD* const thd,
}
if (ret == 0)
{
assert(total_length + thd->wsrep_sr().log_position() == saved_pos);
assert(total_length + thd->wsrep_sr().bytes_certified() == saved_pos);
}
cleanup:

6
sql/wsrep_client_service.cc
View file

@ -138,8 +138,7 @@ void Wsrep_client_service::cleanup_transaction()
}
int Wsrep_client_service::prepare_fragment_for_replication(
wsrep::mutable_buffer& buffer, size_t& log_position)
int Wsrep_client_service::prepare_fragment_for_replication(wsrep::mutable_buffer& buffer)
{
DBUG_ASSERT(m_thd == current_thd);
THD* thd= m_thd;
@ -153,7 +152,7 @@ int Wsrep_client_service::prepare_fragment_for_replication(
}
const my_off_t saved_pos(my_b_tell(cache));
if (reinit_io_cache(cache, READ_CACHE, thd->wsrep_sr().log_position(), 0, 0))
if (reinit_io_cache(cache, READ_CACHE, thd->wsrep_sr().bytes_certified(), 0, 0))
{
DBUG_RETURN(1);
}
@ -187,7 +186,6 @@ int Wsrep_client_service::prepare_fragment_for_replication(
while (cache->file >= 0 && (length= my_b_fill(cache)));
}
DBUG_ASSERT(total_length == buffer.size());
log_position= saved_pos;
cleanup:
if (reinit_io_cache(cache, WRITE_CACHE, saved_pos, 0, 0))
{

2
sql/wsrep_client_service.h
View file

@ -43,7 +43,7 @@ public:
void cleanup_transaction();
bool statement_allowed_for_streaming() const;
size_t bytes_generated() const;
int prepare_fragment_for_replication(wsrep::mutable_buffer&, size_t&);
int prepare_fragment_for_replication(wsrep::mutable_buffer&);
int remove_fragments();
void emergency_shutdown()
{ throw wsrep::not_implemented_error(); }

9
sql/wsrep_high_priority_service.cc
View file

@ -205,12 +205,6 @@ const wsrep::transaction& Wsrep_high_priority_service::transaction() const
DBUG_RETURN(m_thd->wsrep_trx());
}
int Wsrep_high_priority_service::next_fragment(const wsrep::ws_meta& ws_meta)
{
DBUG_ENTER(" Wsrep_high_priority_service::next_fragment");
DBUG_RETURN(m_thd->wsrep_cs().next_fragment(ws_meta));
}
int Wsrep_high_priority_service::adopt_transaction(
const wsrep::transaction& transaction)
{
@ -231,8 +225,7 @@ int Wsrep_high_priority_service::adopt_transaction(
int Wsrep_high_priority_service::append_fragment_and_commit(
const wsrep::ws_handle& ws_handle,
const wsrep::ws_meta& ws_meta,
const wsrep::const_buffer& data,
const wsrep::xid& xid WSREP_UNUSED)
const wsrep::const_buffer& data)
{
DBUG_ENTER("Wsrep_high_priority_service::append_fragment_and_commit");
int ret= start_transaction(ws_handle, ws_meta);

4
sql/wsrep_high_priority_service.h
View file

@ -35,15 +35,13 @@ public:
~Wsrep_high_priority_service();
int start_transaction(const wsrep::ws_handle&,
const wsrep::ws_meta&);
int next_fragment(const wsrep::ws_meta&);
const wsrep::transaction& transaction() const;
int adopt_transaction(const wsrep::transaction&);
int apply_write_set(const wsrep::ws_meta&, const wsrep::const_buffer&,
wsrep::mutable_buffer&) = 0;
int append_fragment_and_commit(const wsrep::ws_handle&,
const wsrep::ws_meta&,
const wsrep::const_buffer&,
const wsrep::xid&);
const wsrep::const_buffer&);
int remove_fragments(const wsrep::ws_meta&);
int commit(const wsrep::ws_handle&, const wsrep::ws_meta&);
int rollback(const wsrep::ws_handle&, const wsrep::ws_meta&);

3
sql/wsrep_storage_service.cc
View file

@ -100,8 +100,7 @@ void Wsrep_storage_service::adopt_transaction(const wsrep::transaction& transact
int Wsrep_storage_service::append_fragment(const wsrep::id& server_id,
wsrep::transaction_id transaction_id,
int flags,
const wsrep::const_buffer& data,
const wsrep::xid& xid WSREP_UNUSED)
const wsrep::const_buffer& data)
{
DBUG_ENTER("Wsrep_storage_service::append_fragment");
DBUG_ASSERT(m_thd == current_thd);

3
sql/wsrep_storage_service.h
View file

@ -33,8 +33,7 @@ public:
int append_fragment(const wsrep::id&,
wsrep::transaction_id,
int flags,
const wsrep::const_buffer&,
const wsrep::xid&);
const wsrep::const_buffer&);
int update_fragment_meta(const wsrep::ws_meta&);
int remove_fragments();
int commit(const wsrep::ws_handle&, const wsrep::ws_meta&);

2
wsrep-lib

@ -1 +1 @@
Subproject commit 66ee7bed1b7fa7b6d3f584517be681aa9ea15df9
Subproject commit 58aa3e821f575532870c5f76f6f1cf833458eed4