revision-id: aca52c36332372a4aa71daf529bfb4383a6334d0 (fb-prod201801-230-gaca52c36332) parent(s): 38b85e5ff2564d495d69857f17f4ada547cdb44f author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-04-29 20:24:38 +0300 message: Range Locking: information_schema.rocksdb_locks now has correct COLUMN_FAMILY_ID --- mysql-test/suite/rocksdb/r/range_locking.result | 6 +++--- mysql-test/suite/rocksdb/r/range_locking_rev_cf.result | 16 ++++++++-------- mysql-test/suite/rocksdb/t/range_locking.inc | 1 + rocksdb | 2 +- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/mysql-test/suite/rocksdb/r/range_locking.result b/mysql-test/suite/rocksdb/r/range_locking.result index e9f6d667931..a5e17f679e5 100644 --- a/mysql-test/suite/rocksdb/r/range_locking.result +++ b/mysql-test/suite/rocksdb/r/range_locking.result @@ -388,7 +388,7 @@ create table t1 ( pk1 int, pk2 int, a int, -primary key(pk1, pk2) comment '$pk_cf' +primary key(pk1, pk2) comment 'default' ) engine=rocksdb; insert into t1 select @@ -426,8 +426,8 @@ 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 -0 $trx_id 0000${indexnr}80000003 - 0100${indexnr}80000003 X -0 $trx_id 0000${indexnr}8000000280000009 X +$cf_id $trx_id 0000${indexnr}80000003 - 0100${indexnr}80000003 X +$cf_id $trx_id 0000${indexnr}8000000280000009 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 a52f35e1862..6ab62f1208b 100644 --- a/mysql-test/suite/rocksdb/r/range_locking_rev_cf.result +++ b/mysql-test/suite/rocksdb/r/range_locking_rev_cf.result @@ -93,12 +93,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 -0 $trx_id 0000${indexnr}8000000a X +$cf_id $trx_id 0000${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 -0 $trx_id 0000${indexnr}8000000a X -0 $trx_id 0000${indexnr}80000028 - 0100${indexnr}80000019 X +$cf_id $trx_id 0000${indexnr}8000000a X +$cf_id $trx_id 0000${indexnr}80000028 - 0100${indexnr}80000019 X rollback; begin; # The following will show a range lock on 2-9 and also a point lock on 10. @@ -107,8 +107,8 @@ 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 -0 $trx_id 0000${indexnr}80000009 - 0100${indexnr}80000002 X -0 $trx_id 0000${indexnr}8000000a X +$cf_id $trx_id 0000${indexnr}80000009 - 0100${indexnr}80000002 X +$cf_id $trx_id 0000${indexnr}8000000a X rollback; drop table t1; # @@ -348,7 +348,7 @@ create table t1 ( pk1 int, pk2 int, a int, -primary key(pk1, pk2) comment '$pk_cf' +primary key(pk1, pk2) comment 'rev:cf1' ) engine=rocksdb; insert into t1 select @@ -386,8 +386,8 @@ 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 -0 $trx_id 0000${indexnr}80000003 - 0100${indexnr}80000003 X -0 $trx_id 0000${indexnr}8000000280000009 X +$cf_id $trx_id 0000${indexnr}8000000280000009 X +$cf_id $trx_id 0000${indexnr}80000003 - 0100${indexnr}80000003 X rollback; connection con1; rollback; diff --git a/mysql-test/suite/rocksdb/t/range_locking.inc b/mysql-test/suite/rocksdb/t/range_locking.inc index 866264176dc..265694436b1 100644 --- a/mysql-test/suite/rocksdb/t/range_locking.inc +++ b/mysql-test/suite/rocksdb/t/range_locking.inc @@ -417,6 +417,7 @@ drop table t1; create table t0(a int) engine=rocksdb; insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); +eval create table t1 ( pk1 int, pk2 int, diff --git a/rocksdb b/rocksdb index 293d6902411..bcc79236884 160000 --- a/rocksdb +++ b/rocksdb @@ -1 +1 @@ -Subproject commit 293d6902411748728fb48bf63e63ba121a963788 +Subproject commit bcc7923688446c58a21f4f0ab287b147f406abc2