1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

ANALYZE FORMAT=JSON: Backport block-nl-join.r_unpack_time_ms from 11.0 +fix MDEV-30830.

Also fix it to work with hashed join (MDEV-30830).

Reviewed by: Monty <monty@mariadb.org>
This commit is contained in:
Sergei Petrunia
2023-03-10 18:02:14 +03:00
committed by Oleksandr Byelkin
parent 954a6decd4
commit 4ed5900626
16 changed files with 218 additions and 23 deletions

View File

@ -721,7 +721,7 @@ public:
class Explain_table_access : public Sql_alloc
{
public:
Explain_table_access(MEM_ROOT *root) :
Explain_table_access(MEM_ROOT *root, bool timed) :
derived_select_number(0),
non_merged_sjm_number(0),
extra_tags(root),
@ -734,6 +734,7 @@ public:
pushed_index_cond(NULL),
sjm_nest(NULL),
pre_join_sort(NULL),
jbuf_unpack_tracker(timed),
rowid_filter(NULL)
{}
~Explain_table_access() { delete sjm_nest; }
@ -840,7 +841,12 @@ public:
Table_access_tracker tracker;
Exec_time_tracker op_tracker;
Table_access_tracker jbuf_tracker;
/*
Track the time to unpack rows from the join buffer.
*/
Time_and_counter_tracker jbuf_unpack_tracker;
Explain_rowid_filter *rowid_filter;
int print_explain(select_result_sink *output, uint8 explain_flags,