- commits - lists.mariadb.org

[Commits] 8eb09c859: Remove Endpoints as a separate data format
by Sergei Petrunia 07 Apr '19

07 Apr '19

revision-id: 8eb09c8598238945560b9750425b2a64238bec1d (v5.8-1028-g8eb09c859) parent(s): 3abdc95f082d80a3ce76bad7d6d319f8706429b2 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-04-07 20:49:34 +0300 message: Remove Endpoints as a separate data format Before, Range Endpoints were passed as Slice object, and also the user provided compare_endpoints_func and convert_key_to_endpoint_func. Now, the user passes rocksdb::Endpoint objects. The lock tree stores endpoints, but the encoding is handled internally by the range locking module. The patch is work-in-progress as the endpoint comparison function still uses memcmp. --- include/rocksdb/utilities/transaction.h | 49 ++++++++++- include/rocksdb/utilities/transaction_db.h | 21 ----- utilities/transactions/pessimistic_transaction.cc | 4 +- utilities/transactions/pessimistic_transaction.h | 4 +- .../transactions/pessimistic_transaction_db.cc | 7 +- .../transactions/pessimistic_transaction_db.h | 4 +- utilities/transactions/range_locking_test.cc | 23 +---- utilities/transactions/transaction_lock_mgr.cc | 99 ++++++++++++++++++---- utilities/transactions/transaction_lock_mgr.h | 16 +--- 9 files changed, 144 insertions(+), 83 deletions(-) diff --git a/include/rocksdb/utilities/transaction.h b/include/rocksdb/utilities/transaction.h index 8a15a3bbd..18ae4726c 100644 --- a/include/rocksdb/utilities/transaction.h +++ b/include/rocksdb/utilities/transaction.h @@ -24,6 +24,53 @@ using TransactionName = std::string; using TransactionID = uint64_t; + +/* + A range endpoint. + + Basic ranges can be defined over rowkeys. A Comparator function defines + ordering, a range endpoint is just a rowkey. + + When one use lexicographic-like ordering, they may want to request "prefix + ranges". + + == Lexicographic ordering == + A lexicographic-like ordering satisfies these criteria: + + 1.The ordering is prefix-based. If there are two keys in form + + key_a = {prefix_a suffix_a} + key_b = {prefix_b suffix_b} + and + prefix_a < prefix_b + then + key_a < key_b. + + An empty string is less than any other constant (from this it follows that + for any prefix and suffix, {prefix, suffix} > {prefix}) + + == Prefix ranges == + With lexicographic-like ordering, one may to construct ranges from a + restriction in form prefix=P: + - the left endpoint would would be {P, inf_suffix=false} + - the right endpoint would be {P, inf_suffix=true}. + + (TODO: or should we instead of the above just require that [Reverse]ByteWiseComparator + is used?) +*/ + +class Endpoint { + public: + Slice slice; + bool inf_suffix; + + Endpoint(const char* s, bool inf_suffix_arg=false) : + slice(s), inf_suffix(inf_suffix_arg) {} + + Endpoint(const char* s, size_t size, bool inf_suffix_arg=false) : + slice(s, size), inf_suffix(inf_suffix_arg) {} +}; + // Provides notification to the caller of SetSnapshotOnNextOperation when // the actual snapshot gets created class TransactionNotifier { @@ -256,7 +303,7 @@ class Transaction { // Note: range endpoints generally a use a different data format than // ranges. virtual Status GetRangeLock(ColumnFamilyHandle*, - const Slice&, const Slice&) { + const Endpoint&, const Endpoint&) { return Status::NotSupported(); } diff --git a/include/rocksdb/utilities/transaction_db.h b/include/rocksdb/utilities/transaction_db.h index 06d73bedd..b12c70785 100644 --- a/include/rocksdb/utilities/transaction_db.h +++ b/include/rocksdb/utilities/transaction_db.h @@ -33,24 +33,6 @@ enum TxnDBWritePolicy { const uint32_t kInitialMaxDeadlocks = 5; -struct RangeLockingOptions { - typedef void (*convert_key_to_endpoint_func)(const rocksdb::Slice &key, - std::string *endpoint); - - typedef int (*compare_endpoints_func)(const char *a, size_t a_len, - const char *b, size_t b_len); - - // TODO: So, functions to compare ranges are here, while - // functions to compare rowkeys are in per-column family and are in - // rocksdb::ColumnFamilyOptions - // - // TODO: Can we change this to work in a way that does not expose the endpoints - // to the user (like discussed on the meeting?) - // - convert_key_to_endpoint_func cvt_func; - compare_endpoints_func cmp_func; -}; - struct TransactionDBOptions { // Specifies the maximum number of keys that can be locked at the same time // per column family. @@ -115,9 +97,6 @@ struct TransactionDBOptions { // If true, range_locking_opts specifies options on range locking (filling // the struct is mandatory) bool use_range_locking = false; - - // Members are valid if use_range_locking= true. - RangeLockingOptions range_locking_opts; }; struct TransactionOptions { diff --git a/utilities/transactions/pessimistic_transaction.cc b/utilities/transactions/pessimistic_transaction.cc index 339dcf422..7ca6ab981 100644 --- a/utilities/transactions/pessimistic_transaction.cc +++ b/utilities/transactions/pessimistic_transaction.cc @@ -601,8 +601,8 @@ Status PessimisticTransaction::TryLock(ColumnFamilyHandle* column_family, Status PessimisticTransaction::GetRangeLock(ColumnFamilyHandle* column_family, - const Slice& start_endp, - const Slice& end_endp) { + const Endpoint& start_endp, + const Endpoint& end_endp) { ColumnFamilyHandle* cfh = column_family ? column_family : db_impl_->DefaultColumnFamily(); uint32_t cfh_id= GetColumnFamilyID(cfh); diff --git a/utilities/transactions/pessimistic_transaction.h b/utilities/transactions/pessimistic_transaction.h index 50030700d..9fb44c74e 100644 --- a/utilities/transactions/pessimistic_transaction.h +++ b/utilities/transactions/pessimistic_transaction.h @@ -113,8 +113,8 @@ class PessimisticTransaction : public TransactionBaseImpl { int64_t GetDeadlockDetectDepth() const { return deadlock_detect_depth_; } virtual Status GetRangeLock(ColumnFamilyHandle* column_family, - const Slice& start_key, - const Slice& end_key); + const Endpoint& start_key, + const Endpoint& end_key); protected: // Refer to // TransactionOptions::use_only_the_last_commit_time_batch_for_recovery diff --git a/utilities/transactions/pessimistic_transaction_db.cc b/utilities/transactions/pessimistic_transaction_db.cc index 270859d1a..06981adf4 100644 --- a/utilities/transactions/pessimistic_transaction_db.cc +++ b/utilities/transactions/pessimistic_transaction_db.cc @@ -50,8 +50,7 @@ void PessimisticTransactionDB::init_lock_manager() { new TransactionDBMutexFactoryImpl()); if (txn_db_options_.use_range_locking) { - range_lock_mgr_= new RangeLockMgr(this, txn_db_options_.range_locking_opts, - mutex_factory); + range_lock_mgr_= new RangeLockMgr(this, mutex_factory); lock_mgr = range_lock_mgr_; } else { lock_mgr = new TransactionLockMgr(this, txn_db_options_.num_stripes, @@ -399,8 +398,8 @@ Status PessimisticTransactionDB::TryLock(PessimisticTransaction* txn, Status PessimisticTransactionDB::TryRangeLock(PessimisticTransaction *txn, uint32_t cfh_id, - const Slice& start_endp, - const Slice& end_endp) { + const Endpoint& start_endp, + const Endpoint& end_endp) { if (range_lock_mgr_) { return range_lock_mgr_->TryRangeLock(txn, cfh_id, start_endp, end_endp, /*exclusive=*/false); diff --git a/utilities/transactions/pessimistic_transaction_db.h b/utilities/transactions/pessimistic_transaction_db.h index ad6eaf4a9..59da1634c 100644 --- a/utilities/transactions/pessimistic_transaction_db.h +++ b/utilities/transactions/pessimistic_transaction_db.h @@ -80,8 +80,8 @@ class PessimisticTransactionDB : public TransactionDB { const std::string& key, bool exclusive); Status TryRangeLock(PessimisticTransaction* txn, uint32_t cfh_id, - const Slice& start_endp, - const Slice& end_endp); + const Endpoint& start_endp, + const Endpoint& end_endp); void UnLock(PessimisticTransaction* txn, const TransactionKeyMap* keys, bool all_keys_hint=false); diff --git a/utilities/transactions/range_locking_test.cc b/utilities/transactions/range_locking_test.cc index 26ee9b84c..aef345be5 100644 --- a/utilities/transactions/range_locking_test.cc +++ b/utilities/transactions/range_locking_test.cc @@ -36,19 +36,6 @@ using std::string; namespace rocksdb { -void range_endpoint_convert_same(const rocksdb::Slice &key, - std::string *res) -{ - res->clear(); - res->append(key.data(), key.size()); -} - -int range_endpoints_compare_default(const char *a, size_t a_len, - const char *b, size_t b_len) -{ - return Slice(a, a_len).compare(Slice(b, b_len)); -} - class RangeLockingTest : public ::testing::Test { public: TransactionDB* db; @@ -65,10 +52,6 @@ class RangeLockingTest : public ::testing::Test { DestroyDB(dbname, options); Status s; txn_db_options.use_range_locking = true; - txn_db_options.range_locking_opts.cvt_func = - range_endpoint_convert_same; - txn_db_options.range_locking_opts.cmp_func = - range_endpoints_compare_default; s = TransactionDB::Open(options, txn_db_options, dbname, &db); assert(s.ok()); @@ -101,7 +84,7 @@ TEST_F(RangeLockingTest, BasicRangeLocking) { // Get a range lock { auto s= txn0->GetRangeLock(db->DefaultColumnFamily(), - Slice("a"), Slice("c")); + Endpoint("a"), Endpoint("c")); ASSERT_EQ(s, Status::OK()); } @@ -109,7 +92,7 @@ TEST_F(RangeLockingTest, BasicRangeLocking) { // Check that range Lock inhibits an overlapping range lock { auto s= txn1->GetRangeLock(db->DefaultColumnFamily(), - Slice("b"), Slice("z")); + Endpoint("b"), Endpoint("z")); ASSERT_TRUE(s.IsTimedOut()); } @@ -127,7 +110,7 @@ TEST_F(RangeLockingTest, BasicRangeLocking) { ASSERT_EQ(s, Status::OK()); auto s2= txn1->GetRangeLock(db->DefaultColumnFamily(), - Slice("c"), Slice("e")); + Endpoint("c"), Endpoint("e")); ASSERT_TRUE(s2.IsTimedOut()); } diff --git a/utilities/transactions/transaction_lock_mgr.cc b/utilities/transactions/transaction_lock_mgr.cc index e0802fb25..d6c221cc7 100644 --- a/utilities/transactions/transaction_lock_mgr.cc +++ b/utilities/transactions/transaction_lock_mgr.cc @@ -790,16 +790,30 @@ public: bool releasing_locks_; }; +static +void serialize_endpoint(const Endpoint &endp, std::string *buf) { + const char SUFFIX_INF= 0x0; + const char SUFFIX_SUP= 0x1; + buf->push_back(endp.inf_suffix ? SUFFIX_SUP : SUFFIX_INF); + buf->append(endp.slice.data(), endp.slice.size()); +} + + // Get a range lock on [start_key; end_key] range Status RangeLockMgr::TryRangeLock(PessimisticTransaction* txn, uint32_t column_family_id, - const rocksdb::Slice &start_key, - const rocksdb::Slice &end_key, + const Endpoint &start_endp, + const Endpoint &end_endp, bool /*exclusive*/) { toku::lock_request request; request.create(mutex_factory_); DBT start_key_dbt, end_key_dbt; + std::string start_key; + std::string end_key; + serialize_endpoint(start_endp, &start_key); + serialize_endpoint(end_endp, &end_key); + toku_fill_dbt(&start_key_dbt, start_key.data(), start_key.size()); toku_fill_dbt(&end_key_dbt, end_key.data(), end_key.size()); @@ -896,10 +910,8 @@ Status RangeLockMgr::TryLock(PessimisticTransaction* txn, uint32_t column_family_id, const std::string& key, Env*, bool exclusive) { - std::string endpoint; - convert_key_to_endpoint(rocksdb::Slice(key.data(), key.size()), &endpoint); - rocksdb::Slice endp_slice(endpoint.data(), endpoint.length()); - return TryRangeLock(txn, column_family_id, endp_slice, endp_slice, exclusive); + Endpoint endp(key.data(), key.size(), false); + return TryRangeLock(txn, column_family_id, endp, endp, exclusive); } static void @@ -907,8 +919,12 @@ range_lock_mgr_release_lock_int(toku::locktree *lt, const PessimisticTransaction* txn, uint32_t /*column_family_id*/, const std::string& key) { - DBT key_dbt; - toku_fill_dbt(&key_dbt, key.data(), key.size()); + DBT key_dbt; + Endpoint endp(key.data(), key.size(), false); + std::string endp_image; + serialize_endpoint(endp, &endp_image); + + toku_fill_dbt(&key_dbt, endp_image.data(), endp_image.size()); toku::range_buffer range_buf; range_buf.create(); range_buf.append(&key_dbt, &key_dbt); @@ -917,8 +933,8 @@ range_lock_mgr_release_lock_int(toku::locktree *lt, } void RangeLockMgr::UnLock(PessimisticTransaction* txn, - uint32_t column_family_id, - const std::string& key, Env*) { + uint32_t column_family_id, + const std::string& key, Env*) { range_lock_mgr_release_lock_int(lt, txn, column_family_id, key); toku::lock_request::retry_all_lock_requests(lt, nullptr /* lock_wait_needed_callback */); } @@ -993,24 +1009,73 @@ void RangeLockMgr::UnLockAll(const PessimisticTransaction* txn, Env*) { } } + + + int RangeLockMgr::compare_dbt_endpoints(__toku_db*, void *arg, const DBT *a_key, const DBT *b_key) { RangeLockMgr* mgr= (RangeLockMgr*) arg; - return mgr->compare_endpoints((const char*)a_key->data, a_key->size, - (const char*)b_key->data, b_key->size); + // TODO: this should compare endpoints using the user-provided comparator + + // endpoint encoding. + // (just use one from any column family) + + const char *a= (const char*)a_key->data; + const char *b= (const char*)b_key->data; + + size_t a_len= a_key->size; + size_t b_len= b_key->size; + + size_t min_len= std::min(a_len, b_len); + + //compare the values. Skip the first byte as it is the endpoint signifier + + //TODO: use the upper layer' comparison function. + int res= memcmp(a+1, b+1, min_len-1); + if (!res) + { + if (b_len > min_len) + { + // a is shorter; + if (a[0] == 0) + return -1; //"a is smaller" + else + { + // a is considered padded with 0xFF:FF:FF:FF... + return 1; // "a" is bigger + } + } + else if (a_len > min_len) + { + // the opposite of the above: b is shorter. + if (b[0] == 0) + return 1; //"b is smaller" + else + { + // b is considered padded with 0xFF:FF:FF:FF... + return -1; // "b" is bigger + } + } + else + { + // the lengths are equal (and the key values, too) + if (a[0] < b[0]) + return -1; + else if (a[0] > b[0]) + return 1; + else + return 0; + } + } + else + return res; } RangeLockMgr::RangeLockMgr(TransactionDB* txn_db, - const RangeLockingOptions& opts, std::shared_ptr<TransactionDBMutexFactory> mutex_factory) : my_txn_db_(txn_db), mutex_factory_(mutex_factory) { - convert_key_to_endpoint= opts.cvt_func; - compare_endpoints= opts.cmp_func; - ltm.create(on_create, on_destroy, on_escalate, NULL, mutex_factory_); - cmp_.create(compare_dbt_endpoints, (void*)this, NULL); DICTIONARY_ID dict_id = { .dictid = 1 }; lt= ltm.get_lt(dict_id, cmp_, /* on_create_extra*/nullptr); diff --git a/utilities/transactions/transaction_lock_mgr.h b/utilities/transactions/transaction_lock_mgr.h index d6c5479f2..c45ebae3f 100644 --- a/utilities/transactions/transaction_lock_mgr.h +++ b/utilities/transactions/transaction_lock_mgr.h @@ -212,8 +212,8 @@ class RangeLockMgr : // used ATM) Status TryRangeLock(PessimisticTransaction* txn, uint32_t column_family_id, - const rocksdb::Slice &start_key, - const rocksdb::Slice &end_key, + const Endpoint &start_endp, + const Endpoint &end_endp, bool exclusive); void UnLock(const PessimisticTransaction* txn, const TransactionKeyMap* keys, @@ -227,7 +227,6 @@ class RangeLockMgr : const std::string& key, Env* env) override ; RangeLockMgr(TransactionDB* txn_db, - const RangeLockingOptions& opts, std::shared_ptr<TransactionDBMutexFactory> mutex_factory); ~RangeLockMgr(); @@ -240,23 +239,12 @@ class RangeLockMgr : LockStatusData GetLockStatusData() override; - typedef RangeLockingOptions::convert_key_to_endpoint_func convert_key_to_endpoint_func; - typedef RangeLockingOptions::compare_endpoints_func compare_endpoints_func; - private: toku::locktree_manager ltm; toku::locktree *lt; // only one tree for now toku::comparator cmp_; - // Convert rowkey to endpoint (TODO: shouldn't "rowkey=const" translate into - // a pair of [start; end] endpoints in general? They translate into the same - // value in our current encoding, but...) - convert_key_to_endpoint_func convert_key_to_endpoint; - - // User-provided endpoint comparison function - compare_endpoints_func compare_endpoints; - TransactionDB* my_txn_db_; std::shared_ptr<TransactionDBMutexFactory> mutex_factory_;

1 0

[Commits] dc3d48b3a4a: MDEV-18265: Replace deprecated variable debug to debug_dbug on Galera tests
by jan 06 Apr '19

06 Apr '19

revision-id: dc3d48b3a4a87a6b47ca6fafd9ea31f00e8bfed2 (mariadb-10.4.3-160-gdc3d48b3a4a) parent(s): d2013e73288c953a6cbcdddf9688584c0353535d author: Jan Lindström committer: Jan Lindström timestamp: 2019-04-06 12:25:29 +0300 message: MDEV-18265: Replace deprecated variable debug to debug_dbug on Galera tests deleted: mysql-test/suite/galera/r/MW-86.result deleted: mysql-test/suite/galera/r/mysql-wsrep#216.result modified: mysql-test/suite/galera/t/GCF-1081.test modified: mysql-test/suite/galera_3nodes_sr/r/GCF-832.result modified: mysql-test/suite/galera_3nodes_sr/t/GCF-810A.test modified: mysql-test/suite/galera_3nodes_sr/t/GCF-810B.test modified: mysql-test/suite/galera_3nodes_sr/t/GCF-810C.test modified: mysql-test/suite/galera_3nodes_sr/t/GCF-832.test modified: mysql-test/suite/galera_sr/r/mysql-wsrep-features#35.result modified: mysql-test/suite/galera_sr/t/mysql-wsrep-features#35.test --- mysql-test/suite/galera/r/MW-86.result | 78 ---------------------- mysql-test/suite/galera/r/mysql-wsrep#216.result | 11 --- mysql-test/suite/galera/t/GCF-1081.test | 4 +- mysql-test/suite/galera_3nodes_sr/r/GCF-832.result | 4 +- mysql-test/suite/galera_3nodes_sr/t/GCF-810A.test | 12 ++-- mysql-test/suite/galera_3nodes_sr/t/GCF-810B.test | 4 +- mysql-test/suite/galera_3nodes_sr/t/GCF-810C.test | 8 +-- mysql-test/suite/galera_3nodes_sr/t/GCF-832.test | 2 +- .../galera_sr/r/mysql-wsrep-features#35.result | 8 +-- .../suite/galera_sr/t/mysql-wsrep-features#35.test | 4 +- 10 files changed, 20 insertions(+), 115 deletions(-) diff --git a/mysql-test/suite/galera/r/MW-86.result b/mysql-test/suite/galera/r/MW-86.result deleted file mode 100644 index bca9be93191..00000000000 --- a/mysql-test/suite/galera/r/MW-86.result +++ /dev/null @@ -1,78 +0,0 @@ -connection node_2; -connection node_1; -connection node_2; -SET SESSION wsrep_sync_wait = 1; -SET GLOBAL DEBUG = "d,sync.wsrep_apply_cb"; -Warnings: -Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead -connection node_1; -CREATE DATABASE db1; -CREATE TABLE bar (f1 INTEGER) ENGINE=InnoDB; -INSERT INTO bar VALUES (1); -connection node_2; -SHOW BINARY LOGS; -SHOW BINLOG EVENTS; -SHOW COLUMNS FROM t1; -SHOW CREATE DATABASE db1; -SHOW CREATE EVENT e1; -SHOW CREATE FUNCTION f1; -SHOW CREATE PROCEDURE p1; -SHOW CREATE TABLE t1; -SHOW CREATE TRIGGER tr1; -SHOW CREATE VIEW v1; -SHOW DATABASES; -SHOW ENGINE InnoDB STATUS; -SHOW FUNCTION CODE f1; -SHOW FUNCTION STATUS; -SHOW GRANTS FOR 'root'@'localhost'; -SHOW INDEX FROM t1; -SHOW OPEN TABLES; -SHOW PROCEDURE CODE p1; -SHOW PROCEDURE STATUS; -SHOW PRIVILEGES; -SHOW STATUS LIKE 'wsrep_cluster_size'; -SHOW TABLE STATUS; -SHOW TABLES; -SHOW TRIGGERS; -SHOW GLOBAL VARIABLES LIKE 'foo_bar'; -SHOW WARNINGS; -SET GLOBAL DEBUG = ""; -SET DEBUG_SYNC = "now SIGNAL signal.wsrep_apply_cb"; -SET SESSION wsrep_sync_wait = 8; -DROP DATABASE db1; -connection node_2; -SET GLOBAL wsrep_provider_options = "repl.causal_read_timeout=PT0.1S"; -SET SESSION wsrep_sync_wait = 8; -SET GLOBAL DEBUG = "d,sync.wsrep_apply_cb"; -connection node_1; -CREATE TABLE q (f1 INTEGER) ENGINE=InnoDB; -INSERT INTO q VALUES (1); -connection node_2; -SHOW BINARY LOGS; -SHOW BINLOG EVENTS; -SHOW COLUMNS FROM t1; -SHOW CREATE DATABASE db1; -SHOW CREATE EVENT e1; -SHOW CREATE FUNCTION f1; -SHOW CREATE PROCEDURE p1; -SHOW CREATE TABLE t1; -SHOW CREATE TRIGGER tr1; -SHOW CREATE VIEW v1; -SHOW DATABASES; -SHOW ENGINE InnoDB STATUS; -SHOW FUNCTION CODE f1; -SHOW FUNCTION STATUS; -SHOW GRANTS FOR 'root'@'localhost'; -SHOW INDEX FROM t1; -SHOW OPEN TABLES; -SHOW PROCEDURE CODE p1; -SHOW PROCEDURE STATUS; -SHOW PRIVILEGES; -SHOW STATUS LIKE 'wsrep_cluster_size'; -SHOW TABLE STATUS; -SHOW TABLES; -SHOW TRIGGERS; -SHOW GLOBAL VARIABLES LIKE 'foo_bar'; -SHOW WARNINGS; -SET GLOBAL DEBUG = ""; -SET DEBUG_SYNC = "now SIGNAL signal.wsrep_apply_cb"; diff --git a/mysql-test/suite/galera/r/mysql-wsrep#216.result b/mysql-test/suite/galera/r/mysql-wsrep#216.result deleted file mode 100644 index b07589d0c04..00000000000 --- a/mysql-test/suite/galera/r/mysql-wsrep#216.result +++ /dev/null @@ -1,11 +0,0 @@ -SET GLOBAL wsrep_debug = ON; -CREATE USER u1 IDENTIFIED BY 'plaintext_password'; -CREATE USER u1 IDENTIFIED BY 'plaintext_password'; -ERROR HY000: Operation CREATE USER failed for 'u1'@'%' -0 -0 -2 -1 -DROP USER u1; -CALL mtr.add_suppression('Operation CREATE USER failed'); - \ No newline at end of file diff --git a/mysql-test/suite/galera/t/GCF-1081.test b/mysql-test/suite/galera/t/GCF-1081.test index 8296c55f1b6..38553feda39 100644 --- a/mysql-test/suite/galera/t/GCF-1081.test +++ b/mysql-test/suite/galera/t/GCF-1081.test @@ -38,7 +38,7 @@ SET SESSION wsrep_sync_wait = 0; # Issue a conflicting insert on node #2 --connection node_1a -SET GLOBAL DEBUG = 'd,sync.wsrep_before_BF_victim_unlock'; +SET GLOBAL debug_dbug = 'd,sync.wsrep_before_BF_victim_unlock'; --connection node_2 --send INSERT INTO t1 VALUES (2, 2); @@ -46,7 +46,7 @@ SET GLOBAL DEBUG = 'd,sync.wsrep_before_BF_victim_unlock'; # Wait until it BF aborts the SP --connection node_1a SET SESSION DEBUG_SYNC = 'now WAIT_FOR sync.wsrep_before_BF_victim_unlock_reached'; -SET GLOBAL DEBUG = ''; +SET GLOBAL debug_dbug = ''; # Unblock the SP --connection node_1a diff --git a/mysql-test/suite/galera_3nodes_sr/r/GCF-832.result b/mysql-test/suite/galera_3nodes_sr/r/GCF-832.result index 58d02e541af..8333fff98db 100644 --- a/mysql-test/suite/galera_3nodes_sr/r/GCF-832.result +++ b/mysql-test/suite/galera_3nodes_sr/r/GCF-832.result @@ -5,9 +5,7 @@ connection node_1; connection node_2; connection node_3; connection node_2; -SET GLOBAL debug="d,crash_last_fragment_commit_after_fragment_removal"; -Warnings: -Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead +SET GLOBAL debug_dbug="d,crash_last_fragment_commit_after_fragment_removal"; CREATE TABLE t1 (f1 VARCHAR(30)) ENGINE=InnoDB; SET AUTOCOMMIT=OFF; SET SESSION wsrep_trx_fragment_size=1; diff --git a/mysql-test/suite/galera_3nodes_sr/t/GCF-810A.test b/mysql-test/suite/galera_3nodes_sr/t/GCF-810A.test index 38d95556e48..fda16b7265c 100644 --- a/mysql-test/suite/galera_3nodes_sr/t/GCF-810A.test +++ b/mysql-test/suite/galera_3nodes_sr/t/GCF-810A.test @@ -16,7 +16,7 @@ --connection node_2 --enable_reconnect -SET GLOBAL debug="d,crash_last_fragment_commit_before_fragment_removal"; +SET GLOBAL debug_dbug="d,crash_last_fragment_commit_before_fragment_removal"; --source suite/galera_3nodes/include/galera_expect_node_crash.inc --source suite/galera_3nodes/include/galera_sr_crash_prepare_nodes.inc @@ -39,7 +39,7 @@ COMMIT; # --connection node_2 -SET GLOBAL debug="d,crash_last_fragment_commit_after_fragment_removal"; +SET GLOBAL debug_dbug="d,crash_last_fragment_commit_after_fragment_removal"; --source suite/galera_3nodes/include/galera_expect_node_crash.inc --source suite/galera_3nodes/include/galera_sr_crash_prepare_nodes.inc @@ -66,7 +66,7 @@ COMMIT; # # --connection node_2 -# SET GLOBAL debug="d,crash_last_fragment_commit_success"; +# SET GLOBAL debug_dbug="d,crash_last_fragment_commit_success"; # --source suite/galera_3nodes/include/galera_expect_node_crash.inc # --source suite/galera_3nodes/include/galera_sr_crash_prepare_nodes.inc @@ -84,7 +84,7 @@ COMMIT; # --connection node_2 -SET GLOBAL debug="d,crash_replicate_fragment_success"; +SET GLOBAL debug_dbug="d,crash_replicate_fragment_success"; --source suite/galera_3nodes/include/galera_expect_node_crash.inc --source suite/galera_3nodes/include/galera_sr_crash_prepare_nodes.inc @@ -102,7 +102,7 @@ COMMIT; # --connection node_2 -SET GLOBAL debug="d,crash_replicate_fragment_after_certify"; +SET GLOBAL debug_dbug="d,crash_replicate_fragment_after_certify"; --source suite/galera_3nodes/include/galera_expect_node_crash.inc --source suite/galera_3nodes/include/galera_sr_crash_prepare_nodes.inc @@ -120,7 +120,7 @@ COMMIT; # --connection node_2 -SET GLOBAL debug="d,crash_replicate_fragment_before_certify"; +SET GLOBAL debug_dbug="d,crash_replicate_fragment_before_certify"; --source suite/galera_3nodes/include/galera_expect_node_crash.inc --source suite/galera_3nodes/include/galera_sr_crash_prepare_nodes.inc diff --git a/mysql-test/suite/galera_3nodes_sr/t/GCF-810B.test b/mysql-test/suite/galera_3nodes_sr/t/GCF-810B.test index 24a518af9f7..cb41b2348de 100644 --- a/mysql-test/suite/galera_3nodes_sr/t/GCF-810B.test +++ b/mysql-test/suite/galera_3nodes_sr/t/GCF-810B.test @@ -15,7 +15,7 @@ # --connection node_3 -SET GLOBAL debug="d,crash_apply_cb_before_append_frag"; +SET GLOBAL debug_dbug="d,crash_apply_cb_before_append_frag"; --source suite/galera_3nodes/include/galera_expect_node_crash.inc --source suite/galera_3nodes/include/galera_sr_crash_prepare_nodes2.inc @@ -32,7 +32,7 @@ COMMIT; # --connection node_3 -SET GLOBAL debug="d,crash_apply_cb_after_append_frag"; +SET GLOBAL debug_dbug="d,crash_apply_cb_after_append_frag"; --source suite/galera_3nodes/include/galera_expect_node_crash.inc --source suite/galera_3nodes/include/galera_sr_crash_prepare_nodes2.inc diff --git a/mysql-test/suite/galera_3nodes_sr/t/GCF-810C.test b/mysql-test/suite/galera_3nodes_sr/t/GCF-810C.test index 79948e5a46d..6c4da2cb5f0 100644 --- a/mysql-test/suite/galera_3nodes_sr/t/GCF-810C.test +++ b/mysql-test/suite/galera_3nodes_sr/t/GCF-810C.test @@ -16,7 +16,7 @@ # --connection node_3 -SET GLOBAL debug="d,crash_commit_cb_last_fragment_commit_success"; +SET GLOBAL debug_dbug="d,crash_commit_cb_last_fragment_commit_success"; --source suite/galera_3nodes/include/galera_expect_node_crash.inc --source suite/galera_3nodes/include/galera_sr_crash_prepare_nodes3.inc @@ -30,7 +30,7 @@ SET GLOBAL debug="d,crash_commit_cb_last_fragment_commit_success"; # --connection node_3 -SET GLOBAL debug="d,crash_commit_cb_before_last_fragment_commit"; +SET GLOBAL debug_dbug="d,crash_commit_cb_before_last_fragment_commit"; --source suite/galera_3nodes/include/galera_expect_node_crash.inc --source suite/galera_3nodes/include/galera_sr_crash_prepare_nodes3.inc @@ -44,7 +44,7 @@ SET GLOBAL debug="d,crash_commit_cb_before_last_fragment_commit"; # --connection node_3 -SET GLOBAL debug="d,crash_apply_cb_after_fragment_removal"; +SET GLOBAL debug_dbug="d,crash_apply_cb_after_fragment_removal"; --source suite/galera_3nodes/include/galera_expect_node_crash.inc --source suite/galera_3nodes/include/galera_sr_crash_prepare_nodes3.inc @@ -58,7 +58,7 @@ SET GLOBAL debug="d,crash_apply_cb_after_fragment_removal"; # --connection node_3 -SET GLOBAL debug="d,crash_apply_cb_before_fragment_removal"; +SET GLOBAL debug_dbug="d,crash_apply_cb_before_fragment_removal"; --source suite/galera_3nodes/include/galera_expect_node_crash.inc --source suite/galera_3nodes/include/galera_sr_crash_prepare_nodes3.inc diff --git a/mysql-test/suite/galera_3nodes_sr/t/GCF-832.test b/mysql-test/suite/galera_3nodes_sr/t/GCF-832.test index c5a6346d6a1..eb7f5603452 100644 --- a/mysql-test/suite/galera_3nodes_sr/t/GCF-832.test +++ b/mysql-test/suite/galera_3nodes_sr/t/GCF-832.test @@ -13,7 +13,7 @@ --source ../galera/include/auto_increment_offset_save.inc --connection node_2 -SET GLOBAL debug="d,crash_last_fragment_commit_after_fragment_removal"; +SET GLOBAL debug_dbug="d,crash_last_fragment_commit_after_fragment_removal"; --let $_server_id= `SELECT @@server_id` --let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.$_server_id.expect diff --git a/mysql-test/suite/galera_sr/r/mysql-wsrep-features#35.result b/mysql-test/suite/galera_sr/r/mysql-wsrep-features#35.result index 41657d7340a..3f463875eb3 100644 --- a/mysql-test/suite/galera_sr/r/mysql-wsrep-features#35.result +++ b/mysql-test/suite/galera_sr/r/mysql-wsrep-features#35.result @@ -6,9 +6,7 @@ SELECT COUNT(*) = 0 FROM t1; COUNT(*) = 0 1 SET SESSION wsrep_sync_wait = 0; -SET GLOBAL debug = '+d,sync.wsrep_apply_cb'; -Warnings: -Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead +SET GLOBAL debug_dbug = '+d,sync.wsrep_apply_cb'; connection node_1; SET SESSION wsrep_trx_fragment_size = 1; SET AUTOCOMMIT=OFF; @@ -29,9 +27,7 @@ INSERT INTO t1 VALUES (1);; connection node_1; COMMIT; connection node_2a; -SET GLOBAL debug = ''; -Warnings: -Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead +SET GLOBAL debug_dbug = ''; SET DEBUG_SYNC = "now SIGNAL signal.wsrep_apply_cb"; connection node_2; Got one of the listed errors diff --git a/mysql-test/suite/galera_sr/t/mysql-wsrep-features#35.test b/mysql-test/suite/galera_sr/t/mysql-wsrep-features#35.test index c5cf1dea0ae..f63e1cca70c 100644 --- a/mysql-test/suite/galera_sr/t/mysql-wsrep-features#35.test +++ b/mysql-test/suite/galera_sr/t/mysql-wsrep-features#35.test @@ -9,7 +9,7 @@ CREATE TABLE t1 (f1 INTEGER PRIMARY KEY) ENGINE=InnoDB; --connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2 SELECT COUNT(*) = 0 FROM t1; SET SESSION wsrep_sync_wait = 0; -SET GLOBAL debug = '+d,sync.wsrep_apply_cb'; +SET GLOBAL debug_dbug = '+d,sync.wsrep_apply_cb'; --connection node_1 SET SESSION wsrep_trx_fragment_size = 1; @@ -34,7 +34,7 @@ SELECT COUNT(*) = 0 FROM t1; COMMIT; --connection node_2a -SET GLOBAL debug = ''; +SET GLOBAL debug_dbug = ''; SET DEBUG_SYNC = "now SIGNAL signal.wsrep_apply_cb"; --connection node_2

1 0

[Commits] 18bf0bf: MDEV-18956 Assertion `sel->quick' failed in JOIN::make_range_rowid_filters
by IgorBabaev 06 Apr '19

06 Apr '19

revision-id: 18bf0bf4968aa80da3a384204d2bfcffbc7dbe7f (mariadb-10.4.3-165-g18bf0bf) parent(s): a2e477ffd0414248d1d3af2eeafe1e3cffddebc6 author: Igor Babaev committer: Igor Babaev timestamp: 2019-04-05 23:14:05 -0700 message: MDEV-18956 Assertion `sel->quick' failed in JOIN::make_range_rowid_filters If SUBS_IN_TO_EXISTS strategy has been chosen for a subquery then additional conditions are injected into WHERE/ON/HAVING of this subquery and it may happen that test_quick_select() invoked from JOIN::make_range_rowid_filters() discovers impossible range. This must be checked. --- mysql-test/main/rowid_filter.result | 25 +++++++++++++++++++++++++ mysql-test/main/rowid_filter.test | 25 +++++++++++++++++++++++++ mysql-test/main/rowid_filter_innodb.result | 25 +++++++++++++++++++++++++ sql/sql_select.cc | 16 +++++++++++++--- 4 files changed, 88 insertions(+), 3 deletions(-) diff --git a/mysql-test/main/rowid_filter.result b/mysql-test/main/rowid_filter.result index 2fdff7d..280ced7 100644 --- a/mysql-test/main/rowid_filter.result +++ b/mysql-test/main/rowid_filter.result @@ -1987,4 +1987,29 @@ pk i 1 10 2 20 DROP TABLE t1; +# +# MDEV-18956: Possible rowid filter for subquery for which +# in_to_exists strategy has been chosen +# +CREATE TABLE t1 (pk int) engine=myisam ; +INSERT INTO t1 VALUES (1),(2); +CREATE TABLE t2 ( +pk int auto_increment PRIMARY KEY, +i1 int, i2 int, c2 varchar(1), +KEY (i1), KEY (i2) +) engine=myisam; +INSERT INTO t2 VALUES +(1,8,6,'t'),(2,5,7,'i'),(3,4,4,'h'),(4,207,38,'d'),(5,183,206,'b'), +(6,7,null,'o'),(7,1,2,'j'),(8,17,36,'s'),(9,4,5,'q'),(10,0,6,'l'), +(11,1,9,'j'),(12,5,6,'y'),(13,null,0,'i'),(14,7,7,'x'),(15,5,2,'u'); +SELECT * FROM t1 HAVING (7, 9) IN (SELECT t2.i1, t2.i2 FROM t2 WHERE t2.i1 = 3); +pk +EXPLAIN EXTENDED +SELECT * FROM t1 HAVING (7, 9) IN (SELECT t2.i1, t2.i2 FROM t2 WHERE t2.i1 = 3); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL Impossible HAVING +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL no matching row in const table +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`pk` AS `pk` from `test`.`t1` having 0 +DROP TABLE t1,t2; set @@use_stat_tables=@save_use_stat_tables; diff --git a/mysql-test/main/rowid_filter.test b/mysql-test/main/rowid_filter.test index d84839b..9c53367 100644 --- a/mysql-test/main/rowid_filter.test +++ b/mysql-test/main/rowid_filter.test @@ -275,4 +275,29 @@ SELECT * FROM t1 WHERE pk < 5; DROP TABLE t1; +--echo # +--echo # MDEV-18956: Possible rowid filter for subquery for which +--echo # in_to_exists strategy has been chosen +--echo # + +CREATE TABLE t1 (pk int) engine=myisam ; +INSERT INTO t1 VALUES (1),(2); + +CREATE TABLE t2 ( + pk int auto_increment PRIMARY KEY, + i1 int, i2 int, c2 varchar(1), + KEY (i1), KEY (i2) +) engine=myisam; + +INSERT INTO t2 VALUES + (1,8,6,'t'),(2,5,7,'i'),(3,4,4,'h'),(4,207,38,'d'),(5,183,206,'b'), + (6,7,null,'o'),(7,1,2,'j'),(8,17,36,'s'),(9,4,5,'q'),(10,0,6,'l'), + (11,1,9,'j'),(12,5,6,'y'),(13,null,0,'i'),(14,7,7,'x'),(15,5,2,'u'); + +SELECT * FROM t1 HAVING (7, 9) IN (SELECT t2.i1, t2.i2 FROM t2 WHERE t2.i1 = 3); +EXPLAIN EXTENDED +SELECT * FROM t1 HAVING (7, 9) IN (SELECT t2.i1, t2.i2 FROM t2 WHERE t2.i1 = 3); + +DROP TABLE t1,t2; + set @@use_stat_tables=@save_use_stat_tables; diff --git a/mysql-test/main/rowid_filter_innodb.result b/mysql-test/main/rowid_filter_innodb.result index 6740111..d19aca1 100644 --- a/mysql-test/main/rowid_filter_innodb.result +++ b/mysql-test/main/rowid_filter_innodb.result @@ -1916,6 +1916,31 @@ pk i 1 10 2 20 DROP TABLE t1; +# +# MDEV-18956: Possible rowid filter for subquery for which +# in_to_exists strategy has been chosen +# +CREATE TABLE t1 (pk int) engine=myisam ; +INSERT INTO t1 VALUES (1),(2); +CREATE TABLE t2 ( +pk int auto_increment PRIMARY KEY, +i1 int, i2 int, c2 varchar(1), +KEY (i1), KEY (i2) +) engine=myisam; +INSERT INTO t2 VALUES +(1,8,6,'t'),(2,5,7,'i'),(3,4,4,'h'),(4,207,38,'d'),(5,183,206,'b'), +(6,7,null,'o'),(7,1,2,'j'),(8,17,36,'s'),(9,4,5,'q'),(10,0,6,'l'), +(11,1,9,'j'),(12,5,6,'y'),(13,null,0,'i'),(14,7,7,'x'),(15,5,2,'u'); +SELECT * FROM t1 HAVING (7, 9) IN (SELECT t2.i1, t2.i2 FROM t2 WHERE t2.i1 = 3); +pk +EXPLAIN EXTENDED +SELECT * FROM t1 HAVING (7, 9) IN (SELECT t2.i1, t2.i2 FROM t2 WHERE t2.i1 = 3); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL Impossible HAVING +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL no matching row in const table +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`pk` AS `pk` from `test`.`t1` having 0 +DROP TABLE t1,t2; set @@use_stat_tables=@save_use_stat_tables; # # MDEV-18755: possible RORI-plan and possible plan with range filter diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 676a73d..f96b340 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -1621,12 +1621,22 @@ bool JOIN::make_range_rowid_filters() filter_map.merge(tab->table->with_impossible_ranges); bool force_index_save= tab->table->force_index; tab->table->force_index= true; - (void) sel->test_quick_select(thd, filter_map, (table_map) 0, - (ha_rows) HA_POS_ERROR, - true, false, true, true); + int rc= sel->test_quick_select(thd, filter_map, (table_map) 0, + (ha_rows) HA_POS_ERROR, + true, false, true, true); tab->table->force_index= force_index_save; if (thd->is_error()) goto no_filter; + /* + If SUBS_IN_TO_EXISTS strtrategy is chosen for the subquery then + additional conditions are injected into WHERE/ON/HAVING and it may + happen that the call of test_quick_select() discovers impossible range. + */ + if (rc == -1) + { + const_table_map|= tab->table->map; + goto no_filter; + } DBUG_ASSERT(sel->quick); filter_container= tab->range_rowid_filter_info->create_container();

1 0

[Commits] d0b9a4c: MDEV-18956 Assertion `sel->quick' failed in JOIN::make_range_rowid_filters
by IgorBabaev 06 Apr '19

06 Apr '19

revision-id: d0b9a4cfd8393d3b6f2746b89437b1b7207142ea (mariadb-10.4.3-165-gd0b9a4c) parent(s): a2e477ffd0414248d1d3af2eeafe1e3cffddebc6 author: Igor Babaev committer: Igor Babaev timestamp: 2019-04-05 23:12:44 -0700 message: MDEV-18956 Assertion `sel->quick' failed in JOIN::make_range_rowid_filters If SUBS_IN_TO_EXISTS strategy has been chosen for a subquery then additional conditions are injected into WHERE/ON/HAVING of this subquery and it may happen that test_quick_select() invoked from JOIN::make_range_rowid_filters() discovers impossible range. This must be checked. --- mysql-test/main/rowid_filter.result | 25 +++++++++++++++++++++++++ mysql-test/main/rowid_filter.test | 25 +++++++++++++++++++++++++ mysql-test/main/rowid_filter_innodb.result | 25 +++++++++++++++++++++++++ sql/sql_select.cc | 16 +++++++++++++--- 4 files changed, 88 insertions(+), 3 deletions(-) diff --git a/mysql-test/main/rowid_filter.result b/mysql-test/main/rowid_filter.result index 2fdff7d..280ced7 100644 --- a/mysql-test/main/rowid_filter.result +++ b/mysql-test/main/rowid_filter.result @@ -1987,4 +1987,29 @@ pk i 1 10 2 20 DROP TABLE t1; +# +# MDEV-18956: Possible rowid filter for subquery for which +# in_to_exists strategy has been chosen +# +CREATE TABLE t1 (pk int) engine=myisam ; +INSERT INTO t1 VALUES (1),(2); +CREATE TABLE t2 ( +pk int auto_increment PRIMARY KEY, +i1 int, i2 int, c2 varchar(1), +KEY (i1), KEY (i2) +) engine=myisam; +INSERT INTO t2 VALUES +(1,8,6,'t'),(2,5,7,'i'),(3,4,4,'h'),(4,207,38,'d'),(5,183,206,'b'), +(6,7,null,'o'),(7,1,2,'j'),(8,17,36,'s'),(9,4,5,'q'),(10,0,6,'l'), +(11,1,9,'j'),(12,5,6,'y'),(13,null,0,'i'),(14,7,7,'x'),(15,5,2,'u'); +SELECT * FROM t1 HAVING (7, 9) IN (SELECT t2.i1, t2.i2 FROM t2 WHERE t2.i1 = 3); +pk +EXPLAIN EXTENDED +SELECT * FROM t1 HAVING (7, 9) IN (SELECT t2.i1, t2.i2 FROM t2 WHERE t2.i1 = 3); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL Impossible HAVING +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL no matching row in const table +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`pk` AS `pk` from `test`.`t1` having 0 +DROP TABLE t1,t2; set @@use_stat_tables=@save_use_stat_tables; diff --git a/mysql-test/main/rowid_filter.test b/mysql-test/main/rowid_filter.test index d84839b..9c53367 100644 --- a/mysql-test/main/rowid_filter.test +++ b/mysql-test/main/rowid_filter.test @@ -275,4 +275,29 @@ SELECT * FROM t1 WHERE pk < 5; DROP TABLE t1; +--echo # +--echo # MDEV-18956: Possible rowid filter for subquery for which +--echo # in_to_exists strategy has been chosen +--echo # + +CREATE TABLE t1 (pk int) engine=myisam ; +INSERT INTO t1 VALUES (1),(2); + +CREATE TABLE t2 ( + pk int auto_increment PRIMARY KEY, + i1 int, i2 int, c2 varchar(1), + KEY (i1), KEY (i2) +) engine=myisam; + +INSERT INTO t2 VALUES + (1,8,6,'t'),(2,5,7,'i'),(3,4,4,'h'),(4,207,38,'d'),(5,183,206,'b'), + (6,7,null,'o'),(7,1,2,'j'),(8,17,36,'s'),(9,4,5,'q'),(10,0,6,'l'), + (11,1,9,'j'),(12,5,6,'y'),(13,null,0,'i'),(14,7,7,'x'),(15,5,2,'u'); + +SELECT * FROM t1 HAVING (7, 9) IN (SELECT t2.i1, t2.i2 FROM t2 WHERE t2.i1 = 3); +EXPLAIN EXTENDED +SELECT * FROM t1 HAVING (7, 9) IN (SELECT t2.i1, t2.i2 FROM t2 WHERE t2.i1 = 3); + +DROP TABLE t1,t2; + set @@use_stat_tables=@save_use_stat_tables; diff --git a/mysql-test/main/rowid_filter_innodb.result b/mysql-test/main/rowid_filter_innodb.result index 6740111..d19aca1 100644 --- a/mysql-test/main/rowid_filter_innodb.result +++ b/mysql-test/main/rowid_filter_innodb.result @@ -1916,6 +1916,31 @@ pk i 1 10 2 20 DROP TABLE t1; +# +# MDEV-18956: Possible rowid filter for subquery for which +# in_to_exists strategy has been chosen +# +CREATE TABLE t1 (pk int) engine=myisam ; +INSERT INTO t1 VALUES (1),(2); +CREATE TABLE t2 ( +pk int auto_increment PRIMARY KEY, +i1 int, i2 int, c2 varchar(1), +KEY (i1), KEY (i2) +) engine=myisam; +INSERT INTO t2 VALUES +(1,8,6,'t'),(2,5,7,'i'),(3,4,4,'h'),(4,207,38,'d'),(5,183,206,'b'), +(6,7,null,'o'),(7,1,2,'j'),(8,17,36,'s'),(9,4,5,'q'),(10,0,6,'l'), +(11,1,9,'j'),(12,5,6,'y'),(13,null,0,'i'),(14,7,7,'x'),(15,5,2,'u'); +SELECT * FROM t1 HAVING (7, 9) IN (SELECT t2.i1, t2.i2 FROM t2 WHERE t2.i1 = 3); +pk +EXPLAIN EXTENDED +SELECT * FROM t1 HAVING (7, 9) IN (SELECT t2.i1, t2.i2 FROM t2 WHERE t2.i1 = 3); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL Impossible HAVING +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL no matching row in const table +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`pk` AS `pk` from `test`.`t1` having 0 +DROP TABLE t1,t2; set @@use_stat_tables=@save_use_stat_tables; # # MDEV-18755: possible RORI-plan and possible plan with range filter diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 676a73d..42a4278 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -1621,12 +1621,22 @@ bool JOIN::make_range_rowid_filters() filter_map.merge(tab->table->with_impossible_ranges); bool force_index_save= tab->table->force_index; tab->table->force_index= true; - (void) sel->test_quick_select(thd, filter_map, (table_map) 0, - (ha_rows) HA_POS_ERROR, - true, false, true, true); + int rc= sel->test_quick_select(thd, filter_map, (table_map) 0, + (ha_rows) HA_POS_ERROR, + true, false, true, true); tab->table->force_index= force_index_save; if (thd->is_error()) goto no_filter; + /* + If SUBS_IN_TO_EXISTS is chosen for the subquery then additional + conditions are injected into WHERE/ON/HAVING and it may happen that + the call of test_quick_select() discovers impossible range. + */ + if (rc == -1) + { + const_table_map|= tab->table->map; + goto no_filter; + } DBUG_ASSERT(sel->quick); filter_container= tab->range_rowid_filter_info->create_container();

1 0

[Commits] a2e477ffd04: MDEV-19186: Assertion `field->table == table' failed in create_tmp_table
by Galina 05 Apr '19

05 Apr '19

revision-id: a2e477ffd0414248d1d3af2eeafe1e3cffddebc6 (mariadb-10.4.3-164-ga2e477ffd04) parent(s): 694d1a50bd7754c5357dde184f87d63b7032ee5e author: Galina Shalygina committer: Galina Shalygina timestamp: 2019-04-06 00:04:52 +0300 message: MDEV-19186: Assertion `field->table == table' failed in create_tmp_table Temporary table is defined with the view field in HAVING. Item_direct_view_ref for this field is dropped and that causes error. To fix it Item_direct_view_ref::remove_item_direct_ref() is added. --- mysql-test/main/having_cond_pushdown.result | 16 ++++++++++++++++ mysql-test/main/having_cond_pushdown.test | 22 ++++++++++++++++++++++ sql/item.h | 1 + 3 files changed, 39 insertions(+) diff --git a/mysql-test/main/having_cond_pushdown.result b/mysql-test/main/having_cond_pushdown.result index e9fcd633895..85ca0342dee 100644 --- a/mysql-test/main/having_cond_pushdown.result +++ b/mysql-test/main/having_cond_pushdown.result @@ -4641,3 +4641,19 @@ pk 3 DROP TABLE t1; DROP VIEW v1; +# +# MDEV-19186: temporary table defined with view field in HAVING +# +CREATE TABLE t1 (pk INT, x VARCHAR(10)); +INSERT INTO t1 VALUES (1,'y'),(2,'s'),(3,'aaa'); +CREATE VIEW v1 AS SELECT * FROM t1; +CREATE TABLE t2 (pk INT, x VARCHAR(10)); +INSERT INTO t2 VALUES (1,'aa'),(2,'t'),(3,'bb'); +CREATE TABLE tmp1 +SELECT v1.pk +FROM t2,v1 +WHERE v1.x = t2.x +GROUP BY v1.pk +HAVING (v1.pk = 1); +DROP TABLE t1,t2,tmp1; +DROP VIEW v1; diff --git a/mysql-test/main/having_cond_pushdown.test b/mysql-test/main/having_cond_pushdown.test index a50fa11484d..257e5cb4875 100644 --- a/mysql-test/main/having_cond_pushdown.test +++ b/mysql-test/main/having_cond_pushdown.test @@ -1318,3 +1318,25 @@ HAVING (1 NOT IN (SELECT COUNT(t1.c1) FROM (v1, t1))); DROP TABLE t1; DROP VIEW v1; + + +--echo # +--echo # MDEV-19186: temporary table defined with view field in HAVING +--echo # + +CREATE TABLE t1 (pk INT, x VARCHAR(10)); +INSERT INTO t1 VALUES (1,'y'),(2,'s'),(3,'aaa'); +CREATE VIEW v1 AS SELECT * FROM t1; + +CREATE TABLE t2 (pk INT, x VARCHAR(10)); +INSERT INTO t2 VALUES (1,'aa'),(2,'t'),(3,'bb'); + +CREATE TABLE tmp1 +SELECT v1.pk +FROM t2,v1 +WHERE v1.x = t2.x +GROUP BY v1.pk +HAVING (v1.pk = 1); + +DROP TABLE t1,t2,tmp1; +DROP VIEW v1; diff --git a/sql/item.h b/sql/item.h index 716b411082f..97d31e6ba34 100644 --- a/sql/item.h +++ b/sql/item.h @@ -5733,6 +5733,7 @@ class Item_direct_view_ref :public Item_direct_ref { return get_item_copy<Item_direct_view_ref>(thd, this); } Item *field_transformer_for_having_pushdown(THD *thd, uchar *arg) { return this; } + Item *remove_item_direct_ref() { return this; } };

1 0

[Commits] 694d1a50bd7: MDEV-19185: Pushdown constant function defined with subquery
by Galina 05 Apr '19

05 Apr '19

revision-id: 694d1a50bd7754c5357dde184f87d63b7032ee5e (mariadb-10.4.3-163-g694d1a50bd7) parent(s): c84dde148f8d82232a110f9ff7c80df94d0d6c8c author: Galina Shalygina committer: Galina Shalygina timestamp: 2019-04-05 22:55:20 +0300 message: MDEV-19185: Pushdown constant function defined with subquery The bug occurs because of the wrong pushdown of constant function defined with subquery from HAVING into WHERE. Subqueries can't be pushed into WHERE. To fix it with_subquery() call is added to check if the function contains subquery. --- mysql-test/main/having_cond_pushdown.result | 16 ++++++++++++++++ mysql-test/main/having_cond_pushdown.test | 17 +++++++++++++++++ sql/item.cc | 5 ++--- sql/item_func.h | 2 +- 4 files changed, 36 insertions(+), 4 deletions(-) diff --git a/mysql-test/main/having_cond_pushdown.result b/mysql-test/main/having_cond_pushdown.result index bec2a937e38..e9fcd633895 100644 --- a/mysql-test/main/having_cond_pushdown.result +++ b/mysql-test/main/having_cond_pushdown.result @@ -4625,3 +4625,19 @@ a MAX(t1.b) c 1 22 3 deallocate prepare stmt1; DROP TABLE t1,t3; +# +# MDEV-19185: pushdown constant function with subquery +# +CREATE TABLE t1 (pk INT, c1 VARCHAR(64)); +INSERT INTO t1 VALUES (1,'bbb'),(2,'aaa'),(3,'ccc'); +CREATE VIEW v1 AS SELECT * FROM t1; +SELECT pk +FROM t1 +GROUP BY pk +HAVING (1 NOT IN (SELECT COUNT(t1.c1) FROM (v1, t1))); +pk +1 +2 +3 +DROP TABLE t1; +DROP VIEW v1; diff --git a/mysql-test/main/having_cond_pushdown.test b/mysql-test/main/having_cond_pushdown.test index 1e5ad610e90..a50fa11484d 100644 --- a/mysql-test/main/having_cond_pushdown.test +++ b/mysql-test/main/having_cond_pushdown.test @@ -1301,3 +1301,20 @@ execute stmt1; deallocate prepare stmt1; DROP TABLE t1,t3; + + +--echo # +--echo # MDEV-19185: pushdown constant function with subquery +--echo # + +CREATE TABLE t1 (pk INT, c1 VARCHAR(64)); +INSERT INTO t1 VALUES (1,'bbb'),(2,'aaa'),(3,'ccc'); +CREATE VIEW v1 AS SELECT * FROM t1; + +SELECT pk +FROM t1 +GROUP BY pk +HAVING (1 NOT IN (SELECT COUNT(t1.c1) FROM (v1, t1))); + +DROP TABLE t1; +DROP VIEW v1; diff --git a/sql/item.cc b/sql/item.cc index 543dc971228..e511921b30b 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -9060,9 +9060,8 @@ bool Item_args::excl_dep_on_grouping_fields(st_select_lex *sel) { for (uint i= 0; i < arg_count; i++) { - if (args[i]->type() == Item::SUBSELECT_ITEM || - (args[i]->type() == Item::FUNC_ITEM && - ((Item_func *)args[i])->functype() == Item_func::UDF_FUNC)) + if (args[i]->type() == Item::FUNC_ITEM && + ((Item_func *)args[i])->functype() == Item_func::UDF_FUNC) return false; if (args[i]->const_item()) continue; diff --git a/sql/item_func.h b/sql/item_func.h index a3bf4d78158..44e9691c9df 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -342,7 +342,7 @@ class Item_func :public Item_func_or_sum, bool excl_dep_on_grouping_fields(st_select_lex *sel) { - if (has_rand_bit()) + if (has_rand_bit() || with_subquery()) return false; return Item_args::excl_dep_on_grouping_fields(sel); }

1 0

[Commits] 3abdc95f0: Range Locking: fix Makefile-based debug build
by Sergei Petrunia 05 Apr '19

05 Apr '19

revision-id: 3abdc95f082d80a3ce76bad7d6d319f8706429b2 (v5.8-1027-g3abdc95f0) parent(s): d4bf4b4197d8887c119bcb5d87db6ba5feb9aabc author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-04-05 20:21:19 +0300 message: Range Locking: fix Makefile-based debug build - List correct files in the Makefile - Lots of -Werror=unused-parameter errors --- Makefile | 3 +++ include/rocksdb/utilities/transaction.h | 5 ++--- src.mk | 8 -------- .../transactions/range_locking/standalone_port.cc | 2 +- utilities/transactions/transaction_lock_mgr.cc | 21 +++++++++++---------- utilities/transactions/transaction_lock_mgr.h | 8 ++++---- 6 files changed, 21 insertions(+), 26 deletions(-) diff --git a/Makefile b/Makefile index 9ece4310c..3b9b5453b 100644 --- a/Makefile +++ b/Makefile @@ -1564,6 +1564,9 @@ blob_db_test: utilities/blob_db/blob_db_test.o $(LIBOBJECTS) $(TESTHARNESS) repeatable_thread_test: util/repeatable_thread_test.o $(LIBOBJECTS) $(TESTHARNESS) $(AM_LINK) +range_locking_test: utilities/transactions/range_locking_test.o $(LIBOBJECTS) $(TESTHARNESS) + $(AM_LINK) + #------------------------------------------------- # make install related stuff INSTALL_PATH ?= /usr/local diff --git a/include/rocksdb/utilities/transaction.h b/include/rocksdb/utilities/transaction.h index 5a2932363..8a15a3bbd 100644 --- a/include/rocksdb/utilities/transaction.h +++ b/include/rocksdb/utilities/transaction.h @@ -255,9 +255,8 @@ class Transaction { // Get a range lock on [start_endpoint; end_endpoint]. // Note: range endpoints generally a use a different data format than // ranges. - virtual Status GetRangeLock(ColumnFamilyHandle* column_family, - const Slice& start_endp, - const Slice& end_endp) { + virtual Status GetRangeLock(ColumnFamilyHandle*, + const Slice&, const Slice&) { return Status::NotSupported(); } diff --git a/src.mk b/src.mk index de0644cac..2a19287e0 100644 --- a/src.mk +++ b/src.mk @@ -218,20 +218,12 @@ LIB_SOURCES = \ utilities/write_batch_with_index/write_batch_with_index.cc \ utilities/write_batch_with_index/write_batch_with_index_internal.cc \ utilities/transactions/range_locking/locktree/keyrange.cc \ - utilities/transactions/range_locking/locktree/keyrange.h \ - utilities/transactions/range_locking/locktree/txnid_set.h \ utilities/transactions/range_locking/locktree/range_buffer.cc \ - utilities/transactions/range_locking/locktree/locktree.h \ - utilities/transactions/range_locking/locktree/treenode.h \ utilities/transactions/range_locking/locktree/wfg.cc \ utilities/transactions/range_locking/locktree/lock_request.cc \ utilities/transactions/range_locking/locktree/locktree.cc \ - utilities/transactions/range_locking/locktree/range_buffer.h \ utilities/transactions/range_locking/locktree/manager.cc \ - utilities/transactions/range_locking/locktree/wfg.h \ utilities/transactions/range_locking/locktree/txnid_set.cc \ - utilities/transactions/range_locking/locktree/lock_request.h \ - utilities/transactions/range_locking/locktree/concurrent_tree.h \ utilities/transactions/range_locking/util/dbt.cc \ utilities/transactions/range_locking/util/memarena.cc \ utilities/transactions/range_locking/standalone_port.cc \ diff --git a/utilities/transactions/range_locking/standalone_port.cc b/utilities/transactions/range_locking/standalone_port.cc index f87105e5b..dbdeb0b97 100644 --- a/utilities/transactions/range_locking/standalone_port.cc +++ b/utilities/transactions/range_locking/standalone_port.cc @@ -60,7 +60,7 @@ toku_instr_key *manager_escalator_mutex_key; // portability/memory.cc size_t -toku_memory_footprint(void * p, size_t touched) +toku_memory_footprint(void* , size_t touched) { return touched; } diff --git a/utilities/transactions/transaction_lock_mgr.cc b/utilities/transactions/transaction_lock_mgr.cc index f15d9df21..e0802fb25 100644 --- a/utilities/transactions/transaction_lock_mgr.cc +++ b/utilities/transactions/transaction_lock_mgr.cc @@ -795,7 +795,7 @@ Status RangeLockMgr::TryRangeLock(PessimisticTransaction* txn, uint32_t column_family_id, const rocksdb::Slice &start_key, const rocksdb::Slice &end_key, - bool exclusive) { + bool /*exclusive*/) { toku::lock_request request; request.create(mutex_factory_); DBT start_key_dbt, end_key_dbt; @@ -836,8 +836,9 @@ Status RangeLockMgr::TryRangeLock(PessimisticTransaction* txn, autovector<TransactionID> wait_ids; bool done= false; - static void lock_wait_callback(void *cdata, TXNID waiter, TXNID waitee) { + static void lock_wait_callback(void *cdata, TXNID /*waiter*/, TXNID waitee) { auto self= (struct st_wait_info*)cdata; + // we know that the waiter is self->txn->GetID() (TODO: assert?) if (!self->done) { self->wait_ids.push_back(waitee); @@ -893,7 +894,7 @@ Status RangeLockMgr::TryRangeLock(PessimisticTransaction* txn, // (currently it is the same as getting a range lock) Status RangeLockMgr::TryLock(PessimisticTransaction* txn, uint32_t column_family_id, - const std::string& key, Env* env, + const std::string& key, Env*, bool exclusive) { std::string endpoint; convert_key_to_endpoint(rocksdb::Slice(key.data(), key.size()), &endpoint); @@ -904,7 +905,7 @@ Status RangeLockMgr::TryLock(PessimisticTransaction* txn, static void range_lock_mgr_release_lock_int(toku::locktree *lt, const PessimisticTransaction* txn, - uint32_t column_family_id, + uint32_t /*column_family_id*/, const std::string& key) { DBT key_dbt; toku_fill_dbt(&key_dbt, key.data(), key.size()); @@ -917,13 +918,13 @@ range_lock_mgr_release_lock_int(toku::locktree *lt, void RangeLockMgr::UnLock(PessimisticTransaction* txn, uint32_t column_family_id, - const std::string& key, Env* env) { + const std::string& key, Env*) { range_lock_mgr_release_lock_int(lt, txn, column_family_id, key); toku::lock_request::retry_all_lock_requests(lt, nullptr /* lock_wait_needed_callback */); } void RangeLockMgr::UnLock(const PessimisticTransaction* txn, - const TransactionKeyMap* key_map, Env* env) { + const TransactionKeyMap* key_map, Env*) { //TODO: if we collect all locks in a range buffer and then // make one call to lock_tree::release_locks(), will that be faster? for (auto& key_map_iter : *key_map) { @@ -939,7 +940,7 @@ void RangeLockMgr::UnLock(const PessimisticTransaction* txn, toku::lock_request::retry_all_lock_requests(lt, nullptr /* lock_wait_needed_callback */); } -void RangeLockMgr::UnLockAll(const PessimisticTransaction* txn, Env* env) { +void RangeLockMgr::UnLockAll(const PessimisticTransaction* txn, Env*) { // owned_locks may hold nullptr if the transaction has never acquired any // locks. @@ -1023,11 +1024,11 @@ RangeLockMgr::RangeLockMgr(TransactionDB* txn_db, @param lt Lock Tree where escalation is happening (currently there is only one) @param buffer Escalation result: list of locks that this transaction now owns in this lock tree. - @param extra Callback context + @param void* Callback context */ -void RangeLockMgr::on_escalate(TXNID txnid, const locktree *lt, - const range_buffer &buffer, void *extra) { +void RangeLockMgr::on_escalate(TXNID txnid, const locktree*, + const range_buffer &buffer, void *) { auto txn= (PessimisticTransaction*)txnid; RangeLockList* trx_locks= (RangeLockList*)txn->owned_locks.get(); diff --git a/utilities/transactions/transaction_lock_mgr.h b/utilities/transactions/transaction_lock_mgr.h index e3de698f2..d6c5479f2 100644 --- a/utilities/transactions/transaction_lock_mgr.h +++ b/utilities/transactions/transaction_lock_mgr.h @@ -195,8 +195,8 @@ class RangeLockMgr : public BaseLockMgr, public RangeLockMgrControl { public: - void AddColumnFamily(uint32_t column_family_id) override { /* do nothing */ } - void RemoveColumnFamily(uint32_t column_family_id) override { /* do nothing */ } + void AddColumnFamily(uint32_t) override { /* do nothing */ } + void RemoveColumnFamily(uint32_t) override { /* do nothing */ } Status TryLock(PessimisticTransaction* txn, uint32_t column_family_id, const std::string& key, Env* env, bool exclusive) override ; @@ -263,8 +263,8 @@ class RangeLockMgr : static int compare_dbt_endpoints(__toku_db*, void *arg, const DBT *a_key, const DBT *b_key); // Callbacks - static int on_create(locktree *lt, void *extra) { return 0; /* no error */ } - static void on_destroy(locktree *lt) {} + static int on_create(locktree*, void*) { return 0; /* no error */ } + static void on_destroy(locktree*) {} static void on_escalate(TXNID txnid, const locktree *lt, const range_buffer &buffer, void *extra);

1 0

[Commits] d4bf4b419: Fix range_locking_test.cc
by Sergei Petrunia 05 Apr '19

05 Apr '19

revision-id: d4bf4b4197d8887c119bcb5d87db6ba5feb9aabc (v5.8-1026-gd4bf4b419) parent(s): 46d49ea0b7e0267b5c360d45d90a64776477b8ed author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-04-05 20:19:18 +0300 message: Fix range_locking_test.cc Now use_range_locking is a part of TransactionDBOptions, not a member of TransactionDB. --- utilities/transactions/range_locking_test.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/utilities/transactions/range_locking_test.cc b/utilities/transactions/range_locking_test.cc index 447e4c44e..26ee9b84c 100644 --- a/utilities/transactions/range_locking_test.cc +++ b/utilities/transactions/range_locking_test.cc @@ -72,7 +72,6 @@ class RangeLockingTest : public ::testing::Test { s = TransactionDB::Open(options, txn_db_options, dbname, &db); assert(s.ok()); - db->use_range_locking= true; rocksdb::RangeLockMgrControl *mgr= db->get_range_lock_manager(); assert(mgr); // can also: mgr->set_max_lock_memory(rocksdb_max_lock_memory);

1 0

[Commits] 8191226: MDEV-7974 XA transactions.
by holyfoot＠askmonty.org 05 Apr '19

05 Apr '19

revision-id: 8191226affa9597bbe202fd5e2005d13af5c9377 (mariadb-10.4.3-84-g8191226) parent(s): 83a19306d2581a7e33f4f6697cefb7f43476773d committer: Alexey Botchkov timestamp: 2019-04-05 16:20:04 +0400 message: MDEV-7974 XA transactions. tokudb_maria.xa test fixed. --- storage/tokudb/mysql-test/tokudb_mariadb/r/xa.result | 1 + storage/tokudb/mysql-test/tokudb_mariadb/t/xa.test | 1 + 2 files changed, 2 insertions(+) diff --git a/storage/tokudb/mysql-test/tokudb_mariadb/r/xa.result b/storage/tokudb/mysql-test/tokudb_mariadb/r/xa.result index 4724a0a..34233b6 100644 --- a/storage/tokudb/mysql-test/tokudb_mariadb/r/xa.result +++ b/storage/tokudb/mysql-test/tokudb_mariadb/r/xa.result @@ -65,4 +65,5 @@ a 20 disconnect con1; connection default; +xa rollback 'testb',0x2030405060,11; drop table t1; diff --git a/storage/tokudb/mysql-test/tokudb_mariadb/t/xa.test b/storage/tokudb/mysql-test/tokudb_mariadb/t/xa.test index dc5520a..625abbb 100644 --- a/storage/tokudb/mysql-test/tokudb_mariadb/t/xa.test +++ b/storage/tokudb/mysql-test/tokudb_mariadb/t/xa.test @@ -69,5 +69,6 @@ select * from t1; disconnect con1; connection default; +xa rollback 'testb',0x2030405060,11; drop table t1;

1 0

[Commits] 83a1930: MDEV-7974 XA transactions.
by holyfoot＠askmonty.org 05 Apr '19

05 Apr '19

revision-id: 83a19306d2581a7e33f4f6697cefb7f43476773d (mariadb-10.4.3-83-g83a1930) parent(s): dfa24e558ea9fb1ace29e97383577fe4e18d0939 committer: Alexey Botchkov timestamp: 2019-04-05 15:34:14 +0400 message: MDEV-7974 XA transactions. FLUSH TABLES WITH READ LOCK now blocks the XA COMMIT/ROLLBACK/PREPARE statements as they write to the binlog/Innodb redo. --- mysql-test/main/flush_read_lock.result | 159 ++++++++++++++++++++++++++++++++- mysql-test/main/flush_read_lock.test | 112 ++++++++++++++++++++++- mysql-test/main/xa.result | 60 +++++++++++++ mysql-test/main/xa.test | 46 +++++++++- sql/transaction.cc | 101 ++++++++++++++++++--- 5 files changed, 459 insertions(+), 19 deletions(-) diff --git a/mysql-test/main/flush_read_lock.result b/mysql-test/main/flush_read_lock.result index 33dc109..9a2f650 100644 --- a/mysql-test/main/flush_read_lock.result +++ b/mysql-test/main/flush_read_lock.result @@ -162,7 +162,19 @@ Success: FTWRL is blocked when 'alter event e1 comment 'test'' is active in anot # --read-only for a discussion why. # Success: Was able to run 'analyze table t1_base' under FTWRL. -Success: Was able to run 'analyze table t1_base' with FTWRL active in another connection. +Timeout in wait_condition.inc for select count(*) = 0 from information_schema.processlist +where info = "analyze table t1_base" +Id User Host db Command Time State Info Progress +3 system user NULL Daemon NULL InnoDB purge worker NULL 0.000 +4 system user NULL Daemon NULL InnoDB purge worker NULL 0.000 +1 system user NULL Daemon NULL InnoDB purge worker NULL 0.000 +2 system user NULL Daemon NULL InnoDB purge coordinator NULL 0.000 +5 system user NULL Daemon NULL InnoDB shutdown handler NULL 0.000 +9 root localhost test Query 31 Waiting for backup lock analyze table t1_base 0.000 +10 root localhost test Query 0 Init show full processlist 0.000 +11 root localhost test Sleep 31 NULL 0.000 +12 root localhost test Sleep 31 NULL 0.000 +Error: Wasn't able to run 'analyze table t1_base' with FTWRL active in another connection! Success: Was able to run FTWRL while 'analyze table t1_base' was active in another connection. # # 3) BEGIN, ROLLBACK and COMMIT statements. @@ -1309,6 +1321,8 @@ unlock tables; # Check that XA non-COMMIT statements are not and COMMIT is # blocked by active FTWRL in another connection # +# XA COMMIT, XA ROLLBACK and XA PREPARE does take COMMIT lock to ensure +# that nothing is written to bin log and redo log under FTWRL mode. connection con1; flush tables with read lock; connection default; @@ -1321,11 +1335,51 @@ connection con1; flush tables with read lock; connection default; xa end 'test1'; -xa prepare 'test1'; -xa rollback 'test1'; +xa prepare 'test1';; +connection con1; +Timeout in wait_condition.inc for select count(*) = 1 from information_schema.processlist +where state = "Waiting for commit lock" and +info = "xa prepare 'test1'" +Id User Host db Command Time State Info Progress +3 system user NULL Daemon NULL InnoDB purge worker NULL 0.000 +4 system user NULL Daemon NULL InnoDB purge worker NULL 0.000 +1 system user NULL Daemon NULL InnoDB purge worker NULL 0.000 +2 system user NULL Daemon NULL InnoDB purge coordinator NULL 0.000 +5 system user NULL Daemon NULL InnoDB shutdown handler NULL 0.000 +9 root localhost test Query 30 Waiting for backup lock xa prepare 'test1' 0.000 +10 root localhost test Query 0 Init show full processlist 0.000 +11 root localhost test Sleep 30 NULL 0.000 +12 root localhost test Sleep 63 NULL 0.000 +unlock tables; +# Switching to connection 'default'. +connection default; +# Reap XA PREPARE. +# Switching to connection 'con1'. connection con1; +flush tables with read lock; +# Switching to connection 'default'. +connection default; +# Send XA ROLLBACK 'test1' +xa rollback 'test1'; +# Switching to connection 'con1'. +connection con1; +# Wait until XA ROLLBACK is blocked. +Timeout in wait_condition.inc for select count(*) = 1 from information_schema.processlist +where state = "Waiting for commit lock" and +info = "xa rollback 'test1'" +Id User Host db Command Time State Info Progress +3 system user NULL Daemon NULL InnoDB purge worker NULL 0.000 +4 system user NULL Daemon NULL InnoDB purge worker NULL 0.000 +1 system user NULL Daemon NULL InnoDB purge worker NULL 0.000 +2 system user NULL Daemon NULL InnoDB purge coordinator NULL 0.000 +5 system user NULL Daemon NULL InnoDB shutdown handler NULL 0.000 +9 root localhost test Query 30 Waiting for backup lock xa rollback 'test1' 0.000 +10 root localhost test Query 0 Init show full processlist 0.000 +11 root localhost test Sleep 61 NULL 0.000 +12 root localhost test Sleep 94 NULL 0.000 unlock tables; connection default; +# Reap XA ROLLBACK xa start 'test1'; insert into t3_trans values (1); connection con1; @@ -1333,7 +1387,33 @@ flush tables with read lock; connection default; connection default; xa end 'test1'; +# Send XA PREPARE 'test1' xa prepare 'test1'; +# Switching to connection 'con1'. +connection con1; +# Wait until XA PREPARE is blocked. +Timeout in wait_condition.inc for select count(*) = 1 from information_schema.processlist +where state = "Waiting for commit lock" and +info = "xa prepare 'test1'" +Id User Host db Command Time State Info Progress +3 system user NULL Daemon NULL InnoDB purge worker NULL 0.000 +4 system user NULL Daemon NULL InnoDB purge worker NULL 0.000 +1 system user NULL Daemon NULL InnoDB purge worker NULL 0.000 +2 system user NULL Daemon NULL InnoDB purge coordinator NULL 0.000 +5 system user NULL Daemon NULL InnoDB shutdown handler NULL 0.000 +9 root localhost test Query 31 Waiting for backup lock xa prepare 'test1' 0.000 +10 root localhost test Query 0 Init show full processlist 0.000 +11 root localhost test Sleep 92 NULL 0.000 +12 root localhost test Sleep 125 NULL 0.000 +unlock tables; +# Switching to connection 'default'. +connection default; +# Reap XA PREPARE. +# Switching to connection 'con1'. +connection con1; +flush tables with read lock; +# Switching to connection 'default'. +connection default; # Send: xa commit 'test1';; connection con1; @@ -1343,6 +1423,77 @@ connection default; # Reap XA COMMIT. delete from t3_trans; # +# Check that XA COMMIT / ROLLBACK for prepared transaction from a +# disconnected session is blocked by active FTWRL in another connection. +# +# Create temporary connection for XA transaction. +connect con_tmp,localhost,root,,; +xa start 'test1'; +insert into t3_trans values (1); +xa end 'test1'; +xa prepare 'test1'; +# Disconnect temporary connection +disconnect con_tmp; +# Create temporary connection for XA transaction. +connect con_tmp,localhost,root,,; +xa start 'test2'; +insert into t3_trans values (2); +xa end 'test2'; +xa prepare 'test2'; +# Disconnect temporary connection +disconnect con_tmp; +# Switching to connection 'con1'. +connection con1; +flush tables with read lock; +# Switching to connection 'default'. +connection default; +# Send XA ROLLBACK 'test1' +xa rollback 'test1'; +# Switching to connection 'con1'. +connection con1; +# Wait until XA ROLLBACK is blocked. +Timeout in wait_condition.inc for select count(*) = 1 from information_schema.processlist +where state = "Waiting for commit lock" and +info = "xa rollback 'test1'" +Id User Host db Command Time State Info Progress +3 system user NULL Daemon NULL InnoDB purge worker NULL 0.000 +4 system user NULL Daemon NULL InnoDB purge worker NULL 0.000 +1 system user NULL Daemon NULL InnoDB purge worker NULL 0.000 +2 system user NULL Daemon NULL InnoDB purge coordinator NULL 0.000 +5 system user NULL Daemon NULL InnoDB shutdown handler NULL 0.000 +9 root localhost test Query 30 Waiting for backup lock xa rollback 'test1' 0.000 +10 root localhost test Query 0 Init show full processlist 0.000 +11 root localhost test Sleep 123 NULL 0.000 +12 root localhost test Sleep 157 NULL 0.000 +unlock tables; +flush tables with read lock; +# Switching to connection 'default'. +connection default; +# Reap XA ROLLBACK +# Send XA COMMIT +xa commit 'test2';; +# Switching to connection 'con1'. +connection con1; +# Wait until XA COMMIT is blocked. +Timeout in wait_condition.inc for select count(*) = 1 from information_schema.processlist +where state = "Waiting for commit lock" and +info = "xa commit 'test2'" +Id User Host db Command Time State Info Progress +3 system user NULL Daemon NULL InnoDB purge worker NULL 0.000 +4 system user NULL Daemon NULL InnoDB purge worker NULL 0.000 +1 system user NULL Daemon NULL InnoDB purge worker NULL 0.000 +2 system user NULL Daemon NULL InnoDB purge coordinator NULL 0.000 +5 system user NULL Daemon NULL InnoDB shutdown handler NULL 0.000 +9 root localhost test Query 31 Waiting for backup lock xa commit 'test2' 0.000 +10 root localhost test Query 0 Init show full processlist 0.000 +11 root localhost test Sleep 154 NULL 0.000 +12 root localhost test Sleep 188 NULL 0.000 +unlock tables; +# Switching to connection 'default'. +connection default; +# Reap XA COMMIT. +delete from t3_trans; +# # Check that XA COMMIT blocks FTWRL in another connection. xa start 'test1'; insert into t3_trans values (1); @@ -1412,6 +1563,7 @@ flush tables with read lock; # Implicit commits are allowed under FTWRL. analyze table t3_trans; Table Op Msg_type Msg_text +test.t3_trans analyze status Engine-independent statistics collected test.t3_trans analyze status OK unlock tables; # @@ -1425,6 +1577,7 @@ unlock tables; connection default; # Reap ANALYZE TABLE Table Op Msg_type Msg_text +test.t3_trans analyze status Engine-independent statistics collected test.t3_trans analyze status OK # # 39.1.b) CHECK TABLE for transactional table is compatible with FTWRL. diff --git a/mysql-test/main/flush_read_lock.test b/mysql-test/main/flush_read_lock.test index f39dbec..74b7117 100644 --- a/mysql-test/main/flush_read_lock.test +++ b/mysql-test/main/flush_read_lock.test @@ -1590,6 +1590,8 @@ unlock tables; --echo # Check that XA non-COMMIT statements are not and COMMIT is --echo # blocked by active FTWRL in another connection --echo # +--echo # XA COMMIT, XA ROLLBACK and XA PREPARE does take COMMIT lock to ensure +--echo # that nothing is written to bin log and redo log under FTWRL mode. connection $con_aux1; flush tables with read lock; connection default; @@ -1602,11 +1604,37 @@ connection $con_aux1; flush tables with read lock; connection default; xa end 'test1'; -xa prepare 'test1'; -xa rollback 'test1'; +--send xa prepare 'test1'; connection $con_aux1; +let $wait_condition= + select count(*) = 1 from information_schema.processlist + where state = "Waiting for commit lock" and + info = "xa prepare 'test1'"; +--source include/wait_condition.inc +unlock tables; +--echo # Switching to connection 'default'. +connection default; +--echo # Reap XA PREPARE. +--reap +--echo # Switching to connection '$con_aux1'. +connection $con_aux1; +flush tables with read lock; +--echo # Switching to connection 'default'. +connection default; +--echo # Send XA ROLLBACK 'test1' +--send xa rollback 'test1' +--echo # Switching to connection '$con_aux1'. +connection $con_aux1; +--echo # Wait until XA ROLLBACK is blocked. +let $wait_condition= + select count(*) = 1 from information_schema.processlist + where state = "Waiting for commit lock" and + info = "xa rollback 'test1'"; +--source include/wait_condition.inc unlock tables; connection default; +--echo # Reap XA ROLLBACK +--reap xa start 'test1'; insert into t3_trans values (1); connection $con_aux1; @@ -1614,7 +1642,27 @@ flush tables with read lock; connection default; connection default; xa end 'test1'; -xa prepare 'test1'; +--echo # Send XA PREPARE 'test1' +--send xa prepare 'test1' +--echo # Switching to connection '$con_aux1'. +connection $con_aux1; +--echo # Wait until XA PREPARE is blocked. +let $wait_condition= + select count(*) = 1 from information_schema.processlist + where state = "Waiting for commit lock" and + info = "xa prepare 'test1'"; +--source include/wait_condition.inc +unlock tables; +--echo # Switching to connection 'default'. +connection default; +--echo # Reap XA PREPARE. +--reap +--echo # Switching to connection '$con_aux1'. +connection $con_aux1; +flush tables with read lock; +--echo # Switching to connection 'default'. +connection default; + --echo # Send: --send xa commit 'test1'; connection $con_aux1; @@ -1630,6 +1678,64 @@ connection default; --reap delete from t3_trans; --echo # +--echo # Check that XA COMMIT / ROLLBACK for prepared transaction from a +--echo # disconnected session is blocked by active FTWRL in another connection. +--echo # +--echo # Create temporary connection for XA transaction. +connect (con_tmp,localhost,root,,); +xa start 'test1'; +insert into t3_trans values (1); +xa end 'test1'; +xa prepare 'test1'; +--echo # Disconnect temporary connection +disconnect con_tmp; +--echo # Create temporary connection for XA transaction. +connect (con_tmp,localhost,root,,); +xa start 'test2'; +insert into t3_trans values (2); +xa end 'test2'; +xa prepare 'test2'; +--echo # Disconnect temporary connection +disconnect con_tmp; +--echo # Switching to connection '$con_aux1'. +connection $con_aux1; +flush tables with read lock; +--echo # Switching to connection 'default'. +connection default; +--echo # Send XA ROLLBACK 'test1' +--send xa rollback 'test1' +--echo # Switching to connection '$con_aux1'. +connection $con_aux1; +--echo # Wait until XA ROLLBACK is blocked. +let $wait_condition= + select count(*) = 1 from information_schema.processlist + where state = "Waiting for commit lock" and + info = "xa rollback 'test1'"; +--source include/wait_condition.inc +unlock tables; +flush tables with read lock; +--echo # Switching to connection 'default'. +connection default; +--echo # Reap XA ROLLBACK +--reap +--echo # Send XA COMMIT +--send xa commit 'test2'; +--echo # Switching to connection '$con_aux1'. +connection $con_aux1; +--echo # Wait until XA COMMIT is blocked. +let $wait_condition= + select count(*) = 1 from information_schema.processlist + where state = "Waiting for commit lock" and + info = "xa commit 'test2'"; +--source include/wait_condition.inc +unlock tables; +--echo # Switching to connection 'default'. +connection default; +--echo # Reap XA COMMIT. +--reap +delete from t3_trans; + +--echo # --echo # Check that XA COMMIT blocks FTWRL in another connection. xa start 'test1'; insert into t3_trans values (1); diff --git a/mysql-test/main/xa.result b/mysql-test/main/xa.result index a609b68..62e9c9b 100644 --- a/mysql-test/main/xa.result +++ b/mysql-test/main/xa.result @@ -355,3 +355,63 @@ DROP TABLE t1, t2, t3; xa rollback 'testb',0x2030405060,11; XA RECOVER; formatID gtrid_length bqual_length data +# Check XA state when lock_wait_timeout happens +# More tests added to flush_read_lock.test +connect con_tmp,localhost,root,,; +set session lock_wait_timeout=1; +create table asd (a int); +xa start 'test1'; +insert into asd values(1); +xa end 'test1'; +connection default; +flush table with read lock; +connection con_tmp; +# PREPARE error will do auto rollback. +xa prepare 'test1'; +ERROR HY000: Lock wait timeout exceeded; try restarting transaction +show errors; +Level Code Message +Error 1205 Lock wait timeout exceeded; try restarting transaction +Error 1402 XA_RBROLLBACK: Transaction branch was rolled back +connection default; +unlock tables; +connection con_tmp; +xa start 'test1'; +insert into asd values(1); +xa end 'test1'; +xa prepare 'test1'; +connection default; +flush tables with read lock; +connection con_tmp; +# LOCK error during ROLLBACK will not alter transaction state. +xa rollback 'test1'; +ERROR HY000: Lock wait timeout exceeded; try restarting transaction +show errors; +Level Code Message +Error 1205 Lock wait timeout exceeded; try restarting transaction +Error 1401 XAER_RMERR: Fatal error occurred in the transaction branch - check your data for consistency +xa recover; +formatID gtrid_length bqual_length data +1 5 0 test1 +# LOCK error during COMMIT will not alter transaction state. +xa commit 'test1'; +ERROR HY000: Lock wait timeout exceeded; try restarting transaction +show errors; +Level Code Message +Error 1205 Lock wait timeout exceeded; try restarting transaction +Error 1401 XAER_RMERR: Fatal error occurred in the transaction branch - check your data for consistency +xa recover; +formatID gtrid_length bqual_length data +1 5 0 test1 +connection default; +unlock tables; +connection con_tmp; +xa rollback 'test1'; +Warnings: +Warning 1196 Some non-transactional changed tables couldn't be rolled back +Warning 1196 Some non-transactional changed tables couldn't be rolled back +xa recover; +formatID gtrid_length bqual_length data +drop table asd; +disconnect con_tmp; +connection default; diff --git a/mysql-test/main/xa.test b/mysql-test/main/xa.test index 7a5cc38..6f56779 100644 --- a/mysql-test/main/xa.test +++ b/mysql-test/main/xa.test @@ -468,7 +468,6 @@ REPLACE INTO t2 SELECT * FROM t2; INSERT INTO t3 VALUES (1); XA BEGIN 'xid3'; - #Cleanup --disconnect con2 --connection default @@ -481,3 +480,48 @@ XA RECOVER; --source include/wait_until_count_sessions.inc +--echo # Check XA state when lock_wait_timeout happens +--echo # More tests added to flush_read_lock.test +connect (con_tmp,localhost,root,,); +set session lock_wait_timeout=1; +create table asd (a int); +xa start 'test1'; +insert into asd values(1); +xa end 'test1'; +connection default; +flush table with read lock; +connection con_tmp; +--echo # PREPARE error will do auto rollback. +--ERROR ER_LOCK_WAIT_TIMEOUT +xa prepare 'test1'; +show errors; +connection default; +unlock tables; + +connection con_tmp; +xa start 'test1'; +insert into asd values(1); +xa end 'test1'; +xa prepare 'test1'; +connection default; +flush tables with read lock; +connection con_tmp; +--echo # LOCK error during ROLLBACK will not alter transaction state. +--ERROR ER_LOCK_WAIT_TIMEOUT +xa rollback 'test1'; +show errors; +xa recover; +--echo # LOCK error during COMMIT will not alter transaction state. +--ERROR ER_LOCK_WAIT_TIMEOUT +xa commit 'test1'; +show errors; +xa recover; +connection default; +unlock tables; +connection con_tmp; +xa rollback 'test1'; +xa recover; +drop table asd; +disconnect con_tmp; +--source include/wait_until_disconnected.inc +connection default; diff --git a/sql/transaction.cc b/sql/transaction.cc index c7b4b80..bef8caa 100644 --- a/sql/transaction.cc +++ b/sql/transaction.cc @@ -1047,18 +1047,39 @@ bool trans_xa_prepare(THD *thd) xa_state_names[thd->transaction.xid_state.xa_state]); else if (!thd->transaction.xid_state.xid.eq(thd->lex->xid)) my_error(ER_XAER_NOTA, MYF(0)); - else if (ha_prepare(thd)) - { - xid_cache_delete(thd, &thd->transaction.xid_state); - thd->transaction.xid_state.xa_state= XA_NOTR; - my_error(ER_XA_RBROLLBACK, MYF(0)); - } else { - res= 0; - thd->transaction.xid_state.xa_state= XA_PREPARED; - if (thd->variables.pseudo_slave_mode) - res= applier_reset_xa_trans(thd); + /* + Acquire metadata lock which will ensure that COMMIT is blocked + by active FLUSH TABLES WITH READ LOCK (and vice versa COMMIT in + progress blocks FTWRL). + + We allow FLUSHer to COMMIT; we assume FLUSHer knows what it does. + */ + MDL_request mdl_request; + mdl_request.init(MDL_key::BACKUP, "", "", MDL_BACKUP_COMMIT, + MDL_STATEMENT); + if (thd->mdl_context.acquire_lock(&mdl_request, + thd->variables.lock_wait_timeout) || + ha_prepare(thd)) + { + if (!mdl_request.ticket) + ha_rollback_trans(thd, TRUE); + thd->variables.option_bits&= ~(OPTION_BEGIN | OPTION_KEEP_LOG); + thd->transaction.all.reset(); + thd->server_status&= + ~(SERVER_STATUS_IN_TRANS | SERVER_STATUS_IN_TRANS_READONLY); + xid_cache_delete(thd, &thd->transaction.xid_state); + thd->transaction.xid_state.xa_state= XA_NOTR; + my_error(ER_XA_RBROLLBACK, MYF(0)); + } + else + { + res= 0; + thd->transaction.xid_state.xa_state= XA_PREPARED; + if (thd->variables.pseudo_slave_mode) + res= applier_reset_xa_trans(thd); + } } DBUG_RETURN(res); @@ -1101,6 +1122,27 @@ bool trans_xa_commit(THD *thd) else { res= xa_trans_rolled_back(xs); + /* + Acquire metadata lock which will ensure that COMMIT is blocked + by active FLUSH TABLES WITH READ LOCK (and vice versa COMMIT in + progress blocks FTWRL). + + We allow FLUSHer to COMMIT; we assume FLUSHer knows what it does. + */ + MDL_request mdl_request; + mdl_request.init(MDL_key::BACKUP, "", "", MDL_BACKUP_COMMIT, + MDL_STATEMENT); + if (thd->mdl_context.acquire_lock(&mdl_request, + thd->variables.lock_wait_timeout)) + { + /* + We can't rollback an XA transaction on lock failure due to + Innodb redo log and bin log update is involved in rollback. + Return error to user for a retry. + */ + my_error(ER_XAER_RMERR, MYF(0)); + DBUG_RETURN(true); + } ha_commit_or_rollback_by_xid(thd->lex->xid, !res); if((WSREP_EMULATE_BINLOG(thd) || mysql_bin_log.is_open()) && xs->is_binlogged) @@ -1139,13 +1181,18 @@ bool trans_xa_commit(THD *thd) We allow FLUSHer to COMMIT; we assume FLUSHer knows what it does. */ mdl_request.init(MDL_key::BACKUP, "", "", MDL_BACKUP_COMMIT, - MDL_TRANSACTION); + MDL_STATEMENT); if (thd->mdl_context.acquire_lock(&mdl_request, thd->variables.lock_wait_timeout)) { - ha_rollback_trans(thd, TRUE); + /* + We can't rollback an XA transaction on lock failure due to + Innodb redo log and bin log update is involved in rollback. + Return error to user for a retry. + */ my_error(ER_XAER_RMERR, MYF(0)); + DBUG_RETURN(true); } else { @@ -1213,6 +1260,21 @@ bool trans_xa_rollback(THD *thd) my_error(ER_XAER_NOTA, MYF(0)); else { + MDL_request mdl_request; + mdl_request.init(MDL_key::BACKUP, "", "", MDL_BACKUP_COMMIT, + MDL_STATEMENT); + if (thd->mdl_context.acquire_lock(&mdl_request, + thd->variables.lock_wait_timeout)) + { + /* + We can't rollback an XA transaction on lock failure due to + Innodb redo log and bin log update is involved in rollback. + Return error to user for a retry. + */ + my_error(ER_XAER_RMERR, MYF(0)); + DBUG_RETURN(true); + } + xa_trans_rolled_back(xs); if (ha_commit_or_rollback_by_xid(thd->lex->xid, 0) == 0 && xs->is_binlogged && @@ -1232,6 +1294,21 @@ bool trans_xa_rollback(THD *thd) DBUG_RETURN(TRUE); } + MDL_request mdl_request; + mdl_request.init(MDL_key::BACKUP, "", "", MDL_BACKUP_COMMIT, + MDL_STATEMENT); + if (thd->mdl_context.acquire_lock(&mdl_request, + thd->variables.lock_wait_timeout)) + { + /* + We can't rollback an XA transaction on lock failure due to + Innodb redo log and bin log update is involved in rollback. + Return error to user for a retry. + */ + my_error(ER_XAER_RMERR, MYF(0)); + DBUG_RETURN(true); + } + if(xa_state == XA_PREPARED && thd->transaction.xid_state.is_binlogged && (WSREP_EMULATE_BINLOG(thd) || mysql_bin_log.is_open())) {

1 0