1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean up innodb.innodb_stats_persistent

Browse Source 
The test was marked big for no apparent reason.
Usw wait_all_purged.inc in the canonical way, and make use of
the sequence engine.
This commit is contained in:
Marko Mäkelä 2019-10-24 21:20:53 +03:00
parent 2809842031
commit 7457181ba4
2 changed files with 21 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
mysql-test/suite/innodb/r/innodb_stats_persistent.result
View File

@ -1,22 +1,15 @@
SET @saved_frequency = @@GLOBAL.innodb_purge_rseg_truncate_frequency;
SET GLOBAL innodb_purge_rseg_truncate_frequency = 1;
SET @saved_include_delete_marked = @@GLOBAL.innodb_stats_include_delete_marked; SET @saved_include_delete_marked = @@GLOBAL.innodb_stats_include_delete_marked;
SET GLOBAL innodb_stats_include_delete_marked = ON; SET GLOBAL innodb_stats_include_delete_marked = ON;
SET @saved_traditional = @@GLOBAL.innodb_stats_traditional; SET @saved_traditional = @@GLOBAL.innodb_stats_traditional;
SET GLOBAL innodb_stats_traditional=false; SET GLOBAL innodb_stats_traditional=false;
SET @saved_modified_counter = @@GLOBAL.innodb_stats_modified_counter; SET @saved_modified_counter = @@GLOBAL.innodb_stats_modified_counter;
SET GLOBAL innodb_stats_modified_counter=1; SET GLOBAL innodb_stats_modified_counter=1;
CREATE TABLE t0 (id SERIAL, val INT UNSIGNED NOT NULL, KEY(val)) CREATE TABLE t1 (id SERIAL, val INT UNSIGNED NOT NULL, KEY(val))
ENGINE=INNODB STATS_PERSISTENT=1,STATS_AUTO_RECALC=1; ENGINE=INNODB STATS_PERSISTENT=1,STATS_AUTO_RECALC=1;
CREATE TABLE t1 LIKE t0; CREATE TABLE t2 LIKE t1;
CREATE TABLE t2 LIKE t0; INSERT INTO t1 (val) SELECT 4 FROM seq_1_to_16;
INSERT INTO t0 (val) VALUES (4);
INSERT INTO t0 (val) SELECT 4 FROM t0;
INSERT INTO t0 (val) SELECT 4 FROM t0;
INSERT INTO t0 (val) SELECT 4 FROM t0;
INSERT INTO t0 (val) SELECT 4 FROM t0;
INSERT INTO t1 SELECT * FROM t0;
SELECT COUNT(*) FROM t1;
COUNT(*)
16
ANALYZE TABLE t1; ANALYZE TABLE t1;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 analyze status OK test.t1 analyze status OK
@ -48,7 +41,7 @@ COUNT(*)
0 0
connection default; connection default;
BEGIN; BEGIN;
INSERT INTO t2 SELECT * FROM t0; INSERT INTO t2 (val) SELECT 4 FROM seq_1_to_16;
# The INSERT will show up before COMMIT. # The INSERT will show up before COMMIT.
EXPLAIN SELECT * FROM t2 WHERE val=4; EXPLAIN SELECT * FROM t2 WHERE val=4;
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
@ -65,17 +58,14 @@ connection con1;
EXPLAIN SELECT * FROM t2 WHERE val=4; EXPLAIN SELECT * FROM t2 WHERE val=4;
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t2 ref val val 4 const 1 Using index 1 SIMPLE t2 ref val val 4 const 1 Using index
SET @saved_frequency = @@GLOBAL.innodb_purge_rseg_truncate_frequency;
SET GLOBAL innodb_purge_rseg_truncate_frequency = 1;
InnoDB 0 transactions not purged InnoDB 0 transactions not purged
SET GLOBAL innodb_purge_rseg_truncate_frequency = @saved_frequency;
# After COMMIT and purge, the DELETE must show up. # After COMMIT and purge, the DELETE must show up.
EXPLAIN SELECT * FROM t1 WHERE val=4; EXPLAIN SELECT * FROM t1 WHERE val=4;
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 ref val val 4 const 1 Using index 1 SIMPLE t1 ref val val 4 const 1 Using index
SET GLOBAL innodb_stats_include_delete_marked = OFF; SET GLOBAL innodb_stats_include_delete_marked = OFF;
BEGIN; BEGIN;
INSERT INTO t1 SELECT * FROM t0; INSERT INTO t1 (val) SELECT 4 FROM seq_1_to_16;
EXPLAIN SELECT * FROM t1 WHERE val=4; EXPLAIN SELECT * FROM t1 WHERE val=4;
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 ref val val 4 const 16 Using index 1 SIMPLE t1 ref val val 4 const 16 Using index
@ -84,7 +74,7 @@ EXPLAIN SELECT * FROM t1 WHERE val=4;
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 ref val val 4 const 1 Using index 1 SIMPLE t1 ref val val 4 const 1 Using index
BEGIN; BEGIN;
INSERT INTO t1 SELECT * FROM t0; INSERT INTO t1 (val) SELECT 4 FROM seq_1_to_16;
COMMIT; COMMIT;
EXPLAIN SELECT * FROM t1 WHERE val=4; EXPLAIN SELECT * FROM t1 WHERE val=4;
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
@ -110,7 +100,8 @@ COUNT(*)
16 16
disconnect con1; disconnect con1;
connection default; connection default;
DROP TABLE t0,t1,t2; DROP TABLE t1,t2;
SET GLOBAL innodb_stats_include_delete_marked = @saved_include_delete_marked; SET GLOBAL innodb_stats_include_delete_marked = @saved_include_delete_marked;
SET GLOBAL innodb_stats_traditional = @saved_traditional; SET GLOBAL innodb_stats_traditional = @saved_traditional;
SET GLOBAL innodb_stats_modified_counter = @saved_modified_counter; SET GLOBAL innodb_stats_modified_counter = @saved_modified_counter;
SET GLOBAL innodb_purge_rseg_truncate_frequency = @saved_frequency;

30
mysql-test/suite/innodb/t/innodb_stats_persistent.test
View File

@ -1,6 +1,8 @@
--source include/have_innodb.inc --source include/have_innodb.inc
--source include/big_test.inc --source include/have_sequence.inc
SET @saved_frequency = @@GLOBAL.innodb_purge_rseg_truncate_frequency;
SET GLOBAL innodb_purge_rseg_truncate_frequency = 1;
SET @saved_include_delete_marked = @@GLOBAL.innodb_stats_include_delete_marked; SET @saved_include_delete_marked = @@GLOBAL.innodb_stats_include_delete_marked;
SET GLOBAL innodb_stats_include_delete_marked = ON; SET GLOBAL innodb_stats_include_delete_marked = ON;
SET @saved_traditional = @@GLOBAL.innodb_stats_traditional; SET @saved_traditional = @@GLOBAL.innodb_stats_traditional;
@ -8,19 +10,11 @@ SET GLOBAL innodb_stats_traditional=false;
SET @saved_modified_counter = @@GLOBAL.innodb_stats_modified_counter; SET @saved_modified_counter = @@GLOBAL.innodb_stats_modified_counter;
SET GLOBAL innodb_stats_modified_counter=1; SET GLOBAL innodb_stats_modified_counter=1;
CREATE TABLE t0 (id SERIAL, val INT UNSIGNED NOT NULL, KEY(val)) CREATE TABLE t1 (id SERIAL, val INT UNSIGNED NOT NULL, KEY(val))
ENGINE=INNODB STATS_PERSISTENT=1,STATS_AUTO_RECALC=1; ENGINE=INNODB STATS_PERSISTENT=1,STATS_AUTO_RECALC=1;
CREATE TABLE t1 LIKE t0; CREATE TABLE t2 LIKE t1;
CREATE TABLE t2 LIKE t0;
INSERT INTO t0 (val) VALUES (4); INSERT INTO t1 (val) SELECT 4 FROM seq_1_to_16;
INSERT INTO t0 (val) SELECT 4 FROM t0;
INSERT INTO t0 (val) SELECT 4 FROM t0;
INSERT INTO t0 (val) SELECT 4 FROM t0;
INSERT INTO t0 (val) SELECT 4 FROM t0;
INSERT INTO t1 SELECT * FROM t0;
SELECT COUNT(*) FROM t1;
ANALYZE TABLE t1; ANALYZE TABLE t1;
connect(con1, localhost, root,,); connect(con1, localhost, root,,);
@ -46,7 +40,7 @@ SELECT COUNT(*) FROM t1;
connection default; connection default;
BEGIN; BEGIN;
INSERT INTO t2 SELECT * FROM t0; INSERT INTO t2 (val) SELECT 4 FROM seq_1_to_16;
--echo # The INSERT will show up before COMMIT. --echo # The INSERT will show up before COMMIT.
EXPLAIN SELECT * FROM t2 WHERE val=4; EXPLAIN SELECT * FROM t2 WHERE val=4;
@ -57,21 +51,18 @@ SELECT COUNT(*) FROM t2;
connection con1; connection con1;
EXPLAIN SELECT * FROM t2 WHERE val=4; EXPLAIN SELECT * FROM t2 WHERE val=4;
SET @saved_frequency = @@GLOBAL.innodb_purge_rseg_truncate_frequency;
SET GLOBAL innodb_purge_rseg_truncate_frequency = 1;
--source include/wait_all_purged.inc --source include/wait_all_purged.inc
SET GLOBAL innodb_purge_rseg_truncate_frequency = @saved_frequency;
--echo # After COMMIT and purge, the DELETE must show up. --echo # After COMMIT and purge, the DELETE must show up.
EXPLAIN SELECT * FROM t1 WHERE val=4; EXPLAIN SELECT * FROM t1 WHERE val=4;
SET GLOBAL innodb_stats_include_delete_marked = OFF; SET GLOBAL innodb_stats_include_delete_marked = OFF;
BEGIN; BEGIN;
INSERT INTO t1 SELECT * FROM t0; INSERT INTO t1 (val) SELECT 4 FROM seq_1_to_16;
EXPLAIN SELECT * FROM t1 WHERE val=4; EXPLAIN SELECT * FROM t1 WHERE val=4;
ROLLBACK; ROLLBACK;
EXPLAIN SELECT * FROM t1 WHERE val=4; EXPLAIN SELECT * FROM t1 WHERE val=4;
BEGIN; BEGIN;
INSERT INTO t1 SELECT * FROM t0; INSERT INTO t1 (val) SELECT 4 FROM seq_1_to_16;
COMMIT; COMMIT;
EXPLAIN SELECT * FROM t1 WHERE val=4; EXPLAIN SELECT * FROM t1 WHERE val=4;
BEGIN; BEGIN;
@ -89,7 +80,8 @@ disconnect con1;
connection default; connection default;
DROP TABLE t0,t1,t2; DROP TABLE t1,t2;
SET GLOBAL innodb_stats_include_delete_marked = @saved_include_delete_marked; SET GLOBAL innodb_stats_include_delete_marked = @saved_include_delete_marked;
SET GLOBAL innodb_stats_traditional = @saved_traditional; SET GLOBAL innodb_stats_traditional = @saved_traditional;
SET GLOBAL innodb_stats_modified_counter = @saved_modified_counter; SET GLOBAL innodb_stats_modified_counter = @saved_modified_counter;
SET GLOBAL innodb_purge_rseg_truncate_frequency = @saved_frequency;