- commits - lists.mariadb.org

[Commits] c3332b8d472: Update to latest range-locking rocksdb
by Sergei Petrunia 30 Nov '19

30 Nov '19

revision-id: c3332b8d47289444a8b11959ad63cadebdd55ed6 (fb-prod201903-265-gc3332b8d472) parent(s): bb4206a5ac2faa912b91c1da0ed69876ca1ab22d author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-11-30 20:04:29 +0300 message: Update to latest range-locking rocksdb --- rocksdb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rocksdb b/rocksdb index 73ff40dcbf0..5db4c985188 160000 --- a/rocksdb +++ b/rocksdb @@ -1 +1 @@ -Subproject commit 73ff40dcbf0a46228ea02d5103d1331335622794 +Subproject commit 5db4c985188654955350b1417aedb2b6f92774d8

1 0

[Commits] 5db4c9851: Range Locking, shared locks: fix a bug in acquisition of the same lock twice
by Sergei Petrunia 30 Nov '19

30 Nov '19

revision-id: 5db4c985188654955350b1417aedb2b6f92774d8 (v5.8-1899-g5db4c9851) parent(s): 73ff40dcbf0a46228ea02d5103d1331335622794 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-11-30 20:03:50 +0300 message: Range Locking, shared locks: fix a bug in acquisition of the same lock twice Check for this case: when the same transaction acquires the same lock twice, the lock should still have m_txnid={the transaction}, m_owners= nullptr. Failure to maintain this invariant breaks the logic in other code and in some scenarios we could end up with shared locks with zero owners. --- utilities/transactions/range_locking/locktree/treenode.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/utilities/transactions/range_locking/locktree/treenode.cc b/utilities/transactions/range_locking/locktree/treenode.cc index 029646d18..725991f7d 100644 --- a/utilities/transactions/range_locking/locktree/treenode.cc +++ b/utilities/transactions/range_locking/locktree/treenode.cc @@ -140,6 +140,9 @@ void treenode::swap_in_place(treenode *node1, treenode *node2) { void treenode::add_shared_owner(TXNID txnid) { assert(m_is_shared); + if (txnid == m_txnid) + return; // acquiring a lock on the same range by the same trx + if (m_txnid != TXNID_SHARED) { m_owners= new TxnidVector; m_owners->insert(m_txnid); @@ -373,7 +376,9 @@ void treenode::recursive_remove(void) { } void treenode::remove_shared_owner(TXNID txnid) { + assert(m_owners->size()>1); m_owners->erase(txnid); + assert(m_owners->size()>0); /* if there is just one owner left, move it to m_txnid */ if (m_owners->size() == 1) {

1 0

[Commits] bb4206a5ac2: Code cleanup and post-merge fixes
by Sergei Petrunia 30 Nov '19

30 Nov '19

revision-id: bb4206a5ac2faa912b91c1da0ed69876ca1ab22d (fb-prod201903-264-gbb4206a5ac2) parent(s): 398dfcdbfc0ba803f1da9b936deff2c893fe29ed author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-11-30 19:06:30 +0300 message: Code cleanup and post-merge fixes - rocksdb.varbinary_format prints different output for range vs point locking. - Update to latest RocksDB: WriteUnprepared should call correct Cleanup(). --- mysql-test/suite/rocksdb/r/varbinary_format.result | 17 ++++++++--------- mysql-test/suite/rocksdb/t/varbinary_format.test | 16 +++++++--------- rocksdb | 2 +- 3 files changed, 16 insertions(+), 19 deletions(-) diff --git a/mysql-test/suite/rocksdb/r/varbinary_format.result b/mysql-test/suite/rocksdb/r/varbinary_format.result index e3dde737f9f..9362d42515c 100644 --- a/mysql-test/suite/rocksdb/r/varbinary_format.result +++ b/mysql-test/suite/rocksdb/r/varbinary_format.result @@ -1,4 +1,3 @@ -set @skip_head=9 + if(@@rocksdb_use_range_locking, 2, 0); CREATE TABLE t1( vb VARBINARY(64) primary key ) ENGINE=rocksdb; @@ -46,8 +45,8 @@ hex(vb) 00000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 000000000000000000000000000000000000000000000000000000000000000000 -SELECT SUBSTRING(a.key,@skip_head) FROM information_schema.rocksdb_locks AS a ORDER BY a.key; -SUBSTRING(a.key,@skip_head) +SELECT SUBSTRING(a.key,9) FROM information_schema.rocksdb_locks AS a ORDER BY a.key; +SUBSTRING(a.key,9) 000000000000000001 000000000000000002 000000000000000003 @@ -112,8 +111,8 @@ hex(vb) 00000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 000000000000000000000000000000000000000000000000000000000000000000 -SELECT SUBSTRING(a.key,@skip_head) FROM information_schema.rocksdb_locks AS a ORDER BY a.key; -SUBSTRING(a.key,@skip_head) +SELECT SUBSTRING(a.key,9) FROM information_schema.rocksdb_locks AS a ORDER BY a.key; +SUBSTRING(a.key,9) 0000000000000000f8 0000000000000000f9 0000000000000000fa @@ -176,8 +175,8 @@ aaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -SELECT SUBSTRING(a.key,@skip_head) FROM information_schema.rocksdb_locks AS a ORDER BY a.key; -SUBSTRING(a.key,@skip_head) +SELECT SUBSTRING(a.key,9) FROM information_schema.rocksdb_locks AS a ORDER BY a.key; +SUBSTRING(a.key,9) 610000000000000001 616100000000000002 616161000000000003 @@ -242,8 +241,8 @@ aaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -SELECT SUBSTRING(a.key,@skip_head) FROM information_schema.rocksdb_locks AS a ORDER BY a.key; -SUBSTRING(a.key,@skip_head) +SELECT SUBSTRING(a.key,9) FROM information_schema.rocksdb_locks AS a ORDER BY a.key; +SUBSTRING(a.key,9) 6100000000000000f8 6161000000000000f9 6161610000000000fa diff --git a/mysql-test/suite/rocksdb/t/varbinary_format.test b/mysql-test/suite/rocksdb/t/varbinary_format.test index cca230614fd..fd9ca2b35da 100644 --- a/mysql-test/suite/rocksdb/t/varbinary_format.test +++ b/mysql-test/suite/rocksdb/t/varbinary_format.test @@ -1,11 +1,9 @@ --source include/have_debug.inc --source include/have_rocksdb.inc -# -# In point-locking mode, skip first 4 bytes, as they indexnr. -# In range-locking mode, there is one more range control byte at the front -# -set @skip_head=9 + if(@@rocksdb_use_range_locking, 2, 0); +# The test uses SELECT .. FOR UPDATE and examines which locks it acquires +# Range Locking will use different locks from point locking +--source suite/rocksdb/include/not_range_locking.inc # Create a table with a varbinary key with the current format and validate # that it sorts correctly @@ -33,7 +31,7 @@ SELECT hex(vb) FROM t1; # validate that the keys were encoded as expected BEGIN; SELECT hex(vb) FROM t1 FOR UPDATE; -SELECT SUBSTRING(a.key,@skip_head) FROM information_schema.rocksdb_locks AS a ORDER BY a.key; +SELECT SUBSTRING(a.key,9) FROM information_schema.rocksdb_locks AS a ORDER BY a.key; ROLLBACK; DROP TABLE t1; @@ -66,7 +64,7 @@ SELECT hex(vb) FROM t1; # validate that the keys were encoded as expected BEGIN; SELECT hex(vb) FROM t1 FOR UPDATE; -SELECT SUBSTRING(a.key,@skip_head) FROM information_schema.rocksdb_locks AS a ORDER BY a.key; +SELECT SUBSTRING(a.key,9) FROM information_schema.rocksdb_locks AS a ORDER BY a.key; ROLLBACK; DROP TABLE t1; @@ -97,7 +95,7 @@ SELECT * FROM t1; # validate that the keys were encoded as expected BEGIN; SELECT * FROM t1 FOR UPDATE; -SELECT SUBSTRING(a.key,@skip_head) FROM information_schema.rocksdb_locks AS a ORDER BY a.key; +SELECT SUBSTRING(a.key,9) FROM information_schema.rocksdb_locks AS a ORDER BY a.key; ROLLBACK; DROP TABLE t1; @@ -130,7 +128,7 @@ SELECT * FROM t1; # validate that the keys were encoded as expected BEGIN; SELECT * FROM t1 FOR UPDATE; -SELECT SUBSTRING(a.key,@skip_head) FROM information_schema.rocksdb_locks AS a ORDER BY a.key; +SELECT SUBSTRING(a.key,9) FROM information_schema.rocksdb_locks AS a ORDER BY a.key; ROLLBACK; DROP TABLE t1; diff --git a/rocksdb b/rocksdb index d09b88fb9ee..73ff40dcbf0 160000 --- a/rocksdb +++ b/rocksdb @@ -1 +1 @@ -Subproject commit d09b88fb9ee1ebdb13cedf5f6b49bea268188366 +Subproject commit 73ff40dcbf0a46228ea02d5103d1331335622794

1 0

[Commits] 73ff40dcb: RangeLocking: Make WriteUnpreparedTxn::Clear() pass all_keys_hint=true to UnLock
by Sergei Petrunia 30 Nov '19

30 Nov '19

revision-id: 73ff40dcbf0a46228ea02d5103d1331335622794 (v5.8-1898-g73ff40dcb) parent(s): d09b88fb9ee1ebdb13cedf5f6b49bea268188366 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-11-30 19:03:43 +0300 message: RangeLocking: Make WriteUnpreparedTxn::Clear() pass all_keys_hint=true to UnLock Failure to do so would be either slow, or fail to release locks at all (when in STO-mode) --- utilities/transactions/write_unprepared_txn.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utilities/transactions/write_unprepared_txn.cc b/utilities/transactions/write_unprepared_txn.cc index d4e5abad5..cf96723f2 100644 --- a/utilities/transactions/write_unprepared_txn.cc +++ b/utilities/transactions/write_unprepared_txn.cc @@ -693,7 +693,7 @@ Status WriteUnpreparedTxn::RollbackInternal() { void WriteUnpreparedTxn::Clear() { if (!recovered_txn_) { - txn_db_impl_->UnLock(this, &GetTrackedKeys()); + txn_db_impl_->UnLock(this, &GetTrackedKeys(), /*all_keys_hint=*/ true); } unprep_seqs_.clear(); flushed_save_points_.reset(nullptr);

1 0

[Commits] 398dfcdbfc0: Fix rocksdb.ttl_primary_read_filtering test
by Sergei Petrunia 30 Nov '19

30 Nov '19

revision-id: 398dfcdbfc0ba803f1da9b936deff2c893fe29ed (fb-prod201903-263-g398dfcdbfc0) parent(s): c62e560ba5d692ac1af5cfb954aa9b36b9c98b35 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-11-30 16:43:52 +0300 message: Fix rocksdb.ttl_primary_read_filtering test In Range-Locking mode, DML statement not necessarily creates a snapshot. Introduce/call Rdb_transaction::locking_iter_created() which will note the current_timestamp, like Rdb_transaction::snapshot_created does. We should take only the time of the first call. --- storage/rocksdb/ha_rocksdb.cc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc index 9743b0b3ee9..262af4816f1 100644 --- a/storage/rocksdb/ha_rocksdb.cc +++ b/storage/rocksdb/ha_rocksdb.cc @@ -2825,6 +2825,11 @@ class Rdb_transaction { m_is_delayed_snapshot = false; } + void locking_iter_created() { + if (!m_snapshot_timestamp) + rdb->GetEnv()->GetCurrentTime(&m_snapshot_timestamp); + } + virtual void acquire_snapshot(bool acquire_now) = 0; virtual void release_snapshot() = 0; @@ -3615,8 +3620,10 @@ class Rdb_transaction_impl : public Rdb_transaction { bool is_rev_cf, bool use_locking_iterator) override { global_stats.queries[QUERIES_RANGE].inc(); - if (use_locking_iterator) + if (use_locking_iterator) { + locking_iter_created(); return GetLockingIterator(m_rocksdb_tx, options, column_family, is_rev_cf); + } else return m_rocksdb_tx->GetIterator(options, column_family); }

1 0

[Commits] c62e560ba5d: Make tests pass (in progress)
by psergey 28 Nov '19

28 Nov '19

revision-id: c62e560ba5d692ac1af5cfb954aa9b36b9c98b35 (fb-prod201903-262-gc62e560ba5d) parent(s): 85e37c7ae3185790ef89a7da660112c73ad6cec1 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-11-28 17:52:58 +0300 message: Make tests pass (in progress) --- .../rocksdb/r/range_locking_shared_locks.result | 128 ++++++++++----------- mysql-test/suite/rocksdb/t/rpl_row_not_found.inc | 2 + 2 files changed, 66 insertions(+), 64 deletions(-) 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 99a80209075..b50e383fd82 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 0000${indexnr}80000003 X -$cf_id $TRX1_ID 0000${indexnr}80000005 S -$cf_id $TRX2_ID 0000${indexnr}80000005 S +$cf_id $TRX1_ID 00${indexnr}80000003 X +$cf_id $TRX1_ID 00${indexnr}80000005 S +$cf_id $TRX2_ID 00${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 0000${indexnr}80000003 X -$cf_id $TRX1_ID 0000${indexnr}80000005 S +$cf_id $TRX1_ID 00${indexnr}80000003 X +$cf_id $TRX1_ID 00${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 0000${indexnr}80000003 X -$cf_id $TRX1_ID 0000${indexnr}80000005 S +$cf_id $TRX1_ID 00${indexnr}80000003 X +$cf_id $TRX1_ID 00${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 0000${indexnr}80000003 X -$cf_id $TRX1_ID 0000${indexnr}80000005 X +$cf_id $TRX1_ID 00${indexnr}80000003 X +$cf_id $TRX1_ID 00${indexnr}80000005 X connection default; rollback; # @@ -114,13 +114,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 0000${indexnr+1}80000002 - 0100${indexnr+1}80000005 X -$cf_id $TRX1_ID 0000${indexnr}80000002 S -$cf_id $TRX1_ID 0000${indexnr}80000003 S -$cf_id $TRX1_ID 0000${indexnr}80000004 S -$cf_id $TRX1_ID 0000${indexnr}80000005 S -$cf_id $TRX1_ID 0000${indexnr}80000006 S -$cf_id $TRX2_ID 0000${indexnr}80000384 X +$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 rollback; disconnect con1; drop table t0,t1; @@ -175,34 +175,34 @@ 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 0000${indexnr}80000000 X -$cf_id $TRX2_ID 0000${indexnr}80000001 X -$cf_id $TRX2_ID 0000${indexnr}80000002 X -$cf_id $TRX2_ID 0000${indexnr}80000003 X -$cf_id $TRX2_ID 0000${indexnr}80000004 X -$cf_id $TRX2_ID 0000${indexnr}80000005 X -$cf_id $TRX2_ID 0000${indexnr}80000006 X -$cf_id $TRX2_ID 0000${indexnr}80000007 X -$cf_id $TRX2_ID 0000${indexnr}80000008 X -$cf_id $TRX2_ID 0000${indexnr}80000009 X -$cf_id $TRX1_ID 0000${indexnr}800003e9 S -$cf_id $TRX2_ID 0000${indexnr}800003e9 S -$cf_id $TRX1_ID 0000${indexnr}8000044c S -$cf_id $TRX2_ID 0000${indexnr}8000044c S -$cf_id $TRX1_ID 0000${indexnr}800004b0 S -$cf_id $TRX2_ID 0000${indexnr}800004b0 S -$cf_id $TRX1_ID 0000${indexnr}800007d0 X -$cf_id $TRX1_ID 0000${indexnr}800007d1 X -$cf_id $TRX1_ID 0000${indexnr}800007d2 X -$cf_id $TRX1_ID 0000${indexnr}800007d3 X -$cf_id $TRX1_ID 0000${indexnr}800007d4 X -$cf_id $TRX1_ID 0000${indexnr}800007d5 X -$cf_id $TRX1_ID 0000${indexnr}800007d6 X -$cf_id $TRX1_ID 0000${indexnr}800007d7 X -$cf_id $TRX1_ID 0000${indexnr}800007d8 X -$cf_id $TRX1_ID 0000${indexnr}800007d9 X -$cf_id $TRX1_ID 0000${indexnr}800009c4 S -$cf_id $TRX2_ID 0000${indexnr}800009ce S +$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 connection default; show status like 'rocksdb_locktree_current_lock_memory'; Variable_name Value @@ -220,26 +220,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 0000${indexnr}80000000 - 0000${indexnr}80000009 X -$cf_id $TRX1_ID 0000${indexnr}800003e9 S -$cf_id $TRX2_ID 0000${indexnr}800003e9 S -$cf_id $TRX1_ID 0000${indexnr}8000044c S -$cf_id $TRX2_ID 0000${indexnr}8000044c S -$cf_id $TRX1_ID 0000${indexnr}800004b0 S -$cf_id $TRX2_ID 0000${indexnr}800004b0 S -$cf_id $TRX1_ID 0000${indexnr}800007d0 - 0000${indexnr}800007d9 X -$cf_id $TRX1_ID 0000${indexnr}800009c4 S -$cf_id $TRX2_ID 0000${indexnr}800009ce S -$cf_id $TRX1_ID 0000${indexnr}80000bb8 X -$cf_id $TRX1_ID 0000${indexnr}80000bb9 X -$cf_id $TRX1_ID 0000${indexnr}80000bba X -$cf_id $TRX1_ID 0000${indexnr}80000bbb X -$cf_id $TRX1_ID 0000${indexnr}80000bbc X -$cf_id $TRX1_ID 0000${indexnr}80000bbd X -$cf_id $TRX1_ID 0000${indexnr}80000bbe X -$cf_id $TRX1_ID 0000${indexnr}80000bbf X -$cf_id $TRX1_ID 0000${indexnr}80000bc0 X -$cf_id $TRX1_ID 0000${indexnr}80000bc1 X +$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 connection con1; rollback; connection default; diff --git a/mysql-test/suite/rocksdb/t/rpl_row_not_found.inc b/mysql-test/suite/rocksdb/t/rpl_row_not_found.inc index 5a78979f048..63b72ce5c5a 100644 --- a/mysql-test/suite/rocksdb/t/rpl_row_not_found.inc +++ b/mysql-test/suite/rocksdb/t/rpl_row_not_found.inc @@ -3,6 +3,8 @@ --source include/have_debug.inc --source include/have_debug_sync.inc +--source suite/rocksdb/include/not_range_locking.inc + connection master; --disable_warnings drop table if exists t1;

1 0

[Commits] 85e37c7ae31: Fix rocksdb.unique_seq_rev_cf test
by psergey 28 Nov '19

28 Nov '19

revision-id: 85e37c7ae3185790ef89a7da660112c73ad6cec1 (fb-prod201903-261-g85e37c7ae31) parent(s): b6188f3823dedf32a53f312ae086564676328b0f author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-11-28 17:50:20 +0300 message: Fix rocksdb.unique_seq_rev_cf test For reverse-ordered column families, we need to flip the endpoint types (like it is already done in ha_rocksdb::set_range_lock) --- storage/rocksdb/ha_rocksdb.cc | 20 ++++++++++++++------ storage/rocksdb/rdb_locking_iter.cc | 5 +++-- storage/rocksdb/rdb_locking_iter.h | 12 ++++++++---- 3 files changed, 25 insertions(+), 12 deletions(-) diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc index 53d489b7474..9743b0b3ee9 100644 --- a/storage/rocksdb/ha_rocksdb.cc +++ b/storage/rocksdb/ha_rocksdb.cc @@ -2769,6 +2769,8 @@ class Rdb_transaction { rocksdb::Status lock_singlepoint_range(rocksdb::ColumnFamilyHandle *const cf, const rocksdb::Slice &point) { + // Normally, one needs to "flip" the endpoint type for reverse-ordered CFs. + // But here we are locking just one point so this is not necessary. rocksdb::Endpoint endp(point, false); return lock_range(cf, endp, endp); } @@ -3177,6 +3179,7 @@ class Rdb_transaction { virtual rocksdb::Iterator *get_iterator( const rocksdb::ReadOptions &options, rocksdb::ColumnFamilyHandle *column_family, + bool is_rev_cf, bool use_locking_iterator=false) = 0; virtual void multi_get(rocksdb::ColumnFamilyHandle *const column_family, @@ -3187,7 +3190,8 @@ class Rdb_transaction { rocksdb::Iterator *get_iterator( - rocksdb::ColumnFamilyHandle *const column_family, bool skip_bloom_filter, + rocksdb::ColumnFamilyHandle *const column_family, bool is_rev_cf, + bool skip_bloom_filter, bool fill_cache, const rocksdb::Slice &eq_cond_lower_bound, const rocksdb::Slice &eq_cond_upper_bound, bool read_current = false, bool create_snapshot = true, @@ -3220,7 +3224,7 @@ class Rdb_transaction { if (read_current) { options.snapshot = nullptr; } - return get_iterator(options, column_family, use_locking_iterator); + return get_iterator(options, column_family, is_rev_cf, use_locking_iterator); } virtual bool is_tx_started() const = 0; @@ -3608,10 +3612,11 @@ class Rdb_transaction_impl : public Rdb_transaction { rocksdb::Iterator *get_iterator( const rocksdb::ReadOptions &options, rocksdb::ColumnFamilyHandle *const column_family, + bool is_rev_cf, bool use_locking_iterator) override { global_stats.queries[QUERIES_RANGE].inc(); if (use_locking_iterator) - return GetLockingIterator(m_rocksdb_tx, options, column_family); + return GetLockingIterator(m_rocksdb_tx, options, column_family, is_rev_cf); else return m_rocksdb_tx->GetIterator(options, column_family); } @@ -3912,6 +3917,7 @@ class Rdb_writebatch_impl : public Rdb_transaction { rocksdb::Iterator *get_iterator( const rocksdb::ReadOptions &options, rocksdb::ColumnFamilyHandle *const /* column_family */, + bool is_rev_cf, bool use_locking_iterator) override { DBUG_ASSERT(!use_locking_iterator); const auto it = rdb->NewIterator(options); @@ -10058,7 +10064,8 @@ int ha_rocksdb::check_and_lock_sk(const uint key_id, } rocksdb::Iterator *const iter = row_info.tx->get_iterator( - kd.get_cf(), total_order_seek, fill_cache, lower_bound_slice, + kd.get_cf(), kd.m_is_reverse_cf, total_order_seek, fill_cache, + lower_bound_slice, upper_bound_slice, true /* read current data */, false /* acquire snapshot */); /* @@ -10711,7 +10718,8 @@ void ha_rocksdb::setup_scan_iterator(const Rdb_key_def &kd, read_opts.snapshot = m_scan_it_snapshot; m_scan_it = rdb->NewIterator(read_opts, kd.get_cf()); } else { - m_scan_it = tx->get_iterator(kd.get_cf(), skip_bloom, fill_cache, + m_scan_it = tx->get_iterator(kd.get_cf(), kd.m_is_reverse_cf, + skip_bloom, fill_cache, m_scan_it_lower_bound_slice, m_scan_it_upper_bound_slice, /*read_current*/ false, @@ -15545,7 +15553,7 @@ rocksdb::Iterator *rdb_tx_get_iterator( Rdb_transaction *tx, const rocksdb::ReadOptions &options, rocksdb::ColumnFamilyHandle *const column_family) { global_stats.queries[QUERIES_RANGE].inc(); - return tx->get_iterator(options, column_family); + return tx->get_iterator(options, column_family, false); } bool rdb_tx_started(Rdb_transaction *tx) { return tx->is_tx_started(); } diff --git a/storage/rocksdb/rdb_locking_iter.cc b/storage/rocksdb/rdb_locking_iter.cc index 5f5cc101e8a..bd2ff90fc83 100644 --- a/storage/rocksdb/rdb_locking_iter.cc +++ b/storage/rocksdb/rdb_locking_iter.cc @@ -11,8 +11,9 @@ namespace myrocks { rocksdb::Iterator* GetLockingIterator( rocksdb::Transaction *trx, const rocksdb::ReadOptions& read_options, - rocksdb::ColumnFamilyHandle* column_family) { - return new LockingIterator(trx, column_family, read_options); + rocksdb::ColumnFamilyHandle* column_family, + bool is_rev_cf) { + return new LockingIterator(trx, column_family, is_rev_cf, read_options); } /* diff --git a/storage/rocksdb/rdb_locking_iter.h b/storage/rocksdb/rdb_locking_iter.h index 632915d4b3d..e2373648d7e 100644 --- a/storage/rocksdb/rdb_locking_iter.h +++ b/storage/rocksdb/rdb_locking_iter.h @@ -34,6 +34,7 @@ class LockingIterator : public rocksdb::Iterator { rocksdb::Transaction *txn_; rocksdb::ColumnFamilyHandle* cfh_; + bool m_is_rev_cf; rocksdb::ReadOptions read_opts_; rocksdb::Iterator *iter_; rocksdb::Status status_; @@ -44,9 +45,10 @@ class LockingIterator : public rocksdb::Iterator { public: LockingIterator(rocksdb::Transaction *txn, rocksdb::ColumnFamilyHandle *cfh, + bool is_rev_cf, const rocksdb::ReadOptions& opts ) : - txn_(txn), cfh_(cfh), read_opts_(opts), iter_(nullptr), + txn_(txn), cfh_(cfh), m_is_rev_cf(is_rev_cf), read_opts_(opts), iter_(nullptr), status_(rocksdb::Status::InvalidArgument()), valid_(false) {} ~LockingIterator() { @@ -98,10 +100,11 @@ class LockingIterator : public rocksdb::Iterator { */ DEBUG_SYNC(current_thd, "rocksdb.locking_iter_scan"); auto end_key = iter_->key(); + bool endp_arg= m_is_rev_cf; if (forward) - status_ = txn_->GetRangeLock(cfh_, rocksdb::Endpoint(target), rocksdb::Endpoint(end_key)); + status_ = txn_->GetRangeLock(cfh_, rocksdb::Endpoint(target, endp_arg), rocksdb::Endpoint(end_key, endp_arg)); else - status_ = txn_->GetRangeLock(cfh_, rocksdb::Endpoint(end_key), rocksdb::Endpoint(target)); + status_ = txn_->GetRangeLock(cfh_, rocksdb::Endpoint(end_key, endp_arg), rocksdb::Endpoint(target, endp_arg)); if (!status_.ok()) { // Failed to get a lock (most likely lock wait timeout) @@ -169,6 +172,7 @@ class LockingIterator : public rocksdb::Iterator { rocksdb::Iterator* GetLockingIterator(rocksdb::Transaction *trx, const rocksdb::ReadOptions& read_options, - rocksdb::ColumnFamilyHandle* column_family); + rocksdb::ColumnFamilyHandle* column_family, + bool is_rev_cf); } // namespace myrocks

1 0

[Commits] 05b2a30: MDEV-20407 mysqld got signal 11; rowid filter
by IgorBabaev 26 Nov '19

26 Nov '19

revision-id: 05b2a309e6932ee2f4198d8082373887157ad16c (mariadb-10.4.10-31-g05b2a30) parent(s): 4d4b2867a2526872a7b476a5c3577be695800a8e author: Igor Babaev committer: Igor Babaev timestamp: 2019-11-26 11:22:51 -0800 message: MDEV-20407 mysqld got signal 11; rowid filter If a joined table is accessed by a full text index then now no range rowid filter can be used when accessing the records of this table. This bug was fixed by the patch for mdev-20056. This commit adds only a test case with a query using a full text index and a range condition for another index. --- mysql-test/main/rowid_filter_innodb.result | 34 ++++++++++++++++++++++++++++++ mysql-test/main/rowid_filter_innodb.test | 33 +++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) diff --git a/mysql-test/main/rowid_filter_innodb.result b/mysql-test/main/rowid_filter_innodb.result index eaad4ef..2f57ee0 100644 --- a/mysql-test/main/rowid_filter_innodb.result +++ b/mysql-test/main/rowid_filter_innodb.result @@ -2321,3 +2321,37 @@ t1.id2 = t1.id); 1 DROP TABLE t1, t2, t3; SET GLOBAL innodb_stats_persistent= @stats.save; +# +# MDEV-20407: usage of range filter is not supported when +# the joined table is accessed by a full text index +# +set @stats.save= @@innodb_stats_persistent; +set global innodb_stats_persistent=on; +create table t1(id int, s text, key (id), fulltext key (s)) engine=innodb; +insert into t1 values +(1119,'t'),(1134,'t'),(1134,'t'),(1143,'t'),(1143,'t'),(1187,'t'),(1187,'t'), +(1187,'t'),(1187,'t'),(1187,'t'),(1187,'t'),(1187,'t'),(1187,'t'),(1187,'t'), +(1187,'t'),(1210,'t'),(1210,'t'),(1210,'t'),(1210,'t'),(1210,'t'),(1210,'t'), +(1214,'t'),(1214,'t'),(1215,'t'),(1215,'t'),(1215,'t'),(1216,'t'),(1218,'t'), +(1220,'t'),(1220,'t'),(1220,'t'),(1222,'t'),(1223,'t'),(1223,'t'),(1224,'t'), +(1225,'t'),(1225,'t'),(1226,'t'),(1226,'t'),(1227,'t'),(1227,'t'),(1228,'t'), +(1229,'t'),(1230,'t'),(1230,'t'),(1231,'t'),(1231,'t'),(1232,'t'),(1232,'t'), +(1232,'t'),(1232,'t'),(1233,'t'),(1241,'t'),(1245,'t'),(1247,'t'),(1247,'t'), +(1247,'t'),(1247,'t'),(1247,'t'),(1247,'t'),(1248,'like fttest'); +analyze table t1; +Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected +test.t1 analyze Warning Engine-independent statistics are not collected for column 's' +test.t1 analyze status OK +explain extended select count(0) from t1 +where id=15066 and (match s against ('+"fttest"' in boolean mode)); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 fulltext id,s s 0 1 1.64 Using where +Warnings: +Note 1003 select count(0) AS `count(0)` from `test`.`t1` where `test`.`t1`.`id` = 15066 and (match `test`.`t1`.`s` against ('+"fttest"' in boolean mode)) +select count(0) from t1 +where id=15066 and (match s against ('+"fttest"' in boolean mode)); +count(0) +0 +drop table t1; +set global innodb_stats_persistent= @stats.save; diff --git a/mysql-test/main/rowid_filter_innodb.test b/mysql-test/main/rowid_filter_innodb.test index cfca162..f1b7b0d 100644 --- a/mysql-test/main/rowid_filter_innodb.test +++ b/mysql-test/main/rowid_filter_innodb.test @@ -182,3 +182,36 @@ eval $q2; DROP TABLE t1, t2, t3; SET GLOBAL innodb_stats_persistent= @stats.save; + +--echo # +--echo # MDEV-20407: usage of range filter is not supported when +--echo # the joined table is accessed by a full text index +--echo # + +set @stats.save= @@innodb_stats_persistent; +set global innodb_stats_persistent=on; + +create table t1(id int, s text, key (id), fulltext key (s)) engine=innodb; + +insert into t1 values +(1119,'t'),(1134,'t'),(1134,'t'),(1143,'t'),(1143,'t'),(1187,'t'),(1187,'t'), +(1187,'t'),(1187,'t'),(1187,'t'),(1187,'t'),(1187,'t'),(1187,'t'),(1187,'t'), +(1187,'t'),(1210,'t'),(1210,'t'),(1210,'t'),(1210,'t'),(1210,'t'),(1210,'t'), +(1214,'t'),(1214,'t'),(1215,'t'),(1215,'t'),(1215,'t'),(1216,'t'),(1218,'t'), +(1220,'t'),(1220,'t'),(1220,'t'),(1222,'t'),(1223,'t'),(1223,'t'),(1224,'t'), +(1225,'t'),(1225,'t'),(1226,'t'),(1226,'t'),(1227,'t'),(1227,'t'),(1228,'t'), +(1229,'t'),(1230,'t'),(1230,'t'),(1231,'t'),(1231,'t'),(1232,'t'),(1232,'t'), +(1232,'t'),(1232,'t'),(1233,'t'),(1241,'t'),(1245,'t'),(1247,'t'),(1247,'t'), +(1247,'t'),(1247,'t'),(1247,'t'),(1247,'t'),(1248,'like fttest'); + +analyze table t1; + +let $q= +select count(0) from t1 + where id=15066 and (match s against ('+"fttest"' in boolean mode)); + +eval explain extended $q; +eval $q; + +drop table t1; +set global innodb_stats_persistent= @stats.save;

1 0

[Commits] b6188f3823d: Make the tests pass
by psergey 26 Nov '19

26 Nov '19

revision-id: b6188f3823dedf32a53f312ae086564676328b0f (fb-prod201903-260-gb6188f3823d) parent(s): 86500865916f729216b7081f4bdc2cd9c0c37e70 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-11-26 20:29:22 +0300 message: Make the tests pass - Fix a bug in RocksDB's range locking - Don't run rocksdb.concurrent_delete with range_locking. --- mysql-test/suite/rocksdb/t/rocksdb_concurrent_delete.test | 4 ++++ rocksdb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/mysql-test/suite/rocksdb/t/rocksdb_concurrent_delete.test b/mysql-test/suite/rocksdb/t/rocksdb_concurrent_delete.test index 47818bfdbe1..3aa51b7be80 100644 --- a/mysql-test/suite/rocksdb/t/rocksdb_concurrent_delete.test +++ b/mysql-test/suite/rocksdb/t/rocksdb_concurrent_delete.test @@ -27,6 +27,10 @@ # In all cases, RR gets snapshot conflict errors if non-first rows get # deleted by another transaction after scanning. +# The tests do not work with range locking as it locks it is about to +# read, first. +--source suite/rocksdb/include/not_range_locking.inc + --source include/have_rocksdb.inc --source include/have_debug_sync.inc diff --git a/rocksdb b/rocksdb index 670bbd25c10..d09b88fb9ee 160000 --- a/rocksdb +++ b/rocksdb @@ -1 +1 @@ -Subproject commit 670bbd25c10c47638f41ee7f635a99443d21e937 +Subproject commit d09b88fb9ee1ebdb13cedf5f6b49bea268188366

1 0

[Commits] d09b88fb9: Make treenode::swap_in_place swap the m_owners, too.
by psergey 26 Nov '19

26 Nov '19

revision-id: d09b88fb9ee1ebdb13cedf5f6b49bea268188366 (v5.8-1897-gd09b88fb9) parent(s): 670bbd25c10c47638f41ee7f635a99443d21e937 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-11-26 20:24:11 +0300 message: Make treenode::swap_in_place swap the m_owners, too. Failure to do so caused random crashes under load. --- utilities/transactions/range_locking/locktree/treenode.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/utilities/transactions/range_locking/locktree/treenode.cc b/utilities/transactions/range_locking/locktree/treenode.cc index 5bf349749..029646d18 100644 --- a/utilities/transactions/range_locking/locktree/treenode.cc +++ b/utilities/transactions/range_locking/locktree/treenode.cc @@ -132,6 +132,10 @@ void treenode::swap_in_place(treenode *node1, treenode *node2) { bool tmp_is_shared= node1->m_is_shared; node1->m_is_shared= node2->m_is_shared; node2->m_is_shared= tmp_is_shared; + + auto tmp_m_owners = node1->m_owners; + node1->m_owners = node2->m_owners; + node2->m_owners = tmp_m_owners; } void treenode::add_shared_owner(TXNID txnid) {

1 0