Skip to content

Commit 279184a

Browse files
committed
MDEV-14562: rocksdb.bloomfilter failed in buildbot
Bloom filter is only used when reading the data from disk. If the data happens to be still in the memtable, bloomfilter wont be used. Stabilize the testcase by making sure the data is on disk before we read it.
1 parent fb5d579 commit 279184a

File tree

4 files changed

+11
-1
lines changed

4 files changed

+11
-1
lines changed

storage/rocksdb/mysql-test/rocksdb/r/bloomfilter.result

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ insert t1
4343
select (seq+9) div 10, (seq+4) div 5, (seq+4) div 5, seq, seq, 1000, "aaabbbccc"
4444
from seq_1_to_10000;
4545
insert t2 select * from t1;
46+
set global rocksdb_force_flush_memtable_now=1;
4647
call bloom_start();
4748
select count(*) from t1;
4849
count(*)
@@ -443,6 +444,7 @@ insert t1
443444
select (seq+9) div 10, (seq+4) div 5, (seq+4) div 5, seq, seq, 1000, "aaabbbccc"
444445
from seq_1_to_10000;
445446
insert t2 select * from t1;
447+
set global rocksdb_force_flush_memtable_now=1;
446448
call bloom_start();
447449
select count(*) from t1;
448450
count(*)
@@ -843,6 +845,7 @@ insert t1
843845
select (seq+9) div 10, (seq+4) div 5, (seq+4) div 5, seq, seq, 1000, "aaabbbccc"
844846
from seq_1_to_10000;
845847
insert t2 select * from t1;
848+
set global rocksdb_force_flush_memtable_now=1;
846849
call bloom_start();
847850
select count(*) from t1;
848851
count(*)
@@ -1243,6 +1246,7 @@ insert t1
12431246
select (seq+9) div 10, (seq+4) div 5, (seq+4) div 5, seq, seq, 1000, "aaabbbccc"
12441247
from seq_1_to_10000;
12451248
insert t2 select * from t1;
1249+
set global rocksdb_force_flush_memtable_now=1;
12461250
call bloom_start();
12471251
select count(*) from t1;
12481252
count(*)
@@ -1643,6 +1647,7 @@ insert t1
16431647
select (seq+9) div 10, (seq+4) div 5, (seq+4) div 5, seq, seq, 1000, "aaabbbccc"
16441648
from seq_1_to_10000;
16451649
insert t2 select * from t1;
1650+
set global rocksdb_force_flush_memtable_now=1;
16461651
call bloom_start();
16471652
select count(*) from t1;
16481653
count(*)

storage/rocksdb/mysql-test/rocksdb/r/bloomfilter_skip.result

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ insert t1
4343
select (seq+9) div 10, (seq+4) div 5, (seq+4) div 5, seq, seq, 1000, "aaabbbccc"
4444
from seq_1_to_10000;
4545
insert t2 select * from t1;
46+
set global rocksdb_force_flush_memtable_now=1;
4647
call bloom_start();
4748
select count(*) from t1;
4849
count(*)
@@ -443,6 +444,7 @@ insert t1
443444
select (seq+9) div 10, (seq+4) div 5, (seq+4) div 5, seq, seq, 1000, "aaabbbccc"
444445
from seq_1_to_10000;
445446
insert t2 select * from t1;
447+
set global rocksdb_force_flush_memtable_now=1;
446448
call bloom_start();
447449
select count(*) from t1;
448450
count(*)
@@ -843,6 +845,7 @@ insert t1
843845
select (seq+9) div 10, (seq+4) div 5, (seq+4) div 5, seq, seq, 1000, "aaabbbccc"
844846
from seq_1_to_10000;
845847
insert t2 select * from t1;
848+
set global rocksdb_force_flush_memtable_now=1;
846849
call bloom_start();
847850
select count(*) from t1;
848851
count(*)
@@ -1243,6 +1246,7 @@ insert t1
12431246
select (seq+9) div 10, (seq+4) div 5, (seq+4) div 5, seq, seq, 1000, "aaabbbccc"
12441247
from seq_1_to_10000;
12451248
insert t2 select * from t1;
1249+
set global rocksdb_force_flush_memtable_now=1;
12461250
call bloom_start();
12471251
select count(*) from t1;
12481252
count(*)
@@ -1643,6 +1647,7 @@ insert t1
16431647
select (seq+9) div 10, (seq+4) div 5, (seq+4) div 5, seq, seq, 1000, "aaabbbccc"
16441648
from seq_1_to_10000;
16451649
insert t2 select * from t1;
1650+
set global rocksdb_force_flush_memtable_now=1;
16461651
call bloom_start();
16471652
select count(*) from t1;
16481653
count(*)

storage/rocksdb/mysql-test/rocksdb/t/bloomfilter_load_select.inc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ insert t1
55
select (seq+9) div 10, (seq+4) div 5, (seq+4) div 5, seq, seq, 1000, "aaabbbccc"
66
from seq_1_to_10000;
77
insert t2 select * from t1;
8+
set global rocksdb_force_flush_memtable_now=1;
89

910
# BF conditions (prefix short(4B)|medium(20B)|long(240B))
1011
#0 no eq condition (o, x, x)

storage/rocksdb/mysql-test/rocksdb/t/disabled.def

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ rpl_row_triggers : Requires read-free slave.
6868
compact_deletes: MDEV-12663 : rocksdb.compact_deletes times out and causes other tests to fail
6969
blind_delete_without_tx_api: MDEV-12286: rocksdb.blind_delete_without_tx_api test fails
7070
information_schema: MDEV-14372: unstable testcase
71-
bloomfilter: MDEV-14562
7271

7372
##
7473
## Tests that fail for some other reason

0 commit comments

Comments
 (0)