summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Petrunia <psergey@askmonty.org>2017-10-29 13:21:23 +0300
committerSergei Petrunia <psergey@askmonty.org>2017-10-29 13:21:23 +0300
commite5678c3fac27af7ca5a8503cccf1fdf3ad4f6fce (patch)
treeacb4b9bd86436ad3bd730188a4d7e7e6df5887dc
parent34188ac4553b9325081280bec14a7cb65453b7ce (diff)
downloadmariadb-git-e5678c3fac27af7ca5a8503cccf1fdf3ad4f6fce.tar.gz
MDEV-13904: rocksdb.add_index_inplace_sstfilewriter timed out
Downscale rocksdb.add_index_inplace_sstfilewriter to be 10x smaller
-rw-r--r--storage/rocksdb/mysql-test/rocksdb/r/add_index_inplace_sstfilewriter.result18
-rw-r--r--storage/rocksdb/mysql-test/rocksdb/t/add_index_inplace_sstfilewriter.test4
2 files changed, 11 insertions, 11 deletions
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/add_index_inplace_sstfilewriter.result b/storage/rocksdb/mysql-test/rocksdb/r/add_index_inplace_sstfilewriter.result
index 2d1ba7ca1d8..0c3ad720194 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/add_index_inplace_sstfilewriter.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/add_index_inplace_sstfilewriter.result
@@ -1,18 +1,18 @@
drop table if exists t1;
CREATE TABLE t1(pk CHAR(5) PRIMARY KEY, a char(30), b char(30)) COLLATE 'latin1_bin';
set rocksdb_bulk_load=1;
-set rocksdb_bulk_load_size=100000;
+set rocksdb_bulk_load_size=10000;
LOAD DATA INFILE <input_file> INTO TABLE t1;
set rocksdb_bulk_load=0;
select count(pk) from t1;
count(pk)
-3000000
+300000
select count(a) from t1;
count(a)
-3000000
+300000
select count(b) from t1;
count(b)
-3000000
+300000
ALTER TABLE t1 ADD INDEX kb(b), ALGORITHM=INPLACE;
ALTER TABLE t1 ADD INDEX kb_copy(b), ALGORITHM=COPY;
SELECT COUNT(*) as c FROM
@@ -25,22 +25,22 @@ c
1
select count(*) from t1 FORCE INDEX(kb);
count(*)
-3000000
+300000
select count(*) from t1 FORCE INDEX(kb_copy);
count(*)
-3000000
+300000
select count(*) from t1 FORCE INDEX(PRIMARY);
count(*)
-3000000
+300000
ALTER TABLE t1 DROP INDEX kb, ALGORITHM=INPLACE;
ALTER TABLE t1 DROP INDEX kb_copy, ALGORITHM=INPLACE;
ALTER TABLE t1 ADD INDEX kb(b), ADD INDEX kab(a,b), ALGORITHM=INPLACE;
SELECT COUNT(*) FROM t1 FORCE INDEX(kab);
COUNT(*)
-3000000
+300000
SELECT COUNT(*) FROM t1 FORCE INDEX(kb);
COUNT(*)
-3000000
+300000
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
diff --git a/storage/rocksdb/mysql-test/rocksdb/t/add_index_inplace_sstfilewriter.test b/storage/rocksdb/mysql-test/rocksdb/t/add_index_inplace_sstfilewriter.test
index 1ac382794ae..78ddbe60da5 100644
--- a/storage/rocksdb/mysql-test/rocksdb/t/add_index_inplace_sstfilewriter.test
+++ b/storage/rocksdb/mysql-test/rocksdb/t/add_index_inplace_sstfilewriter.test
@@ -19,7 +19,7 @@ CREATE TABLE t1(pk CHAR(5) PRIMARY KEY, a char(30), b char(30)) COLLATE 'latin1_
perl;
my $fn = $ENV{'ROCKSDB_INFILE'};
open(my $fh, '>>', $fn) || die "perl open($fn): $!";
-my $max = 3000000;
+my $max = 300000;
my @chars = ("A".."Z", "a".."z", "0".."9");
my @lowerchars = ("a".."z");
my @powers_of_26 = (26 * 26 * 26 * 26, 26 * 26 * 26, 26 * 26, 26, 1);
@@ -48,7 +48,7 @@ EOF
--file_exists $file
set rocksdb_bulk_load=1;
-set rocksdb_bulk_load_size=100000;
+set rocksdb_bulk_load_size=10000;
--disable_query_log
--echo LOAD DATA INFILE <input_file> INTO TABLE t1;
eval LOAD DATA INFILE '$file' INTO TABLE t1;