From 216834b0686aa5b200be831bfdd5ff88dfc2ebba Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Tue, 25 Jan 2022 17:48:44 +0400 Subject: [PATCH] A cleanup for MDEV-18918/MDEV-20254 Adjusting rocksdb tests results. --- .../rocksdb/mysql-test/rocksdb/r/i_s.result | 178 +++++++++--------- .../mysql-test/rocksdb/r/i_s_deadlock.result | 18 +- 2 files changed, 98 insertions(+), 98 deletions(-) diff --git a/storage/rocksdb/mysql-test/rocksdb/r/i_s.result b/storage/rocksdb/mysql-test/rocksdb/r/i_s.result index 84671b765b6..6e7368ac5bc 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/i_s.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/i_s.result @@ -19,141 +19,141 @@ ROCKSDB_TRX SHOW CREATE TABLE INFORMATION_SCHEMA.ROCKSDB_CF_OPTIONS; Table Create Table ROCKSDB_CF_OPTIONS CREATE TEMPORARY TABLE `ROCKSDB_CF_OPTIONS` ( - `CF_NAME` varchar(193) NOT NULL DEFAULT '', - `OPTION_TYPE` varchar(193) NOT NULL DEFAULT '', - `VALUE` varchar(193) NOT NULL DEFAULT '' + `CF_NAME` varchar(193) NOT NULL, + `OPTION_TYPE` varchar(193) NOT NULL, + `VALUE` varchar(193) NOT NULL ) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE INFORMATION_SCHEMA.ROCKSDB_CFSTATS; Table Create Table ROCKSDB_CFSTATS CREATE TEMPORARY TABLE `ROCKSDB_CFSTATS` ( - `CF_NAME` varchar(193) NOT NULL DEFAULT '', - `STAT_TYPE` varchar(193) NOT NULL DEFAULT '', - `VALUE` bigint(21) NOT NULL DEFAULT 0 + `CF_NAME` varchar(193) NOT NULL, + `STAT_TYPE` varchar(193) NOT NULL, + `VALUE` bigint(21) NOT NULL ) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE INFORMATION_SCHEMA.ROCKSDB_COMPACTION_STATS; Table Create Table ROCKSDB_COMPACTION_STATS CREATE TEMPORARY TABLE `ROCKSDB_COMPACTION_STATS` ( - `CF_NAME` varchar(193) NOT NULL DEFAULT '', - `LEVEL` varchar(513) NOT NULL DEFAULT '', - `TYPE` varchar(513) NOT NULL DEFAULT '', - `VALUE` double NOT NULL DEFAULT 0 + `CF_NAME` varchar(193) NOT NULL, + `LEVEL` varchar(513) NOT NULL, + `TYPE` varchar(513) NOT NULL, + `VALUE` double NOT NULL ) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE INFORMATION_SCHEMA.ROCKSDB_DBSTATS; Table Create Table ROCKSDB_DBSTATS CREATE TEMPORARY TABLE `ROCKSDB_DBSTATS` ( - `STAT_TYPE` varchar(193) NOT NULL DEFAULT '', - `VALUE` bigint(21) NOT NULL DEFAULT 0 + `STAT_TYPE` varchar(193) NOT NULL, + `VALUE` bigint(21) NOT NULL ) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE INFORMATION_SCHEMA.ROCKSDB_DDL; Table Create Table ROCKSDB_DDL CREATE TEMPORARY TABLE `ROCKSDB_DDL` ( - `TABLE_SCHEMA` varchar(193) NOT NULL DEFAULT '', - `TABLE_NAME` varchar(193) NOT NULL DEFAULT '', - `PARTITION_NAME` varchar(193) DEFAULT NULL, - `INDEX_NAME` varchar(193) NOT NULL DEFAULT '', - `COLUMN_FAMILY` int(11) NOT NULL DEFAULT 0, - `INDEX_NUMBER` int(11) NOT NULL DEFAULT 0, - `INDEX_TYPE` smallint(6) NOT NULL DEFAULT 0, - `KV_FORMAT_VERSION` smallint(6) NOT NULL DEFAULT 0, - `TTL_DURATION` bigint(21) NOT NULL DEFAULT 0, - `INDEX_FLAGS` bigint(21) NOT NULL DEFAULT 0, - `CF` varchar(193) NOT NULL DEFAULT '', - `AUTO_INCREMENT` bigint(21) unsigned DEFAULT NULL + `TABLE_SCHEMA` varchar(193) NOT NULL, + `TABLE_NAME` varchar(193) NOT NULL, + `PARTITION_NAME` varchar(193), + `INDEX_NAME` varchar(193) NOT NULL, + `COLUMN_FAMILY` int(11) NOT NULL, + `INDEX_NUMBER` int(11) NOT NULL, + `INDEX_TYPE` smallint(6) NOT NULL, + `KV_FORMAT_VERSION` smallint(6) NOT NULL, + `TTL_DURATION` bigint(21) NOT NULL, + `INDEX_FLAGS` bigint(21) NOT NULL, + `CF` varchar(193) NOT NULL, + `AUTO_INCREMENT` bigint(21) unsigned ) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE INFORMATION_SCHEMA.ROCKSDB_DEADLOCK; Table Create Table ROCKSDB_DEADLOCK CREATE TEMPORARY TABLE `ROCKSDB_DEADLOCK` ( - `DEADLOCK_ID` bigint(21) NOT NULL DEFAULT 0, - `TIMESTAMP` bigint(21) NOT NULL DEFAULT 0, - `TRANSACTION_ID` bigint(21) NOT NULL DEFAULT 0, - `CF_NAME` varchar(193) NOT NULL DEFAULT '', - `WAITING_KEY` varchar(513) NOT NULL DEFAULT '', - `LOCK_TYPE` varchar(193) NOT NULL DEFAULT '', - `INDEX_NAME` varchar(193) NOT NULL DEFAULT '', - `TABLE_NAME` varchar(193) NOT NULL DEFAULT '', - `ROLLED_BACK` bigint(21) NOT NULL DEFAULT 0 + `DEADLOCK_ID` bigint(21) NOT NULL, + `TIMESTAMP` bigint(21) NOT NULL, + `TRANSACTION_ID` bigint(21) NOT NULL, + `CF_NAME` varchar(193) NOT NULL, + `WAITING_KEY` varchar(513) NOT NULL, + `LOCK_TYPE` varchar(193) NOT NULL, + `INDEX_NAME` varchar(193) NOT NULL, + `TABLE_NAME` varchar(193) NOT NULL, + `ROLLED_BACK` bigint(21) NOT NULL ) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE INFORMATION_SCHEMA.ROCKSDB_GLOBAL_INFO; Table Create Table ROCKSDB_GLOBAL_INFO CREATE TEMPORARY TABLE `ROCKSDB_GLOBAL_INFO` ( - `TYPE` varchar(513) NOT NULL DEFAULT '', - `NAME` varchar(513) NOT NULL DEFAULT '', - `VALUE` varchar(513) NOT NULL DEFAULT '' + `TYPE` varchar(513) NOT NULL, + `NAME` varchar(513) NOT NULL, + `VALUE` varchar(513) NOT NULL ) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE INFORMATION_SCHEMA.ROCKSDB_INDEX_FILE_MAP; Table Create Table ROCKSDB_INDEX_FILE_MAP CREATE TEMPORARY TABLE `ROCKSDB_INDEX_FILE_MAP` ( - `COLUMN_FAMILY` int(11) NOT NULL DEFAULT 0, - `INDEX_NUMBER` int(11) NOT NULL DEFAULT 0, - `SST_NAME` varchar(193) NOT NULL DEFAULT '', - `NUM_ROWS` bigint(21) NOT NULL DEFAULT 0, - `DATA_SIZE` bigint(21) NOT NULL DEFAULT 0, - `ENTRY_DELETES` bigint(21) NOT NULL DEFAULT 0, - `ENTRY_SINGLEDELETES` bigint(21) NOT NULL DEFAULT 0, - `ENTRY_MERGES` bigint(21) NOT NULL DEFAULT 0, - `ENTRY_OTHERS` bigint(21) NOT NULL DEFAULT 0, - `DISTINCT_KEYS_PREFIX` varchar(800) NOT NULL DEFAULT '' + `COLUMN_FAMILY` int(11) NOT NULL, + `INDEX_NUMBER` int(11) NOT NULL, + `SST_NAME` varchar(193) NOT NULL, + `NUM_ROWS` bigint(21) NOT NULL, + `DATA_SIZE` bigint(21) NOT NULL, + `ENTRY_DELETES` bigint(21) NOT NULL, + `ENTRY_SINGLEDELETES` bigint(21) NOT NULL, + `ENTRY_MERGES` bigint(21) NOT NULL, + `ENTRY_OTHERS` bigint(21) NOT NULL, + `DISTINCT_KEYS_PREFIX` varchar(800) NOT NULL ) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE INFORMATION_SCHEMA.ROCKSDB_LOCKS; Table Create Table ROCKSDB_LOCKS CREATE TEMPORARY TABLE `ROCKSDB_LOCKS` ( - `COLUMN_FAMILY_ID` int(11) NOT NULL DEFAULT 0, - `TRANSACTION_ID` int(11) NOT NULL DEFAULT 0, - `KEY` varchar(513) NOT NULL DEFAULT '', - `MODE` varchar(32) NOT NULL DEFAULT '' + `COLUMN_FAMILY_ID` int(11) NOT NULL, + `TRANSACTION_ID` int(11) NOT NULL, + `KEY` varchar(513) NOT NULL, + `MODE` varchar(32) NOT NULL ) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE INFORMATION_SCHEMA.ROCKSDB_PERF_CONTEXT; Table Create Table ROCKSDB_PERF_CONTEXT CREATE TEMPORARY TABLE `ROCKSDB_PERF_CONTEXT` ( - `TABLE_SCHEMA` varchar(193) NOT NULL DEFAULT '', - `TABLE_NAME` varchar(193) NOT NULL DEFAULT '', - `PARTITION_NAME` varchar(193) DEFAULT NULL, - `STAT_TYPE` varchar(193) NOT NULL DEFAULT '', - `VALUE` bigint(21) NOT NULL DEFAULT 0 + `TABLE_SCHEMA` varchar(193) NOT NULL, + `TABLE_NAME` varchar(193) NOT NULL, + `PARTITION_NAME` varchar(193), + `STAT_TYPE` varchar(193) NOT NULL, + `VALUE` bigint(21) NOT NULL ) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE INFORMATION_SCHEMA.ROCKSDB_PERF_CONTEXT_GLOBAL; Table Create Table ROCKSDB_PERF_CONTEXT_GLOBAL CREATE TEMPORARY TABLE `ROCKSDB_PERF_CONTEXT_GLOBAL` ( - `STAT_TYPE` varchar(193) NOT NULL DEFAULT '', - `VALUE` bigint(21) NOT NULL DEFAULT 0 + `STAT_TYPE` varchar(193) NOT NULL, + `VALUE` bigint(21) NOT NULL ) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE INFORMATION_SCHEMA.ROCKSDB_SST_PROPS; Table Create Table ROCKSDB_SST_PROPS CREATE TEMPORARY TABLE `ROCKSDB_SST_PROPS` ( - `SST_NAME` varchar(193) NOT NULL DEFAULT '', - `COLUMN_FAMILY` int(11) NOT NULL DEFAULT 0, - `DATA_BLOCKS` bigint(21) NOT NULL DEFAULT 0, - `ENTRIES` bigint(21) NOT NULL DEFAULT 0, - `RAW_KEY_SIZE` bigint(21) NOT NULL DEFAULT 0, - `RAW_VALUE_SIZE` bigint(21) NOT NULL DEFAULT 0, - `DATA_BLOCK_SIZE` bigint(21) NOT NULL DEFAULT 0, - `INDEX_BLOCK_SIZE` bigint(21) NOT NULL DEFAULT 0, - `INDEX_PARTITIONS` int(11) NOT NULL DEFAULT 0, - `TOP_LEVEL_INDEX_SIZE` bigint(21) NOT NULL DEFAULT 0, - `FILTER_BLOCK_SIZE` bigint(21) NOT NULL DEFAULT 0, - `COMPRESSION_ALGO` varchar(193) NOT NULL DEFAULT '', - `CREATION_TIME` bigint(21) NOT NULL DEFAULT 0, - `FILE_CREATION_TIME` bigint(21) NOT NULL DEFAULT 0, - `OLDEST_KEY_TIME` bigint(21) NOT NULL DEFAULT 0, - `FILTER_POLICY` varchar(193) NOT NULL DEFAULT '', - `COMPRESSION_OPTIONS` varchar(193) NOT NULL DEFAULT '' + `SST_NAME` varchar(193) NOT NULL, + `COLUMN_FAMILY` int(11) NOT NULL, + `DATA_BLOCKS` bigint(21) NOT NULL, + `ENTRIES` bigint(21) NOT NULL, + `RAW_KEY_SIZE` bigint(21) NOT NULL, + `RAW_VALUE_SIZE` bigint(21) NOT NULL, + `DATA_BLOCK_SIZE` bigint(21) NOT NULL, + `INDEX_BLOCK_SIZE` bigint(21) NOT NULL, + `INDEX_PARTITIONS` int(11) NOT NULL, + `TOP_LEVEL_INDEX_SIZE` bigint(21) NOT NULL, + `FILTER_BLOCK_SIZE` bigint(21) NOT NULL, + `COMPRESSION_ALGO` varchar(193) NOT NULL, + `CREATION_TIME` bigint(21) NOT NULL, + `FILE_CREATION_TIME` bigint(21) NOT NULL, + `OLDEST_KEY_TIME` bigint(21) NOT NULL, + `FILTER_POLICY` varchar(193) NOT NULL, + `COMPRESSION_OPTIONS` varchar(193) NOT NULL ) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE INFORMATION_SCHEMA.ROCKSDB_TRX; Table Create Table ROCKSDB_TRX CREATE TEMPORARY TABLE `ROCKSDB_TRX` ( - `TRANSACTION_ID` bigint(21) NOT NULL DEFAULT 0, - `STATE` varchar(193) NOT NULL DEFAULT '', - `NAME` varchar(193) NOT NULL DEFAULT '', - `WRITE_COUNT` bigint(21) NOT NULL DEFAULT 0, - `LOCK_COUNT` bigint(21) NOT NULL DEFAULT 0, - `TIMEOUT_SEC` int(11) NOT NULL DEFAULT 0, - `WAITING_KEY` varchar(513) NOT NULL DEFAULT '', - `WAITING_COLUMN_FAMILY_ID` int(11) NOT NULL DEFAULT 0, - `IS_REPLICATION` int(11) NOT NULL DEFAULT 0, - `SKIP_TRX_API` int(11) NOT NULL DEFAULT 0, - `READ_ONLY` int(11) NOT NULL DEFAULT 0, - `HAS_DEADLOCK_DETECTION` int(11) NOT NULL DEFAULT 0, - `NUM_ONGOING_BULKLOAD` int(11) NOT NULL DEFAULT 0, - `THREAD_ID` int(11) NOT NULL DEFAULT 0, - `QUERY` varchar(193) NOT NULL DEFAULT '' + `TRANSACTION_ID` bigint(21) NOT NULL, + `STATE` varchar(193) NOT NULL, + `NAME` varchar(193) NOT NULL, + `WRITE_COUNT` bigint(21) NOT NULL, + `LOCK_COUNT` bigint(21) NOT NULL, + `TIMEOUT_SEC` int(11) NOT NULL, + `WAITING_KEY` varchar(513) NOT NULL, + `WAITING_COLUMN_FAMILY_ID` int(11) NOT NULL, + `IS_REPLICATION` int(11) NOT NULL, + `SKIP_TRX_API` int(11) NOT NULL, + `READ_ONLY` int(11) NOT NULL, + `HAS_DEADLOCK_DETECTION` int(11) NOT NULL, + `NUM_ONGOING_BULKLOAD` int(11) NOT NULL, + `THREAD_ID` int(11) NOT NULL, + `QUERY` varchar(193) NOT NULL ) ENGINE=MEMORY DEFAULT CHARSET=utf8 diff --git a/storage/rocksdb/mysql-test/rocksdb/r/i_s_deadlock.result b/storage/rocksdb/mysql-test/rocksdb/r/i_s_deadlock.result index 0419c0f3ec6..4591d64ee46 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/i_s_deadlock.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/i_s_deadlock.result @@ -13,15 +13,15 @@ connection default; show create table information_schema.rocksdb_deadlock; Table Create Table ROCKSDB_DEADLOCK CREATE TEMPORARY TABLE `ROCKSDB_DEADLOCK` ( - `DEADLOCK_ID` bigint(21) NOT NULL DEFAULT 0, - `TIMESTAMP` bigint(21) NOT NULL DEFAULT 0, - `TRANSACTION_ID` bigint(21) NOT NULL DEFAULT 0, - `CF_NAME` varchar(193) NOT NULL DEFAULT '', - `WAITING_KEY` varchar(513) NOT NULL DEFAULT '', - `LOCK_TYPE` varchar(193) NOT NULL DEFAULT '', - `INDEX_NAME` varchar(193) NOT NULL DEFAULT '', - `TABLE_NAME` varchar(193) NOT NULL DEFAULT '', - `ROLLED_BACK` bigint(21) NOT NULL DEFAULT 0 + `DEADLOCK_ID` bigint(21) NOT NULL, + `TIMESTAMP` bigint(21) NOT NULL, + `TRANSACTION_ID` bigint(21) NOT NULL, + `CF_NAME` varchar(193) NOT NULL, + `WAITING_KEY` varchar(513) NOT NULL, + `LOCK_TYPE` varchar(193) NOT NULL, + `INDEX_NAME` varchar(193) NOT NULL, + `TABLE_NAME` varchar(193) NOT NULL, + `ROLLED_BACK` bigint(21) NOT NULL ) ENGINE=MEMORY DEFAULT CHARSET=utf8 create table t (i int primary key) engine=rocksdb; insert into t values (1), (2), (3);