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

Format readwritesplit with Astyle

Browse Source 
Formatted readwritesplit with Astyle. Changed the initialization of
Backend::m_modutil_state to use curly braces to cope with Astyle's lack of
support for curly braces inside parentheses.
This commit is contained in:
Markus Mäkelä
2018-06-23 09:59:55 +03:00
parent e610b285b9
commit a417567a18
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/modules/routing/readwritesplit/rwbackend.cc
View File

@ -10,7 +10,7 @@ namespace maxscale
RWBackend::RWBackend(SERVER_REF* ref): RWBackend::RWBackend(SERVER_REF* ref):
mxs::Backend(ref), mxs::Backend(ref),
m_reply_state(REPLY_STATE_DONE), m_reply_state(REPLY_STATE_DONE),
m_modutil_state({}), m_modutil_state{0},
m_command(0), m_command(0),
m_opening_cursor(false), m_opening_cursor(false),
m_expected_rows(0), m_expected_rows(0),
@ -145,7 +145,7 @@ bool RWBackend::reply_is_complete(GWBUF *buffer)
set_reply_state(REPLY_STATE_DONE); set_reply_state(REPLY_STATE_DONE);
} }
else if (get_reply_state() == REPLY_STATE_START && else if (get_reply_state() == REPLY_STATE_START &&
(!mxs_mysql_is_result_set(buffer) || GWBUF_IS_COLLECTED_RESULT(buffer))) (!mxs_mysql_is_result_set(buffer) || GWBUF_IS_COLLECTED_RESULT(buffer)))
{ {
m_local_infile_requested = false; m_local_infile_requested = false;

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

@ -427,7 +427,7 @@ bool RWSplitSession::route_session_write(GWBUF *querybuf, uint8_t command, uint3
else else
{ {
MXS_ERROR("Failed to execute session command in %s (%s)", MXS_ERROR("Failed to execute session command in %s (%s)",
backend->name(),backend->uri()); backend->name(), backend->uri());
} }
} }
} }

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

@ -43,7 +43,7 @@ typedef std::tr1::unordered_map<uint32_t, mxs::SRWBackend> ExecMap;
* The client session of a RWSplit instance * The client session of a RWSplit instance
*/ */
class RWSplitSession: public mxs::RouterSession, class RWSplitSession: public mxs::RouterSession,
private mxs::QueryClassifier::Handler private mxs::QueryClassifier::Handler
{ {
RWSplitSession(const RWSplitSession&) = delete; RWSplitSession(const RWSplitSession&) = delete;
RWSplitSession& operator=(const RWSplitSession&) = delete; RWSplitSession& operator=(const RWSplitSession&) = delete;