- commits - lists.mariadb.org

[Commits] 0ebc41a1c: Added Comments
by Sergei Petrunia 08 Apr '19

08 Apr '19

revision-id: 0ebc41a1c459263a30e2d2bc68348ed5bcdd59bd (v5.8-1032-g0ebc41a1c) parent(s): a196a4dd46d018a4815467e979fda46126ca5fa9 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-04-08 15:22:11 +0300 message: Added Comments --- utilities/transactions/transaction_util.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/utilities/transactions/transaction_util.h b/utilities/transactions/transaction_util.h index 7377874e6..99312cec9 100644 --- a/utilities/transactions/transaction_util.h +++ b/utilities/transactions/transaction_util.h @@ -23,7 +23,12 @@ struct TransactionKeyMapInfo { // Earliest sequence number that is relevant to this transaction for this key SequenceNumber seq; + // Number of writes done to this key uint32_t num_writes; + + // Number of locking reads done to the key. If both numbers of reads and + // writes go down to zero (happens for RollbackToSavePoint and + // UndoGetForUpdate) the key will be removed from tracking. uint32_t num_reads; bool exclusive;

1 0

[Commits] a196a4dd4: PessimisticTransaction::CommitBatch should lock the keys
by Sergei Petrunia 08 Apr '19

08 Apr '19

revision-id: a196a4dd46d018a4815467e979fda46126ca5fa9 (v5.8-1031-ga196a4dd4) parent(s): 09018ffe081f913be6c1580335d5476ba6c1b0a9 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-04-08 15:21:54 +0300 message: PessimisticTransaction::CommitBatch should lock the keys Regardless of whether the lock manager needs key tracking or not. --- utilities/transactions/pessimistic_transaction.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utilities/transactions/pessimistic_transaction.cc b/utilities/transactions/pessimistic_transaction.cc index 7ca6ab981..ca6bc27b6 100644 --- a/utilities/transactions/pessimistic_transaction.cc +++ b/utilities/transactions/pessimistic_transaction.cc @@ -133,7 +133,7 @@ WriteCommittedTxn::WriteCommittedTxn(TransactionDB* txn_db, Status PessimisticTransaction::CommitBatch(WriteBatch* batch) { TransactionKeyMap keys_to_unlock; - Status s = do_key_tracking_? LockBatch(batch, &keys_to_unlock): Status::OK(); + Status s = LockBatch(batch, &keys_to_unlock); if (!s.ok()) { return s;

1 0

[Commits] 99b1ec2: MDEV-7974 SA transactions.
by holyfoot＠askmonty.org 08 Apr '19

08 Apr '19

revision-id: 99b1ec28431e9783a3f38b13982b3bfeecb54e2b (mariadb-10.4.3-86-g99b1ec2) parent(s): 857464679035193302e7745f9f440f77c709de16 committer: Alexey Botchkov timestamp: 2019-04-08 15:33:28 +0400 message: MDEV-7974 SA transactions. Failing tests added. --- mysql-test/suite/rpl/disabled.def | 2 + .../suite/rpl/t/rpl_xa_survive_crash_debug.test | 70 +++++ .../suite/rpl/t/rpl_xa_survive_disconnect.test | 310 +++++++++++++++++++++ 3 files changed, 382 insertions(+) diff --git a/mysql-test/suite/rpl/disabled.def b/mysql-test/suite/rpl/disabled.def index 9f43bc3..5ff3f88 100644 --- a/mysql-test/suite/rpl/disabled.def +++ b/mysql-test/suite/rpl/disabled.def @@ -20,3 +20,5 @@ rpl_row_index_choice : MDEV-11666 rpl_parallel2 : fails after MDEV-16172 rpl_semi_sync_after_sync : fails after MDEV-16172 rpl_auto_increment_update_failure : disabled for now +rpl_xa_survive_crash_debug : MDEV-7974. Now it fails. +rpl_xa_survive_disconnect : MDEV-7974. Now it fails. diff --git a/mysql-test/suite/rpl/t/rpl_xa_survive_crash_debug.test b/mysql-test/suite/rpl/t/rpl_xa_survive_crash_debug.test new file mode 100644 index 0000000..f78fe47 --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_xa_survive_crash_debug.test @@ -0,0 +1,70 @@ +#HF This test supposed to test the case when we crashed after the +#HF XA ROLBACK but before binlogging. So the ROLLBACK gets lost in the binlog. +#HF I guess we just don't handle that case yet. + + +# The test verifies that crashed in the middle of XA COMMIT server +# does not lose the prepared transaction, neither it gets committed. +# This is to test that fixes to BUG #12161 Xa recovery and client disconnection +# do not break existing policy. +# The prepared XA can be identified and concluded with XA COMMIT or ROLLBACK, +# "manually" by the user. + +--source include/have_debug.inc +# There's some format specifics through show_binlog_events, +# but MIXED is chosen rather to optimize. +--source include/have_binlog_format_mixed.inc +--source include/master-slave.inc + +--source include/rpl_connection_slave.inc +--source include/stop_slave.inc + +--source include/rpl_connection_master.inc + +call mtr.add_suppression("Found 1 prepared XA transactions"); + +CREATE TABLE t1 (a INT); + +--connect (master_conn, 127.0.0.1,root,,test,$MASTER_MYPORT,) +--disable_reconnect +# Transaction is committed (XA-rollback) only +# to binlog, not to engine. +SET DEBUG="+d,crash_after_xa_rollback"; +XA START 'xid_partly_rolled_back'; +INSERT INTO t1 VALUES(1); +XA END 'xid_partly_rolled_back'; +XA PREPARE 'xid_partly_rolled_back'; + +# Server crashes after doing the rollback, but before writing to +# binlog -> ROLLBACK is lost in the binlog. +--error 2013 # CR_SERVER_LOST +--send XA ROLLBACK 'xid_partly_rolled_back' + +--source include/rpl_connection_master.inc +# +# Server restart +# +--enable_reconnect +--let $rpl_server_number= 1 +--source include/rpl_start_server.inc +--disable_reconnect + +--source include/rpl_connection_master.inc +XA RECOVER; +SELECT * FROM t1; +--source include/show_binlog_events.inc +SET @save.sql_log_bin = @@session.sql_log_bin; +SET @@session.sql_log_bin = 0; +XA ROLLBACK 'xid_partly_rolled_back'; +SET @@session.sql_log_bin = @save.sql_log_bin; + +# Verify that slave has 'xid_partly_rolled_back' rolled back. + +--source include/rpl_connection_slave.inc +--source include/start_slave.inc + +--source include/rpl_connection_master.inc +DROP TABLE t1; +--source include/sync_slave_sql_with_master.inc + +--source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_xa_survive_disconnect.test b/mysql-test/suite/rpl/t/rpl_xa_survive_disconnect.test new file mode 100644 index 0000000..223f143 --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_xa_survive_disconnect.test @@ -0,0 +1,310 @@ +#HF This test hangs on sync_slave_sql_with_master +#HF see comments below. + + +# BUG #12161 Xa recovery and client disconnection +# the test verifies that +# a. disconnection does not lose a prepared transaction +# so it can be committed from another connection +# c. the prepared transaction is logged +# d. interleaved prepared transactions are correctly applied on the slave. + +# +# Both replication format are checked through explict +# set @@binlog_format in the test. +# +--source include/have_innodb.inc +--source include/have_binlog_format_mixed.inc +# +# Prepared XA can't get available to an external connection +# until a connection, that either leaves actively or is killed, +# has completed a necessary part of its cleanup. +# Selecting from P_S.threads provides a method to learn that. +# +--source include/have_perfschema.inc +--source include/master-slave.inc + +--connection master +call mtr.add_suppression("Found 2 prepared XA transactions"); +CREATE VIEW v_processlist as SELECT * FROM performance_schema.threads where type = 'FOREGROUND'; + +CREATE DATABASE d1; +CREATE DATABASE d2; + +CREATE TABLE d1.t (a INT) ENGINE=innodb; +CREATE TABLE d2.t (a INT) ENGINE=innodb; + +connect (master_conn1, 127.0.0.1,root,,test,$MASTER_MYPORT,); +--let $conn_id=`SELECT connection_id()` +SET @@session.binlog_format= statement; +XA START '1-stmt'; +INSERT INTO d1.t VALUES (1); +XA END '1-stmt'; +XA PREPARE '1-stmt'; + +--disconnect master_conn1 + +--connection master +--let $wait_condition= SELECT count(*) = 0 FROM v_processlist WHERE PROCESSLIST_ID = $conn_id +--source include/wait_condition.inc + +connect (master_conn2, 127.0.0.1,root,,test,$MASTER_MYPORT,); +--let $conn_id=`SELECT connection_id()` +SET @@session.binlog_format= row; +XA START '1-row'; +INSERT INTO d2.t VALUES (1); +XA END '1-row'; +XA PREPARE '1-row'; + +--disconnect master_conn2 + +--connection master +--let $wait_condition= SELECT count(*) = 0 FROM v_processlist WHERE PROCESSLIST_ID = $conn_id +--source include/wait_condition.inc + +XA START '2'; +INSERT INTO d1.t VALUES (2); +XA END '2'; +XA PREPARE '2'; +XA COMMIT '2'; + +XA COMMIT '1-row'; +XA COMMIT '1-stmt'; +source include/show_binlog_events.inc; + +# the proof: slave is in sync with the table updated by the prepared transactions. +--source include/sync_slave_sql_with_master.inc +--source include/stop_slave.inc + +# +# Recover with Master server restart +# +--connection master + +connect (master2, 127.0.0.1,root,,test,$MASTER_MYPORT,); +--connection master2 +SET @@session.binlog_format= statement; +XA START '3-stmt'; +INSERT INTO d1.t VALUES (3); +XA END '3-stmt'; +XA PREPARE '3-stmt'; +--disconnect master2 + +connect (master2, 127.0.0.1,root,,test,$MASTER_MYPORT,); +--connection master2 +SET @@session.binlog_format= row; +XA START '3-row'; +INSERT INTO d2.t VALUES (4); +XA END '3-row'; +XA PREPARE '3-row'; +--disconnect master2 + +--connection master + +# +# Testing read-only +# +connect (master2, 127.0.0.1,root,,test,$MASTER_MYPORT,); +--connection master2 +XA START '4'; +SELECT * FROM d1.t; +XA END '4'; +XA PREPARE '4'; +--disconnect master2 + +# +# Logging few disconnected XA:s for replication. +# + +#HF This counter (bulk_trx_num) is oribinally set to 10 +#HF --let $bulk_trx_num=10 +#HF But i set it to 0 to reduce the number of queries as +#HF the test hangs anyway. + +--let $bulk_trx_num=0 +--let $i = $bulk_trx_num + +while($i > 0) +{ + --connect (master_bulk_conn$i, 127.0.0.1,root,,test,$MASTER_MYPORT,) + --let $conn_id=`SELECT connection_id()` + + --eval XA START 'bulk_trx_$i' + --eval INSERT INTO d1.t VALUES ($i) + --eval INSERT INTO d2.t VALUES ($i) + --eval XA END 'bulk_trx_$i' + --eval XA PREPARE 'bulk_trx_$i' + + --disconnect master_bulk_conn$i + + --connection master + --let $wait_condition= SELECT count(*) = 0 FROM v_processlist WHERE PROCESSLIST_ID = $conn_id + --source include/wait_condition.inc + + --dec $i +} + +--connection master +--let $i = $bulk_trx_num +while($i > 0) +{ + --let $command=COMMIT + if (`SELECT $i % 2`) + { + --let $command=ROLLBACK + } + --eval XA $command 'bulk_trx_$i' + --dec $i +} + +--let $rpl_server_number= 1 +--source include/rpl_restart_server.inc + +--connection slave +#HF Hhere it actually hangs. +#HF The query SELECT master_pos_wait(.., 548) on slave never ends. +#HF I couldnt reproduce the bug manually, only happens during the test. +--source include/start_slave.inc + +--connection master +--echo *** '3-stmt','3-row' xa-transactions must be in the list *** +XA RECOVER; +XA COMMIT '3-stmt'; +XA ROLLBACK '3-row'; + +--source include/sync_slave_sql_with_master.inc + +# +# Testing replication with marginal XID values and in two formats. +# + + +# Empty XID +connect (master_conn1, 127.0.0.1,root,,test,$MASTER_MYPORT,); +--let $conn_id=`SELECT connection_id()` + +XA START ''; +INSERT INTO d1.t VALUES (4); +XA END ''; +XA PREPARE ''; + +--disconnect master_conn1 + +--connection master +--let $wait_condition= SELECT count(*) = 0 FROM v_processlist WHERE PROCESSLIST_ID = $conn_id +--source include/wait_condition.inc + +# Max size XID +connect (master_conn2, 127.0.0.1,root,,test,$MASTER_MYPORT,); +--let $conn_id=`SELECT connection_id()` + +--let $gtrid=0123456789012345678901234567890123456789012345678901234567890124 +--let $bqual=0123456789012345678901234567890123456789012345678901234567890124 +--eval XA START '$gtrid','$bqual',64 + INSERT INTO d1.t VALUES (64); +--eval XA END '$gtrid','$bqual',64 +--eval XA PREPARE '$gtrid','$bqual',64 + +--disconnect master_conn2 + +--connection master +--let $wait_condition= SELECT count(*) = 0 FROM v_processlist WHERE PROCESSLIST_ID = $conn_id +--source include/wait_condition.inc + +# Max size XID with non-ascii chars +connect (master_conn3, 127.0.0.1,root,,test,$MASTER_MYPORT,); +--let $conn_id=`SELECT connection_id()` + +--let $gtrid_hex=FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF +--let $bqual_hex=00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +--eval XA START X'$gtrid_hex',X'$bqual_hex',0 + INSERT INTO d1.t VALUES (0); +--eval XA END X'$gtrid_hex',X'$bqual_hex',0 +--eval XA PREPARE X'$gtrid_hex',X'$bqual_hex',0 + +--disconnect master_conn3 + +--connection master +--let $wait_condition= SELECT count(*) = 0 FROM v_processlist WHERE PROCESSLIST_ID = $conn_id +--source include/wait_condition.inc + +# Random XID +--disable_query_log + +connect (master_conn4, 127.0.0.1,root,,test,$MASTER_MYPORT,); +--let $conn_id=`SELECT connection_id()` + +--let $gtridlen=`SELECT 2*(round(rand()*100) % 32)` +--let $bquallen=`SELECT 2*(round(rand()*100) % 32)` +--let $gtrid_rand=`SELECT substring(concat(MD5(rand()), MD5(rand())), 1, $gtridlen)` +--let $bqual_rand=`SELECT substring(concat(MD5(rand()), MD5(rand())), 1, $bquallen)` +# formatID max is LONG_MAX +--let $formt_rand=`SELECT floor((rand()*10000000000) % 2147483648)` +--eval XA START X'$gtrid_rand',X'$bqual_rand',$formt_rand + INSERT INTO d1.t VALUES (0); +--eval XA END X'$gtrid_rand',X'$bqual_rand',$formt_rand +--eval XA PREPARE X'$gtrid_rand',X'$bqual_rand',$formt_rand + +--enable_query_log + +--disconnect master_conn4 + +--connection master +--let $wait_condition= SELECT count(*) = 0 FROM v_processlist WHERE PROCESSLIST_ID = $conn_id +--source include/wait_condition.inc + + + XA COMMIT ''; +--eval XA COMMIT '$gtrid','$bqual',64 +--eval XA COMMIT X'$gtrid_hex',X'$bqual_hex',0 +--disable_query_log +--echo XA COMMIT 'RANDOM XID' +--eval XA COMMIT X'$gtrid_rand',X'$bqual_rand',$formt_rand +--enable_query_log + +--source include/sync_slave_sql_with_master.inc + +# +# Testing ONE PHASE +# +--let $onephase_trx_num=10 +--let $i = $onephase_trx_num +while($i > 0) +{ + --connect (master_bulk_conn$i, 127.0.0.1,root,,test,$MASTER_MYPORT,) + + --connection master_bulk_conn$i + --eval XA START 'one_phase_$i' + --eval INSERT INTO d1.t VALUES ($i) + --eval INSERT INTO d2.t VALUES ($i) + --eval XA END 'one_phase_$i' + --eval XA COMMIT 'one_phase_$i' ONE PHASE + + --disconnect master_bulk_conn$i + --dec $i +} +--connection master +--source include/sync_slave_sql_with_master.inc + +# +# Overall consistency check +# +--let $diff_tables= master:d1.t, slave:d1.t +--source include/diff_tables.inc +--let $diff_tables= master:d2.t, slave:d2.t +--source include/diff_tables.inc +# +# cleanup +# +--connection master + +DELETE FROM d1.t; +DELETE FROM d2.t; +DROP TABLE d1.t, d2.t; +DROP DATABASE d1; +DROP DATABASE d2; +DROP VIEW v_processlist; + +--source include/sync_slave_sql_with_master.inc + +--source include/rpl_end.inc

1 0

[Commits] 09b2d37: MDEV-18941: Temporarily record wrong result after MDEV-18922
by holyfoot＠askmonty.org 08 Apr '19

08 Apr '19

revision-id: 09b2d37a3227a559aa157fc4a5da5fd6b2011e40 (mariadb-10.4.3-78-g09b2d37) parent(s): 3dd477db70e37325e3aa36645c0f22f16ffdf7f9 committer: Marko Mäkelä timestamp: 2019-03-15 18:18:45 +0200 message: MDEV-18941: Temporarily record wrong result after MDEV-18922 --- mysql-test/suite/heap/heap_hash.result | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/suite/heap/heap_hash.result b/mysql-test/suite/heap/heap_hash.result index 603baf6..1fbfa99 100644 --- a/mysql-test/suite/heap/heap_hash.result +++ b/mysql-test/suite/heap/heap_hash.result @@ -66,7 +66,7 @@ a alter table t1 engine=myisam; explain select * from t1 where a in (869751,736494,226312,802616); id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 index uniq_id uniq_id 8 NULL 5 Using where; Using index +1 SIMPLE t1 ALL uniq_id NULL NULL NULL 5 Using where drop table t1; create table t1 (x int not null, y int not null, key x using HASH (x), unique y using HASH (y)) engine=heap;

1 0

[Commits] 09018ffe0: Code cleanup
by Sergei Petrunia 07 Apr '19

07 Apr '19

revision-id: 09018ffe081f913be6c1580335d5476ba6c1b0a9 (v5.8-1030-g09018ffe0) parent(s): cc3ead4e33a8637e51c72ecb91256d52285979f5 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-04-07 22:57:39 +0300 message: Code cleanup --- utilities/transactions/transaction_lock_mgr.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/utilities/transactions/transaction_lock_mgr.h b/utilities/transactions/transaction_lock_mgr.h index c45ebae3f..5e9ee851c 100644 --- a/utilities/transactions/transaction_lock_mgr.h +++ b/utilities/transactions/transaction_lock_mgr.h @@ -55,9 +55,9 @@ struct TrackedTrxInfo { class Slice; class PessimisticTransactionDB; -/* - psergey: this should be -*/ +// +// Base class for Point and Range-based lock manager. +// class BaseLockMgr { public: virtual void AddColumnFamily(uint32_t column_family_id) = 0; @@ -71,7 +71,7 @@ class BaseLockMgr { Env* env) = 0; virtual void UnLock(PessimisticTransaction* txn, uint32_t column_family_id, - const std::string& key, Env* env)=0; + const std::string& key, Env* env) = 0; // Resize the deadlock info buffer virtual void Resize(uint32_t)=0; @@ -83,6 +83,7 @@ class BaseLockMgr { }; +// Point lock manager class TransactionLockMgr : public BaseLockMgr { public: TransactionLockMgr(TransactionDB* txn_db, size_t default_num_stripes,

1 0

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

07 Apr '19

revision-id: a8a4635b2544b73a8e76f24202889b20ff8c9dca (fb-prod201801-221-ga8a4635b254) parent(s): 25507440cec73c987976511047032b3ef38b67a5 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-04-07 21:59:20 +0300 message: Remove Endpoints as a separate data format MyRocks part of the change --- rocksdb | 2 +- storage/rocksdb/ha_rocksdb.cc | 105 ++++++------------------------------------ 2 files changed, 14 insertions(+), 93 deletions(-) diff --git a/rocksdb b/rocksdb index 46d49ea0b7e..cc3ead4e33a 160000 --- a/rocksdb +++ b/rocksdb @@ -1 +1 @@ -Subproject commit 46d49ea0b7e0267b5c360d45d90a64776477b8ed +Subproject commit cc3ead4e33a8637e51c72ecb91256d52285979f5 diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc index 6fe877f1f54..5974cc2d0a0 100644 --- a/storage/rocksdb/ha_rocksdb.cc +++ b/storage/rocksdb/ha_rocksdb.cc @@ -2302,12 +2302,13 @@ protected: virtual rocksdb::Status lock_range(rocksdb::ColumnFamilyHandle *const cf, - const rocksdb::Slice &start, bool start_inf_suffix, - const rocksdb::Slice &end, bool end_inf_suffix)=0; + const rocksdb::Endpoint &start, + const rocksdb::Endpoint &end) = 0; rocksdb::Status lock_singlepoint_range(rocksdb::ColumnFamilyHandle *const cf, const rocksdb::Slice &point) { - return lock_range(cf, point, false, point, false); + rocksdb::Endpoint endp(point, false); + return lock_range(cf, endp, endp); } virtual bool prepare(const rocksdb::TransactionName &name) = 0; @@ -2767,26 +2768,9 @@ public: */ virtual rocksdb::Status lock_range(rocksdb::ColumnFamilyHandle *const cf, - const rocksdb::Slice &start, - bool start_inf_suffix, - const rocksdb::Slice &end, - bool end_inf_suffix) override { - const char SUFFIX_INF= 0x0; - const char SUFFIX_SUP= 0x1; - // GetRangeLock accepts range endpoints, not keys. - // Convert keys to range endpoints here. - // See also range_endpoint_convert() below. - StringBuffer<64> left; - left.append(start_inf_suffix? SUFFIX_SUP :SUFFIX_INF); - left.append(start.data(), start.size()); - - StringBuffer<64> right; - right.append(end_inf_suffix? SUFFIX_SUP :SUFFIX_INF); - right.append(end.data(), end.size()); - - return - m_rocksdb_tx->GetRangeLock(cf, rocksdb::Slice(left.ptr(),left.length()), - rocksdb::Slice(right.ptr(),right.length())); + const rocksdb::Endpoint &start_endp, + const rocksdb::Endpoint &end_endp) override { + return m_rocksdb_tx->GetRangeLock(cf, start_endp, end_endp); } private: void release_tx(void) { @@ -3203,10 +3187,8 @@ public: } rocksdb::Status lock_range(rocksdb::ColumnFamilyHandle *const cf, - const rocksdb::Slice &start, - bool start_inf_suffix, - const rocksdb::Slice &end, - bool end_inf_suffix) override { + const rocksdb::Endpoint &left_endp, + const rocksdb::Endpoint &right_endp) override { return rocksdb::Status::OK(); } @@ -4409,62 +4391,6 @@ static int rocksdb_start_tx_and_assign_read_view( } -void range_endpoint_convert(const rocksdb::Slice &key, - std::string *res) -{ - const char SUFFIX_INF= 0x0; - res->clear(); - res->append(&SUFFIX_INF, 1); - res->append(key.data(), key.size()); -} - -int range_endpoints_compare(const char *a, size_t a_len, - const char *b, size_t b_len) -{ - size_t min_len= std::min(a_len, b_len); - - //compare the values. Skip the first byte as it is the endpoint signifier - 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; -} - - static int rocksdb_start_tx_with_shared_read_view( handlerton *const hton, /*!< in: RocksDB handlerton */ THD *const thd, /*!< in: MySQL thread handle of the @@ -5047,6 +4973,7 @@ static int rocksdb_init_func(void *const p) { tx_db_options.custom_mutex_factory = std::make_shared<Rdb_mutex_factory>(); tx_db_options.write_policy = static_cast<rocksdb::TxnDBWritePolicy>(rocksdb_write_policy); + tx_db_options.use_range_locking = rocksdb_use_range_locking; status = check_rocksdb_options_compatibility(rocksdb_datadir, main_opts, cf_descr); @@ -5060,13 +4987,6 @@ static int rocksdb_init_func(void *const p) { DBUG_RETURN(HA_EXIT_FAILURE); } - tx_db_options.use_range_locking = rocksdb_use_range_locking; - if (rocksdb_use_range_locking) - { - tx_db_options.range_locking_opts.cvt_func= range_endpoint_convert; - tx_db_options.range_locking_opts.cmp_func= range_endpoints_compare; - } - status = rocksdb::TransactionDB::Open( main_opts, tx_db_options, rocksdb_datadir, cf_descr, &cf_handles, &rdb); @@ -8321,8 +8241,9 @@ int ha_rocksdb::set_range_lock(Rdb_transaction *tx, end_has_inf_suffix= true; } - auto s= tx->lock_range(kd.get_cf(), slice, start_has_inf_suffix, - end_slice, end_has_inf_suffix); + auto s= tx->lock_range(kd.get_cf(), + rocksdb::Endpoint(slice, start_has_inf_suffix), + rocksdb::Endpoint(end_slice, end_has_inf_suffix)); if (!s.ok()) { return (tx->set_status_error(table->in_use, s, kd, m_tbl_def, m_table_handler));

1 0

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

07 Apr '19

revision-id: cc3ead4e33a8637e51c72ecb91256d52285979f5 (v5.8-1029-gcc3ead4e3) parent(s): 8eb09c8598238945560b9750425b2a64238bec1d author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-04-07 21:54:52 +0300 message: Remove Endpoints as a separate data format Part #2: make the patch usable from MyRocks --- include/rocksdb/utilities/transaction.h | 3 +++ utilities/transactions/transaction_lock_mgr.cc | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/rocksdb/utilities/transaction.h b/include/rocksdb/utilities/transaction.h index 18ae4726c..9dbba3df7 100644 --- a/include/rocksdb/utilities/transaction.h +++ b/include/rocksdb/utilities/transaction.h @@ -64,6 +64,9 @@ class Endpoint { Slice slice; bool inf_suffix; + Endpoint(const Slice &slice_arg, bool inf_suffix_arg=false) : + slice(slice_arg), inf_suffix(inf_suffix_arg) {} + Endpoint(const char* s, bool inf_suffix_arg=false) : slice(s), inf_suffix(inf_suffix_arg) {} diff --git a/utilities/transactions/transaction_lock_mgr.cc b/utilities/transactions/transaction_lock_mgr.cc index d6c221cc7..8b5907bc5 100644 --- a/utilities/transactions/transaction_lock_mgr.cc +++ b/utilities/transactions/transaction_lock_mgr.cc @@ -1010,12 +1010,10 @@ 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; + //RangeLockMgr* mgr= (RangeLockMgr*) arg; // TODO: this should compare endpoints using the user-provided comparator + // endpoint encoding. // (just use one from any column family)

1 0

[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