[Commits] e7efc79: Make rocksdb.information_schema test stable

Sergei Petrunia psergey at askmonty.org
Mon Apr 9 01:10:43 EEST 2018


revision-id: e7efc793504c0cd9d8b6cf9198314ae9b3c58988
parent(s): 34ff2967c5896797174598ac8d70bf941f2eb3f4
committer: Sergei Petrunia
branch nick: 10.2-r10
timestamp: 2018-04-09 01:10:43 +0300
message:

Make rocksdb.information_schema test stable

---
 storage/rocksdb/mysql-test/rocksdb/r/information_schema.result | 7 +++----
 storage/rocksdb/mysql-test/rocksdb/t/information_schema.test   | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/storage/rocksdb/mysql-test/rocksdb/r/information_schema.result b/storage/rocksdb/mysql-test/rocksdb/r/information_schema.result
index 6850d8d..aba14e3 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/information_schema.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/information_schema.result
@@ -4,15 +4,14 @@ DROP TABLE IF EXISTS t3;
 SET GLOBAL ROCKSDB_PAUSE_BACKGROUND_WORK=1;
 create table t1 (a int) engine=rocksdb;
 drop table t1;
-select * from INFORMATION_SCHEMA.ROCKSDB_GLOBAL_INFO;
+select * from INFORMATION_SCHEMA.ROCKSDB_GLOBAL_INFO where type<>'DDL_DROP_INDEX_ONGOING';
 TYPE	NAME	VALUE
 MAX_INDEX_ID	MAX_INDEX_ID	max_index_id
 CF_FLAGS	0	default [0]
 CF_FLAGS	1	__system__ [0]
-DDL_DROP_INDEX_ONGOING	cf_id:0,index_id:max_index_id	
-select count(*) from INFORMATION_SCHEMA.ROCKSDB_GLOBAL_INFO;
+select count(*) from INFORMATION_SCHEMA.ROCKSDB_GLOBAL_INFO where type<>'DDL_DROP_INDEX_ONGOING';
 count(*)
-4
+3
 SET GLOBAL ROCKSDB_PAUSE_BACKGROUND_WORK=0;
 select VALUE into @keysIn from INFORMATION_SCHEMA.ROCKSDB_COMPACTION_STATS where CF_NAME = 'default' and LEVEL = 'Sum' and TYPE = 'KeyIn';
 CREATE TABLE t1 (i1 INT, i2 INT, PRIMARY KEY (i1)) ENGINE = ROCKSDB;
diff --git a/storage/rocksdb/mysql-test/rocksdb/t/information_schema.test b/storage/rocksdb/mysql-test/rocksdb/t/information_schema.test
index 2ffc186..67dae5d 100644
--- a/storage/rocksdb/mysql-test/rocksdb/t/information_schema.test
+++ b/storage/rocksdb/mysql-test/rocksdb/t/information_schema.test
@@ -19,8 +19,8 @@ drop table t1;
 
 --let $max_index_id = query_get_value(SELECT * from INFORMATION_SCHEMA.ROCKSDB_GLOBAL_INFO where type = 'MAX_INDEX_ID', VALUE, 1)
 --replace_result $max_index_id max_index_id
-select * from INFORMATION_SCHEMA.ROCKSDB_GLOBAL_INFO;
-select count(*) from INFORMATION_SCHEMA.ROCKSDB_GLOBAL_INFO;
+select * from INFORMATION_SCHEMA.ROCKSDB_GLOBAL_INFO where type<>'DDL_DROP_INDEX_ONGOING';
+select count(*) from INFORMATION_SCHEMA.ROCKSDB_GLOBAL_INFO where type<>'DDL_DROP_INDEX_ONGOING';
 SET GLOBAL ROCKSDB_PAUSE_BACKGROUND_WORK=0;
 
 select VALUE into @keysIn from INFORMATION_SCHEMA.ROCKSDB_COMPACTION_STATS where CF_NAME = 'default' and LEVEL = 'Sum' and TYPE = 'KeyIn';


More information about the commits mailing list