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

EOF flags are now read in case 0xfe

Browse Source 
EOF flags are now read in case 0xfe and minor improvements
This commit is contained in:
MassimilianoPinto
2016-11-07 10:01:05 +01:00
parent 5b7e5aa36f
commit 9f01a4612d
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/modules/filter/maxrows/maxrows.c
View File

@ -23,6 +23,7 @@
* 26/10/2016 Massimiliano Pinto Initial implementation * 26/10/2016 Massimiliano Pinto Initial implementation
* 04/11/2016 Massimiliano Pinto Addition of SERVER_MORE_RESULTS_EXIST flag (0x0008) * 04/11/2016 Massimiliano Pinto Addition of SERVER_MORE_RESULTS_EXIST flag (0x0008)
* detection in handle_expecting_rows(). * detection in handle_expecting_rows().
* 07/11/2016 Massimiliano Pinto handle_expecting_rows renamed to handle_rows
* *
* @endverbatim * @endverbatim
*/ */
@ -166,7 +167,7 @@ static void maxrows_session_data_free(MAXROWS_SESSION_DATA *data);
static int handle_expecting_fields(MAXROWS_SESSION_DATA *csdata); static int handle_expecting_fields(MAXROWS_SESSION_DATA *csdata);
static int handle_expecting_nothing(MAXROWS_SESSION_DATA *csdata); static int handle_expecting_nothing(MAXROWS_SESSION_DATA *csdata);
static int handle_expecting_response(MAXROWS_SESSION_DATA *csdata); static int handle_expecting_response(MAXROWS_SESSION_DATA *csdata);
static int handle_expecting_rows(MAXROWS_SESSION_DATA *csdata); static int handle_rows(MAXROWS_SESSION_DATA *csdata);
static int handle_ignoring_response(MAXROWS_SESSION_DATA *csdata); static int handle_ignoring_response(MAXROWS_SESSION_DATA *csdata);
static bool process_params(char **options, FILTER_PARAMETER **params, MAXROWS_CONFIG* config); static bool process_params(char **options, FILTER_PARAMETER **params, MAXROWS_CONFIG* config);
@ -368,7 +369,7 @@ static int clientReply(FILTER *instance, void *sdata, GWBUF *data)
case MAXROWS_DISCARDING_RESPONSE: case MAXROWS_DISCARDING_RESPONSE:
case MAXROWS_EXPECTING_ROWS: case MAXROWS_EXPECTING_ROWS:
rv = handle_expecting_rows(csdata); rv = handle_rows(csdata);
break; break;
case MAXROWS_IGNORING_RESPONSE: case MAXROWS_IGNORING_RESPONSE:
@ -524,7 +525,7 @@ static int handle_expecting_fields(MAXROWS_SESSION_DATA *csdata)
case 0xfe: // EOF, the one after the fields. case 0xfe: // EOF, the one after the fields.
csdata->res.offset += packetlen; csdata->res.offset += packetlen;
csdata->state = MAXROWS_EXPECTING_ROWS; csdata->state = MAXROWS_EXPECTING_ROWS;
rv = handle_expecting_rows(csdata); rv = handle_rows(csdata);
break; break;
default: // Field information. default: // Field information.
@ -640,7 +641,7 @@ static int handle_expecting_response(MAXROWS_SESSION_DATA *csdata)
* *
* @param csdata The maxrows session data. * @param csdata The maxrows session data.
*/ */
static int handle_expecting_rows(MAXROWS_SESSION_DATA *csdata) static int handle_rows(MAXROWS_SESSION_DATA *csdata)
{ {
ss_dassert(csdata->state == MAXROWS_EXPECTING_ROWS || csdata->state == MAXROWS_DISCARDING_RESPONSE); ss_dassert(csdata->state == MAXROWS_EXPECTING_ROWS || csdata->state == MAXROWS_DISCARDING_RESPONSE);
ss_dassert(csdata->res.data); ss_dassert(csdata->res.data);
@ -662,7 +663,6 @@ static int handle_expecting_rows(MAXROWS_SESSION_DATA *csdata)
{ {
// We have at least one complete packet. // We have at least one complete packet.
int command = (int)MYSQL_GET_COMMAND(header); int command = (int)MYSQL_GET_COMMAND(header);
int flags = gw_mysql_get_byte2(header + MAXROWS_MYSQL_EOF_PACKET_FLAGS_OFFSET);
switch (command) switch (command)
{ {
@ -703,6 +703,8 @@ static int handle_expecting_rows(MAXROWS_SESSION_DATA *csdata)
* will be an OK packet. * will be an OK packet.
*/ */
int flags = gw_mysql_get_byte2(header + MAXROWS_MYSQL_EOF_PACKET_FLAGS_OFFSET);
if (!(flags & SERVER_MORE_RESULTS_EXIST)) if (!(flags & SERVER_MORE_RESULTS_EXIST))
{ {
if (csdata->state == MAXROWS_DISCARDING_RESPONSE) if (csdata->state == MAXROWS_DISCARDING_RESPONSE)