From 097bd3049c47eb62cc1002da85ca450c7d0591ce Mon Sep 17 00:00:00 2001 From: Sergei Petrunia Date: Fri, 2 Dec 2016 20:49:10 +0000 Subject: [PATCH] MariaRocks port: update test results - EXPLAIN result differences are due to MariaDB's MDEV-11172 - Don't print the value of rocksdb_supported_compression_types to .result file - The rest is trivial Maria-fication --- .../mysql-test/rocksdb/r/rocksdb.result | 163 +++++++++--------- .../rocksdb/mysql-test/rocksdb/t/rocksdb.test | 6 +- 2 files changed, 85 insertions(+), 84 deletions(-) diff --git a/storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result b/storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result index 94a95947282..03416dce36a 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result @@ -546,7 +546,7 @@ pk key1 col1 explain select key1 from t30; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t30 index NULL key1 18 NULL # Using index +1 SIMPLE t30 index NULL key1 20 NULL # Using index select key1 from t30; key1 row1-key @@ -621,7 +621,7 @@ row3 row3-key row3-data explain select * from t30 order by key1 limit 3; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t30 index NULL key1 18 NULL # NULL +1 SIMPLE t30 index NULL key1 20 NULL # select * from t30 order by key1 limit 3; pk key1 col1 row1 row1-key row1-data @@ -630,7 +630,7 @@ row3 row3-key row3-data explain select * from t30 order by key1 desc limit 3; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t30 index NULL key1 18 NULL # NULL +1 SIMPLE t30 index NULL key1 20 NULL # select * from t30 order by key1 desc limit 3; pk key1 col1 row5 row5-key row5-data @@ -668,7 +668,7 @@ row4 row4-key row4-data explain select * from t30 order by pk limit 3; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t30 index NULL PRIMARY 18 NULL # NULL +1 SIMPLE t30 index NULL PRIMARY 18 NULL # select * from t30 order by pk limit 3; pk key1 col1 row1 row1-key row1-data @@ -865,7 +865,10 @@ ERROR 42S02: Unknown table 'test.t45' # Now it fails if there is data overlap with what # already exists # -show variables like 'rocksdb%'; +show variables +where +variable_name like 'rocksdb%' and +variable_name not like 'rocksdb_supported_compression_types'; Variable_name Value rocksdb_access_hint_on_compaction_start 1 rocksdb_advise_random_on_open ON @@ -1413,76 +1416,74 @@ drop table t0, t1; # show status like 'rocksdb%'; Variable_name Value -rocksdb_rows_deleted # -rocksdb_rows_inserted # -rocksdb_rows_read # -rocksdb_rows_updated # -rocksdb_system_rows_deleted # -rocksdb_system_rows_inserted # -rocksdb_system_rows_read # -rocksdb_system_rows_updated # -rocksdb_block_cache_add # -rocksdb_block_cache_data_hit # -rocksdb_block_cache_data_miss # -rocksdb_block_cache_filter_hit # -rocksdb_block_cache_filter_miss # -rocksdb_block_cache_hit # -rocksdb_block_cache_index_hit # -rocksdb_block_cache_index_miss # -rocksdb_block_cache_miss # -rocksdb_block_cachecompressed_hit # -rocksdb_block_cachecompressed_miss # -rocksdb_bloom_filter_prefix_checked # -rocksdb_bloom_filter_prefix_useful # -rocksdb_bloom_filter_useful # -rocksdb_bytes_read # -rocksdb_bytes_written # -rocksdb_compact_read_bytes # -rocksdb_compact_write_bytes # -rocksdb_compaction_key_drop_new # -rocksdb_compaction_key_drop_obsolete # -rocksdb_compaction_key_drop_user # -rocksdb_flush_write_bytes # -rocksdb_getupdatessince_calls # -rocksdb_git_date # -rocksdb_git_hash # -rocksdb_l0_num_files_stall_micros # -rocksdb_l0_slowdown_micros # -rocksdb_memtable_compaction_micros # -rocksdb_memtable_hit # -rocksdb_memtable_miss # -rocksdb_no_file_closes # -rocksdb_no_file_errors # -rocksdb_no_file_opens # -rocksdb_num_iterators # -rocksdb_number_block_not_compressed # -rocksdb_number_deletes_filtered # -rocksdb_number_keys_read # -rocksdb_number_keys_updated # -rocksdb_number_keys_written # -rocksdb_number_merge_failures # -rocksdb_number_multiget_bytes_read # -rocksdb_number_multiget_get # -rocksdb_number_multiget_keys_read # -rocksdb_number_reseeks_iteration # -rocksdb_number_sst_entry_delete # -rocksdb_number_sst_entry_merge # -rocksdb_number_sst_entry_other # -rocksdb_number_sst_entry_put # -rocksdb_number_sst_entry_singledelete # -rocksdb_number_stat_computes # -rocksdb_number_superversion_acquires # -rocksdb_number_superversion_cleanups # -rocksdb_number_superversion_releases # -rocksdb_rate_limit_delay_millis # -rocksdb_sequence_number # -rocksdb_snapshot_conflict_errors # -rocksdb_wal_bytes # -rocksdb_wal_synced # -rocksdb_write_other # -rocksdb_write_self # -rocksdb_write_timedout # -rocksdb_write_wal # +Rocksdb_rows_deleted # +Rocksdb_rows_inserted # +Rocksdb_rows_read # +Rocksdb_rows_updated # +Rocksdb_system_rows_deleted # +Rocksdb_system_rows_inserted # +Rocksdb_system_rows_read # +Rocksdb_system_rows_updated # +Rocksdb_block_cache_add # +Rocksdb_block_cache_data_hit # +Rocksdb_block_cache_data_miss # +Rocksdb_block_cache_filter_hit # +Rocksdb_block_cache_filter_miss # +Rocksdb_block_cache_hit # +Rocksdb_block_cache_index_hit # +Rocksdb_block_cache_index_miss # +Rocksdb_block_cache_miss # +Rocksdb_block_cachecompressed_hit # +Rocksdb_block_cachecompressed_miss # +Rocksdb_bloom_filter_prefix_checked # +Rocksdb_bloom_filter_prefix_useful # +Rocksdb_bloom_filter_useful # +Rocksdb_bytes_read # +Rocksdb_bytes_written # +Rocksdb_compact_read_bytes # +Rocksdb_compact_write_bytes # +Rocksdb_compaction_key_drop_new # +Rocksdb_compaction_key_drop_obsolete # +Rocksdb_compaction_key_drop_user # +Rocksdb_flush_write_bytes # +Rocksdb_getupdatessince_calls # +Rocksdb_l0_num_files_stall_micros # +Rocksdb_l0_slowdown_micros # +Rocksdb_memtable_compaction_micros # +Rocksdb_memtable_hit # +Rocksdb_memtable_miss # +Rocksdb_no_file_closes # +Rocksdb_no_file_errors # +Rocksdb_no_file_opens # +Rocksdb_num_iterators # +Rocksdb_number_block_not_compressed # +Rocksdb_number_deletes_filtered # +Rocksdb_number_keys_read # +Rocksdb_number_keys_updated # +Rocksdb_number_keys_written # +Rocksdb_number_merge_failures # +Rocksdb_number_multiget_bytes_read # +Rocksdb_number_multiget_get # +Rocksdb_number_multiget_keys_read # +Rocksdb_number_reseeks_iteration # +Rocksdb_number_sst_entry_delete # +Rocksdb_number_sst_entry_merge # +Rocksdb_number_sst_entry_other # +Rocksdb_number_sst_entry_put # +Rocksdb_number_sst_entry_singledelete # +Rocksdb_number_stat_computes # +Rocksdb_number_superversion_acquires # +Rocksdb_number_superversion_cleanups # +Rocksdb_number_superversion_releases # +Rocksdb_rate_limit_delay_millis # +Rocksdb_sequence_number # +Rocksdb_snapshot_conflict_errors # +Rocksdb_wal_bytes # +Rocksdb_wal_synced # +Rocksdb_write_other # +Rocksdb_write_self # +Rocksdb_write_timedout # +Rocksdb_write_wal # select VARIABLE_NAME from INFORMATION_SCHEMA.global_status where VARIABLE_NAME LIKE 'rocksdb%'; VARIABLE_NAME ROCKSDB_ROWS_DELETED @@ -1516,8 +1517,6 @@ ROCKSDB_COMPACTION_KEY_DROP_OBSOLETE ROCKSDB_COMPACTION_KEY_DROP_USER ROCKSDB_FLUSH_WRITE_BYTES ROCKSDB_GETUPDATESSINCE_CALLS -ROCKSDB_GIT_DATE -ROCKSDB_GIT_HASH ROCKSDB_L0_NUM_FILES_STALL_MICROS ROCKSDB_L0_SLOWDOWN_MICROS ROCKSDB_MEMTABLE_COMPACTION_MICROS @@ -1590,8 +1589,6 @@ ROCKSDB_COMPACTION_KEY_DROP_OBSOLETE ROCKSDB_COMPACTION_KEY_DROP_USER ROCKSDB_FLUSH_WRITE_BYTES ROCKSDB_GETUPDATESSINCE_CALLS -ROCKSDB_GIT_DATE -ROCKSDB_GIT_HASH ROCKSDB_L0_NUM_FILES_STALL_MICROS ROCKSDB_L0_SLOWDOWN_MICROS ROCKSDB_MEMTABLE_COMPACTION_MICROS @@ -2402,10 +2399,10 @@ a truncate t1; INSERT INTO t1 VALUES(X'042000200020',X'042000200020'),(X'200400200020',X'200400200020'); Warnings: -Warning 1264 Out of range value for column 'a' at row 1 -Warning 1264 Out of range value for column 'b' at row 1 -Warning 1264 Out of range value for column 'a' at row 2 -Warning 1264 Out of range value for column 'b' at row 2 +Warning 1366 Incorrect integer value: '\x04 \x00 \x00 ' for column 'a' at row 1 +Warning 1366 Incorrect integer value: '\x04 \x00 \x00 ' for column 'b' at row 1 +Warning 1366 Incorrect integer value: ' \x04\x00 \x00 ' for column 'a' at row 2 +Warning 1366 Incorrect integer value: ' \x04\x00 \x00 ' for column 'b' at row 2 UNLOCK TABLES; DROP TABLE t1; # diff --git a/storage/rocksdb/mysql-test/rocksdb/t/rocksdb.test b/storage/rocksdb/mysql-test/rocksdb/t/rocksdb.test index aa4b99f1c32..168136bf01c 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/rocksdb.test +++ b/storage/rocksdb/mysql-test/rocksdb/t/rocksdb.test @@ -786,7 +786,11 @@ drop table t45; --echo # Now it fails if there is data overlap with what --echo # already exists --echo # -show variables like 'rocksdb%'; +show variables +where + variable_name like 'rocksdb%' and + variable_name not like 'rocksdb_supported_compression_types'; + create table t47 (pk int primary key, col1 varchar(12)) engine=rocksdb; insert into t47 values (1, 'row1'); insert into t47 values (2, 'row2');