hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-1506: Remove mxs::Buffer wrappers from RWSplitSession

Browse Source 
Now that the mxs::Buffer has a copy_from for GWBUFs, there's no need to
use wrapper functions. This removes the duplicate code in the wrappers.
This commit is contained in:
Markus Mäkelä
2018-04-07 10:19:35 +03:00
parent 23aa9cc492
commit 997835c7f8
3 changed files with 5 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/routing/readwritesplit/rwsplit_route_stmt.cc
View File

@ -965,7 +965,7 @@ bool RWSplitSession::handle_got_target(GWBUF* querybuf, SRWBackend& target, bool
{ {
if (store) if (store)
{ {
set_query(querybuf); m_current_query.copy_from(querybuf);
} }
atomic_add_uint64(&m_router->stats().n_queries, 1); atomic_add_uint64(&m_router->stats().n_queries, 1);

8
server/modules/routing/readwritesplit/rwsplitsession.cc
View File

@ -92,7 +92,7 @@ void close_all_connections(SRWBackendList& backends)
void RWSplitSession::close() void RWSplitSession::close()
{ {
close_all_connections(m_backends); close_all_connections(m_backends);
reset_query(); m_current_query.reset();
if (MXS_LOG_PRIORITY_IS_ENABLED(LOG_INFO) && if (MXS_LOG_PRIORITY_IS_ENABLED(LOG_INFO) &&
m_sescmd_list.size()) m_sescmd_list.size())
@ -384,7 +384,7 @@ void RWSplitSession::clientReply(GWBUF *writebuf, DCB *backend_dcb)
return; return;
} }
reset_query(); m_current_query.reset();
if (backend->reply_is_complete(writebuf)) if (backend->reply_is_complete(writebuf))
{ {
@ -511,7 +511,7 @@ void RWSplitSession::handleError(GWBUF *errmsgbuf, DCB *problem_dcb,
if (can_retry_query()) if (can_retry_query())
{ {
can_continue = true; can_continue = true;
retry_query(release_query()); retry_query(m_current_query.release());
} }
else if (m_config.master_failure_mode == RW_ERROR_ON_WRITE) else if (m_config.master_failure_mode == RW_ERROR_ON_WRITE)
{ {
@ -611,7 +611,7 @@ bool RWSplitSession::handle_error_new_connection(DCB *backend_dcb, GWBUF *errmsg
* Try to reroute the statement to a working server or send an error * Try to reroute the statement to a working server or send an error
* to the client. * to the client.
*/ */
GWBUF *stored = release_query(); GWBUF *stored = m_current_query.release();
if (stored && m_config.retry_failed_reads) if (stored && m_config.retry_failed_reads)
{ {

29
server/modules/routing/readwritesplit/rwsplitsession.hh
View File

@ -194,35 +194,6 @@ private:
m_retry_duration < m_config.delayed_retry_timeout && m_retry_duration < m_config.delayed_retry_timeout &&
!session_trx_is_active(m_client->session); !session_trx_is_active(m_client->session);
} }
/**
* Set the current query
*
* @param query The current query
*/
inline void set_query(GWBUF* query)
{
ss_dassert(!m_current_query.get());
m_current_query.reset(gwbuf_clone(query));
}
/**
* Release current query
*
* @return The current query
*/
inline GWBUF* release_query()
{
return m_current_query.release();
}
/**
* Reset current query
*/
inline void reset_query()
{
m_current_query.reset();
}
}; };
/** /**