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

Fixed some missing return values and added database change routing to right shard.

Browse Source
This commit is contained in:
Markus Makela
2014-12-12 16:25:19 +02:00
parent a7cc40dc6a
commit 175756c478
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
server/modules/routing/dbshard/dbshard.c
View File

@ -1887,7 +1887,19 @@ static int routeQuery(
* eventually to master * eventually to master
*/ */
if((tname = get_shard_target_name(inst,router_cli_ses,querybuf)) != NULL) if (packet_type == MYSQL_COM_INIT_DB)
{
char dbname[MYSQL_DATABASE_MAXLEN+1];
unsigned int plen = gw_mysql_get_byte3((unsigned char*)querybuf->start) - 1;
memcpy(dbname,querybuf->start + 5,plen);
dbname[plen] = '\0';
tname = hashtable_fetch(inst->dbnames_hash,dbname);
if(tname)
{
route_target = TARGET_NAMED_SERVER;
}
}
else if((tname = get_shard_target_name(inst,router_cli_ses,querybuf)) != NULL)
{ {
bool shard_ok = check_shard_status(inst,tname); bool shard_ok = check_shard_status(inst,tname);
@ -1930,17 +1942,16 @@ static int routeQuery(
GWBUF *errbuff; GWBUF *errbuff;
update_dbnames_hash(inst->servers,inst->dbnames_hash); update_dbnames_hash(inst->servers,inst->dbnames_hash);
tname = get_shard_target_name(inst,router_cli_ses,querybuf);
if(tname == NULL && if(tname == NULL &&
router_cli_ses->rses_mysql_session->db[0] == '\0') router_cli_ses->rses_mysql_session->db[0] == '\0')
{ {
/** /**
* No current database or databases in query. * No current database or databases in query, route to all.
*/ */
route_target = TARGET_ALL;
errbuff = modutil_create_mysql_err_msg(1,0,1046,
"3D000",
"No database selected");
} }
else else
{ {
@ -1948,14 +1959,15 @@ static int routeQuery(
/** /**
* Bad shard status * Bad shard status
*/ */
sprintf(errstr,"Unknown database '%s'", sprintf(errstr,"Unknown database '%s'",
router_cli_ses->rses_mysql_session->db); router_cli_ses->rses_mysql_session->db);
errbuff = modutil_create_mysql_err_msg(1,0,1049, errbuff = modutil_create_mysql_err_msg(1,0,1049,
"42000", "42000",
errstr); errstr);
gwbuf_free(querybuf);
return router_cli_ses->rses_client_dcb->func.write(router_cli_ses->rses_client_dcb,errbuff);
} }
router_cli_ses->rses_client_dcb->func.write(router_cli_ses->rses_client_dcb,errbuff);
} }