Skip to content

Commit 4a17a9a

Browse files
yashwantsahu20yashwantsahu20
committed
Changes done:
1. Moved monotonic_time to util 2. Now calculate_query_execution_time will return -1 incase of error. 3. Using util function for setting and getting compression variable values. 4. Added mysql_query_rules
1 parent 34ef47c commit 4a17a9a

17 files changed

+106
-160
lines changed

‎microbench/PR1977_bench.cpp

-7
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,6 @@ inline int fastrand() {
99
return (g_seed>>16)&0x7FFF;
1010
}
1111

12-
inline unsigned long long monotonic_time() {
13-
struct timespec ts;
14-
clock_gettime(CLOCK_MONOTONIC, &ts);
15-
return (((unsigned long long) ts.tv_sec) * 1000000) + (ts.tv_nsec / 1000);
16-
}
17-
18-
1912
#define NSRV 24
2013
#define NLOOP 10000000
2114

‎test/tap/tap/utils.cpp

+6
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,12 @@ int create_table_test_sbtest1(int num_rows, MYSQL *mysql) {
399399
return add_more_rows_test_sbtest1(num_rows, mysql);
400400
}
401401

402+
unsigned long long monotonic_time() {
403+
struct timespec ts;
404+
clock_gettime(CLOCK_MONOTONIC, &ts);
405+
return (((unsigned long long) ts.tv_sec) * 1000000) + (ts.tv_nsec / 1000);
406+
}
407+
402408
int create_table_test_sqlite_sbtest1(int num_rows, MYSQL *mysql) {
403409
MYSQL_QUERY(mysql, "DROP TABLE IF EXISTS sbtest1");
404410
MYSQL_QUERY(mysql, "CREATE TABLE IF NOT EXISTS sbtest1 (id INTEGER PRIMARY KEY AUTOINCREMENT, `k` int(10) NOT NULL DEFAULT '0', `c` char(120) NOT NULL DEFAULT '', `pad` char(60) NOT NULL DEFAULT '')");

‎test/tap/tap/utils.h

+2
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,8 @@ int create_table_test_sbtest1(int num_rows, MYSQL *mysql);
144144
int create_table_test_sqlite_sbtest1(int num_rows, MYSQL *mysql); // as above, but for SQLite3 server
145145
int add_more_rows_test_sbtest1(int num_rows, MYSQL *mysql, bool sqlite=false);
146146

147+
unsigned long long monotonic_time();
148+
147149
using mysql_res_row = std::vector<std::string>;
148150

149151
/**

‎test/tap/tests/multiple_prepared_statements-t.cpp

-6
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,6 @@ inline int fastrand() {
3636
return (g_seed>>16)&0x7FFF;
3737
}
3838

39-
inline unsigned long long monotonic_time() {
40-
struct timespec ts;
41-
clock_gettime(CLOCK_MONOTONIC, &ts);
42-
return (((unsigned long long) ts.tv_sec) * 1000000) + (ts.tv_nsec / 1000);
43-
}
44-
4539
#define NTHREADS 5
4640
#define NCONNS 6
4741
#define NPREP 15000

‎test/tap/tests/mysql-init_connect-1-t.cpp

-6
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,6 @@ It uses 2 valid init_connect, and 2 invalid ones that trigger PMC-10003.
1717
It also sets a value that causes a syntax error
1818
*/
1919

20-
inline unsigned long long monotonic_time() {
21-
struct timespec ts;
22-
clock_gettime(CLOCK_MONOTONIC, &ts);
23-
return (((unsigned long long) ts.tv_sec) * 1000000) + (ts.tv_nsec / 1000);
24-
}
25-
2620
int main(int argc, char** argv) {
2721
CommandLine cl;
2822

‎test/tap/tests/mysql-init_connect-2-t.cpp

-6
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,6 @@ mysql-init_connect
2121
We configure both hostgroup 0 and 1
2222
*/
2323

24-
inline unsigned long long monotonic_time() {
25-
struct timespec ts;
26-
clock_gettime(CLOCK_MONOTONIC, &ts);
27-
return (((unsigned long long) ts.tv_sec) * 1000000) + (ts.tv_nsec / 1000);
28-
}
29-
3024
int main(int argc, char** argv) {
3125
CommandLine cl;
3226

‎test/tap/tests/mysql-last_insert_id-t.cpp

-6
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,6 @@
1111
#include "command_line.h"
1212
#include "utils.h"
1313

14-
inline unsigned long long monotonic_time() {
15-
struct timespec ts;
16-
clock_gettime(CLOCK_MONOTONIC, &ts);
17-
return (((unsigned long long) ts.tv_sec) * 1000000) + (ts.tv_nsec / 1000);
18-
}
19-
2014

2115
std::string queries[5] = {
2216
"SELECT LAST_INSERT_ID() LIMIT 1",

‎test/tap/tests/mysql-protocol_compression_level-t.cpp

+98-70
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,19 @@
1212
#include "command_line.h"
1313
#include "utils.h"
1414

15-
inline unsigned long long monotonic_time() {
16-
struct timespec ts;
17-
clock_gettime(CLOCK_MONOTONIC, &ts);
18-
return (((unsigned long long) ts.tv_sec) * 1000000) + (ts.tv_nsec / 1000);
19-
}
20-
2115
unsigned long calculate_query_execution_time(MYSQL* mysql, const std::string& query) {
2216
MYSQL_RES *res;
2317
MYSQL_ROW row;
2418
unsigned long long begin = monotonic_time();
2519
unsigned long long row_count = 0;
26-
MYSQL_QUERY(mysql, query.c_str());
20+
unsigned long ret_query = 0;
21+
22+
ret_query = mysql_query(mysql, query.c_str());
23+
if (ret_query != 0) {
24+
fprintf(stderr, "Failed to execute query: Error: %s\n", mysql_error(mysql));
25+
return -1;
26+
}
27+
2728
res = mysql_use_result(mysql);
2829
unsigned long long num_rows = mysql_num_rows(res);
2930
unsigned int num_fields = mysql_num_fields(res);
@@ -39,40 +40,6 @@ unsigned long calculate_query_execution_time(MYSQL* mysql, const std::string& qu
3940
return (end - begin);
4041
}
4142

42-
void set_compression_level(MYSQL* proxysql_admin, std::string level) {
43-
std::string query = "UPDATE global_variables SET variable_value = '" + level + "' WHERE variable_name = 'mysql-protocol_compression_level';";
44-
mysql_query(proxysql_admin, query.c_str());
45-
query = "LOAD MYSQL VARIABLES TO RUNTIME;";
46-
mysql_query(proxysql_admin, query.c_str());
47-
}
48-
49-
int32_t get_compression_level(MYSQL* proxysql_admin) {
50-
int32_t compression_level = -1;
51-
const uint32_t SERVERS_COUNT = 10;
52-
53-
int err = mysql_query(proxysql_admin, "SELECT * FROM global_variables WHERE variable_name='mysql-protocol_compression_level'");
54-
if (err != EXIT_SUCCESS) {
55-
diag(
56-
"Query for retrieving value of 'mysql-protocol_compression_level' failed with error: (%d, %s)",
57-
mysql_errno(proxysql_admin), mysql_error(proxysql_admin)
58-
);
59-
return compression_level;
60-
}
61-
62-
MYSQL_RES* res = mysql_store_result(proxysql_admin);
63-
if (res != nullptr) {
64-
int num_rows = mysql_num_rows(res);
65-
MYSQL_ROW row = mysql_fetch_row(res);
66-
67-
if (num_rows && row != nullptr) {
68-
char* endptr = nullptr;
69-
compression_level = strtol(row[1], &endptr, SERVERS_COUNT);
70-
}
71-
}
72-
mysql_free_result(res);
73-
return compression_level;
74-
}
75-
7643
MYSQL* initilize_mysql_connection(char* host, char* username, char* password, int port, bool compression) {
7744
MYSQL* mysql = mysql_init(NULL);
7845
if (!mysql)
@@ -82,14 +49,12 @@ MYSQL* initilize_mysql_connection(char* host, char* username, char* password, in
8249
if (!mysql_real_connect(mysql, host, username, password, NULL, port, NULL, 0)) {
8350
fprintf(stderr, "Failed to connect to database: Error: %s\n",
8451
mysql_error(mysql));
85-
mysql_close(mysql);
8652
return nullptr;
8753
}
8854
if (compression) {
8955
if (mysql_options(mysql, MYSQL_OPT_COMPRESS, nullptr) != 0) {
9056
fprintf(stderr, "Failed to set mysql compression option: Error: %s\n",
9157
mysql_error(mysql));
92-
mysql_close(mysql);
9358
return nullptr;
9459
}
9560
}
@@ -99,36 +64,52 @@ MYSQL* initilize_mysql_connection(char* host, char* username, char* password, in
9964
int main(int argc, char** argv) {
10065

10166
CommandLine cl;
67+
std::string query = "SELECT t1.id id1, t1.k k1, t1.c c1, t1.pad pad1, t2.id id2, t2.k k2, t2.c c2, t2.pad pad2 FROM test.sbtest1 t1 JOIN test.sbtest1 t2 LIMIT 90000000";
68+
unsigned long time_proxy = 0;
69+
unsigned long time_proxy_compressed = 0;
70+
unsigned long diff = 0;
71+
unsigned long time_mysql_compressed = 0;
72+
std::string compression_level = {""};
73+
int32_t ret = 0;
74+
MYSQL* proxysql = nullptr;
75+
MYSQL* proxysql_compression = nullptr;
76+
MYSQL* proxysql_admin = nullptr;
77+
MYSQL* mysql_compression = nullptr;
78+
int performance_diff = 0;
10279

10380
if(cl.getEnv())
10481
return exit_status();
10582

10683
plan(5);
10784

10885
// ProxySQL connection without compression
109-
MYSQL* proxysql = initilize_mysql_connection(cl.host, cl.username, cl.password, cl.port, false);
86+
proxysql = initilize_mysql_connection(cl.host, cl.username, cl.password, cl.port, false);
11087
if (!proxysql) {
111-
return exit_status();
88+
goto cleanup;
11289
}
11390

11491
// ProxySQL connection with compression
115-
MYSQL* proxysql_compression = initilize_mysql_connection(cl.host, cl.username, cl.password, cl.port, true);
92+
proxysql_compression = initilize_mysql_connection(cl.host, cl.username, cl.password, cl.port, true);
11693
if (!proxysql_compression) {
117-
return exit_status();
94+
goto cleanup;
11895
}
11996

12097
// MySQL connection with compression
121-
MYSQL* mysql_compression = initilize_mysql_connection(cl.host, cl.username, cl.password, cl.mysql_port, true);
98+
mysql_compression = initilize_mysql_connection(cl.host, cl.username, cl.password, cl.mysql_port, true);
12299
if (!mysql_compression) {
123-
return exit_status();
100+
goto cleanup;
124101
}
125102

126103
// ProxySQL admin connection
127-
MYSQL* proxysql_admin = initilize_mysql_connection(cl.host, cl.admin_username, cl.admin_password, cl.admin_port, false);
104+
proxysql_admin = initilize_mysql_connection(cl.host, cl.admin_username, cl.admin_password, cl.admin_port, false);
128105
if (!proxysql_admin) {
129-
return exit_status();
106+
goto cleanup;
130107
}
131108

109+
// Change default query rules to avoid replication issues; This test only requires the default hostgroup
110+
MYSQL_QUERY(proxysql_admin, "UPDATE mysql_query_rules SET active=0");
111+
MYSQL_QUERY(proxysql_admin, "LOAD MYSQL QUERY RULES TO RUNTIME");
112+
132113
MYSQL_QUERY(proxysql, "CREATE DATABASE IF NOT EXISTS test");
133114
MYSQL_QUERY(proxysql, "DROP TABLE IF EXISTS test.sbtest1");
134115

@@ -140,45 +121,92 @@ int main(int argc, char** argv) {
140121
MYSQL_QUERY(proxysql, "INSERT INTO sbtest1 (k, c, pad) SELECT FLOOR(RAND() * 10000), REPEAT('a', 120), REPEAT('b', 60) FROM information_schema.tables LIMIT 1000;");
141122
}
142123

143-
std::string query = "SELECT t1.id id1, t1.k k1, t1.c c1, t1.pad pad1, t2.id id2, t2.k k2, t2.c c2, t2.pad pad2 FROM test.sbtest1 t1 JOIN test.sbtest1 t2 LIMIT 90000000";
144-
145-
unsigned long time_proxy = calculate_query_execution_time(proxysql, query);
124+
time_proxy = calculate_query_execution_time(proxysql, query);
146125
diag("Time taken for query with proxysql without compression: %ld", time_proxy);
126+
if (time_proxy == -1) {
127+
goto cleanup;
128+
}
147129

148-
unsigned long time_proxy_compressed = calculate_query_execution_time(proxysql_compression, query);
130+
time_proxy_compressed = calculate_query_execution_time(proxysql_compression, query);
149131
diag("Time taken for query with proxysql with compression: %ld", time_proxy_compressed);
132+
if (time_proxy_compressed == -1) {
133+
goto cleanup;
134+
}
150135

151-
unsigned long diff = abs(time_proxy - time_proxy_compressed);
152-
int performance_diff = (diff * 100) / time_proxy;
136+
diff = abs(time_proxy - time_proxy_compressed);
137+
performance_diff = (diff * 100) / time_proxy;
153138

154139
ok((performance_diff < 10), "proxysql with compression performed well compared to without compression. Performance difference: %d percentage", performance_diff);
155140

156-
unsigned long time_mysql_compressed = calculate_query_execution_time(mysql_compression, query);
141+
time_mysql_compressed = calculate_query_execution_time(mysql_compression, query);
157142
diag("Time taken for query with mysql with compression: %ld", time_mysql_compressed);
143+
if (time_mysql_compressed == -1) {
144+
goto cleanup;
145+
}
158146

159147
diff = abs(time_mysql_compressed - time_proxy_compressed);
160148
performance_diff = (diff * 100) / time_mysql_compressed;
161149

162150
ok((performance_diff < 20), "proxysql with compression performed well compared to mysql with compression. Performance difference: %d percentage", performance_diff);
163151

164-
int32_t compression_level = get_compression_level(proxysql_admin);
165-
ok(compression_level == 3, "Default compression level is correct: %d", compression_level);
152+
ret = get_variable_value(proxysql_admin, "mysql-protocol_compression_level", compression_level, true);
153+
if (ret == EXIT_SUCCESS) {
154+
ok(compression_level == "3", "Default compression level is correct: %s", compression_level.c_str());
155+
}
156+
else {
157+
diag("Failed to get the default compression level.");
158+
goto cleanup;
159+
}
166160

167-
set_compression_level(proxysql_admin, "8");
168-
compression_level = get_compression_level(proxysql_admin);
169-
ok(compression_level == 8, "Compression level set correctly: %d", compression_level);
161+
set_admin_global_variable(proxysql_admin, "mysql-protocol_compression_level", "8");
162+
if (mysql_query(proxysql_admin, "load mysql variables to runtime")) {
163+
diag("Failed to load mysql variables to runtime.");
164+
goto cleanup;
165+
}
166+
ret = get_variable_value(proxysql_admin, "mysql-protocol_compression_level", compression_level, true);
167+
if (ret == EXIT_SUCCESS) {
168+
ok(compression_level == "8", "Compression level is set correctly: %s", compression_level.c_str());
169+
}
170+
else {
171+
diag("Failed to set the Compression level is set correctly:");
172+
goto cleanup;
173+
}
170174

171175
time_proxy_compressed = calculate_query_execution_time(proxysql_compression, query);
172176
diag("Time taken for query with proxysql with compression level 8: %ld", time_proxy_compressed);
177+
if (time_proxy_compressed == -1) {
178+
goto cleanup;
179+
}
173180

174-
set_compression_level(proxysql_admin, "3");
175-
compression_level = get_compression_level(proxysql_admin);
176-
ok(compression_level == 3, "Compression level set correctly: %d", compression_level);
181+
set_admin_global_variable(proxysql_admin, "mysql-protocol_compression_level", "3");
182+
if (mysql_query(proxysql_admin, "load mysql variables to runtime")) {
183+
diag("Failed to load mysql variables to runtime.");
184+
goto cleanup;
185+
}
186+
ret = get_variable_value(proxysql_admin, "mysql-protocol_compression_level", compression_level, true);
187+
if (ret == EXIT_SUCCESS) {
188+
ok(compression_level == "3", "Compression level set correctly: %s", compression_level.c_str());
189+
}
190+
else {
191+
diag("Failed to set the Compression level set correctly:");
192+
goto cleanup;
193+
}
194+
195+
cleanup:
196+
// Recover default query rules
197+
if (proxysql_admin) {
198+
MYSQL_QUERY(proxysql_admin, "UPDATE mysql_query_rules SET active=1");
199+
MYSQL_QUERY(proxysql_admin, "LOAD MYSQL QUERY RULES TO RUNTIME");
200+
}
177201

178-
mysql_close(proxysql);
179-
mysql_close(proxysql_compression);
180-
mysql_close(mysql_compression);
181-
mysql_close(proxysql_admin);
202+
if (proxysql)
203+
mysql_close(proxysql);
204+
if (proxysql_compression)
205+
mysql_close(proxysql_compression);
206+
if (mysql_compression)
207+
mysql_close(mysql_compression);
208+
if (proxysql_admin)
209+
mysql_close(proxysql_admin);
182210

183211
return exit_status();
184212
}

‎test/tap/tests/mysql-test_ssl_CA-t.cpp

-6
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,6 @@ This TAP test:
1919
- creates new connections
2020
*/
2121

22-
inline unsigned long long monotonic_time() {
23-
struct timespec ts;
24-
clock_gettime(CLOCK_MONOTONIC, &ts);
25-
return (((unsigned long long) ts.tv_sec) * 1000000) + (ts.tv_nsec / 1000);
26-
}
27-
2822
int main(int argc, char** argv) {
2923
CommandLine cl;
3024

‎test/tap/tests/reg_test_3434-text_stmt_mix-t.cpp

-6
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,6 @@ inline int fastrand() {
3535
return (g_seed>>16)&0x7FFF;
3636
}
3737

38-
inline unsigned long long monotonic_time() {
39-
struct timespec ts;
40-
clock_gettime(CLOCK_MONOTONIC, &ts);
41-
return (((unsigned long long) ts.tv_sec) * 1000000) + (ts.tv_nsec / 1000);
42-
}
43-
4438
void gen_random_str(char *s, const int len) {
4539
g_seed = monotonic_time() ^ getpid() ^ pthread_self();
4640
static const char alphanum[] =

‎test/tap/tests/savepoint-3749-t.cpp

-8
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,6 @@
1919
#include "utils.h"
2020
#include "command_line.h"
2121

22-
23-
unsigned long long monotonic_time() {
24-
struct timespec ts;
25-
//clock_gettime(CLOCK_MONOTONIC_COARSE, &ts); // this is faster, but not precise
26-
clock_gettime(CLOCK_MONOTONIC, &ts);
27-
return (((unsigned long long) ts.tv_sec) * 1000000) + (ts.tv_nsec / 1000);
28-
}
29-
3022
struct cpu_timer
3123
{
3224
cpu_timer() {

‎test/tap/tests/set_testing-240.h

-7
Original file line numberDiff line numberDiff line change
@@ -115,13 +115,6 @@ int readTestCasesJSON(const std::string& fileName) {
115115
return 1;
116116
}
117117

118-
unsigned long long monotonic_time() {
119-
struct timespec ts;
120-
//clock_gettime(CLOCK_MONOTONIC_COARSE, &ts); // this is faster, but not precise
121-
clock_gettime(CLOCK_MONOTONIC, &ts);
122-
return (((unsigned long long) ts.tv_sec) * 1000000) + (ts.tv_nsec / 1000);
123-
}
124-
125118
struct cpu_timer
126119
{
127120
cpu_timer() {

0 commit comments

Comments
 (0)