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

Cleaned up schemarouter code.

Browse Source
This commit is contained in:
Markus Makela
2015-10-02 15:15:30 +03:00
parent a576606f2b
commit 6227d9f834
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/modules/routing/schemarouter/schemarouter.c
View File

@ -326,7 +326,7 @@ showdb_response_t parse_showdb_response(ROUTER_CLIENT_SES* rses, backend_ref_t*
unsigned char* ptr; unsigned char* ptr;
char* target = bref->bref_backend->backend_server->unique_name; char* target = bref->bref_backend->backend_server->unique_name;
GWBUF* buf; GWBUF* buf;
bool error = false; bool duplicate_found = false;
showdb_response_t rval = SHOWDB_PARTIAL_RESPONSE; showdb_response_t rval = SHOWDB_PARTIAL_RESPONSE;
if (buffer == NULL || *buffer == NULL) if (buffer == NULL || *buffer == NULL)
@ -366,7 +366,7 @@ showdb_response_t parse_showdb_response(ROUTER_CLIENT_SES* rses, backend_ref_t*
ptr += gw_mysql_get_byte3(ptr) + 4; ptr += gw_mysql_get_byte3(ptr) + 4;
} }
while (ptr < (unsigned char*) buf->end && !PTR_IS_EOF(ptr)) while (!duplicate_found && ptr < (unsigned char*) buf->end && !PTR_IS_EOF(ptr))
{ {
int payloadlen = gw_mysql_get_byte3(ptr); int payloadlen = gw_mysql_get_byte3(ptr);
int packetlen = payloadlen + 4; int packetlen = payloadlen + 4;
@ -388,7 +388,7 @@ showdb_response_t parse_showdb_response(ROUTER_CLIENT_SES* rses, backend_ref_t*
pcre_exec(rses->router->ignore_regex, NULL, data, pcre_exec(rses->router->ignore_regex, NULL, data,
strlen(data), 0, 0, ovector, ovec_count) >= 0))) strlen(data), 0, 0, ovector, ovec_count) >= 0)))
{ {
error = true; duplicate_found = true;
skygw_log_write(LE, "Error: Database '%s' found on servers '%s' and '%s' for user %s@%s.", skygw_log_write(LE, "Error: Database '%s' found on servers '%s' and '%s' for user %s@%s.",
data, target, hashtable_fetch(rses->dbhash, data), data, target, hashtable_fetch(rses->dbhash, data),
rses->rses_client_dcb->user, rses->rses_client_dcb->user,
@ -415,7 +415,7 @@ showdb_response_t parse_showdb_response(ROUTER_CLIENT_SES* rses, backend_ref_t*
gwbuf_free(buf); gwbuf_free(buf);
if (error) if (duplicate_found)
rval = SHOWDB_DUPLICATE_DATABASES; rval = SHOWDB_DUPLICATE_DATABASES;
else if (bref->n_mapping_eof == 2) else if (bref->n_mapping_eof == 2)
rval = SHOWDB_FULL_RESPONSE; rval = SHOWDB_FULL_RESPONSE;