summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Petrunia <psergey@askmonty.org>2019-09-11 23:05:12 +0300
committerSergei Petrunia <psergey@askmonty.org>2019-09-11 23:05:12 +0300
commitbe6beb73e9e6adf2ebd69354a2496817f03ae6ff (patch)
tree712b58a653b852a9fb671fd46797c7bec51a7d5b
parentc8dc866fdeee551993ef91fb321135f9106ea00e (diff)
downloadmariadb-git-be6beb73e9e6adf2ebd69354a2496817f03ae6ff.tar.gz
MDEV-16560: [counter] rocksdb.ttl_secondary_read_filtering fail in buildbot
It is not reproducible, but the issue seems to be the same as with MDEV-20490 and rocksdb.ttl_primary_read_filtering - a compaction caused by DROP TABLE gets behind and compacts away the expired rows for the next test. Fix this in the same way.
-rw-r--r--storage/rocksdb/mysql-test/rocksdb/r/ttl_secondary_read_filtering.result1
-rw-r--r--storage/rocksdb/mysql-test/rocksdb/t/ttl_secondary_read_filtering.test3
2 files changed, 4 insertions, 0 deletions
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/ttl_secondary_read_filtering.result b/storage/rocksdb/mysql-test/rocksdb/r/ttl_secondary_read_filtering.result
index 90de5447891..395c84edfe9 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/ttl_secondary_read_filtering.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/ttl_secondary_read_filtering.result
@@ -101,6 +101,7 @@ a b
SELECT * FROM t1 FORCE INDEX (kb);
a b
DROP TABLE t1;
+set global rocksdb_compact_cf= 'default';
# Read filtering index scan tests (None of these queries should return any results)
CREATE TABLE t1 (
a int,
diff --git a/storage/rocksdb/mysql-test/rocksdb/t/ttl_secondary_read_filtering.test b/storage/rocksdb/mysql-test/rocksdb/t/ttl_secondary_read_filtering.test
index d6be7d95f8d..f6042cc517e 100644
--- a/storage/rocksdb/mysql-test/rocksdb/t/ttl_secondary_read_filtering.test
+++ b/storage/rocksdb/mysql-test/rocksdb/t/ttl_secondary_read_filtering.test
@@ -121,6 +121,9 @@ SELECT * FROM t1 FORCE INDEX (kb);
DROP TABLE t1;
+# Compact away the dropped data
+set global rocksdb_compact_cf= 'default';
+
--echo # Read filtering index scan tests (None of these queries should return any results)
CREATE TABLE t1 (
a int,