- commits - lists.mariadb.org

[Commits] 4352397eb83: MDEV-18820 Assertion `lock_table_has(trx, index->table, LOCK_IX)' failed in lock_rec_insert_check_and_lock upon INSERT into table with blob key
by sachin.setiya＠mariadb.com 23 Apr '19

23 Apr '19

revision-id: 4352397eb8383ecc23e15dd4f92d248e0d36cc85 (mariadb-10.4.3-105-g4352397eb83) parent(s): 5469d88e7b4e723e545cd7d511801a16a3642dc4 author: Sachin committer: Sachin timestamp: 2019-03-28 14:16:13 +0530 message: MDEV-18820 Assertion `lock_table_has(trx, index->table, LOCK_IX)' failed in lock_rec_insert_check_and_lock upon INSERT into table with blob key Don't Ignore Any error during index lookup, And throw duplicate key error only if error is HA_ERR_FOUND_DUPP_KEY --- mysql-test/main/long_unique_bugs.result | 26 ++++++++++++++++++++ mysql-test/main/long_unique_bugs.test | 43 +++++++++++++++++++++++++++++++++ sql/handler.cc | 6 ++--- 3 files changed, 72 insertions(+), 3 deletions(-) diff --git a/mysql-test/main/long_unique_bugs.result b/mysql-test/main/long_unique_bugs.result index 48e74bdd564..9b0df9e32fe 100644 --- a/mysql-test/main/long_unique_bugs.result +++ b/mysql-test/main/long_unique_bugs.result @@ -285,3 +285,29 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 ALTER TABLE t1 FORCE; DROP TABLE t1; +set innodb_lock_wait_timeout= 10; +CREATE TABLE t1 ( +id int primary key, +f INT unique +) ENGINE=InnoDB; +CREATE TABLE t2 ( +id int primary key, +a blob unique +) ENGINE=InnoDB; +START TRANSACTION; +connect con1,localhost,root,,test; +connection con1; +set innodb_lock_wait_timeout= 10; +START TRANSACTION; +INSERT INTO t1 VALUES (1,1)/*1*/; +connection default; +INSERT INTO t2 VALUES (2, 1)/*2*/ ; +connection con1; +INSERT INTO t2 VALUES (3, 1)/*3*/; +connection default; +INSERT IGNORE INTO t1 VALUES (4, 1)/*4*/; +connection con1; +ERROR 40001: Deadlock found when trying to get lock; try restarting transaction +disconnect con1; +connection default; +DROP TABLE t1, t2; diff --git a/mysql-test/main/long_unique_bugs.test b/mysql-test/main/long_unique_bugs.test index 11b1c4f09b6..8e4b950b250 100644 --- a/mysql-test/main/long_unique_bugs.test +++ b/mysql-test/main/long_unique_bugs.test @@ -294,3 +294,46 @@ ALTER TABLE t1 ADD UNIQUE (b); show create table t1; ALTER TABLE t1 FORCE; DROP TABLE t1; + +# +# MDEV-18820 Assertion `lock_table_has(trx, index->table, LOCK_IX)' failed in lock_rec_insert_check_and_lock upon INSERT into table with blob key' +# + +--source include/have_innodb.inc +set innodb_lock_wait_timeout= 10; + +CREATE TABLE t1 ( + id int primary key, + f INT unique +) ENGINE=InnoDB; + +CREATE TABLE t2 ( + id int primary key, + a blob unique +) ENGINE=InnoDB; + +START TRANSACTION; + +--connect (con1,localhost,root,,test) + +--connection con1 +set innodb_lock_wait_timeout= 10; +START TRANSACTION; +INSERT INTO t1 VALUES (1,1)/*1*/; + +--connection default +INSERT INTO t2 VALUES (2, 1)/*2*/ ; + +--connection con1 +--send + INSERT INTO t2 VALUES (3, 1)/*3*/; + +--connection default +INSERT IGNORE INTO t1 VALUES (4, 1)/*4*/; + +--connection con1 +--error ER_LOCK_DEADLOCK +--reap +--disconnect con1 +--connection default +DROP TABLE t1, t2; diff --git a/sql/handler.cc b/sql/handler.cc index da7850c5c4e..22af3f8bc81 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -6590,10 +6590,10 @@ static int check_duplicate_long_entry_key(TABLE *table, handler *h, error= HA_ERR_FOUND_DUPP_KEY; goto exit; } - if (result == HA_ERR_LOCK_WAIT_TIMEOUT) - error= HA_ERR_LOCK_WAIT_TIMEOUT; + if (result != HA_ERR_KEY_NOT_FOUND) + error= result; exit: - if (error) + if (error == HA_ERR_FOUND_DUPP_KEY) { table->file->errkey= key_no; if (h->ha_table_flags() & HA_DUPLICATE_POS)

1 0

[Commits] 5469d88e7b4: MDEV-19049 Server crashes in check_duplicate_long_entry_key, ASAN stack-buffer-overflow in Field_blob::get_key_image
by sachin.setiya＠mariadb.com 23 Apr '19

23 Apr '19

revision-id: 5469d88e7b4e723e545cd7d511801a16a3642dc4 (mariadb-10.4.3-104-g5469d88e7b4) parent(s): 0bc42602266815b81fe86b08c2228912c1a95340 author: Sachin committer: Sachin timestamp: 2019-03-28 11:29:25 +0530 message: MDEV-19049 Server crashes in check_duplicate_long_entry_key, ASAN stack-buffer-overflow in Field_blob::get_key_image Long Unique keys should always be last unique key. --- mysql-test/main/long_unique.result | 64 +++++++++++++++---------------- mysql-test/main/long_unique_bugs.result | 46 ++++++++++++++++++++++ mysql-test/main/long_unique_bugs.test | 22 ++++++++++- mysql-test/main/long_unique_innodb.result | 4 +- mysql-test/main/long_unique_update.result | 8 ++-- sql/sql_table.cc | 9 +++++ 6 files changed, 114 insertions(+), 39 deletions(-) diff --git a/mysql-test/main/long_unique.result b/mysql-test/main/long_unique.result index 3843ff4aff0..8ea6d36c321 100644 --- a/mysql-test/main/long_unique.result +++ b/mysql-test/main/long_unique.result @@ -184,8 +184,8 @@ t1 CREATE TABLE `t1` ( `a` blob DEFAULT NULL, `c` int(11) DEFAULT NULL, `db_row_hash_1` int(11) DEFAULT NULL, - UNIQUE KEY `a` (`a`) USING HASH, - UNIQUE KEY `db_row_hash_1` (`db_row_hash_1`) + UNIQUE KEY `db_row_hash_1` (`db_row_hash_1`), + UNIQUE KEY `a` (`a`) USING HASH ) ENGINE=MyISAM DEFAULT CHARSET=latin1 insert into t1 values(45,1,55),(46,1,55); ERROR 23000: Duplicate entry '55' for key 'db_row_hash_1' @@ -507,13 +507,13 @@ t1 CREATE TABLE `t1` ( `db_row_hash_1` int(11) DEFAULT NULL, `db_row_hash_2` int(11) DEFAULT NULL, `db_row_hash_3` int(11) DEFAULT NULL, + UNIQUE KEY `db_row_hash_1` (`db_row_hash_1`), + UNIQUE KEY `db_row_hash_2` (`db_row_hash_2`), + UNIQUE KEY `db_row_hash_3` (`db_row_hash_3`), UNIQUE KEY `a` (`a`) USING HASH, UNIQUE KEY `c` (`c`) USING HASH, UNIQUE KEY `d` (`d`) USING HASH, - UNIQUE KEY `e` (`e`) USING HASH, - UNIQUE KEY `db_row_hash_1` (`db_row_hash_1`), - UNIQUE KEY `db_row_hash_2` (`db_row_hash_2`), - UNIQUE KEY `db_row_hash_3` (`db_row_hash_3`) + UNIQUE KEY `e` (`e`) USING HASH ) ENGINE=MyISAM DEFAULT CHARSET=latin1 alter table t1 add column db_row_hash_7 int, add column db_row_hash_5 int , add column db_row_hash_4 int ; alter table t1 drop column db_row_hash_7,drop column db_row_hash_3, drop column db_row_hash_4; @@ -543,17 +543,17 @@ t1 CREATE TABLE `t1` ( `db_row_hash_1` int(11) DEFAULT NULL, `db_row_hash_2` int(11) DEFAULT NULL, `db_row_hash_5` int(11) DEFAULT NULL, - UNIQUE KEY `d` (`d`) USING HASH, - UNIQUE KEY `e` (`e`) USING HASH, UNIQUE KEY `db_row_hash_1` (`db_row_hash_1`), - UNIQUE KEY `db_row_hash_2` (`db_row_hash_2`) + UNIQUE KEY `db_row_hash_2` (`db_row_hash_2`), + UNIQUE KEY `d` (`d`) USING HASH, + UNIQUE KEY `e` (`e`) USING HASH ) ENGINE=MyISAM DEFAULT CHARSET=latin1 show keys from t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment -t1 0 d 1 d A NULL NULL NULL YES HASH -t1 0 e 1 e A NULL NULL NULL YES HASH t1 0 db_row_hash_1 1 db_row_hash_1 A NULL NULL NULL YES BTREE t1 0 db_row_hash_2 1 db_row_hash_2 A NULL NULL NULL YES BTREE +t1 0 d 1 d A NULL NULL NULL YES HASH +t1 0 e 1 e A NULL NULL NULL YES HASH #add column with unique index on blob; alter table t1 add column a blob unique; show create table t1; @@ -567,18 +567,18 @@ t1 CREATE TABLE `t1` ( `db_row_hash_2` int(11) DEFAULT NULL, `db_row_hash_5` int(11) DEFAULT NULL, `a` blob DEFAULT NULL, - UNIQUE KEY `d` (`d`) USING HASH, - UNIQUE KEY `e` (`e`) USING HASH, UNIQUE KEY `db_row_hash_1` (`db_row_hash_1`), UNIQUE KEY `db_row_hash_2` (`db_row_hash_2`), + UNIQUE KEY `d` (`d`) USING HASH, + UNIQUE KEY `e` (`e`) USING HASH, UNIQUE KEY `a` (`a`) USING HASH ) ENGINE=MyISAM DEFAULT CHARSET=latin1 show keys from t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment -t1 0 d 1 d A NULL NULL NULL YES HASH -t1 0 e 1 e A NULL NULL NULL YES HASH t1 0 db_row_hash_1 1 db_row_hash_1 A NULL NULL NULL YES BTREE t1 0 db_row_hash_2 1 db_row_hash_2 A NULL NULL NULL YES BTREE +t1 0 d 1 d A NULL NULL NULL YES HASH +t1 0 e 1 e A NULL NULL NULL YES HASH t1 0 a 1 a A NULL NULL NULL YES HASH #try to change the blob unique column name; #this will change index to b tree; @@ -594,19 +594,19 @@ t1 CREATE TABLE `t1` ( `db_row_hash_2` int(11) DEFAULT NULL, `db_row_hash_5` int(11) DEFAULT NULL, `a` int(11) DEFAULT NULL, - UNIQUE KEY `d` (`d`) USING HASH, - UNIQUE KEY `e` (`e`), UNIQUE KEY `db_row_hash_1` (`db_row_hash_1`), UNIQUE KEY `db_row_hash_2` (`db_row_hash_2`), - UNIQUE KEY `a` (`a`) + UNIQUE KEY `e` (`e`), + UNIQUE KEY `a` (`a`), + UNIQUE KEY `d` (`d`) USING HASH ) ENGINE=MyISAM DEFAULT CHARSET=latin1 show keys from t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment -t1 0 d 1 d A NULL NULL NULL YES HASH -t1 0 e 1 e A NULL NULL NULL YES BTREE t1 0 db_row_hash_1 1 db_row_hash_1 A NULL NULL NULL YES BTREE t1 0 db_row_hash_2 1 db_row_hash_2 A NULL NULL NULL YES BTREE +t1 0 e 1 e A NULL NULL NULL YES BTREE t1 0 a 1 a A NULL NULL NULL YES BTREE +t1 0 d 1 d A NULL NULL NULL YES HASH alter table t1 add column clm1 blob unique,add column clm2 blob unique; #try changing the name; alter table t1 change column clm1 clm_changed1 blob, change column clm2 clm_changed2 blob; @@ -623,21 +623,21 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `clm_changed1` blob DEFAULT NULL, `clm_changed2` blob DEFAULT NULL, - UNIQUE KEY `d` (`d`) USING HASH, - UNIQUE KEY `e` (`e`), UNIQUE KEY `db_row_hash_1` (`db_row_hash_1`), UNIQUE KEY `db_row_hash_2` (`db_row_hash_2`), + UNIQUE KEY `e` (`e`), UNIQUE KEY `a` (`a`), + UNIQUE KEY `d` (`d`) USING HASH, UNIQUE KEY `clm1` (`clm_changed1`) USING HASH, UNIQUE KEY `clm2` (`clm_changed2`) USING HASH ) ENGINE=MyISAM DEFAULT CHARSET=latin1 show keys from t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment -t1 0 d 1 d A NULL NULL NULL YES HASH -t1 0 e 1 e A NULL NULL NULL YES BTREE t1 0 db_row_hash_1 1 db_row_hash_1 A NULL NULL NULL YES BTREE t1 0 db_row_hash_2 1 db_row_hash_2 A NULL NULL NULL YES BTREE +t1 0 e 1 e A NULL NULL NULL YES BTREE t1 0 a 1 a A NULL NULL NULL YES BTREE +t1 0 d 1 d A NULL NULL NULL YES HASH t1 0 clm1 1 clm_changed1 A NULL NULL NULL YES HASH t1 0 clm2 1 clm_changed2 A NULL NULL NULL YES HASH #now drop the unique key; @@ -655,19 +655,19 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `clm_changed1` blob DEFAULT NULL, `clm_changed2` blob DEFAULT NULL, - UNIQUE KEY `d` (`d`) USING HASH, - UNIQUE KEY `e` (`e`), UNIQUE KEY `db_row_hash_1` (`db_row_hash_1`), UNIQUE KEY `db_row_hash_2` (`db_row_hash_2`), - UNIQUE KEY `a` (`a`) + UNIQUE KEY `e` (`e`), + UNIQUE KEY `a` (`a`), + UNIQUE KEY `d` (`d`) USING HASH ) ENGINE=MyISAM DEFAULT CHARSET=latin1 show keys from t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment -t1 0 d 1 d A NULL NULL NULL YES HASH -t1 0 e 1 e A NULL NULL NULL YES BTREE t1 0 db_row_hash_1 1 db_row_hash_1 A NULL NULL NULL YES BTREE t1 0 db_row_hash_2 1 db_row_hash_2 A NULL NULL NULL YES BTREE +t1 0 e 1 e A NULL NULL NULL YES BTREE t1 0 a 1 a A NULL NULL NULL YES BTREE +t1 0 d 1 d A NULL NULL NULL YES HASH drop table t1; #now the table with key on multiple columns; the ultimate test; create table t1(a blob, b int , c varchar(2000) , d text , e varchar(3000) , f longblob , g int , h text , @@ -1130,17 +1130,17 @@ t1 CREATE TABLE `t1` ( `c` blob DEFAULT NULL, `d` blob DEFAULT NULL, `e` int(11) DEFAULT NULL, + UNIQUE KEY `e` (`e`), UNIQUE KEY `a` (`a`,`c`) USING HASH, - UNIQUE KEY `b` (`b`,`d`) USING HASH, - UNIQUE KEY `e` (`e`) + UNIQUE KEY `b` (`b`,`d`) USING HASH ) ENGINE=MyISAM DEFAULT CHARSET=latin1 show keys from t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment +t1 0 e 1 e A NULL NULL NULL YES BTREE t1 0 a 1 a A NULL NULL NULL YES HASH t1 0 a 2 c A NULL NULL NULL YES HASH t1 0 b 1 b A NULL NULL NULL YES HASH t1 0 b 2 d A NULL NULL NULL YES HASH -t1 0 e 1 e A 0 NULL NULL YES BTREE drop table t1; #visibility of db_row_hash create table t1 (a blob unique , b blob unique); diff --git a/mysql-test/main/long_unique_bugs.result b/mysql-test/main/long_unique_bugs.result index 87a57fb4614..48e74bdd564 100644 --- a/mysql-test/main/long_unique_bugs.result +++ b/mysql-test/main/long_unique_bugs.result @@ -239,3 +239,49 @@ CREATE TABLE t1 (a INT, UNIQUE USING HASH (a)) PARTITION BY HASH (a) PARTITIONS INSERT INTO t1 VALUES (2); REPLACE INTO t1 VALUES (2); DROP TABLE t1; +CREATE TABLE t1 (pk INT, a CHAR(4), b BLOB NOT NULL, PRIMARY KEY(pk)); +INSERT INTO t1 VALUES (1,'foo','bar'); +ALTER TABLE t1 ADD KEY (b(64)); +ALTER TABLE t1 ADD UNIQUE (b(165)); +ALTER TABLE t1 ADD KEY (b(1000)); +ALTER TABLE t1 ADD KEY (b(500)); +ALTER TABLE t1 ADD UNIQUE (a,b); +ALTER TABLE t1 ADD UNIQUE (b(95)); +ALTER TABLE t1 ADD KEY (b(30)); +ALTER TABLE t1 ADD UNIQUE (b(20)); +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `pk` int(11) NOT NULL, + `a` char(4) DEFAULT NULL, + `b` blob NOT NULL, + PRIMARY KEY (`pk`), + UNIQUE KEY `b_2` (`b`(165)), + UNIQUE KEY `b_5` (`b`(95)), + UNIQUE KEY `b_7` (`b`(20)), + UNIQUE KEY `a` (`a`,`b`) USING HASH, + KEY `b` (`b`(64)), + KEY `b_3` (`b`(1000)), + KEY `b_4` (`b`(500)), + KEY `b_6` (`b`(30)) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +ALTER TABLE t1 ADD UNIQUE (b); +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `pk` int(11) NOT NULL, + `a` char(4) DEFAULT NULL, + `b` blob NOT NULL, + PRIMARY KEY (`pk`), + UNIQUE KEY `b_2` (`b`(165)), + UNIQUE KEY `b_5` (`b`(95)), + UNIQUE KEY `b_7` (`b`(20)), + UNIQUE KEY `a` (`a`,`b`) USING HASH, + UNIQUE KEY `b_8` (`b`) USING HASH, + KEY `b` (`b`(64)), + KEY `b_3` (`b`(1000)), + KEY `b_4` (`b`(500)), + KEY `b_6` (`b`(30)) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +ALTER TABLE t1 FORCE; +DROP TABLE t1; diff --git a/mysql-test/main/long_unique_bugs.test b/mysql-test/main/long_unique_bugs.test index ed0daee426f..11b1c4f09b6 100644 --- a/mysql-test/main/long_unique_bugs.test +++ b/mysql-test/main/long_unique_bugs.test @@ -1,4 +1,5 @@ --source include/have_innodb.inc +--source include/have_partition.inc # # MDEV-18707 Server crash in my_hash_sort_bin, ASAN heap-use-after-free in Field::is_null, server hang, corrupted double-linked list @@ -269,8 +270,27 @@ drop table t1; # # MDEV-18904 Assertion `m_part_spec.start_part >= m_part_spec.end_part' failed in ha_partition::index_read_idx_map # ---source include/have_partition.inc CREATE TABLE t1 (a INT, UNIQUE USING HASH (a)) PARTITION BY HASH (a) PARTITIONS 2; INSERT INTO t1 VALUES (2); REPLACE INTO t1 VALUES (2); DROP TABLE t1; + +# +# MDEV-19049 Server crashes in check_duplicate_long_entry_key, ASAN stack-buffer-overflow in Field_blob::get_key_image +# +CREATE TABLE t1 (pk INT, a CHAR(4), b BLOB NOT NULL, PRIMARY KEY(pk)); +INSERT INTO t1 VALUES (1,'foo','bar'); + +ALTER TABLE t1 ADD KEY (b(64)); +ALTER TABLE t1 ADD UNIQUE (b(165)); +ALTER TABLE t1 ADD KEY (b(1000)); +ALTER TABLE t1 ADD KEY (b(500)); +ALTER TABLE t1 ADD UNIQUE (a,b); +ALTER TABLE t1 ADD UNIQUE (b(95)); +ALTER TABLE t1 ADD KEY (b(30)); +ALTER TABLE t1 ADD UNIQUE (b(20)); +show create table t1; +ALTER TABLE t1 ADD UNIQUE (b); +show create table t1; +ALTER TABLE t1 FORCE; +DROP TABLE t1; diff --git a/mysql-test/main/long_unique_innodb.result b/mysql-test/main/long_unique_innodb.result index cb8c3ea4858..135bb0808cc 100644 --- a/mysql-test/main/long_unique_innodb.result +++ b/mysql-test/main/long_unique_innodb.result @@ -9,8 +9,8 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` blob DEFAULT NULL, `c` int(11) DEFAULT NULL, - UNIQUE KEY `a` (`a`) USING HASH, - UNIQUE KEY `c` (`c`) + UNIQUE KEY `c` (`c`), + UNIQUE KEY `a` (`a`) USING HASH ) ENGINE=InnoDB DEFAULT CHARSET=latin1 drop table t1; #test for concurrent insert of long unique in innodb diff --git a/mysql-test/main/long_unique_update.result b/mysql-test/main/long_unique_update.result index 60a4fb46558..b508583f47c 100644 --- a/mysql-test/main/long_unique_update.result +++ b/mysql-test/main/long_unique_update.result @@ -71,8 +71,8 @@ create table t1 (a int primary key, b blob unique , c int unique ); show keys from t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment t1 0 PRIMARY 1 a A 0 NULL NULL BTREE -t1 0 b 1 b A NULL NULL NULL YES HASH t1 0 c 1 c A NULL NULL NULL YES BTREE +t1 0 b 1 b A NULL NULL NULL YES HASH insert into t1 values(1,1,1),(2,2,2),(3,3,3),(4,4,4),(5,5,5),(6,6,6),(7,7,7); select * from t1 limit 3; a b c @@ -220,18 +220,18 @@ t1 CREATE TABLE `t1` ( `f` int(11) DEFAULT NULL, `g` text DEFAULT NULL, PRIMARY KEY (`a`), - UNIQUE KEY `b` (`b`,`c`) USING HASH, UNIQUE KEY `b_2` (`b`,`f`), + UNIQUE KEY `b` (`b`,`c`) USING HASH, UNIQUE KEY `e` (`e`,`g`) USING HASH, UNIQUE KEY `a` (`a`,`b`,`c`,`d`,`e`,`f`,`g`) USING HASH ) ENGINE=MyISAM DEFAULT CHARSET=latin1 show keys from t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment t1 0 PRIMARY 1 a A 0 NULL NULL BTREE -t1 0 b 1 b A NULL NULL NULL YES HASH -t1 0 b 2 c A NULL NULL NULL YES HASH t1 0 b_2 1 b A NULL NULL NULL YES BTREE t1 0 b_2 2 f A NULL NULL NULL YES BTREE +t1 0 b 1 b A NULL NULL NULL YES HASH +t1 0 b 2 c A NULL NULL NULL YES HASH t1 0 e 1 e A NULL NULL NULL YES HASH t1 0 e 2 g A NULL NULL NULL YES HASH t1 0 a 1 a A NULL NULL NULL HASH diff --git a/sql/sql_table.cc b/sql/sql_table.cc index ad62ecc1103..c755a74e174 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -2773,6 +2773,7 @@ bool quick_rm_table(THD *thd, handlerton *base, const LEX_CSTRING *db, - UNIQUE keys where all column are NOT NULL - UNIQUE keys that don't contain partial segments - Other UNIQUE keys + - LONG UNIQUE keys - Normal keys - Fulltext keys @@ -2796,6 +2797,14 @@ static int sort_keys(KEY *a, KEY *b) { if (!(b_flags & HA_NOSAME)) return -1; + /* + Long Unique keys should always be last unique key. + Before this patch they used to change order wrt to partial keys (MDEV-19049) + */ + if (a->algorithm == HA_KEY_ALG_LONG_HASH) + return 1; + if (b->algorithm == HA_KEY_ALG_LONG_HASH) + return -1; if ((a_flags ^ b_flags) & HA_NULL_PART_KEY) { /* Sort NOT NULL keys before other keys */

1 0

[Commits] 45e3dac: MDEV-17605 Statistics for InnoDB table is wrong if persistent statistics is used
by IgorBabaev 23 Apr '19

23 Apr '19

revision-id: 45e3dace5a7b25cdc55c6b5ddb3f26bb5576ea71 (mariadb-10.1.38-112-g45e3dac) parent(s): f4b27400185bab217da11f8781eebb09a8502304 author: Igor Babaev committer: Igor Babaev timestamp: 2019-04-22 17:10:42 -0700 message: MDEV-17605 Statistics for InnoDB table is wrong if persistent statistics is used The command SHOW INDEXES ignored setting of the system variable use_stat_tables to the value of 'preferably' and and showed statistical data received from the engine. Similarly queries over the table STATISTICS from INFORMATION_SCHEMA ignored this setting. It happened because the function fill_schema_table_by_open() did not read any data from statistical tables. --- mysql-test/r/stat_tables.result | 69 ++++++++++++++++++++++++++++++++++ mysql-test/r/stat_tables_innodb.result | 69 ++++++++++++++++++++++++++++++++++ mysql-test/t/stat_tables.test | 54 ++++++++++++++++++++++++++ sql/sql_class.h | 3 ++ sql/sql_show.cc | 5 +++ sql/sql_statistics.cc | 5 ++- 6 files changed, 204 insertions(+), 1 deletion(-) diff --git a/mysql-test/r/stat_tables.result b/mysql-test/r/stat_tables.result index 3ebc3b4..bd3e9ed 100644 --- a/mysql-test/r/stat_tables.result +++ b/mysql-test/r/stat_tables.result @@ -625,3 +625,72 @@ MAX(pk) NULL DROP TABLE t1; set use_stat_tables=@save_use_stat_tables; +# +# MDEV-17605: SHOW INDEXES with use_stat_tables='preferably' +# +set use_stat_tables='preferably'; +CREATE DATABASE dbt3_s001; +use dbt3_s001; +set @save_optimizer_switch=@@optimizer_switch; +set optimizer_switch='extended_keys=off'; +select * from mysql.table_stats; +db_name table_name cardinality +dbt3_s001 lineitem 6005 +select * from mysql.index_stats; +db_name table_name index_name prefix_arity avg_frequency +dbt3_s001 lineitem PRIMARY 1 4.0033 +dbt3_s001 lineitem PRIMARY 2 1.0000 +dbt3_s001 lineitem i_l_shipdate 1 2.6500 +dbt3_s001 lineitem i_l_suppkey_partkey 1 30.0250 +dbt3_s001 lineitem i_l_suppkey_partkey 2 8.5786 +dbt3_s001 lineitem i_l_partkey 1 30.0250 +dbt3_s001 lineitem i_l_suppkey 1 600.5000 +dbt3_s001 lineitem i_l_receiptdate 1 2.6477 +dbt3_s001 lineitem i_l_orderkey 1 4.0033 +dbt3_s001 lineitem i_l_orderkey_quantity 1 4.0033 +dbt3_s001 lineitem i_l_orderkey_quantity 2 1.0404 +dbt3_s001 lineitem i_l_commitdate 1 2.7160 +SHOW INDEXES FROM lineitem; +Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment +lineitem 0 PRIMARY 1 l_orderkey A 1500 NULL NULL BTREE +lineitem 0 PRIMARY 2 l_linenumber A 6005 NULL NULL BTREE +lineitem 1 i_l_shipdate 1 l_shipDATE A 2266 NULL NULL YES BTREE +lineitem 1 i_l_suppkey_partkey 1 l_partkey A 200 NULL NULL YES BTREE +lineitem 1 i_l_suppkey_partkey 2 l_suppkey A 699 NULL NULL YES BTREE +lineitem 1 i_l_partkey 1 l_partkey A 200 NULL NULL YES BTREE +lineitem 1 i_l_suppkey 1 l_suppkey A 10 NULL NULL YES BTREE +lineitem 1 i_l_receiptdate 1 l_receiptDATE A 2268 NULL NULL YES BTREE +lineitem 1 i_l_orderkey 1 l_orderkey A 1500 NULL NULL BTREE +lineitem 1 i_l_orderkey_quantity 1 l_orderkey A 1500 NULL NULL BTREE +lineitem 1 i_l_orderkey_quantity 2 l_quantity A 5771 NULL NULL YES BTREE +lineitem 1 i_l_commitdate 1 l_commitDATE A 2210 NULL NULL YES BTREE +SELECT * FROM INFORMATION_SCHEMA.STATISTICS WHERE table_name='lineitem'; +TABLE_CATALOG TABLE_SCHEMA TABLE_NAME NON_UNIQUE INDEX_SCHEMA INDEX_NAME SEQ_IN_INDEX COLUMN_NAME COLLATION CARDINALITY SUB_PART PACKED NULLABLE INDEX_TYPE COMMENT INDEX_COMMENT +def dbt3_s001 lineitem 0 dbt3_s001 PRIMARY 1 l_orderkey A 1500 NULL NULL BTREE +def dbt3_s001 lineitem 0 dbt3_s001 PRIMARY 2 l_linenumber A 6005 NULL NULL BTREE +def dbt3_s001 lineitem 1 dbt3_s001 i_l_shipdate 1 l_shipDATE A 2266 NULL NULL YES BTREE +def dbt3_s001 lineitem 1 dbt3_s001 i_l_suppkey_partkey 1 l_partkey A 200 NULL NULL YES BTREE +def dbt3_s001 lineitem 1 dbt3_s001 i_l_suppkey_partkey 2 l_suppkey A 699 NULL NULL YES BTREE +def dbt3_s001 lineitem 1 dbt3_s001 i_l_partkey 1 l_partkey A 200 NULL NULL YES BTREE +def dbt3_s001 lineitem 1 dbt3_s001 i_l_suppkey 1 l_suppkey A 10 NULL NULL YES BTREE +def dbt3_s001 lineitem 1 dbt3_s001 i_l_receiptdate 1 l_receiptDATE A 2268 NULL NULL YES BTREE +def dbt3_s001 lineitem 1 dbt3_s001 i_l_orderkey 1 l_orderkey A 1500 NULL NULL BTREE +def dbt3_s001 lineitem 1 dbt3_s001 i_l_orderkey_quantity 1 l_orderkey A 1500 NULL NULL BTREE +def dbt3_s001 lineitem 1 dbt3_s001 i_l_orderkey_quantity 2 l_quantity A 5771 NULL NULL YES BTREE +def dbt3_s001 lineitem 1 dbt3_s001 i_l_commitdate 1 l_commitDATE A 2210 NULL NULL YES BTREE +SELECT +COUNT(DISTINCT l_orderkey), COUNT(DISTINCT l_orderkey,l_linenumber), +COUNT(DISTINCT l_shipDATE), +COUNT(DISTINCT l_partkey), COUNT(DISTINCT l_partkey,l_suppkey), +COUNT(DISTINCT l_suppkey), COUNT(DISTINCT l_receiptDATE), +COUNT(DISTINCT l_orderkey, l_quantity), COUNT(DISTINCT l_commitDATE) +FROM lineitem; +COUNT(DISTINCT l_orderkey) COUNT(DISTINCT l_orderkey,l_linenumber) COUNT(DISTINCT l_shipDATE) COUNT(DISTINCT l_partkey) COUNT(DISTINCT l_partkey,l_suppkey) COUNT(DISTINCT l_suppkey) COUNT(DISTINCT l_receiptDATE) COUNT(DISTINCT l_orderkey, l_quantity) COUNT(DISTINCT l_commitDATE) +1500 6005 2266 200 700 10 2268 5772 2211 +set optimizer_switch=@save_optimizer_switch; +DROP DATABASE dbt3_s001; +delete from mysql.table_stats; +delete from mysql.column_stats; +delete from mysql.index_stats; +set @save_optimizer_switch=@@optimizer_switch; +set use_stat_tables=@save_use_stat_tables; diff --git a/mysql-test/r/stat_tables_innodb.result b/mysql-test/r/stat_tables_innodb.result index b0f794c..579d194 100644 --- a/mysql-test/r/stat_tables_innodb.result +++ b/mysql-test/r/stat_tables_innodb.result @@ -652,5 +652,74 @@ MAX(pk) NULL DROP TABLE t1; set use_stat_tables=@save_use_stat_tables; +# +# MDEV-17605: SHOW INDEXES with use_stat_tables='preferably' +# +set use_stat_tables='preferably'; +CREATE DATABASE dbt3_s001; +use dbt3_s001; +set @save_optimizer_switch=@@optimizer_switch; +set optimizer_switch='extended_keys=off'; +select * from mysql.table_stats; +db_name table_name cardinality +dbt3_s001 lineitem 6005 +select * from mysql.index_stats; +db_name table_name index_name prefix_arity avg_frequency +dbt3_s001 lineitem PRIMARY 1 4.0033 +dbt3_s001 lineitem PRIMARY 2 1.0000 +dbt3_s001 lineitem i_l_shipdate 1 2.6500 +dbt3_s001 lineitem i_l_suppkey_partkey 1 30.0250 +dbt3_s001 lineitem i_l_suppkey_partkey 2 8.5786 +dbt3_s001 lineitem i_l_partkey 1 30.0250 +dbt3_s001 lineitem i_l_suppkey 1 600.5000 +dbt3_s001 lineitem i_l_receiptdate 1 2.6477 +dbt3_s001 lineitem i_l_orderkey 1 4.0033 +dbt3_s001 lineitem i_l_orderkey_quantity 1 4.0033 +dbt3_s001 lineitem i_l_orderkey_quantity 2 1.0404 +dbt3_s001 lineitem i_l_commitdate 1 2.7160 +SHOW INDEXES FROM lineitem; +Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment +lineitem 0 PRIMARY 1 l_orderkey A 1500 NULL NULL BTREE +lineitem 0 PRIMARY 2 l_linenumber A 6005 NULL NULL BTREE +lineitem 1 i_l_shipdate 1 l_shipDATE A 2266 NULL NULL YES BTREE +lineitem 1 i_l_suppkey_partkey 1 l_partkey A 200 NULL NULL YES BTREE +lineitem 1 i_l_suppkey_partkey 2 l_suppkey A 699 NULL NULL YES BTREE +lineitem 1 i_l_partkey 1 l_partkey A 200 NULL NULL YES BTREE +lineitem 1 i_l_suppkey 1 l_suppkey A 10 NULL NULL YES BTREE +lineitem 1 i_l_receiptdate 1 l_receiptDATE A 2268 NULL NULL YES BTREE +lineitem 1 i_l_orderkey 1 l_orderkey A 1500 NULL NULL BTREE +lineitem 1 i_l_orderkey_quantity 1 l_orderkey A 1500 NULL NULL BTREE +lineitem 1 i_l_orderkey_quantity 2 l_quantity A 5771 NULL NULL YES BTREE +lineitem 1 i_l_commitdate 1 l_commitDATE A 2210 NULL NULL YES BTREE +SELECT * FROM INFORMATION_SCHEMA.STATISTICS WHERE table_name='lineitem'; +TABLE_CATALOG TABLE_SCHEMA TABLE_NAME NON_UNIQUE INDEX_SCHEMA INDEX_NAME SEQ_IN_INDEX COLUMN_NAME COLLATION CARDINALITY SUB_PART PACKED NULLABLE INDEX_TYPE COMMENT INDEX_COMMENT +def dbt3_s001 lineitem 0 dbt3_s001 PRIMARY 1 l_orderkey A 1500 NULL NULL BTREE +def dbt3_s001 lineitem 0 dbt3_s001 PRIMARY 2 l_linenumber A 6005 NULL NULL BTREE +def dbt3_s001 lineitem 1 dbt3_s001 i_l_shipdate 1 l_shipDATE A 2266 NULL NULL YES BTREE +def dbt3_s001 lineitem 1 dbt3_s001 i_l_suppkey_partkey 1 l_partkey A 200 NULL NULL YES BTREE +def dbt3_s001 lineitem 1 dbt3_s001 i_l_suppkey_partkey 2 l_suppkey A 699 NULL NULL YES BTREE +def dbt3_s001 lineitem 1 dbt3_s001 i_l_partkey 1 l_partkey A 200 NULL NULL YES BTREE +def dbt3_s001 lineitem 1 dbt3_s001 i_l_suppkey 1 l_suppkey A 10 NULL NULL YES BTREE +def dbt3_s001 lineitem 1 dbt3_s001 i_l_receiptdate 1 l_receiptDATE A 2268 NULL NULL YES BTREE +def dbt3_s001 lineitem 1 dbt3_s001 i_l_orderkey 1 l_orderkey A 1500 NULL NULL BTREE +def dbt3_s001 lineitem 1 dbt3_s001 i_l_orderkey_quantity 1 l_orderkey A 1500 NULL NULL BTREE +def dbt3_s001 lineitem 1 dbt3_s001 i_l_orderkey_quantity 2 l_quantity A 5771 NULL NULL YES BTREE +def dbt3_s001 lineitem 1 dbt3_s001 i_l_commitdate 1 l_commitDATE A 2210 NULL NULL YES BTREE +SELECT +COUNT(DISTINCT l_orderkey), COUNT(DISTINCT l_orderkey,l_linenumber), +COUNT(DISTINCT l_shipDATE), +COUNT(DISTINCT l_partkey), COUNT(DISTINCT l_partkey,l_suppkey), +COUNT(DISTINCT l_suppkey), COUNT(DISTINCT l_receiptDATE), +COUNT(DISTINCT l_orderkey, l_quantity), COUNT(DISTINCT l_commitDATE) +FROM lineitem; +COUNT(DISTINCT l_orderkey) COUNT(DISTINCT l_orderkey,l_linenumber) COUNT(DISTINCT l_shipDATE) COUNT(DISTINCT l_partkey) COUNT(DISTINCT l_partkey,l_suppkey) COUNT(DISTINCT l_suppkey) COUNT(DISTINCT l_receiptDATE) COUNT(DISTINCT l_orderkey, l_quantity) COUNT(DISTINCT l_commitDATE) +1500 6005 2266 200 700 10 2268 5772 2211 +set optimizer_switch=@save_optimizer_switch; +DROP DATABASE dbt3_s001; +delete from mysql.table_stats; +delete from mysql.column_stats; +delete from mysql.index_stats; +set @save_optimizer_switch=@@optimizer_switch; +set use_stat_tables=@save_use_stat_tables; set optimizer_switch=@save_optimizer_switch_for_stat_tables_test; SET SESSION STORAGE_ENGINE=DEFAULT; diff --git a/mysql-test/t/stat_tables.test b/mysql-test/t/stat_tables.test index b89ab2b..97f9f08 100644 --- a/mysql-test/t/stat_tables.test +++ b/mysql-test/t/stat_tables.test @@ -402,3 +402,57 @@ SELECT MAX(pk) FROM t1; DROP TABLE t1; set use_stat_tables=@save_use_stat_tables; + +--echo # +--echo # MDEV-17605: SHOW INDEXES with use_stat_tables='preferably' +--echo # + +set use_stat_tables='preferably'; + +CREATE DATABASE dbt3_s001; + +use dbt3_s001; + +set @save_optimizer_switch=@@optimizer_switch; +set optimizer_switch='extended_keys=off'; + +--disable_query_log +--disable_result_log +--disable_warnings +--source include/dbt3_s001.inc +create index i_p_retailprice on part(p_retailprice); +delete from mysql.table_stats; +delete from mysql.column_stats; +delete from mysql.index_stats; +ANALYZE TABLE lineitem; +FLUSH TABLE mysql.table_stats, mysql.index_stats; +--enable_warnings +--enable_result_log +--enable_query_log + +select * from mysql.table_stats; +select * from mysql.index_stats; + +SHOW INDEXES FROM lineitem; + +SELECT * FROM INFORMATION_SCHEMA.STATISTICS WHERE table_name='lineitem'; + +SELECT + COUNT(DISTINCT l_orderkey), COUNT(DISTINCT l_orderkey,l_linenumber), + COUNT(DISTINCT l_shipDATE), + COUNT(DISTINCT l_partkey), COUNT(DISTINCT l_partkey,l_suppkey), + COUNT(DISTINCT l_suppkey), COUNT(DISTINCT l_receiptDATE), + COUNT(DISTINCT l_orderkey, l_quantity), COUNT(DISTINCT l_commitDATE) +FROM lineitem; + +set optimizer_switch=@save_optimizer_switch; + +DROP DATABASE dbt3_s001; + +delete from mysql.table_stats; +delete from mysql.column_stats; +delete from mysql.index_stats; + +set @save_optimizer_switch=@@optimizer_switch; + +set use_stat_tables=@save_use_stat_tables; diff --git a/sql/sql_class.h b/sql/sql_class.h index 6640e02..2517f5c 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -2199,6 +2199,9 @@ class THD :public Statement, */ bool create_tmp_table_for_derived; + /* The flag to force reading statistics from EITS tables */ + bool force_read_stats; + bool save_prep_leaf_list; /* container for handler's private per-connection data */ diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 73f0f56..46914ea 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -4273,6 +4273,7 @@ fill_schema_table_by_open(THD *thd, bool is_show_fields_or_keys, 'only_view_structure()'. */ lex->sql_command= SQLCOM_SHOW_FIELDS; + thd->force_read_stats= get_schema_table_idx(schema_table) == SCH_STATISTICS; result= (open_temporary_tables(thd, table_list) || open_normal_and_derived_tables(thd, table_list, (MYSQL_OPEN_IGNORE_FLUSH | @@ -4280,6 +4281,10 @@ fill_schema_table_by_open(THD *thd, bool is_show_fields_or_keys, (can_deadlock ? MYSQL_OPEN_FAIL_ON_MDL_CONFLICT : 0)), DT_PREPARE | DT_CREATE)); + + (void) read_statistics_for_tables_if_needed(thd, table_list); + thd->force_read_stats= false; + /* Restore old value of sql_command back as it is being looked at in process_table() function. diff --git a/sql/sql_statistics.cc b/sql/sql_statistics.cc index d3a2094..b435971 100644 --- a/sql/sql_statistics.cc +++ b/sql/sql_statistics.cc @@ -2177,7 +2177,10 @@ inline bool statistics_for_command_is_needed(THD *thd) { if (thd->bootstrap || thd->variables.use_stat_tables == NEVER) return FALSE; - + + if (thd->force_read_stats) + return TRUE; + switch(thd->lex->sql_command) { case SQLCOM_SELECT: case SQLCOM_INSERT:

1 0

[Commits] a4f7d85: MDEV-18920 Prepared statements with st_convexhull hang and eat 100% cpu.
by holyfoot＠askmonty.org 22 Apr '19

22 Apr '19

revision-id: a4f7d859322ab771289abf13f50752266af43187 (mariadb-10.1.38-114-ga4f7d85) parent(s): 6c5e4c9bc0d9ac30f7ec7ee334630bacb58687ba committer: Alexey Botchkov timestamp: 2019-04-22 23:28:44 +0400 message: MDEV-18920 Prepared statements with st_convexhull hang and eat 100% cpu. In the case of error when object shapes are half-collected we need to set the NULL at the vertice's list. --- mysql-test/r/gis-precise.result | 4 ++++ mysql-test/t/gis-precise.test | 6 ++++++ sql/gcalc_slicescan.cc | 2 ++ 3 files changed, 12 insertions(+) diff --git a/mysql-test/r/gis-precise.result b/mysql-test/r/gis-precise.result index 89e5c23..76f72bb 100644 --- a/mysql-test/r/gis-precise.result +++ b/mysql-test/r/gis-precise.result @@ -505,6 +505,10 @@ GEOMETRYFROMTEXT('POINT(4599 60359)'), ) as relate_res; relate_res 0 +prepare s from 'do st_convexhull(st_aswkb(multipoint(point(-11702,15179),point(-5031,27960),point(-30557,11158),point(-27804,30314))))'; +execute s; +execute s; +deallocate prepare s; DROP TABLE IF EXISTS p1; CREATE PROCEDURE p1(dist DOUBLE, geom TEXT) BEGIN diff --git a/mysql-test/t/gis-precise.test b/mysql-test/t/gis-precise.test index 7391b21..7626da6 100644 --- a/mysql-test/t/gis-precise.test +++ b/mysql-test/t/gis-precise.test @@ -381,5 +381,11 @@ SELECT ST_RELATE( 'F*FFFF**F' ) as relate_res; +# MDEV-18920 Prepared statements with st_convexhull hang and eat 100% cpu. +prepare s from 'do st_convexhull(st_aswkb(multipoint(point(-11702,15179),point(-5031,27960),point(-30557,11158),point(-27804,30314))))'; +execute s; +execute s; +deallocate prepare s; + --source include/gis_debug.inc diff --git a/sql/gcalc_slicescan.cc b/sql/gcalc_slicescan.cc index ab48542..644ab4b 100644 --- a/sql/gcalc_slicescan.cc +++ b/sql/gcalc_slicescan.cc @@ -982,6 +982,8 @@ void Gcalc_heap::reset() { if (m_n_points) { + if (m_hook) + *m_hook= NULL; free_list(m_first); m_n_points= 0; }

1 0

[Commits] 9921dbd4542: Update rocksdb submodule (Range Locking: better comments)
by Sergei Petrunia 22 Apr '19

22 Apr '19

revision-id: 9921dbd4542c4fe1e5d28c611f48816e2568fffd (fb-prod201801-224-g9921dbd4542) parent(s): 7dca0d62c8ec62904f611aea81d593e4a74b7d55 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-04-22 14:26:21 +0300 message: Update rocksdb submodule (Range Locking: better comments) --- rocksdb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rocksdb b/rocksdb index ded1df92d19..97b782b47ae 160000 --- a/rocksdb +++ b/rocksdb @@ -1 +1 @@ -Subproject commit ded1df92d1992b63f9db12e8757cb65ea711a4e3 +Subproject commit 97b782b47ae55675e2b0132d6332824343fe141e

1 0

[Commits] 97b782b47: Range Locking: better comments
by Sergei Petrunia 22 Apr '19

22 Apr '19

revision-id: 97b782b47ae55675e2b0132d6332824343fe141e (v5.8-1035-g97b782b47) parent(s): ded1df92d1992b63f9db12e8757cb65ea711a4e3 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-04-22 14:24:13 +0300 message: Range Locking: better comments --- include/rocksdb/utilities/transaction.h | 37 ++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/include/rocksdb/utilities/transaction.h b/include/rocksdb/utilities/transaction.h index e980e032e..20f9b1bbd 100644 --- a/include/rocksdb/utilities/transaction.h +++ b/include/rocksdb/utilities/transaction.h @@ -26,15 +26,21 @@ using TransactionID = uint64_t; /* - A range endpoint. + class Endpoint allows to define prefix ranges. - Basic ranges can be defined over rowkeys. A Comparator function defines - ordering, a range endpoint is just a rowkey. + Prefix ranges are introduced below. - When one use lexicographic-like ordering, they may want to request "prefix - ranges". + == Basic Ranges == + + Basic ranges can be defined over rowkeys. Key Comparator defines ordering of + rowkeys, a finite closed range is the same as range over numbers: + + lower_endpoint <= X <= upper_endpoint + + The endpoints here are possible rowkey values. + + == Lexicographic-like ordering == - == Lexicographic ordering == A lexicographic-like ordering satisfies these criteria: 1.The ordering is prefix-based. If there are two keys in form @@ -49,21 +55,26 @@ using TransactionID = uint64_t; 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 + 3. The row comparison function is able to 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)) + cmp(Slice(A, min_len), Slice(B, min_len)) // this call is valid == Prefix ranges == - With lexicographic-like ordering, one may to construct ranges from a + + With lexicographic-like ordering, one may wish 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?) + == Supported comparators == + BytewiseComparator and ReverseBytweiseComparator meet the lexicographic-like + ordering requirements. + + TODO: RangeLocking will refuse to work if any other comparator is used, + although other comparators meeting this property could be used as well. */ class Endpoint { @@ -310,8 +321,6 @@ class Transaction { } // Get a range lock on [start_endpoint; end_endpoint]. - // Note: range endpoints generally a use a different data format than - // ranges. virtual Status GetRangeLock(ColumnFamilyHandle*, const Endpoint&, const Endpoint&) { return Status::NotSupported();

1 0

[Commits] 7dca0d62c8e: MyRocks part of: Remove TransactionDB::get_range_lock_manager()
by Sergei Petrunia 22 Apr '19

22 Apr '19

revision-id: 7dca0d62c8ec62904f611aea81d593e4a74b7d55 (fb-prod201801-223-g7dca0d62c8e) parent(s): 17d2b76267a967a5e8fbdf35330bc5ee25115cc6 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-04-22 13:21:35 +0300 message: MyRocks part of: Remove TransactionDB::get_range_lock_manager() --- rocksdb | 2 +- storage/rocksdb/ha_rocksdb.cc | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/rocksdb b/rocksdb index 3b7567781e5..ded1df92d19 160000 --- a/rocksdb +++ b/rocksdb @@ -1 +1 @@ -Subproject commit 3b7567781e50b1ced3583a60fa7f1a568cc42d2e +Subproject commit ded1df92d1992b63f9db12e8757cb65ea711a4e3 diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc index 5974cc2d0a0..dea7fb9e53f 100644 --- a/storage/rocksdb/ha_rocksdb.cc +++ b/storage/rocksdb/ha_rocksdb.cc @@ -598,6 +598,7 @@ static uint32_t rocksdb_max_manual_compactions = 0; static ulong rocksdb_max_lock_memory; static my_bool rocksdb_use_range_locking = 0; +static std::shared_ptr<rocksdb::RangeLockMgrHandle> range_lock_mgr; std::atomic<uint64_t> rocksdb_row_lock_deadlocks(0); std::atomic<uint64_t> rocksdb_row_lock_wait_timeouts(0); @@ -4973,7 +4974,12 @@ 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; + + if (rocksdb_use_range_locking) { + range_lock_mgr.reset( + rocksdb::NewRangeLockManager(tx_db_options.custom_mutex_factory)); + tx_db_options.range_lock_mgr = range_lock_mgr; + } status = check_rocksdb_options_compatibility(rocksdb_datadir, main_opts, cf_descr); @@ -4996,11 +5002,9 @@ static int rocksdb_init_func(void *const p) { DBUG_RETURN(HA_EXIT_FAILURE); } - if (rocksdb_use_range_locking) + if (range_lock_mgr) { - rocksdb::RangeLockMgrControl *mgr= rdb->get_range_lock_manager(); - - mgr->set_max_lock_memory(rocksdb_max_lock_memory); + range_lock_mgr->set_max_lock_memory(rocksdb_max_lock_memory); sql_print_information("RocksDB: USING NEW RANGE LOCKING"); sql_print_information("RocksDB: Max lock memory=%lu", rocksdb_max_lock_memory); } @@ -12903,10 +12907,9 @@ static SHOW_VAR rocksdb_empty_status_variables[] = { static void show_rocksdb_locktree_vars(THD *thd, SHOW_VAR *var, char *buff) { var->type = SHOW_ARRAY; - if (rocksdb_use_range_locking) + if (range_lock_mgr) { - //TODO: - rocksdb_locktree_escalation_count= rdb->get_range_lock_manager()->get_escalation_count(); + rocksdb_locktree_escalation_count= range_lock_mgr->get_escalation_count(); var->value = reinterpret_cast<char *>(&rocksdb_locktree_status_variables); } else

1 0

[Commits] ded1df92d: Remove TransactionDB::get_range_lock_manager()
by Sergei Petrunia 22 Apr '19

22 Apr '19

revision-id: ded1df92d1992b63f9db12e8757cb65ea711a4e3 (v5.8-1034-gded1df92d) parent(s): 3b7567781e50b1ced3583a60fa7f1a568cc42d2e author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-04-22 13:18:22 +0300 message: Remove TransactionDB::get_range_lock_manager() This function was used by the user to get a handle to control the range lock manager. Now, the range lock manager is created by the user and then provided to TransactionDB::Open: mgr= rocksdb::NewRangeLockManager(...); TransactionDBOptions txn_db_opts; txn_db_opts.range_lock_mgr = mgr; TransactionDB::Open(... txn_db_opts ...); --- include/rocksdb/utilities/transaction_db.h | 31 +++++++++++--------- utilities/transactions/pessimistic_transaction.cc | 3 +- .../transactions/pessimistic_transaction_db.cc | 33 ++++++++++++---------- .../transactions/pessimistic_transaction_db.h | 8 ++---- utilities/transactions/range_locking_test.cc | 9 +++--- utilities/transactions/transaction_lock_mgr.cc | 18 ++++++++++-- utilities/transactions/transaction_lock_mgr.h | 13 +++++++-- 7 files changed, 69 insertions(+), 46 deletions(-) diff --git a/include/rocksdb/utilities/transaction_db.h b/include/rocksdb/utilities/transaction_db.h index b12c70785..8f0e018f2 100644 --- a/include/rocksdb/utilities/transaction_db.h +++ b/include/rocksdb/utilities/transaction_db.h @@ -33,6 +33,20 @@ enum TxnDBWritePolicy { const uint32_t kInitialMaxDeadlocks = 5; +// A handle to control RangeLockMgr +class RangeLockMgrHandle { + public: + virtual int set_max_lock_memory(size_t max_lock_memory) = 0; + virtual uint64_t get_escalation_count() = 0; + virtual ~RangeLockMgrHandle() {}; +}; + +// A factory function to create a Range Lock Manager +RangeLockMgrHandle* NewRangeLockManager( + std::shared_ptr<TransactionDBMutexFactory> mutex_factory +); + + struct TransactionDBOptions { // Specifies the maximum number of keys that can be locked at the same time // per column family. @@ -93,10 +107,9 @@ struct TransactionDBOptions { // logic in myrocks. This hack of simply not rolling back merge operands works // for the special way that myrocks uses this operands. bool rollback_merge_operands = false; - - // If true, range_locking_opts specifies options on range locking (filling - // the struct is mandatory) - bool use_range_locking = false; + + // If non-null, range locking should be used, and the lock manager is passed. + std::shared_ptr<RangeLockMgrHandle> range_lock_mgr; }; struct TransactionOptions { @@ -197,15 +210,6 @@ struct DeadlockPath { bool empty() { return path.empty() && !limit_exceeded; } }; -// Interface for controlling Range Locking manager -class RangeLockMgrControl { - public: - - virtual int set_max_lock_memory(size_t max_lock_memory) = 0; - virtual uint64_t get_escalation_count() = 0; - - virtual ~RangeLockMgrControl(){} -}; class TransactionDB : public StackableDB { public: @@ -281,7 +285,6 @@ class TransactionDB : public StackableDB { virtual std::vector<DeadlockPath> GetDeadlockInfoBuffer() = 0; virtual void SetDeadlockInfoBufferSize(uint32_t target_size) = 0; - virtual RangeLockMgrControl* get_range_lock_manager() { return nullptr; } protected: // To Create an TransactionDB, call Open() // The ownership of db is transferred to the base StackableDB diff --git a/utilities/transactions/pessimistic_transaction.cc b/utilities/transactions/pessimistic_transaction.cc index ca6bc27b6..ff653fa0e 100644 --- a/utilities/transactions/pessimistic_transaction.cc +++ b/utilities/transactions/pessimistic_transaction.cc @@ -50,7 +50,8 @@ PessimisticTransaction::PessimisticTransaction( skip_concurrency_control_(false) { txn_db_impl_ = static_cast_with_check<PessimisticTransactionDB, TransactionDB>(txn_db); - do_key_tracking_ = !txn_db_impl_->get_range_lock_manager(); + + do_key_tracking_ = txn_db_impl_->ShouldDoKeyTracking(); db_impl_ = static_cast_with_check<DBImpl, DB>(db_); Initialize(txn_options); } diff --git a/utilities/transactions/pessimistic_transaction_db.cc b/utilities/transactions/pessimistic_transaction_db.cc index 06981adf4..e50fb1dad 100644 --- a/utilities/transactions/pessimistic_transaction_db.cc +++ b/utilities/transactions/pessimistic_transaction_db.cc @@ -41,25 +41,28 @@ PessimisticTransactionDB::PessimisticTransactionDB( } void PessimisticTransactionDB::init_lock_manager() { - BaseLockMgr *lock_mgr; - std::shared_ptr<TransactionDBMutexFactory> mutex_factory = - txn_db_options_.custom_mutex_factory? - txn_db_options_.custom_mutex_factory : - std::shared_ptr<TransactionDBMutexFactory>( - new TransactionDBMutexFactoryImpl()); - - if (txn_db_options_.use_range_locking) { - range_lock_mgr_= new RangeLockMgr(this, mutex_factory); - lock_mgr = range_lock_mgr_; + if (txn_db_options_.range_lock_mgr) { + // A custom lock manager was provided in options + std::shared_ptr<RangeLockMgr> tmp; + tmp = std::static_pointer_cast<RangeLockMgr>(txn_db_options_.range_lock_mgr); + lock_mgr_= tmp; + range_lock_mgr_ = static_cast<RangeLockMgr*>(lock_mgr_.get()); } else { - lock_mgr = new TransactionLockMgr(this, txn_db_options_.num_stripes, - txn_db_options_.max_num_locks, - txn_db_options_.max_num_deadlocks, - mutex_factory); + // Use point lock manager by default + std::shared_ptr<TransactionDBMutexFactory> mutex_factory = + txn_db_options_.custom_mutex_factory? + txn_db_options_.custom_mutex_factory : + std::shared_ptr<TransactionDBMutexFactory>( + new TransactionDBMutexFactoryImpl()); + auto lock_mgr = new TransactionLockMgr(this, txn_db_options_.num_stripes, + txn_db_options_.max_num_locks, + txn_db_options_.max_num_deadlocks, + mutex_factory); + lock_mgr_.reset(lock_mgr); range_lock_mgr_ = nullptr; } - lock_mgr_ = std::shared_ptr<BaseLockMgr>(lock_mgr); + lock_mgr_->init(this); } // Support initiliazing PessimisticTransactionDB from a stackable db diff --git a/utilities/transactions/pessimistic_transaction_db.h b/utilities/transactions/pessimistic_transaction_db.h index 59da1634c..e88856342 100644 --- a/utilities/transactions/pessimistic_transaction_db.h +++ b/utilities/transactions/pessimistic_transaction_db.h @@ -127,6 +127,8 @@ class PessimisticTransactionDB : public TransactionDB { virtual void UpdateCFComparatorMap(const std::vector<ColumnFamilyHandle*>&) {} virtual void UpdateCFComparatorMap(ColumnFamilyHandle*) {} + // Key Tracking should be done only with point lock manager. + bool ShouldDoKeyTracking() const { return range_lock_mgr_ == nullptr; } protected: DBImpl* db_impl_; std::shared_ptr<Logger> info_log_; @@ -157,12 +159,6 @@ class PessimisticTransactionDB : public TransactionDB { // Non-null if we are using a lock manager that supports range locking. RangeLockMgr *range_lock_mgr_ = nullptr; - public: - // Return Range Lock Manager if we are actually using it - virtual RangeLockMgrControl* get_range_lock_manager() override { - return range_lock_mgr_; - } - private: void init_lock_manager(); // Must be held when adding/dropping column families. diff --git a/utilities/transactions/range_locking_test.cc b/utilities/transactions/range_locking_test.cc index aef345be5..df01573e4 100644 --- a/utilities/transactions/range_locking_test.cc +++ b/utilities/transactions/range_locking_test.cc @@ -42,6 +42,7 @@ class RangeLockingTest : public ::testing::Test { std::string dbname; Options options; + std::shared_ptr<RangeLockMgrHandle> range_lock_mgr; TransactionDBOptions txn_db_options; RangeLockingTest() @@ -51,13 +52,13 @@ class RangeLockingTest : public ::testing::Test { DestroyDB(dbname, options); Status s; - txn_db_options.use_range_locking = true; + + range_lock_mgr.reset(rocksdb::NewRangeLockManager(nullptr)); + txn_db_options.range_lock_mgr = range_lock_mgr; + s = TransactionDB::Open(options, txn_db_options, dbname, &db); assert(s.ok()); - rocksdb::RangeLockMgrControl *mgr= db->get_range_lock_manager(); - assert(mgr); - // can also: mgr->set_max_lock_memory(rocksdb_max_lock_memory); } ~RangeLockingTest() { diff --git a/utilities/transactions/transaction_lock_mgr.cc b/utilities/transactions/transaction_lock_mgr.cc index 8b5907bc5..edec58261 100644 --- a/utilities/transactions/transaction_lock_mgr.cc +++ b/utilities/transactions/transaction_lock_mgr.cc @@ -28,6 +28,7 @@ #include "util/sync_point.h" #include "util/thread_local.h" #include "utilities/transactions/pessimistic_transaction_db.h" +#include "utilities/transactions/transaction_db_mutex_impl.h" namespace rocksdb { @@ -753,6 +754,18 @@ void TransactionLockMgr::Resize(uint32_t target_size) { // RangeLockMgr - a lock manager that supports range locking ///////////////////////////////////////////////////////////////////////////// +RangeLockMgrHandle* NewRangeLockManager( + std::shared_ptr<TransactionDBMutexFactory> mutex_factory) { + std::shared_ptr<TransactionDBMutexFactory> use_factory; + + if (mutex_factory) + use_factory = mutex_factory; + else + use_factory.reset(new TransactionDBMutexFactoryImpl()); + + return new RangeLockMgr(use_factory); +} + /* Storage for locks that are currently held by a transaction. @@ -1070,9 +1083,8 @@ int RangeLockMgr::compare_dbt_endpoints(__toku_db*, void *arg, } -RangeLockMgr::RangeLockMgr(TransactionDB* txn_db, - std::shared_ptr<TransactionDBMutexFactory> mutex_factory) : - my_txn_db_(txn_db), mutex_factory_(mutex_factory) { +RangeLockMgr::RangeLockMgr(std::shared_ptr<TransactionDBMutexFactory> mutex_factory) : + mutex_factory_(mutex_factory) { 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 }; diff --git a/utilities/transactions/transaction_lock_mgr.h b/utilities/transactions/transaction_lock_mgr.h index 5e9ee851c..02c68964e 100644 --- a/utilities/transactions/transaction_lock_mgr.h +++ b/utilities/transactions/transaction_lock_mgr.h @@ -76,6 +76,9 @@ class BaseLockMgr { // Resize the deadlock info buffer virtual void Resize(uint32_t)=0; virtual std::vector<DeadlockPath> GetDeadlockInfoBuffer()= 0; + + // TransactionDB will call this at start + virtual void init(TransactionDB *db_arg) {}; virtual ~BaseLockMgr(){} using LockStatusData = std::unordered_multimap<uint32_t, KeyLockInfo>; @@ -194,7 +197,7 @@ using namespace toku; */ class RangeLockMgr : public BaseLockMgr, - public RangeLockMgrControl { + public RangeLockMgrHandle { public: void AddColumnFamily(uint32_t) override { /* do nothing */ } void RemoveColumnFamily(uint32_t) override { /* do nothing */ } @@ -227,8 +230,12 @@ class RangeLockMgr : void UnLock(PessimisticTransaction* txn, uint32_t column_family_id, const std::string& key, Env* env) override ; - RangeLockMgr(TransactionDB* txn_db, - std::shared_ptr<TransactionDBMutexFactory> mutex_factory); + RangeLockMgr(std::shared_ptr<TransactionDBMutexFactory> mutex_factory); + + void init(TransactionDB *db_arg) override { + my_txn_db_ = db_arg; + } + ~RangeLockMgr(); int set_max_lock_memory(size_t max_lock_memory) override

1 0

[Commits] 0693c8dd7: Remove TransactionDB::get_range_lock_manager()
by Sergei Petrunia 22 Apr '19

22 Apr '19

revision-id: 0693c8dd78bcbc82dba1867174b16bf3d4d7b67c (v5.8-1034-g0693c8dd7) parent(s): 3b7567781e50b1ced3583a60fa7f1a568cc42d2e author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-04-22 12:31:32 +0300 message: Remove TransactionDB::get_range_lock_manager() This function was used by the user to get a handle to control the range lock manager. Now, the range lock manager is created by the user and then provided to TransactionDB::Open: mgr= rocksdb::NewRangeLockManager(...); TransactionDBOptions txn_db_opts; txn_db_opts.range_lock_mgr = mgr; TransactionDB::Open(... txn_db_opts ...); --- include/rocksdb/utilities/transaction_db.h | 30 +++++++++++--------- utilities/transactions/pessimistic_transaction.cc | 3 +- .../transactions/pessimistic_transaction_db.cc | 33 ++++++++++++---------- .../transactions/pessimistic_transaction_db.h | 8 ++---- utilities/transactions/transaction_lock_mgr.cc | 11 ++++++-- utilities/transactions/transaction_lock_mgr.h | 13 +++++++-- 6 files changed, 56 insertions(+), 42 deletions(-) diff --git a/include/rocksdb/utilities/transaction_db.h b/include/rocksdb/utilities/transaction_db.h index b12c70785..57cf219da 100644 --- a/include/rocksdb/utilities/transaction_db.h +++ b/include/rocksdb/utilities/transaction_db.h @@ -33,6 +33,19 @@ enum TxnDBWritePolicy { const uint32_t kInitialMaxDeadlocks = 5; +// A handle to control RangeLockMgr +class RangeLockMgrHandle { + public: + virtual int set_max_lock_memory(size_t max_lock_memory) = 0; + virtual uint64_t get_escalation_count() = 0; +}; + +// A factory function to create a Range Lock Manager +RangeLockMgrHandle* NewRangeLockManager( + std::shared_ptr<TransactionDBMutexFactory> mutex_factory +); + + struct TransactionDBOptions { // Specifies the maximum number of keys that can be locked at the same time // per column family. @@ -93,10 +106,9 @@ struct TransactionDBOptions { // logic in myrocks. This hack of simply not rolling back merge operands works // for the special way that myrocks uses this operands. bool rollback_merge_operands = false; - - // If true, range_locking_opts specifies options on range locking (filling - // the struct is mandatory) - bool use_range_locking = false; + + // If non-null, range locking should be used, and the lock manager is passed. + std::shared_ptr<RangeLockMgrHandle> range_lock_mgr; }; struct TransactionOptions { @@ -197,15 +209,6 @@ struct DeadlockPath { bool empty() { return path.empty() && !limit_exceeded; } }; -// Interface for controlling Range Locking manager -class RangeLockMgrControl { - public: - - virtual int set_max_lock_memory(size_t max_lock_memory) = 0; - virtual uint64_t get_escalation_count() = 0; - - virtual ~RangeLockMgrControl(){} -}; class TransactionDB : public StackableDB { public: @@ -281,7 +284,6 @@ class TransactionDB : public StackableDB { virtual std::vector<DeadlockPath> GetDeadlockInfoBuffer() = 0; virtual void SetDeadlockInfoBufferSize(uint32_t target_size) = 0; - virtual RangeLockMgrControl* get_range_lock_manager() { return nullptr; } protected: // To Create an TransactionDB, call Open() // The ownership of db is transferred to the base StackableDB diff --git a/utilities/transactions/pessimistic_transaction.cc b/utilities/transactions/pessimistic_transaction.cc index ca6bc27b6..ff653fa0e 100644 --- a/utilities/transactions/pessimistic_transaction.cc +++ b/utilities/transactions/pessimistic_transaction.cc @@ -50,7 +50,8 @@ PessimisticTransaction::PessimisticTransaction( skip_concurrency_control_(false) { txn_db_impl_ = static_cast_with_check<PessimisticTransactionDB, TransactionDB>(txn_db); - do_key_tracking_ = !txn_db_impl_->get_range_lock_manager(); + + do_key_tracking_ = txn_db_impl_->ShouldDoKeyTracking(); db_impl_ = static_cast_with_check<DBImpl, DB>(db_); Initialize(txn_options); } diff --git a/utilities/transactions/pessimistic_transaction_db.cc b/utilities/transactions/pessimistic_transaction_db.cc index 06981adf4..e50fb1dad 100644 --- a/utilities/transactions/pessimistic_transaction_db.cc +++ b/utilities/transactions/pessimistic_transaction_db.cc @@ -41,25 +41,28 @@ PessimisticTransactionDB::PessimisticTransactionDB( } void PessimisticTransactionDB::init_lock_manager() { - BaseLockMgr *lock_mgr; - std::shared_ptr<TransactionDBMutexFactory> mutex_factory = - txn_db_options_.custom_mutex_factory? - txn_db_options_.custom_mutex_factory : - std::shared_ptr<TransactionDBMutexFactory>( - new TransactionDBMutexFactoryImpl()); - - if (txn_db_options_.use_range_locking) { - range_lock_mgr_= new RangeLockMgr(this, mutex_factory); - lock_mgr = range_lock_mgr_; + if (txn_db_options_.range_lock_mgr) { + // A custom lock manager was provided in options + std::shared_ptr<RangeLockMgr> tmp; + tmp = std::static_pointer_cast<RangeLockMgr>(txn_db_options_.range_lock_mgr); + lock_mgr_= tmp; + range_lock_mgr_ = static_cast<RangeLockMgr*>(lock_mgr_.get()); } else { - lock_mgr = new TransactionLockMgr(this, txn_db_options_.num_stripes, - txn_db_options_.max_num_locks, - txn_db_options_.max_num_deadlocks, - mutex_factory); + // Use point lock manager by default + std::shared_ptr<TransactionDBMutexFactory> mutex_factory = + txn_db_options_.custom_mutex_factory? + txn_db_options_.custom_mutex_factory : + std::shared_ptr<TransactionDBMutexFactory>( + new TransactionDBMutexFactoryImpl()); + auto lock_mgr = new TransactionLockMgr(this, txn_db_options_.num_stripes, + txn_db_options_.max_num_locks, + txn_db_options_.max_num_deadlocks, + mutex_factory); + lock_mgr_.reset(lock_mgr); range_lock_mgr_ = nullptr; } - lock_mgr_ = std::shared_ptr<BaseLockMgr>(lock_mgr); + lock_mgr_->init(this); } // Support initiliazing PessimisticTransactionDB from a stackable db diff --git a/utilities/transactions/pessimistic_transaction_db.h b/utilities/transactions/pessimistic_transaction_db.h index 59da1634c..e88856342 100644 --- a/utilities/transactions/pessimistic_transaction_db.h +++ b/utilities/transactions/pessimistic_transaction_db.h @@ -127,6 +127,8 @@ class PessimisticTransactionDB : public TransactionDB { virtual void UpdateCFComparatorMap(const std::vector<ColumnFamilyHandle*>&) {} virtual void UpdateCFComparatorMap(ColumnFamilyHandle*) {} + // Key Tracking should be done only with point lock manager. + bool ShouldDoKeyTracking() const { return range_lock_mgr_ == nullptr; } protected: DBImpl* db_impl_; std::shared_ptr<Logger> info_log_; @@ -157,12 +159,6 @@ class PessimisticTransactionDB : public TransactionDB { // Non-null if we are using a lock manager that supports range locking. RangeLockMgr *range_lock_mgr_ = nullptr; - public: - // Return Range Lock Manager if we are actually using it - virtual RangeLockMgrControl* get_range_lock_manager() override { - return range_lock_mgr_; - } - private: void init_lock_manager(); // Must be held when adding/dropping column families. diff --git a/utilities/transactions/transaction_lock_mgr.cc b/utilities/transactions/transaction_lock_mgr.cc index 8b5907bc5..c3428e057 100644 --- a/utilities/transactions/transaction_lock_mgr.cc +++ b/utilities/transactions/transaction_lock_mgr.cc @@ -753,6 +753,12 @@ void TransactionLockMgr::Resize(uint32_t target_size) { // RangeLockMgr - a lock manager that supports range locking ///////////////////////////////////////////////////////////////////////////// +RangeLockMgrHandle* NewRangeLockManager( + std::shared_ptr<TransactionDBMutexFactory> mutex_factory +) { + return new RangeLockMgr(mutex_factory); +} + /* Storage for locks that are currently held by a transaction. @@ -1070,9 +1076,8 @@ int RangeLockMgr::compare_dbt_endpoints(__toku_db*, void *arg, } -RangeLockMgr::RangeLockMgr(TransactionDB* txn_db, - std::shared_ptr<TransactionDBMutexFactory> mutex_factory) : - my_txn_db_(txn_db), mutex_factory_(mutex_factory) { +RangeLockMgr::RangeLockMgr(std::shared_ptr<TransactionDBMutexFactory> mutex_factory) : + mutex_factory_(mutex_factory) { 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 }; diff --git a/utilities/transactions/transaction_lock_mgr.h b/utilities/transactions/transaction_lock_mgr.h index 5e9ee851c..02c68964e 100644 --- a/utilities/transactions/transaction_lock_mgr.h +++ b/utilities/transactions/transaction_lock_mgr.h @@ -76,6 +76,9 @@ class BaseLockMgr { // Resize the deadlock info buffer virtual void Resize(uint32_t)=0; virtual std::vector<DeadlockPath> GetDeadlockInfoBuffer()= 0; + + // TransactionDB will call this at start + virtual void init(TransactionDB *db_arg) {}; virtual ~BaseLockMgr(){} using LockStatusData = std::unordered_multimap<uint32_t, KeyLockInfo>; @@ -194,7 +197,7 @@ using namespace toku; */ class RangeLockMgr : public BaseLockMgr, - public RangeLockMgrControl { + public RangeLockMgrHandle { public: void AddColumnFamily(uint32_t) override { /* do nothing */ } void RemoveColumnFamily(uint32_t) override { /* do nothing */ } @@ -227,8 +230,12 @@ class RangeLockMgr : void UnLock(PessimisticTransaction* txn, uint32_t column_family_id, const std::string& key, Env* env) override ; - RangeLockMgr(TransactionDB* txn_db, - std::shared_ptr<TransactionDBMutexFactory> mutex_factory); + RangeLockMgr(std::shared_ptr<TransactionDBMutexFactory> mutex_factory); + + void init(TransactionDB *db_arg) override { + my_txn_db_ = db_arg; + } + ~RangeLockMgr(); int set_max_lock_memory(size_t max_lock_memory) override

1 0

[Commits] 61177f7: MDEV-19275 Provide SQL service to plugins.
by holyfoot＠askmonty.org 22 Apr '19

22 Apr '19

revision-id: 61177f75dc30403a5a6ced18ab069c1883952f5b (mariadb-10.4.4-15-g61177f7) parent(s): e4c5551964f398ebbe2b1b34fef028eff6f22fbe committer: Alexey Botchkov timestamp: 2019-04-22 11:36:37 +0400 message: MDEV-19275 Provide SQL service to plugins. Service SQL owerall design. The service_sql.h is not included in services.h, it's supposed to be included explicitly where the service is needed as it includes the mysql.h. --- include/mysql.h | 3 +- include/mysql/service_sql.h | 93 +++++++++++++++++++++++++++++++++++++++++++++ include/service_versions.h | 1 + libmysqld/libmysql.c | 5 --- libservices/CMakeLists.txt | 1 + libservices/sql_service.c | 19 +++++++++ sql-common/client.c | 17 +++++++++ sql/CMakeLists.txt | 1 + sql/service_sql.cc | 43 +++++++++++++++++++++ sql/sql_plugin_services.ic | 24 +++++++++++- 10 files changed, 199 insertions(+), 8 deletions(-) diff --git a/include/mysql.h b/include/mysql.h index 68b2e76..71c903e 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -193,7 +193,8 @@ enum mysql_option /* MariaDB options */ MYSQL_PROGRESS_CALLBACK=5999, MYSQL_OPT_NONBLOCK, - MYSQL_OPT_USE_THREAD_SPECIFIC_MEMORY + MYSQL_OPT_USE_THREAD_SPECIFIC_MEMORY, + MYSQL_OPT_USE_LOCAL_CONNECTION }; /** diff --git a/include/mysql/service_sql.h b/include/mysql/service_sql.h new file mode 100644 index 0000000..587ed77 --- /dev/null +++ b/include/mysql/service_sql.h @@ -0,0 +1,93 @@ +/* Copyright (C) 2019 MariaDB Corporation + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +//#if (!defined (MYSQL_SERVICE_SQL) && defined (_mysql_h)) +#ifndef MYSQL_SERVICE_SQL +#define MYSQL_SERVICE_SQL + +#include "../mysql.h" + +/** + @file + sql service + + Provides interface for plugins to execute SQL queries. + +*/ + +#ifdef __cplusplus +extern "C" { +#endif + + +/* + TODO 5313 - decide if we should uncomment this istead of + the 'include "../mysql.h"' +typedef struct st_mysql MYSQL; +typedef struct st_mysql_res MYSQL_RES; +typedef char **MYSQL_ROW; +*/ + +extern struct sql_service_st { + MYSQL *(*init)(MYSQL *mysql); + MYSQL *(*real_connect)(MYSQL *mysql,const char *host, const char *user, + const char *passwd, const char *db, + uint port, const char *unix_socket,ulong client_flag); + int (*options)(MYSQL *mysql, enum mysql_option option, const void *arg); + void (*close)(MYSQL *mysql); + int (*real_query)(MYSQL *mysql, const char *q, + unsigned long length); + my_ulonglong (*affected_rows)(MYSQL *mysql); + unsigned int (*merrno)(MYSQL *mysql); + const char *(*error)(MYSQL *mysql); + MYSQL_RES *(*store_result)(MYSQL *mysql); + void (*free_result)(MYSQL_RES *result); + my_ulonglong (*num_rows)(MYSQL_RES *res); + unsigned int (*num_fields)(MYSQL_RES *res); + MYSQL_ROW (*fetch_row)(MYSQL_RES *result); + unsigned long * (*fetch_lengths)(MYSQL_RES *result); +} *sql_service; + +#ifdef MYSQL_DYNAMIC_PLUGIN + +#define mysql_init sql_service->init +#define mysql_real_connect sql_service->real_connect +#define mysql_local_connect sql_service->local_connect +#define mysql_close sql_service->close +#define mysql_real_query sql_service->real_query +#define mysql_affected_rows sql_service->affected_rows +#define mysql_warning_count sql_service->warning_count +#define mysql_errno sql_service->errno +#define mysql_sqlstate sql_service->sqlstate +#define mysql_error sql_service->error +#define mysql_store_result sql_service->store_result +#define mysql_free_result sql_service->free_result +#define mysql_num_rows sql_service->num_rows +#define mysql_num_fields sql_service->num_fields +#define mysql_fetch_field sql_service->fetch_field +#define mysql_field_seek sql_service->field_seek +#define mysql_fetch_row sql_service->fetch_row +#define mysql_fetch_lengths sql_service->fetch_lengths + +#endif /*MYSQL_DYNAMIC_PLUGIN*/ + + +#ifdef __cplusplus +} +#endif + +#endif /* MYSQL_SERVICE_SQL */ + + diff --git a/include/service_versions.h b/include/service_versions.h index 050012d..4cb4725 100644 --- a/include/service_versions.h +++ b/include/service_versions.h @@ -43,3 +43,4 @@ #define VERSION_thd_wait 0x0100 #define VERSION_wsrep 0x0202 #define VERSION_json 0x0100 +#define VERSION_sql 0x0100 diff --git a/libmysqld/libmysql.c b/libmysqld/libmysql.c index cd170b4..9c826a4 100644 --- a/libmysqld/libmysql.c +++ b/libmysqld/libmysql.c @@ -1062,11 +1062,6 @@ unsigned int STDCALL mysql_field_count(MYSQL *mysql) return mysql->field_count; } -my_ulonglong STDCALL mysql_affected_rows(MYSQL *mysql) -{ - return mysql->affected_rows; -} - my_ulonglong STDCALL mysql_insert_id(MYSQL *mysql) { return mysql->insert_id; diff --git a/libservices/CMakeLists.txt b/libservices/CMakeLists.txt index b99be71..0120648 100644 --- a/libservices/CMakeLists.txt +++ b/libservices/CMakeLists.txt @@ -38,6 +38,7 @@ SET(MYSQLSERVICES_SOURCES thd_wait_service.c wsrep_service.c json_service.c + sql_service.c ) ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES}) diff --git a/libservices/sql_service.c b/libservices/sql_service.c new file mode 100644 index 0000000..39a9d0a --- /dev/null +++ b/libservices/sql_service.c @@ -0,0 +1,19 @@ + +/* Copyright (c) 2019, Monty Program Ab + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +#include <service_versions.h> +SERVICE_VERSION sql_service= (void*)VERSION_sql; diff --git a/sql-common/client.c b/sql-common/client.c index c66cb1a..ace5630 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -2844,6 +2844,11 @@ set_connect_attributes(MYSQL *mysql, char *buff, size_t buf_len) } +#ifdef MYSQL_SERVER +extern MYSQL * STDCALL do_local_connect(MYSQL *mysql); +#endif /*MYSQL_SERVER*/ + + MYSQL * STDCALL CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user, const char *passwd, const char *db, @@ -2875,6 +2880,10 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user, set_mysql_error(mysql, CR_ALREADY_CONNECTED, unknown_sqlstate); DBUG_RETURN(0); } +#ifdef MYSQL_SERVER + if (mysql->options.methods_to_use == MYSQL_OPT_USE_LOCAL_CONNECTION) + DBUG_RETURN(do_local_connect(mysql)); +#endif mysql->methods= &client_methods; mysql->client_flag=0; /* For handshake */ @@ -3907,6 +3916,11 @@ static MYSQL_RES * cli_use_result(MYSQL *mysql) } +my_ulonglong STDCALL mysql_affected_rows(MYSQL *mysql) +{ + return mysql->affected_rows; +} + /************************************************************************** Return next row of the query results **************************************************************************/ @@ -4038,6 +4052,9 @@ mysql_options(MYSQL *mysql,enum mysql_option option, const void *arg) break; case MYSQL_OPT_USE_REMOTE_CONNECTION: case MYSQL_OPT_USE_EMBEDDED_CONNECTION: +#ifdef MYSQL_SERVER + case MYSQL_OPT_USE_LOCAL_CONNECTION: +#endif /*MYSQL_SERVER*/ case MYSQL_OPT_GUESS_CONNECTION: mysql->options.methods_to_use= option; break; diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index ecca723..6a405c7 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -144,6 +144,7 @@ SET (SQL_SOURCE ${WSREP_SOURCES} table_cache.cc encryption.cc temporary_tables.cc proxy_protocol.cc backup.cc + service_sql.cc ${CMAKE_CURRENT_BINARY_DIR}/sql_builtin.cc ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.cc ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc_ora.cc diff --git a/sql/service_sql.cc b/sql/service_sql.cc new file mode 100644 index 0000000..36f65b7 --- /dev/null +++ b/sql/service_sql.cc @@ -0,0 +1,43 @@ +/* Copyright 2018 Codership Oy <info(a)codership.com> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "mariadb.h" +#include "sql_prepare.h" +#include <sql_common.h> +#include <mysql.h> + +extern "C" +{ + +static MYSQL_METHODS connect_local_methods= +{ + NULL,//loc_read_query_result, + NULL,//loc_advanced_command, + NULL,//loc_read_rows, + NULL,//loc_use_result, + NULL,//loc_fetch_lengths, + NULL,//loc_flush_use_result, + NULL //loc_read_change_user_result +}; + + +MYSQL * STDCALL do_local_connect(MYSQL *mysql) +{ + mysql->methods= &connect_local_methods; + return 0; +} + + +} /* extern "C" */ + diff --git a/sql/sql_plugin_services.ic b/sql/sql_plugin_services.ic index 955b9a0..9e7a5b9 100644 --- a/sql/sql_plugin_services.ic +++ b/sql/sql_plugin_services.ic @@ -17,6 +17,7 @@ /* support for Services */ #include <service_versions.h> #include <mysql/service_wsrep.h> +#include <mysql/service_sql.h> struct st_service_ref { const char *name; @@ -208,7 +209,7 @@ static struct my_print_error_service_st my_print_error_handler= my_printv_error }; -struct json_service_st json_handler= +static struct json_service_st json_handler= { json_type, json_get_array_item, @@ -218,6 +219,24 @@ struct json_service_st json_handler= json_unescape_json }; +static struct sql_service_st sql_handler= +{ + mysql_init, + mysql_real_connect, + mysql_options, + mysql_close, + mysql_real_query, + mysql_affected_rows, + mysql_errno, + mysql_error, + mysql_store_result, + mysql_free_result, + mysql_num_rows, + mysql_num_fields, + mysql_fetch_row, + mysql_fetch_lengths +}; + static struct st_service_ref list_of_services[]= { { "base64_service", VERSION_base64, &base64_handler }, @@ -241,6 +260,7 @@ static struct st_service_ref list_of_services[]= { "thd_timezone_service", VERSION_thd_timezone, &thd_timezone_handler }, { "thd_wait_service", VERSION_thd_wait, &thd_wait_handler }, { "wsrep_service", VERSION_wsrep, &wsrep_handler }, - { "json_service", VERSION_json, &json_handler } + { "json_service", VERSION_json, &json_handler }, + { "sql_service", VERSION_sql, &sql_handler } };

1 0