- commits - lists.mariadb.org

[Commits] 7da2037ab2d: Update RocksDB: Fix a typo in PessimisticTransaction::~PessimisticTransaction
by Sergei Petrunia 01 Dec '19

01 Dec '19

revision-id: 7da2037ab2d6940ac11d4befcf248fd83ad23213 (fb-prod201903-268-g7da2037ab2d) parent(s): 25cbeaf535e07cb54d5267471ae61a88a3cb6ae4 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-12-01 23:41:02 +0300 message: Update RocksDB: Fix a typo in PessimisticTransaction::~PessimisticTransaction --- rocksdb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rocksdb b/rocksdb index 5db4c985188..2d97925f359 160000 --- a/rocksdb +++ b/rocksdb @@ -1 +1 @@ -Subproject commit 5db4c985188654955350b1417aedb2b6f92774d8 +Subproject commit 2d97925f35970781a649ab312a7330fdb4446312

1 0

[Commits] 2d97925f3: Fix a typo in PessimisticTransaction::~PessimisticTransaction
by Sergei Petrunia 01 Dec '19

01 Dec '19

revision-id: 2d97925f35970781a649ab312a7330fdb4446312 (v5.8-1900-g2d97925f3) parent(s): 5db4c985188654955350b1417aedb2b6f92774d8 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-12-01 23:40:05 +0300 message: Fix a typo in PessimisticTransaction::~PessimisticTransaction --- utilities/transactions/pessimistic_transaction.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utilities/transactions/pessimistic_transaction.cc b/utilities/transactions/pessimistic_transaction.cc index 0f25b13d5..d4b167aee 100644 --- a/utilities/transactions/pessimistic_transaction.cc +++ b/utilities/transactions/pessimistic_transaction.cc @@ -333,7 +333,7 @@ void PessimisticTransaction::Initialize(const TransactionOptions& txn_options) { } PessimisticTransaction::~PessimisticTransaction() { - txn_db_impl_->UnLock(this, &GetTrackedKeys()/*, all_keys_hint=true*/); + txn_db_impl_->UnLock(this, &GetTrackedKeys(), /*all_keys_hint=*/true); if (expiration_time_ > 0) { txn_db_impl_->RemoveExpirableTransaction(txn_id_); }

1 0

[Commits] 8db4a6a: Trivial updates
by Sergei Petrunia 01 Dec '19

01 Dec '19

revision-id: 8db4a6a5e2b2a3a53b2a4e01f87753a1d7e03c3d () parent(s): 673729dd318e19957644a7c0ceb432cb88c827b0 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-12-01 23:29:36 +0300 message: Trivial updates --- run-test.sh | 4 ++-- setup-server/setup-fbmysql-clone.sh | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/run-test.sh b/run-test.sh index 7e5f2b4..78a0644 100755 --- a/run-test.sh +++ b/run-test.sh @@ -55,7 +55,7 @@ sleep 5 DATA_DIR=data-fbmysql-$SERVERNAME rm -rf $DATA_DIR -cp -r ${DATA_DIR}.clean $DATA_DIR +# cp -r ${DATA_DIR}.clean /dev/shm/$DATA_DIR ./$SERVER_DIR/sql/mysqld --defaults-file=./my-fbmysql-${SERVERNAME}.cnf & @@ -129,7 +129,7 @@ fi ############################################################################# ### Run the benchmnark -for threads in 1 5 10 20 40 ; do +for threads in 1 5 10 20 40 60 80 100; do #echo "THREADS $threads $storage_engine" diff --git a/setup-server/setup-fbmysql-clone.sh b/setup-server/setup-fbmysql-clone.sh index bdeae7e..b7eab08 100755 --- a/setup-server/setup-fbmysql-clone.sh +++ b/setup-server/setup-fbmysql-clone.sh @@ -35,6 +35,7 @@ make -j8 cd mysql-test ./mtr alias cp -r var/install.db $DATADIR +cp -r var/install.db $DATADIR.clean cd ../.. cat > my-fbmysql-$name.cnf << EOF

1 0

[Commits] 25cbeaf535e: Fix rocksdb.rocksdb_timeout_rollback test with range locking
by Sergei Petrunia 01 Dec '19

01 Dec '19

revision-id: 25cbeaf535e07cb54d5267471ae61a88a3cb6ae4 (fb-prod201903-267-g25cbeaf535e) parent(s): d4d71e07cadb223228474d66ad3277de8650a937 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-12-01 22:29:37 +0300 message: Fix rocksdb.rocksdb_timeout_rollback test with range locking In Range-Locking mode, the statement update t1 set a = a + 1 where a = 2; doesn't acquire a snapshot (because it reads committed data). This means, con2 will acquire its read shapshot only here: connection con2; select * from t1; when con1 has already committed. Because of that, it will see rows with a=11 and a=12, causing a test failure like this: @@ -58,6 +58,8 @@ 6 9 10 +11 +12 commit; select * from t1; a

1 0

[Commits] d4d71e07cad: Disable rocksdb.drop_cf_befre_show_deadlock_info 'range_locking'
by Sergei Petrunia 30 Nov '19

30 Nov '19

revision-id: d4d71e07cadb223228474d66ad3277de8650a937 (fb-prod201903-266-gd4d71e07cad) parent(s): c3332b8d47289444a8b11959ad63cadebdd55ed6 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-11-30 21:50:56 +0300 message: Disable rocksdb.drop_cf_befre_show_deadlock_info 'range_locking' Because Range Locking doesn't support printing of deadlock information. --- mysql-test/suite/rocksdb/t/drop_cf_before_show_deadlock_info.test | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mysql-test/suite/rocksdb/t/drop_cf_before_show_deadlock_info.test b/mysql-test/suite/rocksdb/t/drop_cf_before_show_deadlock_info.test index 292b6c40fbd..e5ee3244db6 100644 --- a/mysql-test/suite/rocksdb/t/drop_cf_before_show_deadlock_info.test +++ b/mysql-test/suite/rocksdb/t/drop_cf_before_show_deadlock_info.test @@ -2,6 +2,10 @@ --source include/have_debug_sync.inc --source include/have_rocksdb.inc +# Doesn't work with range locking because range locking +# does not provide info in rocksdb_deadlock. +--source suite/rocksdb/include/not_range_locking.inc + --disable_query_log call mtr.add_suppression("Column family '[a-z_]+' not found"); --enable_query_log

1 0

[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