- commits - lists.mariadb.org

[Commits] 0998803: MDEV-19195 Active Record unit test fails with MariaDB 10.4.3
by IgorBabaev 08 Apr '19

08 Apr '19

revision-id: 0998803020fc9d48fd2aa8b5177f9431fbee99dd (mariadb-10.4.4-4-g0998803) parent(s): 1e7ad5bb1c69dba8c7d721a2cfbbe98c7e900015 author: Igor Babaev committer: Igor Babaev timestamp: 2019-04-08 11:21:53 -0700 message: MDEV-19195 Active Record unit test fails with MariaDB 10.4.3 Currently usage of range rowid filters can be combined only with ref access and single index range access. So if the optimizer has chosen some other quick select method to access a joined table then no range rowid filter can be used for this table. --- mysql-test/main/rowid_filter_innodb.result | 84 ++++++++++++++++++------------ mysql-test/main/rowid_filter_innodb.test | 21 ++++++++ sql/sql_select.cc | 4 ++ 3 files changed, 77 insertions(+), 32 deletions(-) diff --git a/mysql-test/main/rowid_filter_innodb.result b/mysql-test/main/rowid_filter_innodb.result index d19aca1..c877e5a 100644 --- a/mysql-test/main/rowid_filter_innodb.result +++ b/mysql-test/main/rowid_filter_innodb.result @@ -1977,8 +1977,8 @@ union ( select * from t1 where (f1 is null and f2 is null) and (f2 between 'a' and 'z' or f1 in ('a'))); id select_type table type possible_keys key key_len ref rows Extra -1 PRIMARY t1 ref|filter f1,f2 f2|f1 33|13 const 1 (2%) Using index condition; Using where; Using rowid filter -2 UNION t1 ref|filter f1,f2 f2|f1 33|13 const 1 (2%) Using index condition; Using where; Using rowid filter +1 PRIMARY t1 index_merge f1,f2 f1,f2 13,33 NULL 1 Using intersect(f1,f2); Using where +2 UNION t1 index_merge f1,f2 f1,f2 13,33 NULL 1 Using intersect(f1,f2); Using where NULL UNION RESULT <union1,2> ALL NULL NULL NULL NULL NULL explain format=json ( select * from t1 where (f1 is null and f2 is null) and (f2 between 'a' and 'z' or f1 in ('a'))) @@ -1997,24 +1997,24 @@ EXPLAIN "select_id": 1, "table": { "table_name": "t1", - "access_type": "ref", + "access_type": "index_merge", "possible_keys": ["f1", "f2"], - "key": "f2", - "key_length": "33", - "used_key_parts": ["f2"], - "ref": ["const"], - "rowid_filter": { - "range": { - "key": "f1", - "used_key_parts": ["f1"] - }, - "rows": 1, - "selectivity_pct": 1.5873 + "key_length": "13,33", + "index_merge": { + "intersect": { + "range": { + "key": "f1", + "used_key_parts": ["f1"] + }, + "range": { + "key": "f2", + "used_key_parts": ["f2"] + } + } }, "rows": 1, - "filtered": 100, - "index_condition": "t1.f2 is null", - "attached_condition": "t1.f1 is null and (t1.f2 between 'a' and 'z' or t1.f1 = 'a')" + "filtered": 1.5873, + "attached_condition": "t1.f1 is null and t1.f2 is null and (t1.f2 between 'a' and 'z' or t1.f1 = 'a')" } } }, @@ -2024,24 +2024,24 @@ EXPLAIN "operation": "UNION", "table": { "table_name": "t1", - "access_type": "ref", + "access_type": "index_merge", "possible_keys": ["f1", "f2"], - "key": "f2", - "key_length": "33", - "used_key_parts": ["f2"], - "ref": ["const"], - "rowid_filter": { - "range": { - "key": "f1", - "used_key_parts": ["f1"] - }, - "rows": 1, - "selectivity_pct": 1.5873 + "key_length": "13,33", + "index_merge": { + "intersect": { + "range": { + "key": "f1", + "used_key_parts": ["f1"] + }, + "range": { + "key": "f2", + "used_key_parts": ["f2"] + } + } }, "rows": 1, - "filtered": 100, - "index_condition": "t1.f2 is null", - "attached_condition": "t1.f1 is null and (t1.f2 between 'a' and 'z' or t1.f1 = 'a')" + "filtered": 1.5873, + "attached_condition": "t1.f1 is null and t1.f2 is null and (t1.f2 between 'a' and 'z' or t1.f1 = 'a')" } } } @@ -2050,4 +2050,24 @@ EXPLAIN } } drop table t1; +# +# MDEV-19195: possible RORI-plan and possible plan with range filter +# for not first joined table +# +create table t1 (id int not null primary key) engine=innodb; +insert into t1 values (2),(1); +create table t2 (y int,x int,index (x),index (y)) engine=innodb; +insert into t2 values +(4,1),(4,777),(2,1),(2,888),(111,1),(222,1),(333,345),(444,1), +(555,555),(666,1); +select * from t1 join t2 on t1.id = t2.x where t2.y = 2 and t1.id = 1; +id y x +1 2 1 +explain extended select * from t1 join t2 on t1.id = t2.x where t2.y = 2 and t1.id = 1; +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 const PRIMARY PRIMARY 4 const 1 100.00 Using index +1 SIMPLE t2 index_merge x,y y,x 5,5 NULL 1 100.00 Using intersect(y,x); Using where; Using index +Warnings: +Note 1003 select 1 AS `id`,`test`.`t2`.`y` AS `y`,`test`.`t2`.`x` AS `x` from `test`.`t1` join `test`.`t2` where `test`.`t2`.`y` = 2 and `test`.`t2`.`x` = 1 +drop table t1, t2; SET SESSION STORAGE_ENGINE=DEFAULT; diff --git a/mysql-test/main/rowid_filter_innodb.test b/mysql-test/main/rowid_filter_innodb.test index 803f284..173ba15 100644 --- a/mysql-test/main/rowid_filter_innodb.test +++ b/mysql-test/main/rowid_filter_innodb.test @@ -43,5 +43,26 @@ eval explain format=json $q; drop table t1; +--echo # +--echo # MDEV-19195: possible RORI-plan and possible plan with range filter +--echo # for not first joined table +--echo # + +create table t1 (id int not null primary key) engine=innodb; +insert into t1 values (2),(1); + +create table t2 (y int,x int,index (x),index (y)) engine=innodb; +insert into t2 values + (4,1),(4,777),(2,1),(2,888),(111,1),(222,1),(333,345),(444,1), + (555,555),(666,1); + +let $q= +select * from t1 join t2 on t1.id = t2.x where t2.y = 2 and t1.id = 1; + +eval $q; +eval explain extended $q; + +drop table t1, t2; + SET SESSION STORAGE_ENGINE=DEFAULT; diff --git a/sql/sql_select.cc b/sql/sql_select.cc index f96b340..ba32b8d 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -7815,6 +7815,10 @@ best_access_path(JOIN *join, DBUG_ASSERT(tmp >= 0); } } + else + { + best_filter= 0; + } loose_scan_opt.check_range_access(join, idx, s->quick); }

1 0

[Commits] 17d2b76267a: Update rocksdb revision (only code cleanup changes)
by Sergei Petrunia 08 Apr '19

08 Apr '19

revision-id: 17d2b76267a967a5e8fbdf35330bc5ee25115cc6 (fb-prod201801-222-g17d2b76267a) parent(s): a8a4635b2544b73a8e76f24202889b20ff8c9dca author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-04-08 16:33:01 +0300 message: Update rocksdb revision (only code cleanup changes) --- rocksdb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rocksdb b/rocksdb index cc3ead4e33a..3b7567781e5 160000 --- a/rocksdb +++ b/rocksdb @@ -1 +1 @@ -Subproject commit cc3ead4e33a8637e51c72ecb91256d52285979f5 +Subproject commit 3b7567781e50b1ced3583a60fa7f1a568cc42d2e

1 0

[Commits] 3b7567781: Range Locking: More comments
by Sergei Petrunia 08 Apr '19

08 Apr '19

revision-id: 3b7567781e50b1ced3583a60fa7f1a568cc42d2e (v5.8-1033-g3b7567781) parent(s): 0ebc41a1c459263a30e2d2bc68348ed5bcdd59bd author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-04-08 16:29:58 +0300 message: Range Locking: More comments --- include/rocksdb/utilities/transaction.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/include/rocksdb/utilities/transaction.h b/include/rocksdb/utilities/transaction.h index 9dbba3df7..e980e032e 100644 --- a/include/rocksdb/utilities/transaction.h +++ b/include/rocksdb/utilities/transaction.h @@ -46,8 +46,15 @@ using TransactionID = uint64_t; 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}) + 2. An empty string is less than any other value. From this it follows that + for any prefix and suffix, {prefix, suffix} > {prefix}. + + 3. The row comparison function can compare key prefixes. If the data domain + includes keys A and B, then the comparison function is able to compare + equal-length prefixes: + + min_len= min(byte_length(A), byte_length(B)); + cmp(Slice(A, min_len), Slice(B, min_len)) == Prefix ranges == With lexicographic-like ordering, one may to construct ranges from a

1 0

[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