diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2017-10-09 13:29:09 +0300 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2017-10-09 13:29:09 +0300 |
| commit | f62f9d661adb7139b5a9944b0c928d7761662364 (patch) | |
| tree | 8d1a916b4e4404942bae7c7aaec01e73e38c02fe | |
| parent | 6ff8d5712803a0934ab3ba8be6719f9459820f44 (diff) | |
| download | mariadb-git-f62f9d661adb7139b5a9944b0c928d7761662364.tar.gz | |
Fix rocksdb.perf_context test
The part of the test that counts IO should be run with default
rocksdb_flush_log_at_trx_commt.
| -rw-r--r-- | storage/rocksdb/mysql-test/rocksdb/r/perf_context.result | 3 | ||||
| -rw-r--r-- | storage/rocksdb/mysql-test/rocksdb/t/perf_context.test | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/perf_context.result b/storage/rocksdb/mysql-test/rocksdb/r/perf_context.result index 2e8610d43bd..6586b92d129 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/perf_context.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/perf_context.result @@ -127,6 +127,8 @@ AND STAT_TYPE in ('INTERNAL_KEY_SKIPPED_COUNT', 'INTERNAL_DELETE_SKIPPED_COUNT') TABLE_SCHEMA TABLE_NAME PARTITION_NAME STAT_TYPE VALUE test t1 NULL INTERNAL_KEY_SKIPPED_COUNT 10 test t1 NULL INTERNAL_DELETE_SKIPPED_COUNT 0 +set @tmp_flush_log= @@rocksdb_flush_log_at_trx_commit; +set global rocksdb_flush_log_at_trx_commit=1; BEGIN; INSERT INTO t2 VALUES (1), (2); INSERT INTO t2 VALUES (3), (4); @@ -158,3 +160,4 @@ true DROP TABLE t1; DROP TABLE t2; SET GLOBAL rocksdb_perf_context_level = @prior_rocksdb_perf_context_level; +set global rocksdb_flush_log_at_trx_commit= @tmp_flush_log; diff --git a/storage/rocksdb/mysql-test/rocksdb/t/perf_context.test b/storage/rocksdb/mysql-test/rocksdb/t/perf_context.test index 4290811e868..ee41324a34d 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/perf_context.test +++ b/storage/rocksdb/mysql-test/rocksdb/t/perf_context.test @@ -56,6 +56,8 @@ AND STAT_TYPE in ('INTERNAL_KEY_SKIPPED_COUNT', 'INTERNAL_DELETE_SKIPPED_COUNT') # Statistics for multi-statement transactions cannot be attributed to # individual tables but should show up in global perf context stats +set @tmp_flush_log= @@rocksdb_flush_log_at_trx_commit; +set global rocksdb_flush_log_at_trx_commit=1; BEGIN; INSERT INTO t2 VALUES (1), (2); @@ -90,3 +92,5 @@ SELECT CASE WHEN @b - @a > 0 THEN 'true' ELSE 'false' END; DROP TABLE t1; DROP TABLE t2; SET GLOBAL rocksdb_perf_context_level = @prior_rocksdb_perf_context_level; +set global rocksdb_flush_log_at_trx_commit= @tmp_flush_log; + |