-
Notifications
You must be signed in to change notification settings - Fork 986
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4744 from sysown/v3.0_issue_4707_threshold_result…
…set_size Fix Overflow in *-threshold_resultset_size during Multiplication - v3.0
- Loading branch information
Showing
6 changed files
with
268 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
113 changes: 113 additions & 0 deletions
113
test/tap/tests/mysql-reg_test_4707_threshold_resultset_size-t.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| /** | ||
| * @file mysql-reg_test_4707_threshold_resultset_size-t.cpp | ||
| * @brief The test specifically examines the impact of different mysql-threshold_resultset_size threshold values on query response times | ||
| * and addresses an identified issue caused by variable overflow, which results in slow performance. | ||
| */ | ||
|
|
||
| #include <string> | ||
| #include <sstream> | ||
| #include <chrono> | ||
| #include "mysql.h" | ||
| #include "command_line.h" | ||
| #include "tap.h" | ||
| #include "utils.h" | ||
|
|
||
| CommandLine cl; | ||
|
|
||
| int main(int argc, char** argv) { | ||
|
|
||
| plan(6); // Total number of tests planned | ||
|
|
||
| if (cl.getEnv()) | ||
| return exit_status(); | ||
|
|
||
| // Initialize Admin connection | ||
| MYSQL* proxysql_admin = mysql_init(NULL); | ||
| if (!proxysql_admin) { | ||
| fprintf(stderr, "File %s, line %d, Error: %s\n", __FILE__, __LINE__, mysql_error(proxysql_admin)); | ||
| return -1; | ||
| } | ||
|
|
||
| // Connnect to ProxySQL Admin | ||
| if (!mysql_real_connect(proxysql_admin, cl.admin_host, cl.admin_username, cl.admin_password, NULL, cl.admin_port, NULL, 0)) { | ||
| fprintf(stderr, "File %s, line %d, Error: %s\n", __FILE__, __LINE__, mysql_error(proxysql_admin)); | ||
| return -1; | ||
| } | ||
|
|
||
| // Initialize Backend connection | ||
| MYSQL* proxysql_backend = mysql_init(NULL); | ||
| if (!proxysql_backend) { | ||
| fprintf(stderr, "File %s, line %d, Error: %s\n", __FILE__, __LINE__, mysql_error(proxysql_backend)); | ||
| return -1; | ||
| } | ||
|
|
||
| // Connnect to ProxySQL Backend | ||
| if (!mysql_real_connect(proxysql_backend, cl.host, cl.username, cl.password, NULL, cl.port, NULL, 0)) { | ||
| fprintf(stderr, "File %s, line %d, Error: %s\n", __FILE__, __LINE__, mysql_error(proxysql_backend)); | ||
| return -1; | ||
| } | ||
| MYSQL_QUERY(proxysql_admin, "DELETE FROM mysql_query_rules"); | ||
| MYSQL_QUERY(proxysql_admin, "LOAD MYSQL QUERY RULES TO RUNTIME"); | ||
| MYSQL_QUERY(proxysql_admin, "SET mysql-poll_timeout=2000"); | ||
| MYSQL_QUERY(proxysql_admin, "SET mysql-threshold_resultset_size=8000"); | ||
| MYSQL_QUERY(proxysql_admin, "LOAD MYSQL VARIABLES TO RUNTIME"); | ||
|
|
||
| int rc; | ||
|
|
||
| auto start = std::chrono::high_resolution_clock::now(); | ||
| rc = mysql_query(proxysql_backend, "SELECT 1"); | ||
| auto end = std::chrono::high_resolution_clock::now(); | ||
|
|
||
| if (rc == 0) { | ||
| MYSQL_RES* res = mysql_store_result(proxysql_backend); | ||
| ok(res != nullptr, "Query executed successfully. %s", mysql_error(proxysql_backend)); | ||
| mysql_free_result(res); | ||
| } | ||
| else { | ||
| ok(false, "Error executing query. %s", mysql_error(proxysql_admin)); | ||
| } | ||
|
|
||
| std::chrono::duration<double, std::milli> duration = end - start; | ||
| ok(duration.count() < 10.00, "Execution time should be less than 10 ms. Actual: %f ms", duration.count()); | ||
|
|
||
| MYSQL_QUERY(proxysql_admin, "SET mysql-threshold_resultset_size=536870912"); | ||
| MYSQL_QUERY(proxysql_admin, "LOAD MYSQL VARIABLES TO RUNTIME"); | ||
|
|
||
| start = std::chrono::high_resolution_clock::now(); | ||
| rc = mysql_query(proxysql_backend, "SELECT 1"); | ||
| end = std::chrono::high_resolution_clock::now(); | ||
|
|
||
| if (rc == 0) { | ||
| MYSQL_RES* res = mysql_store_result(proxysql_backend); | ||
| ok(res != nullptr, "Query executed successfully. %s", mysql_error(proxysql_backend)); | ||
| mysql_free_result(res); | ||
| } | ||
| else { | ||
| ok(false, "Error executing query. %s", mysql_error(proxysql_admin)); | ||
| } | ||
| duration = end - start; | ||
| ok(duration.count() < 10.00, "Execution time should be less than 10 ms. Actual: %f ms", duration.count()); | ||
|
|
||
| MYSQL_QUERY(proxysql_admin, "SET mysql-threshold_resultset_size=1073741824"); | ||
| MYSQL_QUERY(proxysql_admin, "LOAD MYSQL VARIABLES TO RUNTIME"); | ||
|
|
||
| start = std::chrono::high_resolution_clock::now(); | ||
| rc = mysql_query(proxysql_backend, "SELECT 1"); | ||
| end = std::chrono::high_resolution_clock::now(); | ||
|
|
||
| if (rc == 0) { | ||
| MYSQL_RES* res = mysql_store_result(proxysql_backend); | ||
| ok(res != nullptr, "Query executed successfully. %s", mysql_error(proxysql_backend)); | ||
| mysql_free_result(res); | ||
| } | ||
| else { | ||
| ok(false, "Error executing query. %s", mysql_error(proxysql_admin)); | ||
| } | ||
| duration = end - start; | ||
| ok(duration.count() < 10.00, "Execution time should be less than 10 ms. Actual: %f ms", duration.count()); | ||
|
|
||
| mysql_close(proxysql_backend); | ||
| mysql_close(proxysql_admin); | ||
|
|
||
| return exit_status(); | ||
| } |
134 changes: 134 additions & 0 deletions
134
test/tap/tests/pgsql-reg_test_4707_threshold_resultset_size-t.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,134 @@ | ||
| /** | ||
| * @file pgsql-reg_test_4707_threshold_resultset_size-t.cpp | ||
| * @brief The test specifically examines the impact of different pgsql-threshold_resultset_size threshold values on query response times | ||
| * and addresses an identified issue caused by variable overflow, which results in slow performance. | ||
| */ | ||
|
|
||
| #include <string> | ||
| #include <sstream> | ||
| #include <chrono> | ||
| #include "libpq-fe.h" | ||
| #include "command_line.h" | ||
| #include "tap.h" | ||
| #include "utils.h" | ||
|
|
||
| CommandLine cl; | ||
|
|
||
| using PGConnPtr = std::unique_ptr<PGconn, decltype(&PQfinish)>; | ||
|
|
||
| enum ConnType { | ||
| ADMIN, | ||
| BACKEND | ||
| }; | ||
|
|
||
| PGConnPtr createNewConnection(ConnType conn_type, bool with_ssl) { | ||
|
|
||
| const char* host = (conn_type == BACKEND) ? cl.pgsql_host : cl.pgsql_admin_host; | ||
| int port = (conn_type == BACKEND) ? cl.pgsql_port : cl.pgsql_admin_port; | ||
| const char* username = (conn_type == BACKEND) ? cl.pgsql_username : cl.admin_username; | ||
| const char* password = (conn_type == BACKEND) ? cl.pgsql_password : cl.admin_password; | ||
|
|
||
| std::stringstream ss; | ||
|
|
||
| ss << "host=" << host << " port=" << port; | ||
| ss << " user=" << username << " password=" << password; | ||
| ss << (with_ssl ? " sslmode=require" : " sslmode=disable"); | ||
|
|
||
| PGconn* conn = PQconnectdb(ss.str().c_str()); | ||
| if (PQstatus(conn) != CONNECTION_OK) { | ||
| fprintf(stderr, "Connection failed to '%s': %s", (conn_type == BACKEND ? "Backend" : "Admin"), PQerrorMessage(conn)); | ||
| PQfinish(conn); | ||
| return PGConnPtr(nullptr, &PQfinish); | ||
| } | ||
| return PGConnPtr(conn, &PQfinish); | ||
| } | ||
|
|
||
| bool executeQueries(PGconn* conn, const std::vector<std::string>& queries) { | ||
| for (const auto& query : queries) { | ||
| diag("Running: %s", query.c_str()); | ||
| PGresult* res = PQexec(conn, query.c_str()); | ||
| bool success = PQresultStatus(res) == PGRES_TUPLES_OK || | ||
| PQresultStatus(res) == PGRES_COMMAND_OK; | ||
| if (!success) { | ||
| fprintf(stderr, "Failed to execute query '%s': %s", | ||
| query.c_str(), PQerrorMessage(conn)); | ||
| PQclear(res); | ||
| return false; | ||
| } | ||
| PQclear(res); | ||
| } | ||
| return true; | ||
| } | ||
|
|
||
| int main(int argc, char** argv) { | ||
|
|
||
| plan(6); // Total number of tests planned | ||
|
|
||
| if (cl.getEnv()) | ||
| return exit_status(); | ||
|
|
||
| // Connnect to ProxySQL Admin | ||
| PGConnPtr admin_conn = createNewConnection(ConnType::ADMIN, false); | ||
|
|
||
| if (!admin_conn) { | ||
| BAIL_OUT("Error: failed to connect to the database in file %s, line %d\n", __FILE__, __LINE__); | ||
| return exit_status(); | ||
| } | ||
|
|
||
| // Connnect to ProxySQL Backend | ||
| PGConnPtr backend_conn = createNewConnection(ConnType::BACKEND, false); | ||
|
|
||
| if (!backend_conn) { | ||
| BAIL_OUT("Error: failed to connect to the database in file %s, line %d\n", __FILE__, __LINE__); | ||
| return exit_status(); | ||
| } | ||
|
|
||
| if (!executeQueries(admin_conn.get(), { | ||
| "DELETE FROM pgsql_query_rules", | ||
| "LOAD PGSQL QUERY RULES TO RUNTIME", | ||
| "SET pgsql-poll_timeout=2000", | ||
| "SET pgsql-threshold_resultset_size=8000", | ||
| "LOAD PGSQL VARIABLES TO RUNTIME" })) | ||
| return exit_status(); | ||
|
|
||
| bool success; | ||
|
|
||
| auto start = std::chrono::high_resolution_clock::now(); | ||
| success = executeQueries(backend_conn.get(), { "SELECT 1" }); | ||
| auto end = std::chrono::high_resolution_clock::now(); | ||
|
|
||
| ok(success, "Query executed successfully. %s", PQerrorMessage(backend_conn.get())); | ||
|
|
||
| std::chrono::duration<double, std::milli> duration = end - start; | ||
| ok(duration.count() < 10.00, "Execution time should be less than 10 ms. Actual: %f ms", duration.count()); | ||
|
|
||
| if (!executeQueries(admin_conn.get(), { | ||
| "SET pgsql-threshold_resultset_size=536870912", | ||
| "LOAD PGSQL VARIABLES TO RUNTIME" })) | ||
| return exit_status(); | ||
|
|
||
| start = std::chrono::high_resolution_clock::now(); | ||
| success = executeQueries(backend_conn.get(), { "SELECT 1" }); | ||
| end = std::chrono::high_resolution_clock::now(); | ||
|
|
||
| ok(success, "Query executed successfully. %s", PQerrorMessage(backend_conn.get())); | ||
|
|
||
| duration = end - start; | ||
| ok(duration.count() < 10.00, "Execution time should be less than 10 ms. Actual: %f ms", duration.count()); | ||
|
|
||
| if (!executeQueries(admin_conn.get(), { | ||
| "SET pgsql-threshold_resultset_size=1073741824", | ||
| "LOAD PGSQL VARIABLES TO RUNTIME" })) | ||
| return exit_status(); | ||
|
|
||
| start = std::chrono::high_resolution_clock::now(); | ||
| success = executeQueries(backend_conn.get(), { "SELECT 1" }); | ||
| end = std::chrono::high_resolution_clock::now(); | ||
|
|
||
| ok(success, "Query executed successfully. %s", PQerrorMessage(backend_conn.get())); | ||
|
|
||
| duration = end - start; | ||
| ok(duration.count() < 10.00, "Execution time should be less than 10 ms. Actual: %f ms", duration.count()); | ||
|
|
||
| return exit_status(); | ||
| } |