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

Rename readwritesplit variables

Browse Source 
Renamed variables to better represent the types of variables they
represent. Reordered some of the functions so that the functions don't
need to be declared before they are used.
This commit is contained in:
Markus Mäkelä
2017-06-19 13:14:09 +03:00
parent aa61c8a30b
commit 37b6cf250d
6 changed files with 365 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
server/modules/routing/readwritesplit/rwsplit_session_cmd.cc
View File

@ -26,21 +26,22 @@
* Functions for session command handling
*/
void process_sescmd_response(ROUTER_CLIENT_SES* rses, SRWBackend& bref, GWBUF** ppPacket, bool* reconnect)
void process_sescmd_response(ROUTER_CLIENT_SES* rses, SRWBackend& backend,
GWBUF** ppPacket, bool* pReconnect)
{
if (bref->session_command_count())
if (backend->session_command_count())
{
/** We are executing a session command */
if (GWBUF_IS_TYPE_SESCMD_RESPONSE((*ppPacket)))
{
uint8_t cmd;
gwbuf_copy_data(*ppPacket, MYSQL_HEADER_LEN, 1, &cmd);
uint64_t id = bref->complete_session_command();
uint64_t id = backend->complete_session_command();
if (rses->recv_sescmd < rses->sent_sescmd &&
id == rses->recv_sescmd + 1 &&
(!rses->current_master || // Session doesn't have a master
rses->current_master == bref)) // This is the master's response
rses->current_master == backend)) // This is the master's response
{
/** First reply to this session command, route it to the client */
++rses->recv_sescmd;
@ -60,9 +61,9 @@ void process_sescmd_response(ROUTER_CLIENT_SES* rses, SRWBackend& bref, GWBUF**
{
MXS_ERROR("Slave server '%s': response differs from master's response. "
"Closing connection due to inconsistent session state.",
bref->server()->unique_name);
bref->close(mxs::Backend::CLOSE_FATAL);
*reconnect = true;
backend->server()->unique_name);
backend->close(mxs::Backend::CLOSE_FATAL);
*pReconnect = true;
}
}
}