database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-05 13:16:09 +03:00
Code Activity

Merge 11.0 into 11.1

Browse Source
This commit is contained in:
Marko Mäkelä
2023-07-26 15:13:43 +03:00
parent 26b96094ec f2b4972bd4
commit c6ac1e39b6
214 changed files with 5163 additions and 2783 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
sql/sql_explain.cc
View File

@@ -1960,6 +1960,26 @@ void Explain_rowid_filter::print_explain_json(Explain_query *query,
writer->end_object(); // rowid_filter
}
static void trace_engine_stats(handler *file, Json_writer *writer)
{
if (file && file->handler_stats)
{
ha_handler_stats *hs= file->handler_stats;
writer->add_member("r_engine_stats").start_object();
if (hs->pages_accessed)
writer->add_member("pages_accessed").add_ull(hs->pages_accessed);
if (hs->pages_updated)
writer->add_member("pages_updated").add_ull(hs->pages_updated);
if (hs->pages_read_count)
writer->add_member("pages_read_count").add_ull(hs->pages_read_count);
if (hs->pages_read_time)
writer->add_member("pages_read_time_ms").
add_double(hs->pages_read_time / 1000.0);
if (hs->undo_records_read)
writer->add_member("old_rows_read").add_ull(hs->undo_records_read);
writer->end_object();
}
}
void Explain_table_access::print_explain_json(Explain_query *query,
Json_writer *writer,
@@ -2118,6 +2138,7 @@ void Explain_table_access::print_explain_json(Explain_query *query,
writer->add_member("r_table_time_ms").add_double(total_time);
writer->add_member("r_other_time_ms").add_double(extra_time_tracker.get_time_ms());
}
trace_engine_stats(handler_for_stats, writer);
}
/* `filtered` */
@@ -2823,6 +2844,8 @@ void Explain_update::print_explain_json(Explain_query *query,
}
}
trace_engine_stats(handler_for_stats, writer);
if (where_cond)
{
writer->add_member("attached_condition");