MDEV-406: ANALYZE $stmt: get ANALYZE work for subqueries

- "ANALYZE $stmt" should discard select's output, but it should still evaluate the output columns (otherwise, subqueries in select list are not executed) - SHOW EXPLAIN's code practice of calling JOIN::save_explain_data() after JOIN::exec() is disastrous for ANALYZE, because it resets all counters after the first execution. It is stopped = "Late" test_if_skip_sort_order() calls explicitly update their part of the query plan. = Also, I had to rewrite I_S optimization to actually have optimization and execution stages.

Author: spetrunia

mysql-test/r/analyze_stmt.result

@@ -61,3 +61,17 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	r_rows	filtered	r_f
 NULL	UNION RESULT	<union1,2>	ALL	NULL	NULL	NULL	NULL	NULL	5	NULL	NULL
 drop table t1;
 drop table t0;
+# 
+# Try a subquery.
+# 
+create table t0 (a int, b int);
+insert into t0 values
+(0,0),(1,1),(2,2),(3,3),(4,4),(5,5),(6,6),(7,7),(8,8),(9,9);
+create table t1 (a int, b int);
+insert into t1 values (1,1),(2,2),(3,3);
+# See .test file for the right values of r_rows and r_filtered.
+analyze select a, a in (select t0.b from t0 where t0.b+1=t1.b+1) from t1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	r_rows	filtered	r_filtered	Extra
+1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	3	3	100.00	100.00
+2	DEPENDENT SUBQUERY	t0	ALL	NULL	NULL	NULL	NULL	10	3	100.00	33.33	Using where
+drop table t0,t1;

mysql-test/r/show_explain.result

@@ -641,7 +641,7 @@ set debug_dbug='+d,show_explain_probe_join_exec_start';
 SHOW INDEX FROM t1;
 show explain for $thr2;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	STATISTICS	ALL	NULLNULLNULL	NULL	NULLSkip_open_table; Scanned all databases
+1	SIMPLE	STATISTICS	ALL	NULLTABLE_SCHEMA,TABLE_NAMENULL	NULL	NULLOpen_full_table; Scanned 0 databases
 Warnings:
 Note	1003	SHOW INDEX FROM t1
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment

mysql-test/t/analyze_stmt.test

@@ -34,5 +34,29 @@ insert into t1 select a,a from t0;
 analyze (select * from t1 A where a<5) union (select * from t1 B where a in (5,6));
 analyze (select * from t1 A where a<5) union (select * from t1 B where a in (1,2));
 drop table t1;
-
 drop table t0;
+
+--echo # 
+--echo # Try a subquery.
+--echo # 
+create table t0 (a int, b int);
+insert into t0 values
+ (0,0),(1,1),(2,2),(3,3),(4,4),(5,5),(6,6),(7,7),(8,8),(9,9);
+
+create table t1 (a int, b int);
+insert into t1 values (1,1),(2,2),(3,3);
+
+#
+# t1 t0
+# a=1 (0,1) 2 rows
+# a=2 (0,1,2) 3 rows
+# a=3 (0,1,2,3) 4 rows
+#
+# TOTAL TOTAL= 9 rows. 3 executions, avg=3 rows.
+# WHERE is satisfied for 1 row per query, which gives filtered=33.3
+
+--echo # See .test file for the right values of r_rows and r_filtered.
+analyze select a, a in (select t0.b from t0 where t0.b+1=t1.b+1) from t1;
+
+drop table t0,t1;
+

sql/protocol.h

@@ -210,6 +210,42 @@ class Protocol_binary :public Protocol
  virtual enum enum_protocol_type type() { return PROTOCOL_BINARY; };
 };
 
+
+/*
+ A helper for "ANALYZE $stmt" which looks a real network procotol but doesn't
+ write results to the network.
+
+ At first glance, class select_send looks like a more appropriate place to
+ implement the "write nothing" hook. This is not true, because
+ - we need to evaluate the value of every item, and do it the way
+ select_send does it (i.e. call item->val_int() or val_real() or...)
+ - select_send::send_data() has some other code, like telling the storage
+ engine that the row can be unlocked. We want to keep that also.
+ as a result, "ANALYZE $stmt" uses a select_send_analyze which still uses 
+ select_send::send_data() & co., and also uses Protocol_discard object.
+*/
+
+class Protocol_discard : public Protocol_text
+{
+public:
+ Protocol_discard(THD *thd_arg) : Protocol_text(thd_arg) {}
+ /* The real writing is done only in write() */
+ virtual bool write() { return 0; }
+ virtual bool send_result_set_metadata(List<Item> *list, uint flags)
+ {
+ // Don't pas Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF flags 
+ return Protocol_text::send_result_set_metadata(list, 0);
+ }
+
+ // send_error is intentionally not overloaded.
+ virtual bool send_eof(uint server_status, uint statement_warn_count)
+ {
+ return 0;
+ }
+
+};
+
+
 void send_warning(THD *thd, uint sql_errno, const char *err=0);
 bool net_send_error(THD *thd, uint sql_errno, const char *err,
  const char* sqlstate);

sql/sql_class.h

@@ -3959,19 +3959,21 @@ class select_send :public select_result {
  virtual void cleanup();
 };
 
+
+/*
+ We need this class, because select_send::send_eof() will call ::my_eof.
+
+ See also class Protocol_discard.
+*/
+
 class select_send_analyze : public select_send
 {
-bool discard_data;
  bool send_result_set_metadata(List<Item> &list, uint flags) { return 0; }
- /* 
- ANALYZE-todo: we should call val_int() (or val_str() or whatever) to
- compute the columns. If we don't, it's not full execution.
- */
- int send_data(List<Item> &items) { return 0; }
  bool send_eof() { return 0; }
  void abort_result_set() {}
 };
 
+
 class select_to_file :public select_result_interceptor {
 protected:
  sql_exchange *exchange;

sql/sql_explain.cc

@@ -345,6 +345,13 @@ int Explain_node::print_explain_for_children(Explain_query *query,
 }
 
 
+void Explain_select::replace_table(uint idx, Explain_table_access *new_tab)
+{
+ delete join_tabs[idx];
+ join_tabs[idx]= new_tab;
+}
+
+
 Explain_select::~Explain_select()
 {
  if (join_tabs)

sql/sql_explain.h

@@ -129,6 +129,12 @@ class Explain_select : public Explain_node
  join_tabs[n_join_tabs++]= tab;
  return false;
  }
+ 
+ /*
+ This is used to save the results of "late" test_if_skip_sort_order() calls
+ that are made from JOIN::exec
+ */
+ void replace_table(uint idx, Explain_table_access *new_tab);
 
 public:
  int select_id;

sql/sql_parse.cc

@@ -5260,10 +5260,13 @@ static bool execute_sqlcom_select(THD *thd, TABLE_LIST *all_tables)
  {
  //psergey-todo: ANALYZE should hook in here...
  select_result *save_result;
+ Protocol *save_protocol;
  if (lex->analyze_stmt)
  {
  save_result= result;
  result= new select_send_analyze();
+ save_protocol= thd->protocol;
+ thd->protocol= new Protocol_discard(thd);
  }
  else
  {
@@ -5280,6 +5283,7 @@ static bool execute_sqlcom_select(THD *thd, TABLE_LIST *all_tables)
  result= save_result;
  if (!result && !(result= new select_send()))
  return 1;
+ thd->protocol= save_protocol;
  thd->lex->explain->send_explain(thd);
 
  if (result != lex->result)