revision-id: b034e5370e7e874d7c7c419996c38ecb03e5bbdf (fb-prod8-202009-52-gb034e5370e7) parent(s): 686be2914fb36e6082162684642fbd62c44a00bf author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2020-11-30 21:59:14 +0300 message: Update test results Causes: - Changes on MySQL-8 side - Acquired locks are now printed using different format --- mysql-test/suite/rocksdb/r/range_locking.result | 28 +++-- .../suite/rocksdb/r/range_locking_rev_cf.result | 16 +-- .../rocksdb/r/range_locking_seek_for_update.result | 4 +- .../rocksdb/r/range_locking_shared_locks.result | 130 ++++++++++----------- 4 files changed, 91 insertions(+), 87 deletions(-) diff --git a/mysql-test/suite/rocksdb/r/range_locking.result b/mysql-test/suite/rocksdb/r/range_locking.result index 07a01ec13b5..1621e97efa0 100644 --- a/mysql-test/suite/rocksdb/r/range_locking.result +++ b/mysql-test/suite/rocksdb/r/range_locking.result @@ -99,12 +99,12 @@ pk a 10 10 # select * from information_schema.rocksdb_locks; # With replacements by select_from_is_rowlocks.inc COLUMN_FAMILY_ID TRANSACTION_ID KEY mode -$cf_id $trx_id 00${indexnr}8000000a X +$cf_id $trx_id ${indexnr}8000000a X delete from t1 where pk between 25 and 40; # select * from information_schema.rocksdb_locks; # With replacements by select_from_is_rowlocks.inc COLUMN_FAMILY_ID TRANSACTION_ID KEY mode -$cf_id $trx_id 00${indexnr}8000000a X -$cf_id $trx_id 00${indexnr}80000019 - 01${indexnr}80000028 X +$cf_id $trx_id ${indexnr}8000000a X +$cf_id $trx_id ${indexnr}80000019-${indexnr}80000028:1 X rollback; begin; # The following will show a range lock on 2-9 and also a point lock on 10. @@ -113,7 +113,7 @@ select * from t1 where pk between 2 and 9 for update; pk a # select * from information_schema.rocksdb_locks; # With replacements by select_from_is_rowlocks.inc COLUMN_FAMILY_ID TRANSACTION_ID KEY mode -$cf_id $trx_id 00${indexnr}80000002 - 01${indexnr}80000009 X +$cf_id $trx_id ${indexnr}80000002-${indexnr}80000009:1 X rollback; drop table t1; connection con1; @@ -182,8 +182,10 @@ connection con1; begin; explain select * from t1 where kp1=2 for update; -id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 ref kp1 kp1 4 const # NULL +id select_type table partitions type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 NULL ref kp1 kp1 4 const # 100.00 NULL +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`kp1` AS `kp1`,`test`.`t1`.`kp2` AS `kp2`,`test`.`t1`.`a` AS `a` from `test`.`t1` where (`test`.`t1`.`kp1` = 2) select * from t1 where kp1=2 for update; kp1 kp2 a 2 3 1234 @@ -417,8 +419,10 @@ select * from t1 where pk1=3 order by pk1 desc, pk2 desc for update; -id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 ref PRIMARY PRIMARY 4 const # Using where +id select_type table partitions type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 NULL ref PRIMARY PRIMARY 4 const # 100.00 Backward index scan +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`pk1` AS `pk1`,`test`.`t1`.`pk2` AS `pk2`,`test`.`t1`.`a` AS `a` from `test`.`t1` where (`test`.`t1`.`pk1` = 3) order by `test`.`t1`.`pk1` desc,`test`.`t1`.`pk2` desc select * from t1 where pk1=3 order by pk1 desc, pk2 desc @@ -436,7 +440,7 @@ pk1 pk2 a 3 0 30 # select * from information_schema.rocksdb_locks; # With replacements by select_from_is_rowlocks.inc COLUMN_FAMILY_ID TRANSACTION_ID KEY mode -$cf_id $trx_id 00${indexnr}80000003 - 01${indexnr}80000003 X +$cf_id $trx_id ${indexnr}80000003-${indexnr}80000003:1 X rollback; # # Test range locking for ranges with HA_READ_PREFIX_LAST_OR_PREV @@ -463,7 +467,7 @@ pk1 pk2 a 4 5 45 # select * from information_schema.rocksdb_locks; # With replacements by select_from_is_rowlocks.inc COLUMN_FAMILY_ID TRANSACTION_ID KEY mode -$cf_id $trx_id 00${indexnr}8000000480000005 - 01${indexnr}8000000480000008 X +$cf_id $trx_id ${indexnr}8000000480000005-${indexnr}8000000480000008:1 X rollback; connection con1; rollback; @@ -498,7 +502,7 @@ pk a 8 8 # select * from information_schema.rocksdb_locks; # With replacements by select_from_is_rowlocks.inc COLUMN_FAMILY_ID TRANSACTION_ID KEY mode -$cf_id $trx_id 00${indexnr} - 00${indexnr}8000000a X +$cf_id $trx_id ${indexnr}-${indexnr}8000000a X rollback; begin; select * from t1 where pk>1990 order by pk desc limit 10 for update; @@ -509,7 +513,7 @@ pk a 1992 1992 # select * from information_schema.rocksdb_locks; # With replacements by select_from_is_rowlocks.inc COLUMN_FAMILY_ID TRANSACTION_ID KEY mode -$cf_id $trx_id 00${indexnr}800007c6 - 00${indexnr+1} X +$cf_id $trx_id ${indexnr}800007c6-${indexnr+1} X rollback; connection con1; rollback; diff --git a/mysql-test/suite/rocksdb/r/range_locking_rev_cf.result b/mysql-test/suite/rocksdb/r/range_locking_rev_cf.result index 3dd1fcfa320..883cb88ec79 100644 --- a/mysql-test/suite/rocksdb/r/range_locking_rev_cf.result +++ b/mysql-test/suite/rocksdb/r/range_locking_rev_cf.result @@ -99,12 +99,12 @@ pk a 10 10 # select * from information_schema.rocksdb_locks; # With replacements by select_from_is_rowlocks.inc COLUMN_FAMILY_ID TRANSACTION_ID KEY mode -$cf_id $trx_id 00${indexnr}8000000a X +$cf_id $trx_id ${indexnr}8000000a X delete from t1 where pk between 25 and 40; # select * from information_schema.rocksdb_locks; # With replacements by select_from_is_rowlocks.inc COLUMN_FAMILY_ID TRANSACTION_ID KEY mode -$cf_id $trx_id 00${indexnr}8000000a X -$cf_id $trx_id 00${indexnr}80000028 - 01${indexnr}80000019 X +$cf_id $trx_id ${indexnr}8000000a X +$cf_id $trx_id ${indexnr}80000028-${indexnr}80000019:1 X rollback; begin; # The following will show a range lock on 2-9 and also a point lock on 10. @@ -113,7 +113,7 @@ select * from t1 where pk between 2 and 9 for update; pk a # select * from information_schema.rocksdb_locks; # With replacements by select_from_is_rowlocks.inc COLUMN_FAMILY_ID TRANSACTION_ID KEY mode -$cf_id $trx_id 00${indexnr}80000009 - 01${indexnr}80000002 X +$cf_id $trx_id ${indexnr}80000009-${indexnr}80000002:1 X rollback; drop table t1; connection con1; @@ -400,7 +400,7 @@ pk1 pk2 a 3 0 30 # select * from information_schema.rocksdb_locks; # With replacements by select_from_is_rowlocks.inc COLUMN_FAMILY_ID TRANSACTION_ID KEY mode -$cf_id $trx_id 00${indexnr}80000003 - 01${indexnr}80000003 X +$cf_id $trx_id ${indexnr}80000003-${indexnr}80000003:1 X rollback; # # Test range locking for ranges with HA_READ_PREFIX_LAST_OR_PREV @@ -427,7 +427,7 @@ pk1 pk2 a 4 5 45 # select * from information_schema.rocksdb_locks; # With replacements by select_from_is_rowlocks.inc COLUMN_FAMILY_ID TRANSACTION_ID KEY mode -$cf_id $trx_id 00${indexnr}8000000480000008 - 01${indexnr}8000000480000005 X +$cf_id $trx_id ${indexnr}8000000480000008-${indexnr}8000000480000005:1 X rollback; connection con1; rollback; @@ -462,7 +462,7 @@ pk a 8 8 # select * from information_schema.rocksdb_locks; # With replacements by select_from_is_rowlocks.inc COLUMN_FAMILY_ID TRANSACTION_ID KEY mode -$cf_id $trx_id 00${indexnr} - 00${indexnr}8000000a X +$cf_id $trx_id ${indexnr}-${indexnr}8000000a X rollback; begin; select * from t1 where pk>1990 order by pk desc limit 10 for update; @@ -473,7 +473,7 @@ pk a 1992 1992 # select * from information_schema.rocksdb_locks; # With replacements by select_from_is_rowlocks.inc COLUMN_FAMILY_ID TRANSACTION_ID KEY mode -$cf_id $trx_id 00${indexnr}800007c6 - 00${indexnr+1} X +$cf_id $trx_id ${indexnr}800007c6-${indexnr+1} X rollback; connection con1; rollback; diff --git a/mysql-test/suite/rocksdb/r/range_locking_seek_for_update.result b/mysql-test/suite/rocksdb/r/range_locking_seek_for_update.result index a19331b81c4..54559d7d0a3 100644 --- a/mysql-test/suite/rocksdb/r/range_locking_seek_for_update.result +++ b/mysql-test/suite/rocksdb/r/range_locking_seek_for_update.result @@ -208,7 +208,7 @@ pk a # The below will lock from pk=1007 (0x3ef) till the end of the table: # select * from information_schema.rocksdb_locks; # With replacements by select_from_is_rowlocks.inc COLUMN_FAMILY_ID TRANSACTION_ID KEY mode -$cf_id $trx_id 00${indexnr}800003ef - 00${indexnr+1} X +$cf_id $trx_id ${indexnr}800003ef-${indexnr+1} X rollback; begin; select * from t1 where pk <1007 order by pk desc limit 2 for update; @@ -217,7 +217,7 @@ pk a 1001 1001 # select * from information_schema.rocksdb_locks; # With replacements by select_from_is_rowlocks.inc COLUMN_FAMILY_ID TRANSACTION_ID KEY mode -$cf_id $trx_id 00${indexnr}800003e9 - 00${indexnr}800003ef X +$cf_id $trx_id ${indexnr}800003e9-${indexnr}800003ef X connection con1; rollback; connection default; diff --git a/mysql-test/suite/rocksdb/r/range_locking_shared_locks.result b/mysql-test/suite/rocksdb/r/range_locking_shared_locks.result index 722889e6721..580108de6f6 100644 --- a/mysql-test/suite/rocksdb/r/range_locking_shared_locks.result +++ b/mysql-test/suite/rocksdb/r/range_locking_shared_locks.result @@ -25,15 +25,15 @@ pk a # Now for pk=5 we should see two locks by TRX1 and TRX2 with mode=S: # select * from information_schema.rocksdb_locks; # With replacements by select_from_is_rowlocks.inc COLUMN_FAMILY_ID TRANSACTION_ID KEY mode -$cf_id $TRX1_ID 00${indexnr}80000003 X -$cf_id $TRX1_ID 00${indexnr}80000005 S -$cf_id $TRX2_ID 00${indexnr}80000005 S +$cf_id $TRX1_ID ${indexnr}80000003 X +$cf_id $TRX1_ID ${indexnr}80000005 S +$cf_id $TRX2_ID ${indexnr}80000005 S rollback; # Now, TRX2_ID should be gone: # select * from information_schema.rocksdb_locks; # With replacements by select_from_is_rowlocks.inc COLUMN_FAMILY_ID TRANSACTION_ID KEY mode -$cf_id $TRX1_ID 00${indexnr}80000003 X -$cf_id $TRX1_ID 00${indexnr}80000005 S +$cf_id $TRX1_ID ${indexnr}80000003 X +$cf_id $TRX1_ID ${indexnr}80000005 S connection default; # Get a read lock on pk=3 (where we have a write lock). # The result should be that we will still have a write lock @@ -42,8 +42,8 @@ pk a 3 3 # select * from information_schema.rocksdb_locks; # With replacements by select_from_is_rowlocks.inc COLUMN_FAMILY_ID TRANSACTION_ID KEY mode -$cf_id $TRX1_ID 00${indexnr}80000003 X -$cf_id $TRX1_ID 00${indexnr}80000005 S +$cf_id $TRX1_ID ${indexnr}80000003 X +$cf_id $TRX1_ID ${indexnr}80000005 S # Get a write lock on pk=5 (where we have a read lock). # The result should be that we will have a write lock. select * from t1 where pk=5 for update; @@ -51,8 +51,8 @@ pk a 5 5 # select * from information_schema.rocksdb_locks; # With replacements by select_from_is_rowlocks.inc COLUMN_FAMILY_ID TRANSACTION_ID KEY mode -$cf_id $TRX1_ID 00${indexnr}80000003 X -$cf_id $TRX1_ID 00${indexnr}80000005 X +$cf_id $TRX1_ID ${indexnr}80000003 X +$cf_id $TRX1_ID ${indexnr}80000005 X connection default; rollback; # @@ -116,13 +116,13 @@ pk a 5 5 # select * from information_schema.rocksdb_locks; # With replacements by select_from_is_rowlocks.inc COLUMN_FAMILY_ID TRANSACTION_ID KEY mode -$cf_id $TRX1_ID 00${indexnr+1}80000002 - 01${indexnr+1}80000005 X -$cf_id $TRX1_ID 00${indexnr}80000002 S -$cf_id $TRX1_ID 00${indexnr}80000003 S -$cf_id $TRX1_ID 00${indexnr}80000004 S -$cf_id $TRX1_ID 00${indexnr}80000005 S -$cf_id $TRX1_ID 00${indexnr}80000006 S -$cf_id $TRX2_ID 00${indexnr}80000384 X +$cf_id $TRX1_ID ${indexnr+1}80000002-${indexnr+1}80000005:1 X +$cf_id $TRX1_ID ${indexnr}80000002 S +$cf_id $TRX1_ID ${indexnr}80000003 S +$cf_id $TRX1_ID ${indexnr}80000004 S +$cf_id $TRX1_ID ${indexnr}80000005 S +$cf_id $TRX1_ID ${indexnr}80000006 S +$cf_id $TRX2_ID ${indexnr}80000384 X rollback; disconnect con1; drop table t0,t1; @@ -177,38 +177,38 @@ connection con1; insert into t1 select 2000+A.a, 0 from t0 A; # select * from information_schema.rocksdb_locks; # With replacements by select_from_is_rowlocks.inc COLUMN_FAMILY_ID TRANSACTION_ID KEY mode -$cf_id $TRX2_ID 00${indexnr}80000000 X -$cf_id $TRX2_ID 00${indexnr}80000001 X -$cf_id $TRX2_ID 00${indexnr}80000002 X -$cf_id $TRX2_ID 00${indexnr}80000003 X -$cf_id $TRX2_ID 00${indexnr}80000004 X -$cf_id $TRX2_ID 00${indexnr}80000005 X -$cf_id $TRX2_ID 00${indexnr}80000006 X -$cf_id $TRX2_ID 00${indexnr}80000007 X -$cf_id $TRX2_ID 00${indexnr}80000008 X -$cf_id $TRX2_ID 00${indexnr}80000009 X -$cf_id $TRX1_ID 00${indexnr}800003e9 S -$cf_id $TRX2_ID 00${indexnr}800003e9 S -$cf_id $TRX1_ID 00${indexnr}8000044c S -$cf_id $TRX2_ID 00${indexnr}8000044c S -$cf_id $TRX1_ID 00${indexnr}800004b0 S -$cf_id $TRX2_ID 00${indexnr}800004b0 S -$cf_id $TRX1_ID 00${indexnr}800007d0 X -$cf_id $TRX1_ID 00${indexnr}800007d1 X -$cf_id $TRX1_ID 00${indexnr}800007d2 X -$cf_id $TRX1_ID 00${indexnr}800007d3 X -$cf_id $TRX1_ID 00${indexnr}800007d4 X -$cf_id $TRX1_ID 00${indexnr}800007d5 X -$cf_id $TRX1_ID 00${indexnr}800007d6 X -$cf_id $TRX1_ID 00${indexnr}800007d7 X -$cf_id $TRX1_ID 00${indexnr}800007d8 X -$cf_id $TRX1_ID 00${indexnr}800007d9 X -$cf_id $TRX1_ID 00${indexnr}800009c4 S -$cf_id $TRX2_ID 00${indexnr}800009ce S +$cf_id $TRX2_ID ${indexnr}80000000 X +$cf_id $TRX2_ID ${indexnr}80000001 X +$cf_id $TRX2_ID ${indexnr}80000002 X +$cf_id $TRX2_ID ${indexnr}80000003 X +$cf_id $TRX2_ID ${indexnr}80000004 X +$cf_id $TRX2_ID ${indexnr}80000005 X +$cf_id $TRX2_ID ${indexnr}80000006 X +$cf_id $TRX2_ID ${indexnr}80000007 X +$cf_id $TRX2_ID ${indexnr}80000008 X +$cf_id $TRX2_ID ${indexnr}80000009 X +$cf_id $TRX1_ID ${indexnr}800003e9 S +$cf_id $TRX2_ID ${indexnr}800003e9 S +$cf_id $TRX1_ID ${indexnr}8000044c S +$cf_id $TRX2_ID ${indexnr}8000044c S +$cf_id $TRX1_ID ${indexnr}800004b0 S +$cf_id $TRX2_ID ${indexnr}800004b0 S +$cf_id $TRX1_ID ${indexnr}800007d0 X +$cf_id $TRX1_ID ${indexnr}800007d1 X +$cf_id $TRX1_ID ${indexnr}800007d2 X +$cf_id $TRX1_ID ${indexnr}800007d3 X +$cf_id $TRX1_ID ${indexnr}800007d4 X +$cf_id $TRX1_ID ${indexnr}800007d5 X +$cf_id $TRX1_ID ${indexnr}800007d6 X +$cf_id $TRX1_ID ${indexnr}800007d7 X +$cf_id $TRX1_ID ${indexnr}800007d8 X +$cf_id $TRX1_ID ${indexnr}800007d9 X +$cf_id $TRX1_ID ${indexnr}800009c4 S +$cf_id $TRX2_ID ${indexnr}800009ce S connection default; show status like 'rocksdb_locktree_current_lock_memory'; Variable_name Value -rocksdb_locktree_current_lock_memory 7896 +rocksdb_locktree_current_lock_memory 8792 set @save_mlm= @@rocksdb_max_lock_memory; # Set the limit to cause lock escalation: set @cur_mem_usage= (select @@ -222,26 +222,26 @@ connection con1; insert into t1 select 3000+A.a, 0 from t0 A; # select * from information_schema.rocksdb_locks; # With replacements by select_from_is_rowlocks.inc COLUMN_FAMILY_ID TRANSACTION_ID KEY mode -$cf_id $TRX2_ID 00${indexnr}80000000 - 00${indexnr}80000009 X -$cf_id $TRX1_ID 00${indexnr}800003e9 S -$cf_id $TRX2_ID 00${indexnr}800003e9 S -$cf_id $TRX1_ID 00${indexnr}8000044c S -$cf_id $TRX2_ID 00${indexnr}8000044c S -$cf_id $TRX1_ID 00${indexnr}800004b0 S -$cf_id $TRX2_ID 00${indexnr}800004b0 S -$cf_id $TRX1_ID 00${indexnr}800007d0 - 00${indexnr}800007d9 X -$cf_id $TRX1_ID 00${indexnr}800009c4 S -$cf_id $TRX2_ID 00${indexnr}800009ce S -$cf_id $TRX1_ID 00${indexnr}80000bb8 X -$cf_id $TRX1_ID 00${indexnr}80000bb9 X -$cf_id $TRX1_ID 00${indexnr}80000bba X -$cf_id $TRX1_ID 00${indexnr}80000bbb X -$cf_id $TRX1_ID 00${indexnr}80000bbc X -$cf_id $TRX1_ID 00${indexnr}80000bbd X -$cf_id $TRX1_ID 00${indexnr}80000bbe X -$cf_id $TRX1_ID 00${indexnr}80000bbf X -$cf_id $TRX1_ID 00${indexnr}80000bc0 X -$cf_id $TRX1_ID 00${indexnr}80000bc1 X +$cf_id $TRX2_ID ${indexnr}80000000-${indexnr}80000009 X +$cf_id $TRX1_ID ${indexnr}800003e9 S +$cf_id $TRX2_ID ${indexnr}800003e9 S +$cf_id $TRX1_ID ${indexnr}8000044c S +$cf_id $TRX2_ID ${indexnr}8000044c S +$cf_id $TRX1_ID ${indexnr}800004b0 S +$cf_id $TRX2_ID ${indexnr}800004b0 S +$cf_id $TRX1_ID ${indexnr}800007d0-${indexnr}800007d9 X +$cf_id $TRX1_ID ${indexnr}800009c4 S +$cf_id $TRX2_ID ${indexnr}800009ce S +$cf_id $TRX1_ID ${indexnr}80000bb8 X +$cf_id $TRX1_ID ${indexnr}80000bb9 X +$cf_id $TRX1_ID ${indexnr}80000bba X +$cf_id $TRX1_ID ${indexnr}80000bbb X +$cf_id $TRX1_ID ${indexnr}80000bbc X +$cf_id $TRX1_ID ${indexnr}80000bbd X +$cf_id $TRX1_ID ${indexnr}80000bbe X +$cf_id $TRX1_ID ${indexnr}80000bbf X +$cf_id $TRX1_ID ${indexnr}80000bc0 X +$cf_id $TRX1_ID ${indexnr}80000bc1 X connection con1; rollback; connection default;