Honor reset and copy options in get_query_digests_reset_v2()

pull/4096/head
Javier Sánchez Parra 3 years ago
parent a19edfd428
commit 0da59a6620

@ -324,7 +324,9 @@ class Query_Processor {
SQLite3_result * get_query_digests();
SQLite3_result * get_query_digests_reset();
std::pair<SQLite3_result *, int> get_query_digests_v2(const bool use_resultset = true);
std::pair<SQLite3_result *, int> get_query_digests_reset_v2(const bool use_resultset = true);
std::pair<SQLite3_result *, int> get_query_digests_reset_v2(
const bool copy, const bool use_resultset = true
);
void get_query_digests_reset(umap_query_digest *uqd, umap_query_digest_text *uqdt);
unsigned long long purge_query_digests(bool async_purge, bool parallel, char **msg);
unsigned long long purge_query_digests_async(char **msg);

@ -9673,7 +9673,7 @@ int ProxySQL_Admin::stats___mysql_query_digests_v2(bool reset, bool copy, bool u
if (!GloQPro) return 0;
std::pair<SQLite3_result *, int> res;
if (reset == true) {
res = GloQPro->get_query_digests_reset_v2(use_resultset);
res = GloQPro->get_query_digests_reset_v2(copy, use_resultset);
} else {
res = GloQPro->get_query_digests_v2(use_resultset);
}

@ -1401,7 +1401,9 @@ SQLite3_result * Query_Processor::get_query_digests() {
return result;
}
std::pair<SQLite3_result *, int> Query_Processor::get_query_digests_reset_v2(const bool use_resultset) {
std::pair<SQLite3_result *, int> Query_Processor::get_query_digests_reset_v2(
const bool copy, const bool use_resultset
) {
SQLite3_result *result = NULL;
umap_query_digest digest_umap_aux;
umap_query_digest_text digest_text_umap_aux;
@ -1477,7 +1479,7 @@ std::pair<SQLite3_result *, int> Query_Processor::get_query_digests_reset_v2(con
}
} else {
num_rows = GloAdmin->stats___save_mysql_query_digest_to_sqlite(
false, false, result, &digest_umap_aux, &digest_text_umap_aux
true, copy, result, &digest_umap_aux, &digest_text_umap_aux
);
for (
std::unordered_map<uint64_t, void *>::iterator it = digest_umap_aux.begin();

Loading…
Cancel
Save