Skip to content

M
MariaDB
Commit 0d033b6d authored by Sergei Petrunia's avatar Sergei Petrunia
Browse files
Options

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

parent 2879fb08
Show whitespace changes
Inline Side-by-side
Showing with 91 additions and 130 deletions
storage/rocksdb/mysql-test/rocksdb/include/bulk_load.inc
View file @ 0d033b6d
...@@ -50,7 +50,7 @@ eval CREATE TABLE t3( ...@@ -50,7 +50,7 @@ eval CREATE TABLE t3(
perl; perl;
my $fn = $ENV{'ROCKSDB_INFILE'}; my $fn = $ENV{'ROCKSDB_INFILE'};
open(my $fh, '>', $fn) || die "perl open($fn): $!"; open(my $fh, '>', $fn) || die "perl open($fn): $!";
my $max = 5000000; my $max = 2500000;
my $desc = $ENV{'MTR_DATA_ORDER_DESC'}; my $desc = $ENV{'MTR_DATA_ORDER_DESC'};
my @chars = ("A".."Z", "a".."z", "0".."9"); my @chars = ("A".."Z", "a".."z", "0".."9");
my @powers_of_26 = (26 * 26 * 26 * 26, 26 * 26 * 26, 26 * 26, 26, 1); my @powers_of_26 = (26 * 26 * 26 * 26, 26 * 26 * 26, 26 * 26, 26, 1);
...@@ -118,14 +118,11 @@ ANALYZE TABLE t1, t2, t3; ...@@ -118,14 +118,11 @@ ANALYZE TABLE t1, t2, t3;
SHOW TABLE STATUS WHERE name LIKE 't%'; SHOW TABLE STATUS WHERE name LIKE 't%';
# Make sure all the data is there. # Make sure all the data is there.
select count(pk) from t1; select count(pk),count(a) from t1;
select count(a) from t1;
select count(b) from t1; select count(b) from t1;
select count(pk) from t2; select count(pk),count(a) from t2;
select count(a) from t2;
select count(b) from t2; select count(b) from t2;
select count(pk) from t3; select count(pk),count(a) from t3;
select count(a) from t3;
select count(b) from t3; select count(b) from t3;
# Create a dummy file with a bulk load extesion. It should be removed when # Create a dummy file with a bulk load extesion. It should be removed when
......
storage/rocksdb/mysql-test/rocksdb/r/bulk_load.result
View file @ 0d033b6d
...@@ -38,9 +38,9 @@ LOAD DATA INFILE <input_file> INTO TABLE t3; ...@@ -38,9 +38,9 @@ LOAD DATA INFILE <input_file> INTO TABLE t3;
set rocksdb_bulk_load=0; set rocksdb_bulk_load=0;
SHOW TABLE STATUS WHERE name LIKE 't%'; 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 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 t1 ROCKSDB 10 Fixed 2500000 # # # # 0 NULL NULL NULL NULL latin1_bin NULL
t2 ROCKSDB 10 Fixed 5000000 # # # # 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 5000000 # # # # 0 NULL NULL NULL NULL latin1_bin NULL partitioned t3 ROCKSDB 10 Fixed 2500000 # # # # 0 NULL NULL NULL NULL latin1_bin NULL partitioned
ANALYZE TABLE t1, t2, t3; ANALYZE TABLE t1, t2, t3;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 analyze status OK test.t1 analyze status OK
...@@ -48,36 +48,27 @@ test.t2 analyze status OK ...@@ -48,36 +48,27 @@ test.t2 analyze status OK
test.t3 analyze status OK test.t3 analyze status OK
SHOW TABLE STATUS WHERE name LIKE 't%'; 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 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 t1 ROCKSDB 10 Fixed 2500000 # # # # 0 NULL NULL NULL NULL latin1_bin NULL
t2 ROCKSDB 10 Fixed 5000000 # # # # 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 5000000 # # # # 0 NULL NULL NULL NULL latin1_bin NULL partitioned t3 ROCKSDB 10 Fixed 2500000 # # # # 0 NULL NULL NULL NULL latin1_bin NULL partitioned
select count(pk) from t1; select count(pk),count(a) from t1;
count(pk) count(pk) count(a)
5000000 2500000 2500000
select count(a) from t1;
count(a)
5000000
select count(b) from t1; select count(b) from t1;
count(b) count(b)
5000000 2500000
select count(pk) from t2; select count(pk),count(a) from t2;
count(pk) count(pk) count(a)
5000000 2500000 2500000
select count(a) from t2;
count(a)
5000000
select count(b) from t2; select count(b) from t2;
count(b) count(b)
5000000 2500000
select count(pk) from t3; select count(pk),count(a) from t3;
count(pk) count(pk) count(a)
5000000 2500000 2500000
select count(a) from t3;
count(a)
5000000
select count(b) from t3; select count(b) from t3;
count(b) count(b)
5000000 2500000
longfilenamethatvalidatesthatthiswillgetdeleted.bulk_load.tmp longfilenamethatvalidatesthatthiswillgetdeleted.bulk_load.tmp
test.bulk_load.tmp test.bulk_load.tmp
disconnect other; disconnect other;
......
storage/rocksdb/mysql-test/rocksdb/r/bulk_load_rev_cf.result
View file @ 0d033b6d
...@@ -38,9 +38,9 @@ LOAD DATA INFILE <input_file> INTO TABLE t3; ...@@ -38,9 +38,9 @@ LOAD DATA INFILE <input_file> INTO TABLE t3;
set rocksdb_bulk_load=0; set rocksdb_bulk_load=0;
SHOW TABLE STATUS WHERE name LIKE 't%'; 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 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 t1 ROCKSDB 10 Fixed 2500000 # # # # 0 NULL NULL NULL NULL latin1_bin NULL
t2 ROCKSDB 10 Fixed 5000000 # # # # 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 5000000 # # # # 0 NULL NULL NULL NULL latin1_bin NULL partitioned t3 ROCKSDB 10 Fixed 2500000 # # # # 0 NULL NULL NULL NULL latin1_bin NULL partitioned
ANALYZE TABLE t1, t2, t3; ANALYZE TABLE t1, t2, t3;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 analyze status OK test.t1 analyze status OK
...@@ -48,36 +48,27 @@ test.t2 analyze status OK ...@@ -48,36 +48,27 @@ test.t2 analyze status OK
test.t3 analyze status OK test.t3 analyze status OK
SHOW TABLE STATUS WHERE name LIKE 't%'; 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 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 t1 ROCKSDB 10 Fixed 2500000 # # # # 0 NULL NULL NULL NULL latin1_bin NULL
t2 ROCKSDB 10 Fixed 5000000 # # # # 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 5000000 # # # # 0 NULL NULL NULL NULL latin1_bin NULL partitioned t3 ROCKSDB 10 Fixed 2500000 # # # # 0 NULL NULL NULL NULL latin1_bin NULL partitioned
select count(pk) from t1; select count(pk),count(a) from t1;
count(pk) count(pk) count(a)
5000000 2500000 2500000
select count(a) from t1;
count(a)
5000000
select count(b) from t1; select count(b) from t1;
count(b) count(b)
5000000 2500000
select count(pk) from t2; select count(pk),count(a) from t2;
count(pk) count(pk) count(a)
5000000 2500000 2500000
select count(a) from t2;
count(a)
5000000
select count(b) from t2; select count(b) from t2;
count(b) count(b)
5000000 2500000
select count(pk) from t3; select count(pk),count(a) from t3;
count(pk) count(pk) count(a)
5000000 2500000 2500000
select count(a) from t3;
count(a)
5000000
select count(b) from t3; select count(b) from t3;
count(b) count(b)
5000000 2500000
longfilenamethatvalidatesthatthiswillgetdeleted.bulk_load.tmp longfilenamethatvalidatesthatthiswillgetdeleted.bulk_load.tmp
test.bulk_load.tmp test.bulk_load.tmp
disconnect other; disconnect other;
......
storage/rocksdb/mysql-test/rocksdb/r/bulk_load_rev_cf_and_data.result
View file @ 0d033b6d
...@@ -38,9 +38,9 @@ LOAD DATA INFILE <input_file> INTO TABLE t3; ...@@ -38,9 +38,9 @@ LOAD DATA INFILE <input_file> INTO TABLE t3;
set rocksdb_bulk_load=0; set rocksdb_bulk_load=0;
SHOW TABLE STATUS WHERE name LIKE 't%'; 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 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 t1 ROCKSDB 10 Fixed 2500000 # # # # 0 NULL NULL NULL NULL latin1_bin NULL
t2 ROCKSDB 10 Fixed 5000000 # # # # 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 5000000 # # # # 0 NULL NULL NULL NULL latin1_bin NULL partitioned t3 ROCKSDB 10 Fixed 2500000 # # # # 0 NULL NULL NULL NULL latin1_bin NULL partitioned
ANALYZE TABLE t1, t2, t3; ANALYZE TABLE t1, t2, t3;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 analyze status OK test.t1 analyze status OK
...@@ -48,36 +48,27 @@ test.t2 analyze status OK ...@@ -48,36 +48,27 @@ test.t2 analyze status OK
test.t3 analyze status OK test.t3 analyze status OK
SHOW TABLE STATUS WHERE name LIKE 't%'; 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 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 t1 ROCKSDB 10 Fixed 2500000 # # # # 0 NULL NULL NULL NULL latin1_bin NULL
t2 ROCKSDB 10 Fixed 5000000 # # # # 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 5000000 # # # # 0 NULL NULL NULL NULL latin1_bin NULL partitioned t3 ROCKSDB 10 Fixed 2500000 # # # # 0 NULL NULL NULL NULL latin1_bin NULL partitioned
select count(pk) from t1; select count(pk),count(a) from t1;
count(pk) count(pk) count(a)
5000000 2500000 2500000
select count(a) from t1;
count(a)
5000000
select count(b) from t1; select count(b) from t1;
count(b) count(b)
5000000 2500000
select count(pk) from t2; select count(pk),count(a) from t2;
count(pk) count(pk) count(a)
5000000 2500000 2500000
select count(a) from t2;
count(a)
5000000
select count(b) from t2; select count(b) from t2;
count(b) count(b)
5000000 2500000
select count(pk) from t3; select count(pk),count(a) from t3;
count(pk) count(pk) count(a)
5000000 2500000 2500000
select count(a) from t3;
count(a)
5000000
select count(b) from t3; select count(b) from t3;
count(b) count(b)
5000000 2500000
longfilenamethatvalidatesthatthiswillgetdeleted.bulk_load.tmp longfilenamethatvalidatesthatthiswillgetdeleted.bulk_load.tmp
test.bulk_load.tmp test.bulk_load.tmp
disconnect other; disconnect other;
......
storage/rocksdb/mysql-test/rocksdb/r/bulk_load_rev_data.result
View file @ 0d033b6d
...@@ -38,9 +38,9 @@ LOAD DATA INFILE <input_file> INTO TABLE t3; ...@@ -38,9 +38,9 @@ LOAD DATA INFILE <input_file> INTO TABLE t3;
set rocksdb_bulk_load=0; set rocksdb_bulk_load=0;
SHOW TABLE STATUS WHERE name LIKE 't%'; 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 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 t1 ROCKSDB 10 Fixed 2500000 # # # # 0 NULL NULL NULL NULL latin1_bin NULL
t2 ROCKSDB 10 Fixed 5000000 # # # # 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 5000000 # # # # 0 NULL NULL NULL NULL latin1_bin NULL partitioned t3 ROCKSDB 10 Fixed 2500000 # # # # 0 NULL NULL NULL NULL latin1_bin NULL partitioned
ANALYZE TABLE t1, t2, t3; ANALYZE TABLE t1, t2, t3;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 analyze status OK test.t1 analyze status OK
...@@ -48,36 +48,27 @@ test.t2 analyze status OK ...@@ -48,36 +48,27 @@ test.t2 analyze status OK
test.t3 analyze status OK test.t3 analyze status OK
SHOW TABLE STATUS WHERE name LIKE 't%'; 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 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 t1 ROCKSDB 10 Fixed 2500000 # # # # 0 NULL NULL NULL NULL latin1_bin NULL
t2 ROCKSDB 10 Fixed 5000000 # # # # 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 5000000 # # # # 0 NULL NULL NULL NULL latin1_bin NULL partitioned t3 ROCKSDB 10 Fixed 2500000 # # # # 0 NULL NULL NULL NULL latin1_bin NULL partitioned
select count(pk) from t1; select count(pk),count(a) from t1;
count(pk) count(pk) count(a)
5000000 2500000 2500000
select count(a) from t1;
count(a)
5000000
select count(b) from t1; select count(b) from t1;
count(b) count(b)
5000000 2500000
select count(pk) from t2; select count(pk),count(a) from t2;
count(pk) count(pk) count(a)
5000000 2500000 2500000
select count(a) from t2;
count(a)
5000000
select count(b) from t2; select count(b) from t2;
count(b) count(b)
5000000 2500000
select count(pk) from t3; select count(pk),count(a) from t3;
count(pk) count(pk) count(a)
5000000 2500000 2500000
select count(a) from t3;
count(a)
5000000
select count(b) from t3; select count(b) from t3;
count(b) count(b)
5000000 2500000
longfilenamethatvalidatesthatthiswillgetdeleted.bulk_load.tmp longfilenamethatvalidatesthatthiswillgetdeleted.bulk_load.tmp
test.bulk_load.tmp test.bulk_load.tmp
disconnect other; disconnect other;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7