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

Use custom result set detection functions

Browse Source 
The functions that the readwritesplit uses can assume that the buffer
contains only one packet in contiguous memory.
This commit is contained in:
Markus Mäkelä
2017-10-05 17:03:36 +03:00
parent e474b78d95
commit 9ece996466
1 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
server/modules/routing/readwritesplit/readwritesplit.cc
View File

@ -522,11 +522,33 @@ static bool is_large(GWBUF* buffer)
static bool more_results_exist(GWBUF* buffer) static bool more_results_exist(GWBUF* buffer)
{ {
ss_dassert(is_eof(buffer)); ss_dassert(is_eof(buffer) || mxs_mysql_is_ok_packet(buffer));
uint16_t status = gw_mysql_get_byte2(GWBUF_DATA(buffer) + MYSQL_HEADER_LEN + 1 + 2); uint16_t status = gw_mysql_get_byte2(GWBUF_DATA(buffer) + MYSQL_HEADER_LEN + 1 + 2);
return status & SERVER_MORE_RESULTS_EXIST; return status & SERVER_MORE_RESULTS_EXIST;
} }
static bool is_result_set(GWBUF *buffer)
{
bool rval = false;
switch (GWBUF_DATA(buffer)[MYSQL_HEADER_LEN])
{
case MYSQL_REPLY_OK:
case MYSQL_REPLY_ERR:
case MYSQL_REPLY_LOCAL_INFILE:
case MYSQL_REPLY_EOF:
/** Not a result set */
break;
default:
rval = true;
break;
}
return rval;
}
/** /**
* @brief Check if we have received a complete reply from the backend * @brief Check if we have received a complete reply from the backend
* *
@ -539,9 +561,9 @@ bool reply_is_complete(SRWBackend backend, GWBUF *buffer)
{ {
mxs_mysql_cmd_t cmd = mxs_mysql_current_command(backend->dcb()->session); mxs_mysql_cmd_t cmd = mxs_mysql_current_command(backend->dcb()->session);
if (backend->get_reply_state() == REPLY_STATE_START && !mxs_mysql_is_result_set(buffer)) if (backend->get_reply_state() == REPLY_STATE_START && !is_result_set(buffer))
{ {
if (cmd == MXS_COM_STMT_PREPARE || !mxs_mysql_more_results_after_ok(buffer)) if (cmd == MXS_COM_STMT_PREPARE || !more_results_exist(buffer))
{ {
/** Not a result set, we have the complete response */ /** Not a result set, we have the complete response */
LOG_RS(backend, REPLY_STATE_DONE); LOG_RS(backend, REPLY_STATE_DONE);