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

Improve protocol level result collection

Browse Source 
The result collection now covers more cases, including the use of
COM_CHANGE_USER. The addition of COM_STMT_EXECUTE to the list of commands
that generate result set responses is needed in order for the code to take
the correct branch.
This commit is contained in:
Markus Mäkelä
2018-07-16 21:47:23 +03:00
parent 28609a2c77
commit 4da7e4678f
1 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc
View File

@ -656,6 +656,14 @@ static inline bool session_ok_to_route(DCB *dcb)
static inline bool expecting_resultset(MySQLProtocol *proto) static inline bool expecting_resultset(MySQLProtocol *proto)
{ {
return proto->current_command == MXS_COM_QUERY || return proto->current_command == MXS_COM_QUERY ||
proto->current_command == MXS_COM_STMT_EXECUTE ||
/**
* The addition of COM_STMT_FETCH to the list of commands that produce
* result sets is slightly wrong. The command can generate complete
* result sets but it can also generate incomplete ones if cursors
* are used. The use of cursors most likely needs to be detected on
* an upper level and the use of this function avoided in those cases.
*/
proto->current_command == MXS_COM_STMT_FETCH; proto->current_command == MXS_COM_STMT_FETCH;
} }
@ -857,16 +865,22 @@ gw_read_and_write(DCB *dcb)
proto->collect_result = false; proto->collect_result = false;
result_collected = true; result_collected = true;
} }
else if (expecting_ps_response(proto) && else if (expecting_ps_response(proto))
mxs_mysql_is_prep_stmt_ok(read_buffer))
{ {
if (!complete_ps_response(read_buffer)) if (mxs_mysql_is_prep_stmt_ok(read_buffer) &&
{ !complete_ps_response(read_buffer))
dcb_readq_prepend(dcb, read_buffer); {
return 0; dcb_readq_prepend(dcb, read_buffer);
} return 0;
}
// Collected the complete result // Collected the complete result
proto->collect_result = false;
result_collected = true;
}
else
{
// Assume that everything else responds with an single packet
proto->collect_result = false; proto->collect_result = false;
result_collected = true; result_collected = true;
} }
@ -1715,6 +1729,10 @@ gw_create_change_user_packet(MYSQL_session* mses,
bytes += 4; bytes += 4;
buffer = gwbuf_alloc(bytes); buffer = gwbuf_alloc(bytes);
// The COM_CHANGE_USER is a session command so the result must be collected
gwbuf_set_type(buffer, GWBUF_TYPE_COLLECT_RESULT);
payload = GWBUF_DATA(buffer); payload = GWBUF_DATA(buffer);
memset(payload, '\0', bytes); memset(payload, '\0', bytes);
payload_start = payload; payload_start = payload;