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

Added error logging to schemarouter about cross-database queries.

Browse Source
This commit is contained in:
Markus Makela 2015-03-19 22:18:20 +02:00
parent 7581070bc4
commit 163e598f8a
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -429,20 +429,29 @@ char* get_shard_target_name(ROUTER_INSTANCE* router, ROUTER_CLIENT_SES* client,
if(sz > 0){
has_dbs = true;
for(i = 0; i < sz; i++){
char* name;
if((name = (char*)hashtable_fetch(ht,dbnms[i]))){
if((rval = (char*)hashtable_fetch(ht,dbnms[i]))){
if(strcmp(dbnms[i],"information_schema") == 0)
if(strcmp(dbnms[i],"information_schema") == 0 && rval == NULL)
{
has_dbs = false;
rval = NULL;
}
else
{
skygw_log_write(LOGFILE_TRACE,"schemarouter: Query targets database '%s' on server '%s",dbnms[i],rval);
/** Warn about improper usage of the router */
if(rval && strcmp(name,rval) != 0)
{
skygw_log_write(LOGFILE_ERROR,"Error : Schemarouter: Query targets databases on servers '%s' and '%s'. "
"Cross database queries across servers are not supported."
,rval,name);
}
else if (rval == NULL)
{
rval = name;
has_dbs = true;
skygw_log_write(LOGFILE_TRACE,"schemarouter: Query targets database '%s' on server '%s'",dbnms[i],rval);
}
}
for(j = i;j < sz;j++) free(dbnms[j]);
break;
}
free(dbnms[i]);
}