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

TAP: Move init_mysql_conn() and run_q() to utils

Browse Source 
Signed-off-by: Wazir Ahmed <wazir@proxysql.com>
pull/5085/head
Wazir Ahmed 7 months ago
parent aa80a1f9c8
commit 8ebd7e48ae
12 changed files with 43 additions and 62 deletions
Show Stats Download Patch File Download Diff File

35
test/tap/tap/utils.cpp
Unescape View File

@ -2316,3 +2316,38 @@ bool get_env_bool(const char* envname, bool envdefault) {
return (bool) res;
};
MYSQL* init_mysql_conn(char* host, int port, char* user, char* pass, bool ssl, bool cmp) {
diag("Creating MySQL conn host=\"%s\" port=\"%d\" user=\"%s\" ssl=\"%d\" cmp=\"%d\"", host, port, user, ssl, cmp);
MYSQL* mysql = mysql_init(NULL);
if (!mysql) {
return nullptr;
}
if (cmp) {
if (mysql_options(mysql, MYSQL_OPT_COMPRESS, nullptr)) {
return nullptr;
}
}
int cflags = 0;
if (ssl) {
if (mysql_ssl_set(mysql, NULL, NULL, NULL, NULL, NULL)) {
return nullptr;
}
cflags |= CLIENT_SSL;
}
if (!mysql_real_connect(mysql, host, user, pass, NULL, port, NULL, cflags)) {
return nullptr;
}
return mysql;
}
int run_q(MYSQL *mysql, const char *q) {
MYSQL_QUERY_T(mysql,q);
return 0;
}

3
test/tap/tap/utils.h
Unescape View File

@ -1002,4 +1002,7 @@ const char* get_env_str(const char* envname, const char* envdefault);
int get_env_int(const char* envname, int envdefault);
bool get_env_bool(const char* envname, bool envdefault);
MYSQL* init_mysql_conn(char* host, int port, char* user, char* pass, bool ssl=false, bool cmp=false);
int run_q(MYSQL *mysql, const char *q);
#endif // #define UTILS_H

4
test/tap/tests/admin_various_commands2-t.cpp
Unescape View File

@ -103,10 +103,6 @@ void add_commands_set1(std::vector<std::string>& queries, std::string m, bool wi
}
}
int run_q(MYSQL *mysql, const char *q) {
MYSQL_QUERY(mysql,q);
return 0;
}
int main() {
CommandLine cl;

4
test/tap/tests/admin_various_commands3-t.cpp
Unescape View File

@ -37,10 +37,6 @@ std::vector<unsigned int> vals = { 100, 345, 800 };
std::vector<std::string> queries = {};
int run_q(MYSQL *mysql, const char *q) {
MYSQL_QUERY(mysql,q);
return 0;
}
int main() {
CommandLine cl;

4
test/tap/tests/firewall_commands1-t.cpp
Unescape View File

@ -51,10 +51,6 @@ std::vector<std::string> queries = {
"LOAD MYSQL FIREWALL TO RUNTIME",
};
int run_q(MYSQL *mysql, const char *q) {
MYSQL_QUERY(mysql,q);
return 0;
}
int main() {
CommandLine cl;

4
test/tap/tests/kill_connection-t.cpp
Unescape View File

@ -22,10 +22,6 @@ This test verifies a variety of things:
const int NUM_CONNS = 5;
int run_q(MYSQL *mysql, const char *q) {
MYSQL_QUERY(mysql,q);
return 0;
}
int main(int argc, char** argv) {
CommandLine cl;

4
test/tap/tests/kill_connection2-t.cpp
Unescape View File

@ -18,10 +18,6 @@ This test verifies that client connections are dropped because of:
const int NUM_CONNS = 5;
int run_q(MYSQL *mysql, const char *q) {
MYSQL_QUERY(mysql,q);
return 0;
}
MYSQL * conns[NUM_CONNS];
unsigned long mythreadid[NUM_CONNS];

4
test/tap/tests/kill_connection3-t.cpp
Unescape View File

@ -18,10 +18,6 @@ This test verifies that client connections are dropped because of:
const int NUM_CONNS = 35;
int run_q(MYSQL *mysql, const char *q) {
MYSQL_QUERY(mysql,q);
return 0;
}
MYSQL * conns[NUM_CONNS];
unsigned long mythreadid[NUM_CONNS];

4
test/tap/tests/mysql-fast_forward-t.cpp
Unescape View File

@ -18,10 +18,6 @@ This test verifies that client connections are dropped because of:
const int NUM_CONNS = 35;
const int RPI = 50;
int run_q(MYSQL *mysql, const char *q) {
MYSQL_QUERY(mysql,q);
return 0;
}
MYSQL * conns[NUM_CONNS];
unsigned long mythreadid[NUM_CONNS];

5
test/tap/tests/mysql-mirror1-t.cpp
Unescape View File

@ -24,11 +24,6 @@ This test also triggers:
const int NUM_CONNS = 15;
const int RPI = 20; // rows per insert
int run_q(MYSQL *mysql, const char *q) {
MYSQL_QUERY(mysql,q);
return 0;
}
MYSQL * conns[NUM_CONNS];
unsigned long mythreadid[NUM_CONNS];

29
test/tap/tests/mysql-protocol_compression_level-t.cpp
Unescape View File

@ -88,25 +88,6 @@ uint64_t measure_avg_query_time(
return avg;
}
MYSQL* init_mysql_conn(char* host, char* user, char* pass, int port, bool cmp=false) {
diag("Creating MySQL conn host=\"%s\" port=\"%d\" cmp=\"%d\"", user, port, cmp);
MYSQL* mysql = mysql_init(NULL);
if (!mysql) {
return nullptr;
}
if (cmp) {
if (mysql_options(mysql, MYSQL_OPT_COMPRESS, nullptr)) {
return nullptr;
}
}
if (!mysql_real_connect(mysql, host, user, pass, NULL, port, NULL, 0)) {
return nullptr;
}
return mysql;
}
const char version_comment_query[] { "select @@version_comment limit 1" };
@ -140,13 +121,13 @@ int main(int argc, char** argv) {
return EXIT_FAILURE;
}
MYSQL* admin = init_mysql_conn(cl.host, cl.admin_username, cl.admin_password, cl.admin_port);
MYSQL* admin = init_mysql_conn(cl.host, cl.admin_port, cl.admin_username, cl.admin_password);
if (!admin) {
fprintf(stderr, "File %s, line %d, Error: %s\n", __FILE__, __LINE__, mysql_error(admin));
return EXIT_FAILURE;
}
MYSQL* proxy = init_mysql_conn(cl.host, cl.username, cl.password, cl.port);
MYSQL* proxy = init_mysql_conn(cl.host, cl.port, cl.username, cl.password);
if (!proxy) {
fprintf(stderr, "File %s, line %d, Error: %s\n", __FILE__, __LINE__, mysql_error(admin));
return EXIT_FAILURE;
@ -185,17 +166,17 @@ int main(int argc, char** argv) {
" (SELECT 1 UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4) as u4;"
);
MYSQL* proxy_cmp = init_mysql_conn(cl.host, cl.username, cl.password, cl.port, true);
MYSQL* proxy_cmp = init_mysql_conn(cl.host, cl.port, cl.username, cl.password, false, true);
if (!proxy_cmp) {
fprintf(stderr, "File %s, line %d, Error: %s\n", __FILE__, __LINE__, mysql_error(proxy_cmp));
return EXIT_FAILURE;
}
MYSQL* mysql = init_mysql_conn(cl.host, cl.username, cl.password, cl.mysql_port, false);
MYSQL* mysql = init_mysql_conn(cl.host, cl.mysql_port, cl.username, cl.password, false, false);
if (!mysql) {
fprintf(stderr, "File %s, line %d, Error: %s\n", __FILE__, __LINE__, mysql_error(mysql));
return EXIT_FAILURE;
}
MYSQL* mysql_cmp = init_mysql_conn(cl.host, cl.username, cl.password, cl.mysql_port, true);
MYSQL* mysql_cmp = init_mysql_conn(cl.host, cl.mysql_port, cl.username, cl.password, false, true);
if (!mysql_cmp) {
fprintf(stderr, "File %s, line %d, Error: %s\n", __FILE__, __LINE__, mysql_error(mysql_cmp));
return EXIT_FAILURE;

5
test/tap/tests/test_cluster1-t.cpp
Unescape View File

@ -26,11 +26,6 @@
* 127.0.0.1:26009 : satellite node6
*/
int run_q(MYSQL *mysql, const char *q) {
MYSQL_QUERY(mysql,q);
return 0;
}
void get_time(std::string& s) {
time_t __timer;
char __buffer[30];

Write Preview
Loading…
Cancel
Save