MDEV-14375: rocksdb.bulk_load_unsorted fails

Down-scale the test by a factor of 2.

3 files changed, 46 insertions, 67 deletions

diff --git a/storage/rocksdb/mysql-test/rocksdb/include/bulk_load_unsorted.inc b/storage/rocksdb/mysql-test/rocksdb/include/bulk_load_unsorted.inc
index 151ec0ccf14..5f808087e3e 100644
--- a/storage/rocksdb/mysql-test/rocksdb/include/bulk_load_unsorted.inc
+++ b/storage/rocksdb/mysql-test/rocksdb/include/bulk_load_unsorted.inc
@@ -84,7 +84,7 @@ perl;
 my $fn = $ENV{'ROCKSDB_INFILE'};
 open(my $fh, '>', $fn) || die "perl open($fn): $!";
 binmode $fh;
-my $max = 5000000;
+my $max = 2500000;
 my $sign = 1;
 for (my $ii = 0; $ii < $max; $ii++)
 {
@@ -129,12 +129,9 @@ ANALYZE TABLE t1, t2, t3;
 SHOW TABLE STATUS WHERE name LIKE 't%';
 
 # Make sure all the data is there.
-select count(a) from t1;
-select count(b) from t1;
-select count(a) from t2;
-select count(b) from t2;
-select count(a) from t3;
-select count(b) from t3;
+select count(a),count(b) from t1;
+select count(a),count(b) from t2;
+select count(a),count(b) from t3;
 
 SELECT * FROM t1 FORCE INDEX (PRIMARY) LIMIT 3;
 SELECT * FROM t2 FORCE INDEX (PRIMARY) LIMIT 3;
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_unsorted.result b/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_unsorted.result
index 2adaba1e228..40274c337c3 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_unsorted.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_unsorted.result
@@ -75,9 +75,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_swedish_ci	NULL		
-t2	ROCKSDB	10	Fixed	5000000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
-t3	ROCKSDB	10	Fixed	5000000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL	partitioned	
+t1	ROCKSDB	10	Fixed	2500000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
+t2	ROCKSDB	10	Fixed	2500000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
+t3	ROCKSDB	10	Fixed	2500000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL	partitioned	
 ANALYZE TABLE t1, t2, t3;
 Table	Op	Msg_type	Msg_text
 test.t1	analyze	status	OK
@@ -85,36 +85,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_swedish_ci	NULL		
-t2	ROCKSDB	10	Fixed	5000000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
-t3	ROCKSDB	10	Fixed	5000000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL	partitioned	
-select count(a) from t1;
-count(a)
-5000000
-select count(b) from t1;
-count(b)
-5000000
-select count(a) from t2;
-count(a)
-5000000
-select count(b) from t2;
-count(b)
-5000000
-select count(a) from t3;
-count(a)
-5000000
-select count(b) from t3;
-count(b)
-5000000
+t1	ROCKSDB	10	Fixed	2500000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
+t2	ROCKSDB	10	Fixed	2500000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
+t3	ROCKSDB	10	Fixed	2500000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL	partitioned	
+select count(a),count(b) from t1;
+count(a)	count(b)
+2500000	2500000
+select count(a),count(b) from t2;
+count(a)	count(b)
+2500000	2500000
+select count(a),count(b) from t3;
+count(a)	count(b)
+2500000	2500000
 SELECT * FROM t1 FORCE INDEX (PRIMARY) LIMIT 3;
 a	b
--4999998	5000000
--4999996	4999998
--4999994	4999996
+-2499998	2500000
+-2499996	2499998
+-2499994	2499996
 SELECT * FROM t2 FORCE INDEX (PRIMARY) LIMIT 3;
 a	b
-4999999	-4999997
-4999997	-4999995
-4999995	-4999993
+2499999	-2499997
+2499997	-2499995
+2499995	-2499993
 disconnect other;
 DROP TABLE t1, t2, t3;
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_unsorted_rev.result b/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_unsorted_rev.result
index f828fa57255..1aaac8ec268 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_unsorted_rev.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_unsorted_rev.result
@@ -75,9 +75,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_swedish_ci	NULL		
-t2	ROCKSDB	10	Fixed	5000000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
-t3	ROCKSDB	10	Fixed	5000000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL	partitioned	
+t1	ROCKSDB	10	Fixed	2500000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
+t2	ROCKSDB	10	Fixed	2500000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
+t3	ROCKSDB	10	Fixed	2500000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL	partitioned	
 ANALYZE TABLE t1, t2, t3;
 Table	Op	Msg_type	Msg_text
 test.t1	analyze	status	OK
@@ -85,36 +85,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_swedish_ci	NULL		
-t2	ROCKSDB	10	Fixed	5000000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
-t3	ROCKSDB	10	Fixed	5000000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL	partitioned	
-select count(a) from t1;
-count(a)
-5000000
-select count(b) from t1;
-count(b)
-5000000
-select count(a) from t2;
-count(a)
-5000000
-select count(b) from t2;
-count(b)
-5000000
-select count(a) from t3;
-count(a)
-5000000
-select count(b) from t3;
-count(b)
-5000000
+t1	ROCKSDB	10	Fixed	2500000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
+t2	ROCKSDB	10	Fixed	2500000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
+t3	ROCKSDB	10	Fixed	2500000	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL	partitioned	
+select count(a),count(b) from t1;
+count(a)	count(b)
+2500000	2500000
+select count(a),count(b) from t2;
+count(a)	count(b)
+2500000	2500000
+select count(a),count(b) from t3;
+count(a)	count(b)
+2500000	2500000
 SELECT * FROM t1 FORCE INDEX (PRIMARY) LIMIT 3;
 a	b
-4999999	-4999997
-4999997	-4999995
-4999995	-4999993
+2499999	-2499997
+2499997	-2499995
+2499995	-2499993
 SELECT * FROM t2 FORCE INDEX (PRIMARY) LIMIT 3;
 a	b
--4999998	5000000
--4999996	4999998
--4999994	4999996
+-2499998	2500000
+-2499996	2499998
+-2499994	2499996
 disconnect other;
 DROP TABLE t1, t2, t3;