Down-scale rocksdb.bulk_load* tests by 2x. This should fix MDEV-13904

5 files changed, 91 insertions, 130 deletions

diff --git a/storage/rocksdb/mysql-test/rocksdb/include/bulk_load.inc b/storage/rocksdb/mysql-test/rocksdb/include/bulk_load.inc
index 6472b969ce6..8ec97510dbd 100644
--- a/storage/rocksdb/mysql-test/rocksdb/include/bulk_load.inc
+++ b/storage/rocksdb/mysql-test/rocksdb/include/bulk_load.inc
@@ -50,7 +50,7 @@ eval CREATE TABLE t3(
 perl;
 my $fn = $ENV{'ROCKSDB_INFILE'};
 open(my $fh, '>', $fn) || die "perl open($fn): $!";
-my $max = 5000000;
+my $max = 2500000;
 my $desc = $ENV{'MTR_DATA_ORDER_DESC'};
 my @chars = ("A".."Z", "a".."z", "0".."9");
 my @powers_of_26 = (26 * 26 * 26 * 26, 26 * 26 * 26, 26 * 26, 26, 1);
@@ -118,15 +118,12 @@ ANALYZE TABLE t1, t2, t3;
 SHOW TABLE STATUS WHERE name LIKE 't%';
 
 # Make sure all the data is there.
-select count(pk) from t1;
-select count(a) from t1;
-select count(b) from t1;
-select count(pk) from t2;
-select count(a) from t2;
-select count(b) from t2;
-select count(pk) from t3;
-select count(a) from t3;
-select count(b) from t3;
+select count(pk),count(a) from t1;
+select count(b)           from t1;
+select count(pk),count(a) from t2;
+select count(b)           from t2;
+select count(pk),count(a) from t3;
+select count(b)           from t3;
 
 # Create a dummy file with a bulk load extesion.  It should be removed when
 # the server starts
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/bulk_load.result b/storage/rocksdb/mysql-test/rocksdb/r/bulk_load.result
index 4a746d64c87..737d3a3befa 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/bulk_load.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/bulk_load.result
@@ -38,9 +38,9 @@ LOAD DATA INFILE <input_file> INTO TABLE t3;
 set rocksdb_bulk_load=0;
 SHOW TABLE STATUS WHERE name LIKE 't%';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	ROCKSDB	10	Fixed	5000000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL		
-t2	ROCKSDB	10	Fixed	5000000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL		
-t3	ROCKSDB	10	Fixed	5000000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL	partitioned	
+t1	ROCKSDB	10	Fixed	2500000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL		
+t2	ROCKSDB	10	Fixed	2500000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL		
+t3	ROCKSDB	10	Fixed	2500000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL	partitioned	
 ANALYZE TABLE t1, t2, t3;
 Table	Op	Msg_type	Msg_text
 test.t1	analyze	status	OK
@@ -48,36 +48,27 @@ test.t2	analyze	status	OK
 test.t3	analyze	status	OK
 SHOW TABLE STATUS WHERE name LIKE 't%';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	ROCKSDB	10	Fixed	5000000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL		
-t2	ROCKSDB	10	Fixed	5000000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL		
-t3	ROCKSDB	10	Fixed	5000000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL	partitioned	
-select count(pk) from t1;
-count(pk)
-5000000
-select count(a) from t1;
-count(a)
-5000000
-select count(b) from t1;
+t1	ROCKSDB	10	Fixed	2500000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL		
+t2	ROCKSDB	10	Fixed	2500000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL		
+t3	ROCKSDB	10	Fixed	2500000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL	partitioned	
+select count(pk),count(a) from t1;
+count(pk)	count(a)
+2500000	2500000
+select count(b)           from t1;
 count(b)
-5000000
-select count(pk) from t2;
-count(pk)
-5000000
-select count(a) from t2;
-count(a)
-5000000
-select count(b) from t2;
+2500000
+select count(pk),count(a) from t2;
+count(pk)	count(a)
+2500000	2500000
+select count(b)           from t2;
 count(b)
-5000000
-select count(pk) from t3;
-count(pk)
-5000000
-select count(a) from t3;
-count(a)
-5000000
-select count(b) from t3;
+2500000
+select count(pk),count(a) from t3;
+count(pk)	count(a)
+2500000	2500000
+select count(b)           from t3;
 count(b)
-5000000
+2500000
 longfilenamethatvalidatesthatthiswillgetdeleted.bulk_load.tmp
 test.bulk_load.tmp
 disconnect other;
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_rev_cf.result b/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_rev_cf.result
index 4fd7ae9d9a5..b4ef029e5c4 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_rev_cf.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_rev_cf.result
@@ -38,9 +38,9 @@ LOAD DATA INFILE <input_file> INTO TABLE t3;
 set rocksdb_bulk_load=0;
 SHOW TABLE STATUS WHERE name LIKE 't%';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	ROCKSDB	10	Fixed	5000000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL		
-t2	ROCKSDB	10	Fixed	5000000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL		
-t3	ROCKSDB	10	Fixed	5000000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL	partitioned	
+t1	ROCKSDB	10	Fixed	2500000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL		
+t2	ROCKSDB	10	Fixed	2500000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL		
+t3	ROCKSDB	10	Fixed	2500000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL	partitioned	
 ANALYZE TABLE t1, t2, t3;
 Table	Op	Msg_type	Msg_text
 test.t1	analyze	status	OK
@@ -48,36 +48,27 @@ test.t2	analyze	status	OK
 test.t3	analyze	status	OK
 SHOW TABLE STATUS WHERE name LIKE 't%';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	ROCKSDB	10	Fixed	5000000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL		
-t2	ROCKSDB	10	Fixed	5000000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL		
-t3	ROCKSDB	10	Fixed	5000000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL	partitioned	
-select count(pk) from t1;
-count(pk)
-5000000
-select count(a) from t1;
-count(a)
-5000000
-select count(b) from t1;
+t1	ROCKSDB	10	Fixed	2500000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL		
+t2	ROCKSDB	10	Fixed	2500000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL		
+t3	ROCKSDB	10	Fixed	2500000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL	partitioned	
+select count(pk),count(a) from t1;
+count(pk)	count(a)
+2500000	2500000
+select count(b)           from t1;
 count(b)
-5000000
-select count(pk) from t2;
-count(pk)
-5000000
-select count(a) from t2;
-count(a)
-5000000
-select count(b) from t2;
+2500000
+select count(pk),count(a) from t2;
+count(pk)	count(a)
+2500000	2500000
+select count(b)           from t2;
 count(b)
-5000000
-select count(pk) from t3;
-count(pk)
-5000000
-select count(a) from t3;
-count(a)
-5000000
-select count(b) from t3;
+2500000
+select count(pk),count(a) from t3;
+count(pk)	count(a)
+2500000	2500000
+select count(b)           from t3;
 count(b)
-5000000
+2500000
 longfilenamethatvalidatesthatthiswillgetdeleted.bulk_load.tmp
 test.bulk_load.tmp
 disconnect other;
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_rev_cf_and_data.result b/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_rev_cf_and_data.result
index 7d7c9f34200..b7d5a9c922f 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_rev_cf_and_data.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_rev_cf_and_data.result
@@ -38,9 +38,9 @@ LOAD DATA INFILE <input_file> INTO TABLE t3;
 set rocksdb_bulk_load=0;
 SHOW TABLE STATUS WHERE name LIKE 't%';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	ROCKSDB	10	Fixed	5000000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL		
-t2	ROCKSDB	10	Fixed	5000000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL		
-t3	ROCKSDB	10	Fixed	5000000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL	partitioned	
+t1	ROCKSDB	10	Fixed	2500000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL		
+t2	ROCKSDB	10	Fixed	2500000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL		
+t3	ROCKSDB	10	Fixed	2500000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL	partitioned	
 ANALYZE TABLE t1, t2, t3;
 Table	Op	Msg_type	Msg_text
 test.t1	analyze	status	OK
@@ -48,36 +48,27 @@ test.t2	analyze	status	OK
 test.t3	analyze	status	OK
 SHOW TABLE STATUS WHERE name LIKE 't%';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	ROCKSDB	10	Fixed	5000000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL		
-t2	ROCKSDB	10	Fixed	5000000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL		
-t3	ROCKSDB	10	Fixed	5000000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL	partitioned	
-select count(pk) from t1;
-count(pk)
-5000000
-select count(a) from t1;
-count(a)
-5000000
-select count(b) from t1;
+t1	ROCKSDB	10	Fixed	2500000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL		
+t2	ROCKSDB	10	Fixed	2500000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL		
+t3	ROCKSDB	10	Fixed	2500000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL	partitioned	
+select count(pk),count(a) from t1;
+count(pk)	count(a)
+2500000	2500000
+select count(b)           from t1;
 count(b)
-5000000
-select count(pk) from t2;
-count(pk)
-5000000
-select count(a) from t2;
-count(a)
-5000000
-select count(b) from t2;
+2500000
+select count(pk),count(a) from t2;
+count(pk)	count(a)
+2500000	2500000
+select count(b)           from t2;
 count(b)
-5000000
-select count(pk) from t3;
-count(pk)
-5000000
-select count(a) from t3;
-count(a)
-5000000
-select count(b) from t3;
+2500000
+select count(pk),count(a) from t3;
+count(pk)	count(a)
+2500000	2500000
+select count(b)           from t3;
 count(b)
-5000000
+2500000
 longfilenamethatvalidatesthatthiswillgetdeleted.bulk_load.tmp
 test.bulk_load.tmp
 disconnect other;
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_rev_data.result b/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_rev_data.result
index c1b6d48a6a5..7ccc39f3582 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_rev_data.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_rev_data.result
@@ -38,9 +38,9 @@ LOAD DATA INFILE <input_file> INTO TABLE t3;
 set rocksdb_bulk_load=0;
 SHOW TABLE STATUS WHERE name LIKE 't%';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	ROCKSDB	10	Fixed	5000000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL		
-t2	ROCKSDB	10	Fixed	5000000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL		
-t3	ROCKSDB	10	Fixed	5000000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL	partitioned	
+t1	ROCKSDB	10	Fixed	2500000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL		
+t2	ROCKSDB	10	Fixed	2500000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL		
+t3	ROCKSDB	10	Fixed	2500000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL	partitioned	
 ANALYZE TABLE t1, t2, t3;
 Table	Op	Msg_type	Msg_text
 test.t1	analyze	status	OK
@@ -48,36 +48,27 @@ test.t2	analyze	status	OK
 test.t3	analyze	status	OK
 SHOW TABLE STATUS WHERE name LIKE 't%';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	ROCKSDB	10	Fixed	5000000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL		
-t2	ROCKSDB	10	Fixed	5000000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL		
-t3	ROCKSDB	10	Fixed	5000000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL	partitioned	
-select count(pk) from t1;
-count(pk)
-5000000
-select count(a) from t1;
-count(a)
-5000000
-select count(b) from t1;
+t1	ROCKSDB	10	Fixed	2500000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL		
+t2	ROCKSDB	10	Fixed	2500000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL		
+t3	ROCKSDB	10	Fixed	2500000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_bin	NULL	partitioned	
+select count(pk),count(a) from t1;
+count(pk)	count(a)
+2500000	2500000
+select count(b)           from t1;
 count(b)
-5000000
-select count(pk) from t2;
-count(pk)
-5000000
-select count(a) from t2;
-count(a)
-5000000
-select count(b) from t2;
+2500000
+select count(pk),count(a) from t2;
+count(pk)	count(a)
+2500000	2500000
+select count(b)           from t2;
 count(b)
-5000000
-select count(pk) from t3;
-count(pk)
-5000000
-select count(a) from t3;
-count(a)
-5000000
-select count(b) from t3;
+2500000
+select count(pk),count(a) from t3;
+count(pk)	count(a)
+2500000	2500000
+select count(b)           from t3;
 count(b)
-5000000
+2500000
 longfilenamethatvalidatesthatthiswillgetdeleted.bulk_load.tmp
 test.bulk_load.tmp
 disconnect other;