From 41e351f6082a60140f1d71a0261037d039b30925 Mon Sep 17 00:00:00 2001 From: Sergei Petrunia Date: Thu, 5 Sep 2019 17:43:13 +0300 Subject: MDEV-20490: rocksdb.ttl_primary_read_filtering fails in BB Make the test stable: after DROP TABLE, make sure the compaction is run and finishes. If we don't do this, the post-drop compaction may run during the next testcase. It will cause a record from the next testcase to be compacted away when the test logic doesn't expect it and the test will fail --- storage/rocksdb/mysql-test/rocksdb/r/ttl_primary_read_filtering.result | 1 + storage/rocksdb/mysql-test/rocksdb/t/ttl_primary_read_filtering.test | 2 ++ 2 files changed, 3 insertions(+) (limited to 'storage') diff --git a/storage/rocksdb/mysql-test/rocksdb/r/ttl_primary_read_filtering.result b/storage/rocksdb/mysql-test/rocksdb/r/ttl_primary_read_filtering.result index c66b17926b7..558924e6513 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/ttl_primary_read_filtering.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/ttl_primary_read_filtering.result @@ -76,6 +76,7 @@ select variable_value-@a from information_schema.global_status where variable_na variable_value-@a 4 DROP TABLE t1; +set global ROCKSDB_COMPACT_CF= 'default'; CREATE TABLE t1 ( a int, b int, diff --git a/storage/rocksdb/mysql-test/rocksdb/t/ttl_primary_read_filtering.test b/storage/rocksdb/mysql-test/rocksdb/t/ttl_primary_read_filtering.test index 4e8b081c4d5..7a7609f456e 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/ttl_primary_read_filtering.test +++ b/storage/rocksdb/mysql-test/rocksdb/t/ttl_primary_read_filtering.test @@ -102,6 +102,8 @@ SELECT * FROM t1; select variable_value-@a from information_schema.global_status where variable_name='rocksdb_rows_filtered'; DROP TABLE t1; +# Compact away the dropped data +set global ROCKSDB_COMPACT_CF= 'default'; # Read filtering index scan tests (None of these queries should return any results) CREATE TABLE t1 ( -- cgit v1.2.1