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

Speed up main.sum_distinct-big

Browse Source 
Eliminate one InnoDB table with 128*16384 rows, and use
the sequence engine instead. Also, run everything in a single
transaction, to prevent purge from running concurrently
unnecessarily. (Starting with MariaDB Server 10.3, purge would
reset the DB_TRX_ID after INSERT.)
This commit is contained in:
Marko Mäkelä 2019-09-25 11:29:21 +03:00
parent 5f118b26c8
commit 516f7c111b
2 changed files with 17 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
mysql-test/r/sum_distinct-big.result
View File

@ -1,7 +1,5 @@
DROP TABLE IF EXISTS t1, t2;
set @save_tmp_table_size=@@tmp_table_size; set @save_tmp_table_size=@@tmp_table_size;
set @save_max_heap_table_size=@@max_heap_table_size; set @save_max_heap_table_size=@@max_heap_table_size;
set @save_storage_engine=@@storage_engine;
set storage_engine=MYISAM; set storage_engine=MYISAM;
CREATE TABLE t1 (id INTEGER); CREATE TABLE t1 (id INTEGER);
CREATE TABLE t2 (id INTEGER); CREATE TABLE t2 (id INTEGER);
@ -127,34 +125,12 @@ DROP TABLE t2;
SET @@tmp_table_size=@save_tmp_table_size; SET @@tmp_table_size=@save_tmp_table_size;
SET @@max_heap_table_size=@save_max_heap_table_size; SET @@max_heap_table_size=@save_max_heap_table_size;
# #
# Bug mdev-4311: COUNT(DISTINCT...) requiring a file for Unique # MDEV-4311: COUNT(DISTINCT...) requiring a file for UNIQUE (bug #68749)
# (bug #68749)
# #
set @save_storage_engine=@@storage_engine;
set storage_engine=INNODB;
CREATE TABLE t1 (id INTEGER) ENGINE=InnoDB;
CREATE TABLE t2 (id INTEGER) ENGINE=InnoDB; CREATE TABLE t2 (id INTEGER) ENGINE=InnoDB;
INSERT INTO t1 (id) VALUES (1), (1), (1),(1); BEGIN;
INSERT INTO t1 (id) SELECT id FROM t1; INSERT INTO t2 SELECT b.seq FROM seq_1_to_128 a, seq_1_to_16384 b
INSERT INTO t1 (id) SELECT id FROM t1; ORDER BY b.seq*rand();
INSERT INTO t1 (id) SELECT id FROM t1;
INSERT INTO t1 (id) SELECT id FROM t1;
INSERT INTO t1 (id) SELECT id FROM t1;
INSERT INTO t1 SELECT id+1 FROM t1;
INSERT INTO t1 SELECT id+2 FROM t1;
INSERT INTO t1 SELECT id+4 FROM t1;
INSERT INTO t1 SELECT id+8 FROM t1;
INSERT INTO t1 SELECT id+16 FROM t1;
INSERT INTO t1 SELECT id+32 FROM t1;
INSERT INTO t1 SELECT id+64 FROM t1;
INSERT INTO t1 SELECT id+128 FROM t1;
INSERT INTO t1 SELECT id+256 FROM t1;
INSERT INTO t1 SELECT id+512 FROM t1;
INSERT INTO t1 SELECT id+1024 FROM t1;
INSERT INTO t1 SELECT id+2048 FROM t1;
INSERT INTO t1 SELECT id+4096 FROM t1;
INSERT INTO t1 SELECT id+8192 FROM t1;
INSERT INTO t2 SELECT id FROM t1 ORDER BY id*rand();
INSERT INTO t2 VALUE(NULL); INSERT INTO t2 VALUE(NULL);
# With default tmp_table_size / max_heap_table_size # With default tmp_table_size / max_heap_table_size
SELECT SQL_NO_CACHE count(DISTINCT id) sm FROM t2; SELECT SQL_NO_CACHE count(DISTINCT id) sm FROM t2;
@ -176,5 +152,5 @@ SET @@max_heap_table_size=@save_max_heap_table_size;
SELECT SQL_NO_CACHE count(DISTINCT id) sm FROM t2; SELECT SQL_NO_CACHE count(DISTINCT id) sm FROM t2;
sm sm
16384 16384
DROP TABLE t1,t2; COMMIT;
set storage_engine=@save_storage_engine; DROP TABLE t2;

44
mysql-test/t/sum_distinct-big.test
View File

@ -4,15 +4,11 @@
--source include/big_test.inc --source include/big_test.inc
--source include/have_innodb.inc --source include/have_innodb.inc
--disable_warnings --source include/have_sequence.inc
DROP TABLE IF EXISTS t1, t2;
--enable_warnings
set @save_tmp_table_size=@@tmp_table_size; set @save_tmp_table_size=@@tmp_table_size;
set @save_max_heap_table_size=@@max_heap_table_size; set @save_max_heap_table_size=@@max_heap_table_size;
set @save_storage_engine=@@storage_engine;
# #
# Test the case when distinct values doesn't fit in memory and # Test the case when distinct values doesn't fit in memory and
# filesort is used (see uniques.cc:merge_walk) # filesort is used (see uniques.cc:merge_walk)
@ -95,38 +91,13 @@ SET @@tmp_table_size=@save_tmp_table_size;
SET @@max_heap_table_size=@save_max_heap_table_size; SET @@max_heap_table_size=@save_max_heap_table_size;
--echo # --echo #
--echo # Bug mdev-4311: COUNT(DISTINCT...) requiring a file for Unique --echo # MDEV-4311: COUNT(DISTINCT...) requiring a file for UNIQUE (bug #68749)
--echo # (bug #68749)
--echo # --echo #
set @save_storage_engine=@@storage_engine;
set storage_engine=INNODB;
CREATE TABLE t1 (id INTEGER) ENGINE=InnoDB;
CREATE TABLE t2 (id INTEGER) ENGINE=InnoDB; CREATE TABLE t2 (id INTEGER) ENGINE=InnoDB;
INSERT INTO t1 (id) VALUES (1), (1), (1),(1); BEGIN;
INSERT INTO t1 (id) SELECT id FROM t1; INSERT INTO t2 SELECT b.seq FROM seq_1_to_128 a, seq_1_to_16384 b
INSERT INTO t1 (id) SELECT id FROM t1; ORDER BY b.seq*rand();
INSERT INTO t1 (id) SELECT id FROM t1;
INSERT INTO t1 (id) SELECT id FROM t1;
INSERT INTO t1 (id) SELECT id FROM t1;
INSERT INTO t1 SELECT id+1 FROM t1;
INSERT INTO t1 SELECT id+2 FROM t1;
INSERT INTO t1 SELECT id+4 FROM t1;
INSERT INTO t1 SELECT id+8 FROM t1;
INSERT INTO t1 SELECT id+16 FROM t1;
INSERT INTO t1 SELECT id+32 FROM t1;
INSERT INTO t1 SELECT id+64 FROM t1;
INSERT INTO t1 SELECT id+128 FROM t1;
INSERT INTO t1 SELECT id+256 FROM t1;
INSERT INTO t1 SELECT id+512 FROM t1;
INSERT INTO t1 SELECT id+1024 FROM t1;
INSERT INTO t1 SELECT id+2048 FROM t1;
INSERT INTO t1 SELECT id+4096 FROM t1;
INSERT INTO t1 SELECT id+8192 FROM t1;
INSERT INTO t2 SELECT id FROM t1 ORDER BY id*rand();
INSERT INTO t2 VALUE(NULL); INSERT INTO t2 VALUE(NULL);
--echo # With default tmp_table_size / max_heap_table_size --echo # With default tmp_table_size / max_heap_table_size
@ -147,7 +118,6 @@ SET @@max_heap_table_size=@save_max_heap_table_size;
--echo # Back to default tmp_table_size / max_heap_table_size --echo # Back to default tmp_table_size / max_heap_table_size
SELECT SQL_NO_CACHE count(DISTINCT id) sm FROM t2; SELECT SQL_NO_CACHE count(DISTINCT id) sm FROM t2;
COMMIT;
DROP TABLE t1,t2; DROP TABLE t2;
set storage_engine=@save_storage_engine;