Mirrors
/
mariadb
mirror of https://github.com/MariaDB/server
3
0
Fork 0
Code Releases Activity
Browse Source

MDEV-27021 Add support of FORMAT=JSON for SHOW ANALYZE

pull/2112/head
Oleg Smirnov 4 years ago
committed by Sergei Petrunia
parent
e7fcd496d4
commit
d1a1ad4c28
6 changed files with 1634 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1229
      mysql-test/main/show_analyze_json.result
  2. 368
      mysql-test/main/show_analyze_json.test
  3. 14
      mysql-test/main/show_explain_json.result
  4. 3
      sql/handler.h
  5. 30
      sql/sql_show.cc
  6. 13
      sql/sql_yacc.yy

1229
mysql-test/main/show_analyze_json.result
File diff suppressed because it is too large
View File

368
mysql-test/main/show_analyze_json.test
View File

@ -0,0 +1,368 @@
#
# Tests for SHOW ANALYZE FORMAT=JSON FOR functionality
#
--source include/have_debug.inc
--source include/have_debug_sync.inc
--source include/have_innodb.inc
# Using valgrind can cause 'reap' to fail. See comment below
--source include/not_valgrind.inc
--disable_warnings
drop table if exists t0, t1, t2, t3, t4;
drop view if exists v1;
--enable_warnings
SET @old_debug= @@session.debug;
#
# Testcases in this file do not work with embedded server. The reason for this
# is that we use the following commands for synchronization:
#
# set @show_explain_probe_select_id=1;
# SET debug_dbug='d,show_explain_probe_join_exec_start';
# send select count(*) from t1 where a < 100000;
#
# When ran with mysqltest_embedded, this translates into:
#
# Thread1> DBUG_PUSH("d,show_explain_probe_join_exec_start");
# Thread1> create another thread for doing "send ... reap"
# Thread2> mysql_parse("select count(*) from t1 where a < 100000");
#
# That is, "select count(*) ..." is ran in a thread for which DBUG_PUSH(...)
# has not been called. As a result, show_explain_probe_join_exec_start does not fire, and
# "select count(*) ..." does not wait till its SHOW ANALYZE command, and the
# test fails.
#
-- source include/not_embedded.inc
set debug_sync='RESET';
create table t0 (a int);
insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
create table t1 (a int);
alter table t1 add b int, add c int, add filler char(32);
insert into t1 select A.a, 10*B.a, 100*C.a, 'foo filler' from t0 A, t0 B, t0 C;
alter table t1 add key(a), add key(b);
analyze table t1;
#
# Try to call SHOW ANALYZE with a missing thread ID
#
--error ER_PARSE_ERROR
show analyze format=JSON for;
#
# Try SHOW ANALYZE for a non-existent thread
#
--error ER_NO_SUCH_THREAD
show analyze format=json for 1001;
--error ER_SET_CONSTANTS_ONLY
show analyze format=JSON for (select a from t0 limit 1);
#
# Setup two threads and their ids
#
let $thr1=`select connection_id()`;
connect (con1, localhost, root,,);
connection con1;
let $thr2=`select connection_id()`;
SET @old_debug= @@session.debug;
connection default;
# SHOW ANALYZE FOR <idle thread>
--error ER_TARGET_NOT_EXPLAINABLE
evalp show analyze format = JSON for $thr2;
# SHOW ANALYZE FOR <ourselves>
--error ER_TARGET_NOT_EXPLAINABLE
evalp show analyze format = json for $thr1;
# Not supported format of output
--error ER_UNKNOWN_EXPLAIN_FORMAT
evalp show analyze FORMAT=HTML for $thr1;
--error ER_UNKNOWN_EXPLAIN_FORMAT
evalp analyze FORMAT=XML for connection $thr1;
let $wait_condition= select State='show_explain_trap' from information_schema.processlist where id=$thr2;
#
# Test SHOW ANALYZE for simple queries
#
connection con1;
set @show_explain_probe_select_id=1;
SET debug_dbug='+d,show_explain_probe_join_exec_end';
send select count(*) from t1 where c < 500;
connection default;
--source include/wait_condition.inc
--source include/analyze-format.inc
evalp show analyze format=JSON for $thr2;
connection con1;
reap;
send select max(c) from t1 where c < 10;
connection default;
--source include/wait_condition.inc
--source include/analyze-format.inc
evalp show analyze format=json for $thr2;
connection con1;
reap;
--echo # We can catch ANALYZE too.
send analyze select max(c) from t1 where a < 10;
connection default;
--source include/wait_condition.inc
--source include/analyze-format.inc
evalp show analyze format=json for $thr2;
connection con1;
reap;
SET debug_dbug=@old_debug;
--echo # UNION, select, first branch
set @show_explain_probe_select_id=1;
SET debug_dbug='+d,show_explain_probe_join_exec_end';
send select max(a) from t0 A where a<=5 union select max(a+1) from t0 B where a>=9;
connection default;
--source include/wait_condition.inc
--source include/analyze-format.inc
evalp show analyze FORMAT= json for $thr2;
connection con1;
reap;
--echo # UNION, select, second branch
set @show_explain_probe_select_id=2; # <--- Second branch
SET debug_dbug='+d,show_explain_probe_join_exec_end';
send select max(a) from t0 A where a<=5 union select max(a+1) from t0 B where a>=9;
connection default;
--source include/wait_condition.inc
--source include/analyze-format.inc
evalp show analyze format=JSON for $thr2;
connection con1;
reap;
--echo # UNION, analyze, first branch
set @show_explain_probe_select_id=1;
SET debug_dbug='+d,show_explain_probe_join_exec_end';
send analyze select a from t0 A where a<=5 union select a+1 from t0 B where a>=9;
connection default;
--source include/wait_condition.inc
--source include/analyze-format.inc
evalp show analyze format=json for $thr2;
connection con1;
reap;
--echo # UNION, analyze, second branch
set @show_explain_probe_select_id=2;
send analyze select a from t0 A where a<=5 union select a+1 from t0 B where a>=9;
connection default;
--source include/wait_condition.inc
--source include/analyze-format.inc
evalp show analyze FORMAT=JSON for $thr2;
connection con1;
reap;
SET debug_dbug=@old_debug;
--echo # Uncorrelated subquery, select
set @show_explain_probe_select_id=1;
SET debug_dbug='+d,show_explain_probe_join_exec_end';
send select a, (select max(a) from t0 B where a>6) from t0 A where a<2;
connection default;
--source include/wait_condition.inc
--source include/analyze-format.inc
evalp show analyze format=json for $thr2;
connection con1;
reap;
SET debug_dbug=@old_debug;
--echo # Uncorrelated subquery, analyze
set @show_explain_probe_select_id=1;
SET debug_dbug='+d,show_explain_probe_join_exec_end';
send analyze select a, (select max(a) from t0 B where a>6) from t0 A where a<2;
connection default;
--source include/wait_condition.inc
--source include/analyze-format.inc
evalp show analyze format=json for $thr2;
connection con1;
reap;
SET debug_dbug=@old_debug;
--echo # correlated subquery, select, before execution start
set @show_explain_probe_select_id=1;
SET debug_dbug='+d,show_explain_probe_join_exec_start';
send select a, (select max(a) from t0 b where b.a+a.a<10) from t0 a where a<2;
connection default;
--source include/wait_condition.inc
--source include/analyze-format.inc
evalp show analyze format=json for $thr2;
connection con1;
reap;
SET debug_dbug=@old_debug;
--echo # correlated subquery, select, after execution
set @show_explain_probe_select_id=1;
SET debug_dbug='+d,show_explain_probe_join_exec_end';
send select a, (select max(a) from t0 b where b.a+a.a<10) from t0 a where a<2;
connection default;
--source include/wait_condition.inc
--source include/analyze-format.inc
evalp show analyze format=json for $thr2;
connection con1;
reap;
SET debug_dbug=@old_debug;
--echo # correlated subquery, analyze
set @show_explain_probe_select_id=1;
SET debug_dbug='+d,show_explain_probe_join_exec_end';
send analyze select a, (select max(a) from t0 b where b.a+a.a<10) from t0 a where a<2;
connection default;
--source include/wait_condition.inc
--source include/analyze-format.inc
evalp show analyze format=json for $thr2;
connection con1;
reap;
SET debug_dbug=@old_debug;
--echo # Try to do SHOW ANALYZE for a query that runs a SET command:
--echo #
set @show_explain_probe_select_id=2; # <---
SET debug_dbug='+d,show_explain_probe_join_exec_start';
send set @foo= (select max(a) from t0 where sin(a) >0);
connection default;
--source include/wait_condition.inc
--source include/analyze-format.inc
--error ER_TARGET_NOT_EXPLAINABLE
evalp show analyze format=json for $thr2;
evalp kill query $thr2;
connection con1;
--error ER_QUERY_INTERRUPTED
reap;
SET debug_dbug=@old_debug;
--echo #
--echo # Attempt SHOW ANALYZE for an UPDATE
--echo #
create table t2 as select a as a, a as dummy from t0 limit 2;
set @show_explain_probe_select_id=2;
SET debug_dbug='+d,show_explain_probe_join_exec_start';
send update t2 set dummy=0 where (select max(a) from t0 where t2.a + t0.a <3) >3 ;
connection default;
--source include/wait_condition.inc
--source include/analyze-format.inc
evalp show analyze FORMAT=JSON for $thr2;
--source include/wait_condition.inc
--source include/analyze-format.inc
evalp show analyze FORMAT=JSON for $thr2;
connection con1;
reap;
drop table t2;
SET debug_dbug=@old_debug;
--echo #
--echo # Attempt SHOW ANALYZE for a DELETE
--echo #
create table t2 as select a as a, a as dummy from t0 limit 2;
set @show_explain_probe_select_id=2;
SET debug_dbug='+d,show_explain_probe_join_exec_start';
send delete from t2 where (select max(a) from t0 where t2.a + t0.a <3) >3 ;
connection default;
--source include/wait_condition.inc
--source include/analyze-format.inc
evalp show analyze FORMAT=JSON for $thr2;
--source include/wait_condition.inc
--source include/analyze-format.inc
evalp show analyze FORMAT=JSON for $thr2;
connection con1;
reap;
drop table t2;
SET debug_dbug=@old_debug;
--echo #
--echo # Multiple SHOW ANALYZE calls for one select
--echo #
create table t2 as select a as a, a as dummy from t0 limit 3;
set @show_explain_probe_select_id=2;
SET debug_dbug='+d,show_explain_probe_join_exec_start';
send select t2.a, ((select max(a) from t0 where t2.a + t0.a <3) >3) as SUBQ from t2;
connection default;
--source include/wait_condition.inc
--source include/analyze-format.inc
evalp show analyze format=json for $thr2;
--source include/wait_condition.inc
--source include/analyze-format.inc
evalp show analyze format=json for $thr2;
--source include/wait_condition.inc
--source include/analyze-format.inc
evalp show analyze format=json for $thr2;
connection con1;
reap;
SET debug_dbug=@old_debug;
drop table t2;
--echo #
--echo # SHOW ANALYZE for SELECT ... ORDER BY with "Using filesort"
--echo #
SET debug_dbug='+d,show_explain_probe_join_exec_end';
set @show_explain_probe_select_id=1;
send select * from t0 order by a;
connection default;
--source include/wait_condition.inc
--source include/analyze-format.inc
evalp show analyze format=JSON for $thr2;
connection con1;
reap;
SET debug_dbug=@old_debug;
--echo #
--echo # SHOW ANALYZE for SELECT ... with "Using temporary"
--echo #
connection con1;
SET debug_dbug='+d,show_explain_probe_join_exec_end';
set @show_explain_probe_select_id=1;
send select distinct a from t0;
connection default;
--source include/wait_condition.inc
--source include/analyze-format.inc
evalp show analyze format=json for $thr2;
connection con1;
reap;
SET debug_dbug=@old_debug;
--echo #
--echo # SHOW ANALYZE for SELECT ... with "Using temporary; Using filesort"
--echo #
SET debug_dbug='+d,show_explain_probe_join_exec_end';
set @show_explain_probe_select_id=1;
send select distinct a from t0;
connection default;
--source include/wait_condition.inc
--source include/analyze-format.inc
evalp show analyze format=json for $thr2;
connection con1;
reap;
SET debug_dbug=@old_debug;
drop table t0,t1;
--echo # End
connection default;
disconnect con1;
set debug_sync='RESET';

14
mysql-test/main/show_explain_json.result
View File

@ -26,17 +26,17 @@ connection con1;
SET @old_debug= @@session.debug;
connection default;
show explain format=JSON for $thr2;
ERROR HY000: Target is not running an EXPLAINable command
ERROR HY000: Target is not executing an operation with a query plan
explain format=json for connection $thr2;
ERROR HY000: Target is not running an EXPLAINable command
ERROR HY000: Target is not executing an operation with a query plan
show explain format=json for $thr1;
ERROR HY000: Target is not running an EXPLAINable command
ERROR HY000: Target is not executing an operation with a query plan
explain FORMAT=JSON for connection $thr1;
ERROR HY000: Target is not running an EXPLAINable command
ERROR HY000: Target is not executing an operation with a query plan
show explain FORMAT=HTML for $thr1;
ERROR HY000: Unknown EXPLAIN format name: 'HTML'
ERROR HY000: Unknown EXPLAIN/ANALYZE format name: 'HTML'
explain FORMAT=XML for connection $thr1;
ERROR HY000: Unknown EXPLAIN format name: 'XML'
ERROR HY000: Unknown EXPLAIN/ANALYZE format name: 'XML'
connection con1;
set @show_explain_probe_select_id=1;
SET debug_dbug='+d,show_explain_probe_join_exec_start';
@ -523,7 +523,7 @@ SET debug_dbug='+d,show_explain_probe_join_exec_start';
set @foo= (select max(a) from t0 where sin(a) >0);
connection default;
show explain format=JSON for $thr2;
ERROR HY000: Target is not running an EXPLAINable command
ERROR HY000: Target is not executing an operation with a query plan
kill query $thr2;
connection con1;
ERROR 70100: Query execution was interrupted

3
sql/handler.h
View File

@ -1025,7 +1025,8 @@ enum enum_schema_tables
SCH_EVENTS,
SCH_EXPLAIN_TABULAR,
SCH_EXPLAIN_JSON,
SCH_ANALYZE,
SCH_ANALYZE_TABULAR,
SCH_ANALYZE_JSON,
SCH_FILES,
SCH_GLOBAL_STATUS,
SCH_GLOBAL_VARIABLES,

30
sql/sql_show.cc
View File

@ -3242,13 +3242,14 @@ int fill_show_explain_tabular(THD *thd, TABLE_LIST *table, COND *cond)
int fill_show_explain_json(THD *thd, TABLE_LIST *table, COND *cond)
{
return fill_show_explain_or_analyze(
thd, table, cond, TRUE /* json_format */, TRUE /* is_analyze */);
thd, table, cond, TRUE /* json_format */, FALSE /* is_analyze */);
}
int fill_show_analyze_tabular(THD * thd, TABLE_LIST * table, COND * cond)
{
return fill_show_explain_or_analyze(
thd, table, cond, FALSE /* json_format */, TRUE /* is_analyze */);
thd, table, cond, FALSE /* json_format */, TRUE /* is_analyze */);
}
@ -9676,7 +9677,7 @@ ST_FIELD_INFO show_explain_json_fields_info[]=
};
ST_FIELD_INFO show_analyze_fields_info[]=
ST_FIELD_INFO show_analyze_tabular_fields_info[]=
{
Column("id", SLonglong(3), NULLABLE, "id"),
Column("select_type", Varchar(19), NOT_NULL, "select_type"),
@ -9699,6 +9700,11 @@ ST_FIELD_INFO show_analyze_fields_info[]=
};
ST_FIELD_INFO show_analyze_json_fields_info[]= {
Column("EXPLAIN", Longtext(MAX_FIELD_VARCHARLENGTH), NOT_NULL, "ANALYZE"),
CEnd()};
ST_FIELD_INFO check_constraints_fields_info[]=
{
Column("CONSTRAINT_CATALOG", Catalog(), NOT_NULL, OPEN_FULL_TABLE),
@ -9759,12 +9765,18 @@ ST_SCHEMA_TABLE schema_tables[]=
{"EVENTS", Show::events_fields_info, 0,
0, make_old_format, 0, -1, -1, 0, 0},
#endif
{"EXPLAIN", Show::show_explain_tabular_fields_info, 0, fill_show_explain_tabular,
make_old_format, 0, -1, -1, TRUE /*hidden*/ , 0},
{"EXPLAIN_JSON", Show::show_explain_json_fields_info, 0, fill_show_explain_json,
make_old_format, 0, -1, -1, TRUE /*hidden*/, 0},
{"ANALYZE", Show::show_analyze_fields_info, 0, fill_show_analyze_tabular,
make_old_format, 0, -1, -1, TRUE /*hidden*/, 0},
{"EXPLAIN", Show::show_explain_tabular_fields_info, 0,
fill_show_explain_tabular, make_old_format, 0, -1, -1,
TRUE /*hidden*/ , 0},
{"EXPLAIN_JSON", Show::show_explain_json_fields_info, 0,
fill_show_explain_json, make_old_format, 0, -1, -1,
TRUE /*hidden*/ , 0},
{"ANALYZE", Show::show_analyze_tabular_fields_info, 0,
fill_show_analyze_tabular, make_old_format, 0, -1, -1,
TRUE /*hidden*/, 0},
{"ANALYZE_JSON", Show::show_analyze_json_fields_info, 0,
fill_show_analyze_json, make_old_format, 0, -1, -1,
TRUE /*hidden*/, 0},
{"FILES", Show::files_fields_info, 0,
hton_fill_schema_table, 0, 0, -1, -1, 0, 0},
{"GLOBAL_STATUS", Show::variables_fields_info, 0,

13
sql/sql_yacc.yy
View File

@ -13944,16 +13944,17 @@ show_param:
{
Lex->sql_command= SQLCOM_SHOW_EXPLAIN;
if (unlikely(prepare_schema_table(thd, Lex, 0,
Lex->explain_json ? SCH_EXPLAIN_JSON : SCH_EXPLAIN_TABULAR)))
Lex->explain_json ? SCH_EXPLAIN_JSON : SCH_EXPLAIN_TABULAR)))
MYSQL_YYABORT;
add_value_to_list(thd, $4);
}
| ANALYZE_SYM FOR_SYM expr
| ANALYZE_SYM opt_format_json FOR_SYM expr
{
Lex->sql_command= SQLCOM_SHOW_ANALYZE;
if (unlikely(prepare_schema_table(thd, Lex, 0, SCH_ANALYZE)))
if (unlikely(prepare_schema_table(thd, Lex, 0,
Lex->explain_json ? SCH_ANALYZE_JSON : SCH_ANALYZE_TABULAR)))
MYSQL_YYABORT;
add_value_to_list(thd, $3);
add_value_to_list(thd, $4);
}
| IDENT_sys remember_tok_start wild_and_where
{
@ -14107,8 +14108,8 @@ opt_format_json:
else if (lex_string_eq(&$3, STRING_WITH_LEN("TRADITIONAL")))
DBUG_ASSERT(Lex->explain_json==false);
else
my_yyabort_error((ER_UNKNOWN_EXPLAIN_FORMAT, MYF(0), "EXPLAIN",
$3.str));
my_yyabort_error((ER_UNKNOWN_EXPLAIN_FORMAT, MYF(0),
"EXPLAIN/ANALYZE", $3.str));
}
;

Write Preview
Loading…
Cancel
Save