From fe0f5c2b4dbff29a60a6c6dc6c14025fd1fed683 Mon Sep 17 00:00:00 2001 From: Wazir Ahmed Date: Thu, 7 Aug 2025 13:58:58 +0530 Subject: [PATCH] TAP: Update `check_query_count()` to fetch count from all hostgroups Signed-off-by: Wazir Ahmed --- test/tap/tap/utils.cpp | 22 ++++++++++++++-------- test/tap/tap/utils.h | 4 ++-- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/test/tap/tap/utils.cpp b/test/tap/tap/utils.cpp index 7fbe4d074..e0c93ef1e 100644 --- a/test/tap/tap/utils.cpp +++ b/test/tap/tap/utils.cpp @@ -2168,11 +2168,14 @@ void check_conn_count(MYSQL* admin, const string& conn_type, uint32_t conn_num, void check_query_count(MYSQL* admin, uint32_t queries, uint32_t hg) { const string queries_s { to_string(queries) }; - const string hg_s { to_string(hg) }; - const string select_hg_queries { - "SELECT Queries FROM stats_mysql_connection_pool WHERE hostgroup=" + to_string(hg) - }; + string select_hg_queries; + if (hg == -1) { + select_hg_queries = "SELECT SUM(Queries) FROM stats_mysql_connection_pool"; + } else { + select_hg_queries = "SELECT Queries FROM stats_mysql_connection_pool WHERE hostgroup=" + to_string(hg); + } + const string check_queries { "SELECT IIF((" + select_hg_queries + ")=" + queries_s + ",'TRUE','FALSE')" }; @@ -2193,11 +2196,14 @@ void check_query_count(MYSQL* admin, vector queries, uint32_t hg) { } ) }; - const string hg_s { to_string(hg) }; - const string select_hg_queries { - "SELECT Queries FROM stats_mysql_connection_pool WHERE hostgroup=" + to_string(hg) - }; + string select_hg_queries; + if (hg == -1) { + select_hg_queries = "SELECT SUM(Queries) FROM stats_mysql_connection_pool"; + } else { + select_hg_queries = "SELECT Queries FROM stats_mysql_connection_pool WHERE hostgroup=" + to_string(hg); + } + const string check_queries { "SELECT IIF((" + select_hg_queries + ") IN (" + queries_s + "),'TRUE','FALSE')" }; diff --git a/test/tap/tap/utils.h b/test/tap/tap/utils.h index 36dc54c17..cea8c548f 100644 --- a/test/tap/tap/utils.h +++ b/test/tap/tap/utils.h @@ -969,8 +969,8 @@ struct srv_addr_t { // Helpers using 'wait_for_cond' on 'stats_mysql_connection' void check_conn_count(MYSQL* admin, const std::string& conn_type, uint32_t conn_num, int32_t hg=-1); -void check_query_count(MYSQL* admin, uint32_t queries, uint32_t hg); -void check_query_count(MYSQL* admin, std::vector queries, uint32_t hg); +void check_query_count(MYSQL* admin, uint32_t queries, uint32_t hg=-1); +void check_query_count(MYSQL* admin, std::vector queries, uint32_t hg=-1); /** * @brief Fetches the ProxySQL nodes configured in the supplied instance.