aherman
/
proxysql
mirror of https://github.com/sysown/proxysql
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adding tests to benchmark multiple lookups in mysql_query_rules_fast_routing

Browse Source
pull/2635/head
René Cannaò 6 years ago
parent d15f055b1b
commit 9c2f0bf3ac
4 changed files with 89 additions and 15 deletions
Show Stats Download Patch File Download Diff File

4
include/proxysql_admin.h
Unescape View File

@ -339,7 +339,7 @@ class ProxySQL_Admin {
void enable_grouprep_testing();
#endif // TEST_GROUPREP
unsigned int ProxySQL_Test___GenerateRandom_mysql_query_rules_fast_routing(unsigned int);
bool ProxySQL_Test___Verify_mysql_query_rules_fast_routing(int *ret1, int *ret2, int cnt);
unsigned int ProxySQL_Test___GenerateRandom_mysql_query_rules_fast_routing(unsigned int, bool);
bool ProxySQL_Test___Verify_mysql_query_rules_fast_routing(int *ret1, int *ret2, int cnt, int dual);
};
#endif /* __CLASS_PROXYSQL_ADMIN_H */

1
include/query_processor.h
Unescape View File

@ -326,6 +326,7 @@ class Query_Processor {
void load_fast_routing(SQLite3_result *resultset);
SQLite3_result * get_current_query_rules_fast_routing();
int testing___find_HG_in_mysql_query_rules_fast_routing(char *username, char *schemaname, int flagIN);
int testing___find_HG_in_mysql_query_rules_fast_routing_dual(char *username, char *schemaname, int flagIN);
// firewall
void load_mysql_firewall(SQLite3_result *u, SQLite3_result *r, SQLite3_result *sf);

53
lib/ProxySQL_Admin.cpp
Unescape View File

@ -3321,7 +3321,11 @@ void admin_session_handler(MySQL_Session *sess, void *_pa, PtrSize_t *pkt) {
if (test_arg1==0) {
test_arg1=10000;
}
r1 = SPA->ProxySQL_Test___GenerateRandom_mysql_query_rules_fast_routing(test_arg1);
if (test_arg2) {
r1 = SPA->ProxySQL_Test___GenerateRandom_mysql_query_rules_fast_routing(test_arg1, true);
} else {
r1 = SPA->ProxySQL_Test___GenerateRandom_mysql_query_rules_fast_routing(test_arg1, false);
}
SPA->send_MySQL_OK(&sess->client_myds->myprot, (char *)"Generated new mysql_query_rules_fast_routing table", r1);
run_query=false;
break;
@ -3330,7 +3334,11 @@ void admin_session_handler(MySQL_Session *sess, void *_pa, PtrSize_t *pkt) {
if (test_arg1==0) {
test_arg1=10000;
}
r1 = SPA->ProxySQL_Test___GenerateRandom_mysql_query_rules_fast_routing(test_arg1);
if (test_arg2) {
r1 = SPA->ProxySQL_Test___GenerateRandom_mysql_query_rules_fast_routing(test_arg1, true);
} else {
r1 = SPA->ProxySQL_Test___GenerateRandom_mysql_query_rules_fast_routing(test_arg1, false);
}
msg = SPA->load_mysql_query_rules_to_runtime();
if (msg==NULL) {
SPA->send_MySQL_OK(&sess->client_myds->myprot, (char *)"Generated new mysql_query_rules_fast_routing table and loaded to runtime", r1);
@ -3340,7 +3348,7 @@ void admin_session_handler(MySQL_Session *sess, void *_pa, PtrSize_t *pkt) {
run_query=false;
break;
case 13:
// generate random mysql_query_rules_fast_routing and LOAD TO RUNTIME
// LOAD MYSQL QUERY RULES TO RUNTIME for N times
if (test_arg1==0) {
test_arg1=1;
}
@ -3360,7 +3368,7 @@ void admin_session_handler(MySQL_Session *sess, void *_pa, PtrSize_t *pkt) {
}
{
int ret1, ret2;
bool bret = SPA->ProxySQL_Test___Verify_mysql_query_rules_fast_routing(&ret1, &ret2, test_arg1);
bool bret = SPA->ProxySQL_Test___Verify_mysql_query_rules_fast_routing(&ret1, &ret2, test_arg1, test_arg2);
if (bret) {
SPA->send_MySQL_OK(&sess->client_myds->myprot, (char *)"Verified all rules in mysql_query_rules_fast_routing", ret1);
} else {
@ -5882,7 +5890,8 @@ bool ProxySQL_Admin::ProxySQL_Test___Load_MySQL_Whitelist(int *ret1, int *ret2,
return ret;
}
bool ProxySQL_Admin::ProxySQL_Test___Verify_mysql_query_rules_fast_routing(int *ret1, int *ret2, int cnt) {
// if dual is not 0 , we call the new search algorithm
bool ProxySQL_Admin::ProxySQL_Test___Verify_mysql_query_rules_fast_routing(int *ret1, int *ret2, int cnt, int dual) {
char *q = (char *)"SELECT username, schemaname, flagIN, destination_hostgroup FROM mysql_query_rules_fast_routing ORDER BY RANDOM()";
char *error=NULL;
int cols=0;
@ -5900,7 +5909,13 @@ bool ProxySQL_Admin::ProxySQL_Test___Verify_mysql_query_rules_fast_routing(int *
for (std::vector<SQLite3_row *>::iterator it = resultset->rows.begin() ; it != resultset->rows.end(); ++it) {
SQLite3_row *r=*it;
int dest_HG = atoi(r->fields[3]);
int ret_HG = GloQPro->testing___find_HG_in_mysql_query_rules_fast_routing(r->fields[0], r->fields[1], atoi(r->fields[2]));
int ret_HG;
if (dual==0) {
// legacy algorithm
ret_HG = GloQPro->testing___find_HG_in_mysql_query_rules_fast_routing(r->fields[0], r->fields[1], atoi(r->fields[2]));
} else {
ret_HG = GloQPro->testing___find_HG_in_mysql_query_rules_fast_routing_dual(r->fields[0], r->fields[1], atoi(r->fields[2]));
}
if (dest_HG == ret_HG) {
matching_rows++;
}
@ -5916,7 +5931,13 @@ bool ProxySQL_Admin::ProxySQL_Test___Verify_mysql_query_rules_fast_routing(int *
for (std::vector<SQLite3_row *>::iterator it = resultset->rows.begin() ; it != resultset->rows.end(); ++it) {
SQLite3_row *r=*it;
int dest_HG = atoi(r->fields[3]);
int ret_HG = GloQPro->testing___find_HG_in_mysql_query_rules_fast_routing(r->fields[0], r->fields[1], atoi(r->fields[2]));
int ret_HG;
if (dual==0) {
// legacy algorithm
ret_HG = GloQPro->testing___find_HG_in_mysql_query_rules_fast_routing(r->fields[0], r->fields[1], atoi(r->fields[2]));
} else {
ret_HG = GloQPro->testing___find_HG_in_mysql_query_rules_fast_routing_dual(r->fields[0], r->fields[1], atoi(r->fields[2]));
}
assert(dest_HG==ret_HG);
}
}
@ -5926,7 +5947,7 @@ bool ProxySQL_Admin::ProxySQL_Test___Verify_mysql_query_rules_fast_routing(int *
return ret;
}
unsigned int ProxySQL_Admin::ProxySQL_Test___GenerateRandom_mysql_query_rules_fast_routing(unsigned int cnt) {
unsigned int ProxySQL_Admin::ProxySQL_Test___GenerateRandom_mysql_query_rules_fast_routing(unsigned int cnt, bool empty) {
char *a = (char *)"INSERT OR IGNORE INTO mysql_query_rules_fast_routing VALUES (?1, ?2, ?3, ?4, '')";
int rc;
sqlite3_stmt *statement1=NULL;
@ -5937,16 +5958,22 @@ unsigned int ProxySQL_Admin::ProxySQL_Test___GenerateRandom_mysql_query_rules_fa
char * schemaname_buf = (char *)malloc(64);
//ui.username = username_buf;
//ui.schemaname = schemaname_buf;
strcpy(username_buf,"user_name_");
if (empty==false) {
strcpy(username_buf,"user_name_");
} else {
strcpy(username_buf,"");
}
strcpy(schemaname_buf,"shard_name_");
int _k;
for (unsigned int i=0; i<cnt; i++) {
_k = fastrand()%20 + 1;
for (int _i=0 ; _i<_k ; _i++) {
int b = fastrand()%10;
username_buf[10+_i]='0' + b;
if (empty == false) {
for (int _i=0 ; _i<_k ; _i++) {
int b = fastrand()%10;
username_buf[10+_i]='0' + b;
}
username_buf[10+_k]='\0';
}
username_buf[10+_k]='\0';
_k = fastrand()%30 + 1;
for (int _i=0 ; _i<_k ; _i++) {
int b = fastrand()%10;

46
lib/Query_Processor.cpp
Unescape View File

@ -2684,6 +2684,9 @@ void Query_Processor::load_fast_routing(SQLite3_result *resultset) {
rules_mem_used += fast_routing_resultset->get_size();
};
// this testing function doesn't care if the user exists or not
// the arguments are coming from this query:
// SELECT username, schemaname, flagIN, destination_hostgroup FROM mysql_query_rules_fast_routing ORDER BY RANDOM()
int Query_Processor::testing___find_HG_in_mysql_query_rules_fast_routing(char *username, char *schemaname, int flagIN) {
int ret = -1;
pthread_rwlock_rdlock(&rwlock);
@ -2708,6 +2711,49 @@ int Query_Processor::testing___find_HG_in_mysql_query_rules_fast_routing(char *u
return ret;
}
// this testing function implement the dual search: with and without username
// if the length of username is 0 , it will search for random username (that shouldn't exist!)
int Query_Processor::testing___find_HG_in_mysql_query_rules_fast_routing_dual(char *username, char *schemaname, int flagIN) {
int ret = -1;
const char * random_user = (char *)"my_ReaLLy_Rand_User_123456";
char * u = NULL;
if (strlen(username)) {
u = username;
} else {
u = (char *)random_user;
}
pthread_rwlock_rdlock(&rwlock);
if (rules_fast_routing) {
char keybuf[256];
char * keybuf_ptr = keybuf;
size_t keylen = strlen(u)+strlen(rand_del)+strlen(schemaname)+30; // 30 is a big number
if (keylen > 250) {
keybuf_ptr = (char *)malloc(keylen);
}
sprintf(keybuf_ptr,"%s%s%s---%d", username, rand_del, schemaname, flagIN);
khiter_t k = kh_get(khStrInt, rules_fast_routing, keybuf_ptr);
if (k == kh_end(rules_fast_routing)) {
} else {
ret = kh_val(rules_fast_routing,k);
}
if (ret == -1) { // we didn't find it
if (strlen(username)==0) { // we need to search for empty username
sprintf(keybuf_ptr,"%s%s---%d", rand_del, schemaname, flagIN); // no username here
khiter_t k = kh_get(khStrInt, rules_fast_routing, keybuf_ptr);
if (k == kh_end(rules_fast_routing)) {
} else {
ret = kh_val(rules_fast_routing,k);
}
}
}
if (keylen > 250) {
free(keybuf_ptr);
}
}
pthread_rwlock_unlock(&rwlock);
return ret;
}
void Query_Processor::get_current_mysql_firewall_whitelist(SQLite3_result **u, SQLite3_result **r, SQLite3_result **sf) {
pthread_mutex_lock(&global_mysql_firewall_whitelist_mutex);
if (global_mysql_firewall_whitelist_rules_runtime) {

Write Preview
Loading…
Cancel
Save