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

Removed all references to use_sql_variables_in variable where it is used in dbshard.

Browse Source 
Commented out dead code.
Fixed some indentations.
This commit is contained in:
VilhoRaatikka
2014-12-16 14:14:57 +02:00
parent ef94b7ee54
commit f861d67b7f
3 changed files with 54 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
server/core/config.c
View File

@ -451,57 +451,56 @@ int error_count = 0;
} }
} }
if(is_dbshard) if(is_dbshard)
{ {
CONFIG_PARAMETER* param = NULL; CONFIG_PARAMETER* param = NULL;
char* ignore_databases; char* ignore_databases;
bool succp = true; bool succp = true;
ignore_databases = ignore_databases =
config_get_value(obj->parameters, config_get_value(obj->parameters,
"ignore_databases"); "ignore_databases");
if (ignore_databases != NULL) if (ignore_databases != NULL)
{ {
param = config_get_param( param = config_get_param(
obj->parameters, obj->parameters,
"ignore_databases"); "ignore_databases");
if (param == NULL)
{ if (param == NULL)
{
succp = false; succp = false;
} }
else else
{ {
param->qfd.valstr = strdup(param->value); param->qfd.valstr = strdup(param->value);
param->qfd_param_type = STRING_TYPE; param->qfd_param_type = STRING_TYPE;
succp = service_set_param_value(obj->element, succp = service_set_param_value(
param, obj->element,
ignore_databases, param,
COUNT_NONE, ignore_databases,
STRING_TYPE); COUNT_NONE,
STRING_TYPE);
} }
}
}
if (!succp) if (!succp)
{ {
if(param){ if(param){
LOGIF(LM, (skygw_log_write( LOGIF(LM, (skygw_log_write(
LOGFILE_MESSAGE, LOGFILE_MESSAGE,
"* Warning : invalid value type " "* Warning : invalid value type "
"for parameter \'%s.%s = %s\'\n\tExpected " "for parameter \'%s.%s = %s\'\n\tExpected "
"type is [master|all] for " "type is [master|all] for "
"use sql variables in.", "use sql variables in.",
((SERVICE*)obj->element)->name, ((SERVICE*)obj->element)->name,
param->name, param->name,
param->value))); param->value)));
}else{ }else{
LOGIF(LE, (skygw_log_write( LOGIF(LE, (skygw_log_write(
LOGFILE_ERROR, LOGFILE_ERROR,
"Error : parameter was NULL"))); "Error : parameter was NULL")));
}
} }
}
} }
/** Parameters for rwsplit router only */ /** Parameters for rwsplit router only */
if (is_rwsplit) if (is_rwsplit)

6
server/modules/monitor/mysql_mon.c
View File

@ -764,14 +764,14 @@ int log_no_master = 1;
if (!(root_master->mon_prev_status & SERVER_STALE_STATUS) && !(root_master->server->status & SERVER_MAINT)) { if (!(root_master->mon_prev_status & SERVER_STALE_STATUS) && !(root_master->server->status & SERVER_MAINT)) {
LOGIF(LM, (skygw_log_write( LOGIF(LM, (skygw_log_write(
LOGFILE_MESSAGE, LOGFILE_MESSAGE,
"Info: A Master Server is now available: %s:%i", "Info : A Master Server is now available: %s:%i",
root_master->server->name, root_master->server->name,
root_master->server->port))); root_master->server->port)));
} }
} else { } else {
LOGIF(LE, (skygw_log_write_flush( LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,
"Error: No Master can be determined. Last known was %s:%i", "Error : No Master can be determined. Last known was %s:%i",
root_master->server->name, root_master->server->name,
root_master->server->port))); root_master->server->port)));
} }
@ -780,7 +780,7 @@ int log_no_master = 1;
if (!root_master && log_no_master) { if (!root_master && log_no_master) {
LOGIF(LE, (skygw_log_write_flush( LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,
"Error: No Master can be determined"))); "Error : No Master can be determined")));
log_no_master = 0; log_no_master = 0;
} }
} }

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

@ -101,7 +101,6 @@ static backend_ref_t* get_bref_from_dcb(ROUTER_CLIENT_SES* rses, DCB* dcb);
static route_target_t get_shard_route_target ( static route_target_t get_shard_route_target (
skygw_query_type_t qtype, skygw_query_type_t qtype,
bool trx_active, bool trx_active,
target_t use_sql_variables_in,
HINT* hint); HINT* hint);
#if 0 #if 0
static backend_ref_t* check_candidate_bref( static backend_ref_t* check_candidate_bref(
@ -236,10 +235,11 @@ static void tracelog_routed_query(
backend_ref_t* bref, backend_ref_t* bref,
GWBUF* buf); GWBUF* buf);
#if defined(NOT_USED) /*< Not needed but left as an example */
static void dbshard_process_router_options( static void dbshard_process_router_options(
ROUTER_INSTANCE* router, ROUTER_INSTANCE* router,
char** options); char** options);
#endif
static bool route_session_write( static bool route_session_write(
ROUTER_CLIENT_SES* router_client_ses, ROUTER_CLIENT_SES* router_client_ses,
@ -773,7 +773,7 @@ static void refreshInstance(
router->ignore_list = tokenize_string(param->qfd.valstr); router->ignore_list = tokenize_string(param->qfd.valstr);
} }
} }
#if defined(NOT_USED) /*< This is kept as an example if such parameter is processed later */
else if (paramtype == SQLVAR_TARGET_TYPE) else if (paramtype == SQLVAR_TARGET_TYPE)
{ {
if (strncmp(param->name, if (strncmp(param->name,
@ -791,7 +791,7 @@ static void refreshInstance(
} }
} }
} }
#endif
if (refresh_single) if (refresh_single)
{ {
break; break;
@ -1423,7 +1423,6 @@ static backend_ref_t* check_candidate_bref(
static route_target_t get_shard_route_target ( static route_target_t get_shard_route_target (
skygw_query_type_t qtype, skygw_query_type_t qtype,
bool trx_active, /*< !!! turha ? */ bool trx_active, /*< !!! turha ? */
target_t use_sql_variables_in, /*< 'master' == single tässä tapauksessa */
HINT* hint) /*< !!! turha ? */ HINT* hint) /*< !!! turha ? */
{ {
route_target_t target = TARGET_UNDEFINED; route_target_t target = TARGET_UNDEFINED;
@ -1443,8 +1442,7 @@ static route_target_t get_shard_route_target (
target = TARGET_ALL; target = TARGET_ALL;
} }
else if(QUERY_IS_TYPE(qtype, QUERY_TYPE_SYSVAR_READ) || else if(QUERY_IS_TYPE(qtype, QUERY_TYPE_SYSVAR_READ) ||
(use_sql_variables_in == TYPE_ALL && QUERY_IS_TYPE(qtype, QUERY_TYPE_GSYSVAR_READ))
QUERY_IS_TYPE(qtype, QUERY_TYPE_GSYSVAR_READ)))
{ {
target = TARGET_ANY; target = TARGET_ANY;
} }
@ -1723,21 +1721,21 @@ GWBUF* gen_show_dbs_response(ROUTER_INSTANCE* router, ROUTER_CLIENT_SES* client)
const char* org_name = "SCHEMA_NAME"; const char* org_name = "SCHEMA_NAME";
char next_length = 0x0c; char next_length = 0x0c;
char charset[2] = {0x21, 0x00}; char charset[2] = {0x21, 0x00};
char column_length[4] = { MYSQL_DATABASE_MAXLEN, char column_length[4] = { MYSQL_DATABASE_MAXLEN,
MYSQL_DATABASE_MAXLEN >> 8, MYSQL_DATABASE_MAXLEN >> 8,
MYSQL_DATABASE_MAXLEN >> 16, MYSQL_DATABASE_MAXLEN >> 16,
MYSQL_DATABASE_MAXLEN >> 24 }; MYSQL_DATABASE_MAXLEN >> 24 };
char column_type = 0xfd; char column_type = 0xfd;
char eof[9] = { 0x05,0x00,0x00, char eof[9] = { 0x05,0x00,0x00,
0x03,0xfe,0x00, 0x03,0xfe,0x00,
0x00,0x22,0x00 }; 0x00,0x22,0x00 };
#if defined(NOT_USED)
char ok_packet[11] = { 0x07,0x00,0x00,0x00, char ok_packet[11] = { 0x07,0x00,0x00,0x00,
0x00,0x00,0x00, 0x00,0x00,0x00,
0x00,0x00, 0x00,0x00,
0x00,0x00 }; 0x00,0x00 };
#endif
coldef_len = sizeof(catalog) + strlen(schema) + 1 + coldef_len = sizeof(catalog) + strlen(schema) + 1 +
strlen(table) + 1 + strlen(table) + 1 +
@ -2132,15 +2130,12 @@ static int routeQuery(
} }
else else
{ {
/** /**
* The query targets something else than a shard. * The query targets something else than a shard.
*/ */
route_target = get_shard_route_target(qtype, route_target = get_shard_route_target(qtype,
router_cli_ses->rses_transaction_active, router_cli_ses->rses_transaction_active,
router_cli_ses->rses_config.rw_use_sql_variables_in,
querybuf->hint); querybuf->hint);
} }
@ -4439,6 +4434,7 @@ static backend_ref_t* get_root_master_bref(
#endif #endif
#if defined(NOT_USED) /*< THis isn't needed at the moment but left as an example */
static void dbshard_process_router_options( static void dbshard_process_router_options(
ROUTER_INSTANCE* router, ROUTER_INSTANCE* router,
char** options) char** options)
@ -4491,6 +4487,7 @@ static void dbshard_process_router_options(
} }
} /*< for */ } /*< for */
} }
#endif /*< NOT_USED */
/** /**
* Read new database nbame from MYSQL_COM_INIT_DB packet, check that it exists * Read new database nbame from MYSQL_COM_INIT_DB packet, check that it exists