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

Merge pull request #4286 from sysown/v2.x-fix_stats_query_digests_timestamps

Browse Source 
Fix timestamps regression for `stats_mysql_query_digest`
pull/4291/head
René Cannaò 3 years ago committed by GitHub
parent 4c77e09ee8 83efe7d790
commit 5c65fd150b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 45 additions and 5 deletions
Show Stats Download Patch File Download Diff File

26
lib/ProxySQL_Admin.cpp
Unescape View File

@ -9849,6 +9849,12 @@ int ProxySQL_Admin::stats___save_mysql_query_digest_to_sqlite(
max_bulk_row_idx=max_bulk_row_idx*32;
auto it = resultset ? digest_umap->cend() : digest_umap->cbegin();
int i = 0;
time_t __now;
time(&__now);
unsigned long long curtime=monotonic_time();
time_t seen_time;
// If the function do not receives a resultset, it gets the values directly from the digest_umap
while (resultset ? i != resultset->rows_count : it != digest_umap->end()) {
QP_query_digest_stats *qds = (QP_query_digest_stats *)(resultset ? NULL : it->second);
@ -9868,8 +9874,14 @@ int ProxySQL_Admin::stats___save_mysql_query_digest_to_sqlite(
rc=(*proxy_sqlite3_bind_text)(statement32, (idx*14)+5, resultset ? row->fields[3] : digest_hex_str.c_str(), -1, SQLITE_TRANSIENT); ASSERT_SQLITE_OK(rc, statsdb);
rc=(*proxy_sqlite3_bind_text)(statement32, (idx*14)+6, resultset ? row->fields[4] : qds->get_digest_text(digest_text_umap), -1, SQLITE_TRANSIENT); ASSERT_SQLITE_OK(rc, statsdb);
rc=(*proxy_sqlite3_bind_int64)(statement32, (idx*14)+7, resultset ? atoll(row->fields[5]) : qds->count_star); ASSERT_SQLITE_OK(rc, statsdb);
rc=(*proxy_sqlite3_bind_int64)(statement32, (idx*14)+8, resultset ? atoll(row->fields[6]) : qds->first_seen); ASSERT_SQLITE_OK(rc, statsdb);
rc=(*proxy_sqlite3_bind_int64)(statement32, (idx*14)+9, resultset ? atoll(row->fields[7]) : qds->last_seen); ASSERT_SQLITE_OK(rc, statsdb);
{
seen_time = qds != nullptr ? __now - curtime/1000000 + qds->first_seen/1000000 : 0;
rc=(*proxy_sqlite3_bind_int64)(statement32, (idx*14)+8, resultset ? atoll(row->fields[6]) : seen_time); ASSERT_SQLITE_OK(rc, statsdb);
}
{
seen_time = qds != nullptr ? __now - curtime/1000000 + qds->last_seen/1000000 : 0;
rc=(*proxy_sqlite3_bind_int64)(statement32, (idx*14)+9, resultset ? atoll(row->fields[7]) : seen_time); ASSERT_SQLITE_OK(rc, statsdb);
}
rc=(*proxy_sqlite3_bind_int64)(statement32, (idx*14)+10, resultset ? atoll(row->fields[8]) : qds->sum_time); ASSERT_SQLITE_OK(rc, statsdb);
rc=(*proxy_sqlite3_bind_int64)(statement32, (idx*14)+11, resultset ? atoll(row->fields[9]) : qds->min_time); ASSERT_SQLITE_OK(rc, statsdb);
rc=(*proxy_sqlite3_bind_int64)(statement32, (idx*14)+12, resultset ? atoll(row->fields[10]) : qds->max_time); ASSERT_SQLITE_OK(rc, statsdb);
@ -9888,8 +9900,14 @@ int ProxySQL_Admin::stats___save_mysql_query_digest_to_sqlite(
rc=(*proxy_sqlite3_bind_text)(statement1, 5, resultset ? row->fields[3] : digest_hex_str.c_str(), -1, SQLITE_TRANSIENT); ASSERT_SQLITE_OK(rc, statsdb);
rc=(*proxy_sqlite3_bind_text)(statement1, 6, resultset ? row->fields[4] : qds->get_digest_text(digest_text_umap), -1, SQLITE_TRANSIENT); ASSERT_SQLITE_OK(rc, statsdb);
rc=(*proxy_sqlite3_bind_int64)(statement1, 7, resultset ? atoll(row->fields[5]) : qds->count_star); ASSERT_SQLITE_OK(rc, statsdb);
rc=(*proxy_sqlite3_bind_int64)(statement1, 8, resultset ? atoll(row->fields[6]) : qds->first_seen); ASSERT_SQLITE_OK(rc, statsdb);
rc=(*proxy_sqlite3_bind_int64)(statement1, 9, resultset ? atoll(row->fields[7]) : qds->last_seen); ASSERT_SQLITE_OK(rc, statsdb);
{
seen_time = qds != nullptr ? __now - curtime/1000000 + qds->first_seen/1000000 : 0;
rc=(*proxy_sqlite3_bind_int64)(statement1, 8, resultset ? atoll(row->fields[6]) : seen_time); ASSERT_SQLITE_OK(rc, statsdb);
}
{
seen_time = qds != nullptr ? __now - curtime/1000000 + qds->last_seen/1000000 : 0;
rc=(*proxy_sqlite3_bind_int64)(statement1, 9, resultset ? atoll(row->fields[7]) : seen_time); ASSERT_SQLITE_OK(rc, statsdb);
}
rc=(*proxy_sqlite3_bind_int64)(statement1, 10, resultset ? atoll(row->fields[8]) : qds->sum_time); ASSERT_SQLITE_OK(rc, statsdb);
rc=(*proxy_sqlite3_bind_int64)(statement1, 11, resultset ? atoll(row->fields[9]) : qds->min_time); ASSERT_SQLITE_OK(rc, statsdb);
rc=(*proxy_sqlite3_bind_int64)(statement1, 12, resultset ? atoll(row->fields[10]) : qds->max_time); ASSERT_SQLITE_OK(rc, statsdb);

24
test/tap/tests/test_digest_umap_aux-t.cpp
Unescape View File

@ -174,7 +174,7 @@ int main(int argc, char** argv) {
return EXIT_FAILURE;
}
plan(1 + DUMMY_QUERIES.size() * 3); // always specify the number of tests that are going to be performed
plan(1 + DUMMY_QUERIES.size() * 5); // always specify the number of tests that are going to be performed
MYSQL *proxy_admin = mysql_init(NULL);
if (!mysql_real_connect(proxy_admin, cl.host, cl.admin_username, cl.admin_password, NULL, cl.admin_port, NULL, 0)) {
@ -182,6 +182,8 @@ int main(int argc, char** argv) {
return EXIT_FAILURE;
}
MYSQL_QUERY(proxy_admin, "TRUNCATE TABLE stats.stats_mysql_query_digest");
vector<const char*> admin_queries = {
"DELETE FROM mysql_query_rules",
"LOAD MYSQL QUERY RULES TO RUNTIME",
@ -199,6 +201,8 @@ int main(int argc, char** argv) {
return EXIT_FAILURE;
}
time_t init_time = time(NULL);
MYSQL_RES *res = NULL;
for (const auto &query : DUMMY_QUERIES) {
diag("Running: %s", query);
@ -243,6 +247,8 @@ int main(int argc, char** argv) {
);
vector<digest_stats> ds_vector_after = get_digest_stats(proxy_admin);
time_t final_time = time(NULL);
for (int i = 0; i < DUMMY_QUERIES.size(); i++) {
ok(
ds_vector_before[i].hostgroup == ds_vector_after[i].hostgroup &&
@ -285,7 +291,23 @@ int main(int argc, char** argv) {
ds_vector_before[i].last_seen, ds_vector_after[i].last_seen,
ds_vector_before[i].sum_time, ds_vector_after[i].sum_time
);
uint64_t bf_first_seen = ds_vector_before[i].first_seen;
ok(
init_time - 1 <= bf_first_seen && init_time + 1 >= bf_first_seen,
"'first_seen' within required time range - min: %ld, max: %ld, first_seen: %ld",
init_time - 1, init_time + 1, bf_first_seen
);
uint64_t bf_last_seen = ds_vector_before[i].last_seen;
ok(
init_time <= bf_last_seen && final_time >= bf_last_seen,
"'last_seen' within required time range - min: %ld, max: %ld, last_seen: %ld",
init_time, final_time, bf_last_seen
);
}
mysql_close(proxy_admin);
return exit_status();
}

Write Preview
Loading…
Cancel
Save