- commits - lists.mariadb.org

[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

[Commits] d64d583: MDEV-20056 Assertion `!prebuilt->index->is_primary()' failed
by IgorBabaev 26 Nov '19

26 Nov '19

revision-id: d64d583aa46a1ec618812497dbe0a15c877f198f (mariadb-10.4.10-25-gd64d583) parent(s): f95288211ce1023e0d268229fbe5febbf0b2edd3 author: Igor Babaev committer: Igor Babaev timestamp: 2019-11-25 17:40:47 -0800 message: MDEV-20056 Assertion `!prebuilt->index->is_primary()' failed in row_search_idx_cond_check When usage of rowid filter is evaluated by the optimizer to join a table to the current partial join employing a certain index it should be checked that a key for at least the major component of this index can be constructed using values from the columns of the partial join. --- mysql-test/main/rowid_filter_innodb.result | 76 ++++++++++++++++++++++++++++++ mysql-test/main/rowid_filter_innodb.test | 53 +++++++++++++++++++++ sql/sql_select.cc | 9 +++- 3 files changed, 137 insertions(+), 1 deletion(-) diff --git a/mysql-test/main/rowid_filter_innodb.result b/mysql-test/main/rowid_filter_innodb.result index 37e32f0..eaad4ef 100644 --- a/mysql-test/main/rowid_filter_innodb.result +++ b/mysql-test/main/rowid_filter_innodb.result @@ -2245,3 +2245,79 @@ a 5 DROP TABLE t1; SET GLOBAL innodb_stats_persistent= @stats.save; +# +# MDEV-20056: index to build range filter should not be +# the same as table access index +# +SET @stats.save= @@innodb_stats_persistent; +SET GLOBAL innodb_stats_persistent= ON; +CREATE TABLE t1 (ch varchar(1), id int, id2 int) ENGINE=InnoDB; +INSERT INTO t1 VALUES +('l',3,2), ('e',NULL,NULL), ('r',7,3), ('h',NULL,2), (NULL,4,4), ('c',4,NULL), +('k',NULL,NULL), ('h',NULL,NULL), ('b',9,NULL), ('f',6,NULL); +CREATE TABLE t2 ( +pk int NOT NULL, col_date_key date, ch2 varchar(1), id2 int, +PRIMARY KEY (pk), KEY (col_date_key), KEY (ch2), KEY (id2) +) ENGINE=InnoDB; +INSERT INTO t2 VALUES +(1,'2034-04-21','g',9), (2,'2006-09-08','y',1), (3,NULL,'h',2), +(4,'1987-03-02','s',2), (5,'2019-07-02','u',NULL),(6,'2012-12-18','z',1), +(7,NULL,'w',4), (8,'2005-03-10','o',8), (9,'1987-02-12','d',4); +CREATE TABLE t3 (id int) ENGINE=InnoDB; +INSERT INTO t3 VALUES (6); +ANALYZE TABLE t1,t2,t3; +Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected +test.t1 analyze status OK +test.t2 analyze status Engine-independent statistics collected +test.t2 analyze status OK +test.t3 analyze status Engine-independent statistics collected +test.t3 analyze status OK +EXPLAIN EXTENDED SELECT 1 FROM t3 +WHERE EXISTS ( SELECT 1 FROM t1 +WHERE t3.id IN ( SELECT bt1.id FROM t2, t1 AS bt1 +WHERE bt1.id = t2.pk AND +t2.ch2 <= 'g' ) OR +t1.id2 = t1.id); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY t3 ALL NULL NULL NULL NULL 1 100.00 Using where +2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 10 100.00 Using where +3 MATERIALIZED t2 range PRIMARY,col_date_key,ch2,id2 ch2 4 NULL 2 100.00 Using where; Using index +3 MATERIALIZED bt1 ALL NULL NULL NULL NULL 10 100.00 Using where; Using join buffer (flat, BNL join) +Warnings: +Note 1276 Field or reference 'test.t3.id' of SELECT #2 was resolved in SELECT #1 +Note 1003 /* select#1 */ select 1 AS `1` from `test`.`t3` where <in_optimizer>(1,<expr_cache><`test`.`t3`.`id`>(exists(/* select#2 */ select 1 from `test`.`t1` where <expr_cache><`test`.`t3`.`id`>(<in_optimizer>(`test`.`t3`.`id`,`test`.`t3`.`id` in ( <materialize> (/* select#3 */ select `test`.`bt1`.`id` from `test`.`t2` join `test`.`t1` `bt1` where `test`.`bt1`.`id` = `test`.`t2`.`pk` and `test`.`t2`.`ch2` <= 'g' ), <primary_index_lookup>(`test`.`t3`.`id` in <temporary table> on distinct_key where `test`.`t3`.`id` = `<subquery3>`.`id`)))) or `test`.`t1`.`id2` = `test`.`t1`.`id` limit 1))) +SELECT 1 FROM t3 +WHERE EXISTS ( SELECT 1 FROM t1 +WHERE t3.id IN ( SELECT bt1.id FROM t2, t1 AS bt1 +WHERE bt1.id = t2.pk AND +t2.ch2 <= 'g' ) OR +t1.id2 = t1.id); +1 +1 +EXPLAIN EXTENDED SELECT 1 FROM t3 +WHERE EXISTS ( SELECT 1 FROM t1 +WHERE t3.id IN ( SELECT bt1.id FROM t2, t1 AS bt1 +WHERE bt1.ch = t2.ch2 AND +bt1.id = t2.pk AND +t2.ch2 <= 'g' ) OR +t1.id2 = t1.id); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY t3 ALL NULL NULL NULL NULL 1 100.00 Using where +2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 10 100.00 Using where +3 MATERIALIZED t2 range PRIMARY,col_date_key,ch2,id2 ch2 4 NULL 2 100.00 Using where; Using index +3 MATERIALIZED bt1 ALL NULL NULL NULL NULL 10 100.00 Using where; Using join buffer (flat, BNL join) +Warnings: +Note 1276 Field or reference 'test.t3.id' of SELECT #2 was resolved in SELECT #1 +Note 1003 /* select#1 */ select 1 AS `1` from `test`.`t3` where <in_optimizer>(1,<expr_cache><`test`.`t3`.`id`>(exists(/* select#2 */ select 1 from `test`.`t1` where <expr_cache><`test`.`t3`.`id`>(<in_optimizer>(`test`.`t3`.`id`,`test`.`t3`.`id` in ( <materialize> (/* select#3 */ select `test`.`bt1`.`id` from `test`.`t2` join `test`.`t1` `bt1` where `test`.`bt1`.`ch` = `test`.`t2`.`ch2` and `test`.`bt1`.`id` = `test`.`t2`.`pk` and `test`.`t2`.`ch2` <= 'g' ), <primary_index_lookup>(`test`.`t3`.`id` in <temporary table> on distinct_key where `test`.`t3`.`id` = `<subquery3>`.`id`)))) or `test`.`t1`.`id2` = `test`.`t1`.`id` limit 1))) +SELECT 1 FROM t3 +WHERE EXISTS ( SELECT 1 FROM t1 +WHERE t3.id IN ( SELECT bt1.id FROM t2, t1 AS bt1 +WHERE bt1.ch = t2.ch2 AND +bt1.id = t2.pk AND +t2.ch2 <= 'g' ) OR +t1.id2 = t1.id); +1 +1 +DROP TABLE t1, t2, t3; +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 4a6c431..cfca162 100644 --- a/mysql-test/main/rowid_filter_innodb.test +++ b/mysql-test/main/rowid_filter_innodb.test @@ -129,3 +129,56 @@ SELECT a FROM t1 WHERE c < 'k' AND b > 't' ORDER BY a; DROP TABLE t1; SET GLOBAL innodb_stats_persistent= @stats.save; + +--echo # +--echo # MDEV-20056: index to build range filter should not be +--echo # the same as table access index +--echo # + +SET @stats.save= @@innodb_stats_persistent; +SET GLOBAL innodb_stats_persistent= ON; + +CREATE TABLE t1 (ch varchar(1), id int, id2 int) ENGINE=InnoDB; +INSERT INTO t1 VALUES +('l',3,2), ('e',NULL,NULL), ('r',7,3), ('h',NULL,2), (NULL,4,4), ('c',4,NULL), +('k',NULL,NULL), ('h',NULL,NULL), ('b',9,NULL), ('f',6,NULL); + +CREATE TABLE t2 ( + pk int NOT NULL, col_date_key date, ch2 varchar(1), id2 int, + PRIMARY KEY (pk), KEY (col_date_key), KEY (ch2), KEY (id2) +) ENGINE=InnoDB; +INSERT INTO t2 VALUES +(1,'2034-04-21','g',9), (2,'2006-09-08','y',1), (3,NULL,'h',2), +(4,'1987-03-02','s',2), (5,'2019-07-02','u',NULL),(6,'2012-12-18','z',1), +(7,NULL,'w',4), (8,'2005-03-10','o',8), (9,'1987-02-12','d',4); + +CREATE TABLE t3 (id int) ENGINE=InnoDB; +INSERT INTO t3 VALUES (6); + +ANALYZE TABLE t1,t2,t3; + +let $q1= +SELECT 1 FROM t3 +WHERE EXISTS ( SELECT 1 FROM t1 + WHERE t3.id IN ( SELECT bt1.id FROM t2, t1 AS bt1 + WHERE bt1.id = t2.pk AND + t2.ch2 <= 'g' ) OR + t1.id2 = t1.id); + +eval EXPLAIN EXTENDED $q1; +eval $q1; + +let $q2= +SELECT 1 FROM t3 +WHERE EXISTS ( SELECT 1 FROM t1 + WHERE t3.id IN ( SELECT bt1.id FROM t2, t1 AS bt1 + WHERE bt1.ch = t2.ch2 AND + bt1.id = t2.pk AND + t2.ch2 <= 'g' ) OR + t1.id2 = t1.id); + +eval EXPLAIN EXTENDED $q2; +eval $q2; + +DROP TABLE t1, t2, t3; +SET GLOBAL innodb_stats_persistent= @stats.save; diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 1ee2a17..3286224 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -1602,6 +1602,12 @@ bool JOIN::make_range_rowid_filters() { if (!tab->range_rowid_filter_info) continue; + + DBUG_ASSERT(!(tab->ref.key >= 0 && + tab->ref.key == (int) tab->range_rowid_filter_info->key_no)); + DBUG_ASSERT(!(tab->ref.key == -1 && tab->quick && + tab->quick->index == tab->range_rowid_filter_info->key_no)); + int err; SQL_SELECT *sel= NULL; Rowid_filter_container *filter_container= NULL; @@ -7665,7 +7671,8 @@ best_access_path(JOIN *join, found_ref); } /* not ft_key */ - if (records < DBL_MAX) + if (records < DBL_MAX && + (found_part & 1)) // start_key->key can be used for index access { double rows= record_count * records; double access_cost_factor= MY_MIN(tmp / rows, 1.0);

1 0

[Commits] 86500865916: Cleanup in tests: "${indexnr}" takes 8 hex digits, not 6.
by psergey 24 Nov '19

24 Nov '19

revision-id: 86500865916f729216b7081f4bdc2cd9c0c37e70 (fb-prod201903-259-g86500865916) parent(s): b3fb7f7674a9cd1df3931aa1121247713af75a89 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-11-24 22:29:47 +0300 message: Cleanup in tests: "${indexnr}" takes 8 hex digits, not 6. --- .../suite/rocksdb/include/select_from_is_rowlocks.inc | 4 ++-- mysql-test/suite/rocksdb/r/range_locking.result | 18 +++++++++--------- mysql-test/suite/rocksdb/r/range_locking_rev_cf.result | 18 +++++++++--------- .../rocksdb/r/range_locking_seek_for_update.result | 16 ++++++++-------- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/mysql-test/suite/rocksdb/include/select_from_is_rowlocks.inc b/mysql-test/suite/rocksdb/include/select_from_is_rowlocks.inc index 74330efca21..e5f54d68914 100644 --- a/mysql-test/suite/rocksdb/include/select_from_is_rowlocks.inc +++ b/mysql-test/suite/rocksdb/include/select_from_is_rowlocks.inc @@ -17,10 +17,10 @@ set @cf_id=(select column_family from information_schema.rocksdb_ddl where table_name='t1' and index_name='PRIMARY'); set @rtrx_id=(select transaction_id from information_schema.rocksdb_trx where thread_id=connection_id()); -set @indexnr= (select lower(lpad(hex(index_number),6,'0')) from information_schema.rocksdb_ddl +set @indexnr= (select lower(lpad(hex(index_number),8,'0')) from information_schema.rocksdb_ddl where table_name='t1' and index_name='PRIMARY'); -set @indexnr_next= (select lower(lpad(hex(index_number+1),6,'0')) +set @indexnr_next= (select lower(lpad(hex(index_number+1),8,'0')) from information_schema.rocksdb_ddl where table_name='t1' and index_name='PRIMARY'); diff --git a/mysql-test/suite/rocksdb/r/range_locking.result b/mysql-test/suite/rocksdb/r/range_locking.result index bee37926ddf..5a58ddf148e 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 0000${indexnr}8000000a X +$cf_id $trx_id 00${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 0000${indexnr}8000000a X -$cf_id $trx_id 0000${indexnr}80000019 - 0100${indexnr}80000028 X +$cf_id $trx_id 00${indexnr}8000000a X +$cf_id $trx_id 00${indexnr}80000019 - 01${indexnr}80000028 X rollback; begin; # The following will show a range lock on 2-9 and also a point lock on 10. @@ -113,8 +113,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 -$cf_id $trx_id 0000${indexnr}80000002 - 0100${indexnr}80000009 X -$cf_id $trx_id 0000${indexnr}8000000a X +$cf_id $trx_id 00${indexnr}80000002 - 01${indexnr}80000009 X +$cf_id $trx_id 00${indexnr}8000000a X rollback; drop table t1; connection con1; @@ -437,8 +437,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 -$cf_id $trx_id 0000${indexnr}8000000280000009 X -$cf_id $trx_id 0000${indexnr}80000003 - 0100${indexnr}80000003 X +$cf_id $trx_id 00${indexnr}8000000280000009 X +$cf_id $trx_id 00${indexnr}80000003 - 01${indexnr}80000003 X rollback; # # Test range locking for ranges with HA_READ_PREFIX_LAST_OR_PREV @@ -463,8 +463,8 @@ 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 0000${indexnr}8000000480000004 X -$cf_id $trx_id 0000${indexnr}8000000480000005 - 0100${indexnr}8000000480000008 X +$cf_id $trx_id 00${indexnr}8000000480000004 X +$cf_id $trx_id 00${indexnr}8000000480000005 - 01${indexnr}8000000480000008 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 04f88ab656a..811ad88e91b 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 0000${indexnr}8000000a X +$cf_id $trx_id 00${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 0000${indexnr}8000000a X -$cf_id $trx_id 0000${indexnr}80000028 - 0100${indexnr}80000019 X +$cf_id $trx_id 00${indexnr}8000000a X +$cf_id $trx_id 00${indexnr}80000028 - 01${indexnr}80000019 X rollback; begin; # The following will show a range lock on 2-9 and also a point lock on 10. @@ -113,8 +113,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 -$cf_id $trx_id 0000${indexnr}80000009 - 0100${indexnr}80000002 X -$cf_id $trx_id 0000${indexnr}8000000a X +$cf_id $trx_id 00${indexnr}80000009 - 01${indexnr}80000002 X +$cf_id $trx_id 00${indexnr}8000000a X rollback; drop table t1; connection con1; @@ -397,8 +397,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 -$cf_id $trx_id 0000${indexnr}8000000280000009 X -$cf_id $trx_id 0000${indexnr}80000003 - 0100${indexnr}80000003 X +$cf_id $trx_id 00${indexnr}8000000280000009 X +$cf_id $trx_id 00${indexnr}80000003 - 01${indexnr}80000003 X rollback; # # Test range locking for ranges with HA_READ_PREFIX_LAST_OR_PREV @@ -423,8 +423,8 @@ 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 0000${indexnr}8000000480000004 X -$cf_id $trx_id 0000${indexnr}8000000480000008 - 0100${indexnr}8000000480000005 X +$cf_id $trx_id 00${indexnr}8000000480000004 X +$cf_id $trx_id 00${indexnr}8000000480000008 - 01${indexnr}8000000480000005 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 aa6f52a02bc..2614e8ce66e 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 @@ -28,7 +28,7 @@ pk a # Now, we will just see locks on 10=0xA and 11=0xB: # 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 0000${indexnr}8000000b X +$cf_id $trx_id 00${indexnr}8000000b X # # SeekForUpdate Test #1: A query with type=range (without upper bound) and LIMIT # @@ -43,8 +43,8 @@ pk a 502 502 # 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 0000${indexnr}8000000b X -$cf_id $trx_id 0000${indexnr}800001f4 - 0000${indexnr}800001f6 X +$cf_id $trx_id 00${indexnr}8000000b X +$cf_id $trx_id 00${indexnr}800001f4 - 00${indexnr}800001f6 X rollback; begin; select * from t1 where pk=11 for update; @@ -61,8 +61,8 @@ pk a 2 2 # 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 0000${indexnr} - 0000${indexnr}80000002 X -$cf_id $trx_id 0000${indexnr}8000000b X +$cf_id $trx_id 00${indexnr} - 00${indexnr}80000002 X +$cf_id $trx_id 00${indexnr}8000000b X rollback; connection con1; rollback; @@ -140,7 +140,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 0000${indexnr}80000005 - 0000${indexnr}8000000a X +$cf_id $trx_id 00${indexnr}80000005 - 00${indexnr}8000000a X rollback; delete from t1 where pk=8; # @@ -200,7 +200,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 0000${indexnr}800003ef - 0000${indexnr+1} X +$cf_id $trx_id 00${indexnr}800003ef - 00${indexnr+1} X rollback; begin; select * from t1 where pk <1007 order by pk desc limit 2 for update; @@ -209,7 +209,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 0000${indexnr}800003e9 - 0000${indexnr}800003ef X +$cf_id $trx_id 00${indexnr}800003e9 - 00${indexnr}800003ef X connection con1; rollback; connection default;

1 0

[Commits] b3fb7f7674a: Fix rocksdb.range_locking_seek_for_update test
by psergey 24 Nov '19

24 Nov '19

revision-id: b3fb7f7674a9cd1df3931aa1121247713af75a89 (fb-prod201903-258-gb3fb7f7674a) parent(s): 8599cfdb73e671ef867b2eec1a911cb461b9e5ec author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-11-24 22:19:55 +0300 message: Fix rocksdb.range_locking_seek_for_update test Make it work when ran after other tests --- mysql-test/suite/rocksdb/include/select_from_is_rowlocks.inc | 3 ++- mysql-test/suite/rocksdb/r/range_locking_seek_for_update.result | 3 --- mysql-test/suite/rocksdb/t/range_locking_seek_for_update.test | 1 + 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/mysql-test/suite/rocksdb/include/select_from_is_rowlocks.inc b/mysql-test/suite/rocksdb/include/select_from_is_rowlocks.inc index cb95b149bae..74330efca21 100644 --- a/mysql-test/suite/rocksdb/include/select_from_is_rowlocks.inc +++ b/mysql-test/suite/rocksdb/include/select_from_is_rowlocks.inc @@ -20,7 +20,8 @@ set @rtrx_id=(select transaction_id from information_schema.rocksdb_trx set @indexnr= (select lower(lpad(hex(index_number),6,'0')) from information_schema.rocksdb_ddl where table_name='t1' and index_name='PRIMARY'); -set @indexnr_next= (select lpad(hex(index_number+1),6,'0') from information_schema.rocksdb_ddl +set @indexnr_next= (select lower(lpad(hex(index_number+1),6,'0')) + from information_schema.rocksdb_ddl where table_name='t1' and index_name='PRIMARY'); let $extra_where = where 1; 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 b31be59d35a..aa6f52a02bc 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 @@ -29,7 +29,6 @@ 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 0000${indexnr}8000000b X -$cf_id 6 0000${indexnr}8000000a X # # SeekForUpdate Test #1: A query with type=range (without upper bound) and LIMIT # @@ -46,7 +45,6 @@ pk a COLUMN_FAMILY_ID TRANSACTION_ID KEY mode $cf_id $trx_id 0000${indexnr}8000000b X $cf_id $trx_id 0000${indexnr}800001f4 - 0000${indexnr}800001f6 X -$cf_id 6 0000${indexnr}8000000a X rollback; begin; select * from t1 where pk=11 for update; @@ -65,7 +63,6 @@ pk a COLUMN_FAMILY_ID TRANSACTION_ID KEY mode $cf_id $trx_id 0000${indexnr} - 0000${indexnr}80000002 X $cf_id $trx_id 0000${indexnr}8000000b X -$cf_id 6 0000${indexnr}8000000a X rollback; connection con1; rollback; diff --git a/mysql-test/suite/rocksdb/t/range_locking_seek_for_update.test b/mysql-test/suite/rocksdb/t/range_locking_seek_for_update.test index edef8ac5bfa..0230113eeb1 100644 --- a/mysql-test/suite/rocksdb/t/range_locking_seek_for_update.test +++ b/mysql-test/suite/rocksdb/t/range_locking_seek_for_update.test @@ -33,6 +33,7 @@ connection default; begin; select * from t1 where pk=11 for update; +let $select_from_is_rowlocks_current_trx_only=1; --echo # Now, we will just see locks on 10=0xA and 11=0xB: --source suite/rocksdb/include/select_from_is_rowlocks.inc

1 0

[Commits] 8599cfdb73e: Range locking fixes
by psergey 24 Nov '19

24 Nov '19

revision-id: 8599cfdb73e671ef867b2eec1a911cb461b9e5ec (fb-prod201903-257-g8599cfdb73e) parent(s): 30c4f566dca5d8a8bec2969faa7132c746afad92 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-11-24 22:18:02 +0300 message: Range locking fixes - Update RocksDB to revision that prints the locks in STO-mode, too. - Make rocksdb.range_locking test survive --repeat=N runs. --- .../suite/rocksdb/include/select_from_is_rowlocks.inc | 2 +- mysql-test/suite/rocksdb/r/range_locking.result | 11 +++++++++++ mysql-test/suite/rocksdb/r/range_locking_rev_cf.result | 11 +++++++++++ mysql-test/suite/rocksdb/t/range_locking.inc | 18 +++++++++++++++++- rocksdb | 2 +- 5 files changed, 41 insertions(+), 3 deletions(-) diff --git a/mysql-test/suite/rocksdb/include/select_from_is_rowlocks.inc b/mysql-test/suite/rocksdb/include/select_from_is_rowlocks.inc index da80d466012..cb95b149bae 100644 --- a/mysql-test/suite/rocksdb/include/select_from_is_rowlocks.inc +++ b/mysql-test/suite/rocksdb/include/select_from_is_rowlocks.inc @@ -17,7 +17,7 @@ set @cf_id=(select column_family from information_schema.rocksdb_ddl where table_name='t1' and index_name='PRIMARY'); set @rtrx_id=(select transaction_id from information_schema.rocksdb_trx where thread_id=connection_id()); -set @indexnr= (select lpad(hex(index_number),6,'0') from information_schema.rocksdb_ddl +set @indexnr= (select lower(lpad(hex(index_number),6,'0')) from information_schema.rocksdb_ddl where table_name='t1' and index_name='PRIMARY'); set @indexnr_next= (select lpad(hex(index_number+1),6,'0') from information_schema.rocksdb_ddl diff --git a/mysql-test/suite/rocksdb/r/range_locking.result b/mysql-test/suite/rocksdb/r/range_locking.result index f9f77a31476..bee37926ddf 100644 --- a/mysql-test/suite/rocksdb/r/range_locking.result +++ b/mysql-test/suite/rocksdb/r/range_locking.result @@ -80,6 +80,12 @@ drop table t1; # # Test INFORMATION_SCHEMA.lock_info in range-locking mode # +connect con1,localhost,root,,; +connection con1; +create table t0 (a int primary key); +begin; +insert into t0 values (1); +connection default; create table t1 ( pk int, a int, @@ -111,6 +117,11 @@ $cf_id $trx_id 0000${indexnr}80000002 - 0100${indexnr}80000009 X $cf_id $trx_id 0000${indexnr}8000000a X rollback; drop table t1; +connection con1; +rollback; +drop table t0; +connection default; +disconnect con1; # # MDEV-18104: MyRocks-Gap-Lock: range locking bounds are incorrect for multi-part keys # 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 b07c654e7d1..04f88ab656a 100644 --- a/mysql-test/suite/rocksdb/r/range_locking_rev_cf.result +++ b/mysql-test/suite/rocksdb/r/range_locking_rev_cf.result @@ -80,6 +80,12 @@ drop table t1; # # Test INFORMATION_SCHEMA.lock_info in range-locking mode # +connect con1,localhost,root,,; +connection con1; +create table t0 (a int primary key); +begin; +insert into t0 values (1); +connection default; create table t1 ( pk int, a int, @@ -111,6 +117,11 @@ $cf_id $trx_id 0000${indexnr}80000009 - 0100${indexnr}80000002 X $cf_id $trx_id 0000${indexnr}8000000a X rollback; drop table t1; +connection con1; +rollback; +drop table t0; +connection default; +disconnect con1; # # MDEV-18104: MyRocks-Gap-Lock: range locking bounds are incorrect for multi-part keys # diff --git a/mysql-test/suite/rocksdb/t/range_locking.inc b/mysql-test/suite/rocksdb/t/range_locking.inc index 1c5fb92b584..ecc8e4432bb 100644 --- a/mysql-test/suite/rocksdb/t/range_locking.inc +++ b/mysql-test/suite/rocksdb/t/range_locking.inc @@ -90,7 +90,7 @@ connection con1; rollback; drop table t2; -# Cleanup +# cleanup connection default; disconnect con1; disconnect con2; @@ -99,6 +99,15 @@ drop table t1; --echo # --echo # Test INFORMATION_SCHEMA.lock_info in range-locking mode --echo # + +connect (con1,localhost,root,,); +connection con1; +eval create table t0 (a int primary key); +begin; +insert into t0 values (1); +connection default; + + eval create table t1 ( pk int, @@ -112,6 +121,8 @@ insert into t1 values begin; select * from t1 where pk=10 for update; +#let TRX1_ID=`(select transaction_id from information_schema.rocksdb_trx where thread_id=connection_id())` ; +let $select_from_is_rowlocks_current_trx_only=1; --source suite/rocksdb/include/select_from_is_rowlocks.inc delete from t1 where pk between 25 and 40; @@ -127,6 +138,11 @@ select * from t1 where pk between 2 and 9 for update; rollback; drop table t1; +connection con1; +rollback; +drop table t0; +connection default; +disconnect con1; --echo # --echo # MDEV-18104: MyRocks-Gap-Lock: range locking bounds are incorrect for multi-part keys diff --git a/rocksdb b/rocksdb index c15474bf496..670bbd25c10 160000 --- a/rocksdb +++ b/rocksdb @@ -1 +1 @@ -Subproject commit c15474bf496a227c6247e2e56040009c55c4bbc0 +Subproject commit 670bbd25c10c47638f41ee7f635a99443d21e937

1 0

[Commits] ef1ce998bd0: Make rocksdb.range_locking_seek_for_update survive --repeat
by psergey 24 Nov '19

24 Nov '19

revision-id: ef1ce998bd035756f545d45afe4c133f922313a7 (fb-prod201903-258-gef1ce998bd0) parent(s): 34a0cf718aa19d5bda2d471b2c6e20dac8256989 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-11-24 20:17:54 +0300 message: Make rocksdb.range_locking_seek_for_update survive --repeat --- mysql-test/suite/rocksdb/include/select_from_is_rowlocks.inc | 3 ++- mysql-test/suite/rocksdb/r/range_locking_seek_for_update.result | 3 --- mysql-test/suite/rocksdb/t/range_locking_seek_for_update.test | 1 + 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/mysql-test/suite/rocksdb/include/select_from_is_rowlocks.inc b/mysql-test/suite/rocksdb/include/select_from_is_rowlocks.inc index cb95b149bae..74330efca21 100644 --- a/mysql-test/suite/rocksdb/include/select_from_is_rowlocks.inc +++ b/mysql-test/suite/rocksdb/include/select_from_is_rowlocks.inc @@ -20,7 +20,8 @@ set @rtrx_id=(select transaction_id from information_schema.rocksdb_trx set @indexnr= (select lower(lpad(hex(index_number),6,'0')) from information_schema.rocksdb_ddl where table_name='t1' and index_name='PRIMARY'); -set @indexnr_next= (select lpad(hex(index_number+1),6,'0') from information_schema.rocksdb_ddl +set @indexnr_next= (select lower(lpad(hex(index_number+1),6,'0')) + from information_schema.rocksdb_ddl where table_name='t1' and index_name='PRIMARY'); let $extra_where = where 1; 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 b31be59d35a..aa6f52a02bc 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 @@ -29,7 +29,6 @@ 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 0000${indexnr}8000000b X -$cf_id 6 0000${indexnr}8000000a X # # SeekForUpdate Test #1: A query with type=range (without upper bound) and LIMIT # @@ -46,7 +45,6 @@ pk a COLUMN_FAMILY_ID TRANSACTION_ID KEY mode $cf_id $trx_id 0000${indexnr}8000000b X $cf_id $trx_id 0000${indexnr}800001f4 - 0000${indexnr}800001f6 X -$cf_id 6 0000${indexnr}8000000a X rollback; begin; select * from t1 where pk=11 for update; @@ -65,7 +63,6 @@ pk a COLUMN_FAMILY_ID TRANSACTION_ID KEY mode $cf_id $trx_id 0000${indexnr} - 0000${indexnr}80000002 X $cf_id $trx_id 0000${indexnr}8000000b X -$cf_id 6 0000${indexnr}8000000a X rollback; connection con1; rollback; diff --git a/mysql-test/suite/rocksdb/t/range_locking_seek_for_update.test b/mysql-test/suite/rocksdb/t/range_locking_seek_for_update.test index edef8ac5bfa..0230113eeb1 100644 --- a/mysql-test/suite/rocksdb/t/range_locking_seek_for_update.test +++ b/mysql-test/suite/rocksdb/t/range_locking_seek_for_update.test @@ -33,6 +33,7 @@ connection default; begin; select * from t1 where pk=11 for update; +let $select_from_is_rowlocks_current_trx_only=1; --echo # Now, we will just see locks on 10=0xA and 11=0xB: --source suite/rocksdb/include/select_from_is_rowlocks.inc

1 0