@@fast_analyze_table: make sure not to clear secondary index stats (mysql#104)

Signed-off-by: Shlomi Noach <[email protected]>

Author: shlomi-noach

mysql-test/r/fast_analyze_table.result

@@ -1,4 +1,4 @@
-drop table if exists t0;
+drop table if exists t0, tleft, tright;
 create table t0 (id int primary key);
 show global variables like 'fast_analyze_table';
 Variable_name	Value
@@ -24,3 +24,34 @@ Table	Op	Msg_type	Msg_text
 test.t0	analyze	status	OK
 set @@fast_analyze_table=0;
 drop table if exists t0;
+create table tright (id int auto_increment primary key, i int unsigned not null, sha varchar(40) not null, key i_idx (i));
+insert into tright values (null, floor(rand()*4294967295), sha1(rand()));
+insert into tright select null, floor(rand()*4294967295), sha1(rand()) from tright;
+insert into tright select null, floor(rand()*4294967295), sha1(rand()) from tright;
+select count(*) from tright;
+count(*)
+4
+create table tleft (id int primary key, i int unsigned, key tlefti_idx(i));
+insert into tleft select id, i from tright;
+select count(*) from tright;
+count(*)
+4
+analyze table tright;
+Table	Op	Msg_type	Msg_text
+test.tright	analyze	status	OK
+analyze table tleft;
+Table	Op	Msg_type	Msg_text
+test.tleft	analyze	status	OK
+set @@fast_analyze_table=1;
+select @@fast_analyze_table;
+@@fast_analyze_table
+1
+analyze table tright;
+Table	Op	Msg_type	Msg_text
+test.tright	analyze	status	OK
+explain select min(sha) from tleft straight_join tright using (i) where tleft.id between 0 and 1000000;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	tleft	NULL	index	PRIMARY,tlefti_idx	tlefti_idx	5	NULL	4	100.00	Using where; Using index
+1	SIMPLE	tright	NULL	ref	i_idx	i_idx	4	test.tleft.i	1	100.00	NULL
+set @@fast_analyze_table=0;
+drop table tleft, tright;

mysql-test/t/fast_analyze_table.test

@@ -5,7 +5,7 @@
 --source include/count_sessions.inc
 
 --disable_warnings
-drop table if exists t0;
+drop table if exists t0, tleft, tright;
 --enable_warnings
 
 create table t0 (id int primary key);
@@ -23,3 +23,29 @@ show session variables like 'fast_analyze_table';
 analyze table t0;
 set @@fast_analyze_table=0;
 drop table if exists t0;
+
+# Test joins
+
+create table tright (id int auto_increment primary key, i int unsigned not null, sha varchar(40) not null, key i_idx (i));
+
+insert into tright values (null, floor(rand()*4294967295), sha1(rand()));
+insert into tright select null, floor(rand()*4294967295), sha1(rand()) from tright;
+insert into tright select null, floor(rand()*4294967295), sha1(rand()) from tright;
+select count(*) from tright;
+
+create table tleft (id int primary key, i int unsigned, key tlefti_idx(i));
+insert into tleft select id, i from tright;
+select count(*) from tright;
+
+analyze table tright;
+analyze table tleft;
+
+set @@fast_analyze_table=1;
+select @@fast_analyze_table;
+analyze table tright;
+--disable_warnings
+explain select min(sha) from tleft straight_join tright using (i) where tleft.id between 0 and 1000000;
+--enable_warnings
+set @@fast_analyze_table=0;
+
+drop table tleft, tright;

storage/innobase/dict/dict0stats.cc

@@ -2048,9 +2048,15 @@ static dberr_t dict_stats_update_persistent(
       continue;
     }
 
+    if (only_clustered_index) {
+      // Skip analyzing secondary indexes. But also, bail out before actually clearing their
+      // statistics.
+      continue;
+    }
+
     dict_stats_empty_index(index);
 
-    if (only_clustered_index || dict_stats_should_ignore_index(index)) {
+    if (dict_stats_should_ignore_index(index)) {
       continue;
     }