Skip to content

Commit 2d75d8c

Browse files
committed
Update rocksdb.trx_info test
Range Locking code locks the gap after the last value now, which means for 2-row table "SELECT * FROM t FOR UPDATE" will place 3 locks.
1 parent 69c31c8 commit 2d75d8c

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

mysql-test/suite/rocksdb/r/trx_info.result

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,10 @@ a
99
2
1010
select * from information_schema.rocksdb_trx;
1111
TRANSACTION_ID STATE NAME WRITE_COUNT LOCK_COUNT TIMEOUT_SEC WAITING_KEY WAITING_COLUMN_FAMILY_ID IS_REPLICATION SKIP_TRX_API READ_ONLY HAS_DEADLOCK_DETECTION NUM_ONGOING_BULKLOAD THREAD_ID QUERY
12-
_TRX_ID_ STARTED _NAME_ 0 2 1 _KEY_ 0 0 0 0 0 0 _THREAD_ID_ select * from information_schema.rocksdb_trx
12+
_TRX_ID_ STARTED _NAME_ 0 2_or_3 1 _KEY_ 0 0 0 0 0 0 _THREAD_ID_ select * from information_schema.rocksdb_trx
13+
select
14+
if(@@rocksdb_use_range_locking=1, LOCK_COUNT=3, LOCK_COUNT=2) as LOCK_COUNT_IS_CORRECT
15+
from information_schema.rocksdb_trx;
16+
LOCK_COUNT_IS_CORRECT
17+
1
1318
DROP TABLE t1;

mysql-test/suite/rocksdb/t/trx_info.test

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ insert into t1 values (2);
1111
set autocommit=0;
1212
select * from t1 for update;
1313

14-
--replace_column 1 _TRX_ID_ 3 _NAME_ 7 _KEY_ 14 _THREAD_ID_
14+
--replace_column 1 _TRX_ID_ 3 _NAME_ 5 2_or_3 7 _KEY_ 14 _THREAD_ID_
1515
select * from information_schema.rocksdb_trx;
1616

17+
select
18+
if(@@rocksdb_use_range_locking=1, LOCK_COUNT=3, LOCK_COUNT=2) as LOCK_COUNT_IS_CORRECT
19+
from information_schema.rocksdb_trx;
20+
1721
DROP TABLE t1;

0 commit comments

Comments
 (0)