mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Bug#11853126 RE-ENABLE CONCURRENT READS WHILE CREATING
SECONDARY INDEX IN INNODB The patches for Bug#11751388 and Bug#11784056 enabled concurrent reads while creating secondary indexes in InnoDB. However, they introduced a regression. This regression occured if ALTER TABLE failed after the index had been added, for example during the lock upgrade needed to update .FRM. If this happened, InnoDB and the server got out of sync with regards to which indexes actually existed. Therefore the patch for Bug#11815600 again disabled concurrent reads. This patch re-enables concurrent reads. The original regression is fixed by splitting the ADD INDEX operation into two parts. First the new index is created but not made active. This is done while concurrent reads are allowed. The second part of the operation makes the index active (or reverts the change). This is done after lock upgrade, which prevents the original regression. In order to implement this change, the patch changes the storage API for in-place index creation. handler::add_index() is split into two functions, handler_add_index() and handler::final_add_index(). The former for creating indexes without making them visible and the latter for commiting (i.e. making visible) new indexes or reverting the changes. Large parts of this patch were written by Marko Mäkelä. Test case added to innodb_mysql_lock.test.
This commit is contained in:
Jon Olav Hauglid
@ -152,133 +152,129 @@ disconnect con1;
|
||||
--echo # that implement add_index
|
||||
--echo #
|
||||
|
||||
--echo #
|
||||
--echo # DISABLED due to Bug#11815600
|
||||
--echo #
|
||||
--disable_warnings
|
||||
DROP DATABASE IF EXISTS db1;
|
||||
DROP TABLE IF EXISTS t1;
|
||||
--enable_warnings
|
||||
|
||||
#--disable_warnings
|
||||
#DROP DATABASE IF EXISTS db1;
|
||||
#DROP TABLE IF EXISTS t1;
|
||||
#--enable_warnings
|
||||
#
|
||||
#connect(con1,localhost,root);
|
||||
#connect(con2,localhost,root);
|
||||
#
|
||||
#--echo # Test 1: Secondary index, should not block reads (original test case).
|
||||
#
|
||||
#--echo # Connection default
|
||||
#connection default;
|
||||
#CREATE DATABASE db1;
|
||||
#CREATE TABLE db1.t1(id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, value INT) engine=innodb;
|
||||
#INSERT INTO db1.t1(value) VALUES (1), (2);
|
||||
#SET DEBUG_SYNC= "alter_table_manage_keys SIGNAL manage WAIT_FOR query";
|
||||
#--echo # Sending:
|
||||
#--send ALTER TABLE db1.t1 ADD INDEX(value)
|
||||
#
|
||||
#--echo # Connection con1
|
||||
#connection con1;
|
||||
#SET DEBUG_SYNC= "now WAIT_FOR manage";
|
||||
# # Neither of these two statements should be blocked
|
||||
#USE db1;
|
||||
#SELECT * FROM t1;
|
||||
#SET DEBUG_SYNC= "now SIGNAL query";
|
||||
#
|
||||
#--echo # Connection default
|
||||
#connection default;
|
||||
#--echo # Reaping: ALTER TABLE db1.t1 ADD INDEX(value)
|
||||
#--reap
|
||||
#DROP DATABASE db1;
|
||||
#
|
||||
#--echo # Test 2: Primary index (implicit), should block reads.
|
||||
#
|
||||
#CREATE TABLE t1(a INT NOT NULL, b INT NOT NULL) engine=innodb;
|
||||
#SET DEBUG_SYNC= "alter_table_manage_keys SIGNAL manage WAIT_FOR query";
|
||||
#--echo # Sending:
|
||||
#--send ALTER TABLE t1 ADD UNIQUE INDEX(a)
|
||||
#
|
||||
#--echo # Connection con1
|
||||
#connection con1;
|
||||
#SET DEBUG_SYNC= "now WAIT_FOR manage";
|
||||
#USE test;
|
||||
#--echo # Sending:
|
||||
#--send SELECT * FROM t1
|
||||
#
|
||||
#--echo # Connection con2
|
||||
#connection con2;
|
||||
#--echo # Waiting for SELECT to be blocked by the metadata lock on t1
|
||||
#let $wait_condition= SELECT COUNT(*)= 1 FROM information_schema.processlist
|
||||
# WHERE state= 'Waiting for table metadata lock'
|
||||
# AND info='SELECT * FROM t1';
|
||||
#--source include/wait_condition.inc
|
||||
#SET DEBUG_SYNC= "now SIGNAL query";
|
||||
#
|
||||
#--echo # Connection default
|
||||
#connection default;
|
||||
#--echo # Reaping: ALTER TABLE t1 ADD UNIQUE INDEX(a)
|
||||
#--reap
|
||||
#
|
||||
#--echo # Connection con1
|
||||
#connection con1;
|
||||
#--echo # Reaping: SELECT * FROM t1
|
||||
#--reap
|
||||
#
|
||||
#--echo # Test 3: Primary index (explicit), should block reads.
|
||||
#
|
||||
#--echo # Connection default
|
||||
#connection default;
|
||||
#ALTER TABLE t1 DROP INDEX a;
|
||||
#SET DEBUG_SYNC= "alter_table_manage_keys SIGNAL manage WAIT_FOR query";
|
||||
#--echo # Sending:
|
||||
#--send ALTER TABLE t1 ADD PRIMARY KEY (a)
|
||||
#
|
||||
#--echo # Connection con1
|
||||
#connection con1;
|
||||
#SET DEBUG_SYNC= "now WAIT_FOR manage";
|
||||
#--echo # Sending:
|
||||
#--send SELECT * FROM t1
|
||||
#
|
||||
#--echo # Connection con2
|
||||
#connection con2;
|
||||
#--echo # Waiting for SELECT to be blocked by the metadata lock on t1
|
||||
#let $wait_condition= SELECT COUNT(*)= 1 FROM information_schema.processlist
|
||||
# WHERE state= 'Waiting for table metadata lock'
|
||||
# AND info='SELECT * FROM t1';
|
||||
#--source include/wait_condition.inc
|
||||
#SET DEBUG_SYNC= "now SIGNAL query";
|
||||
#
|
||||
#--echo # Connection default
|
||||
#connection default;
|
||||
#--echo # Reaping: ALTER TABLE t1 ADD PRIMARY KEY (a)
|
||||
#--reap
|
||||
#
|
||||
#--echo # Connection con1
|
||||
#connection con1;
|
||||
#--echo # Reaping: SELECT * FROM t1
|
||||
#--reap
|
||||
#
|
||||
#--echo # Test 4: Secondary unique index, should not block reads.
|
||||
#
|
||||
#--echo # Connection default
|
||||
#connection default;
|
||||
#SET DEBUG_SYNC= "alter_table_manage_keys SIGNAL manage WAIT_FOR query";
|
||||
#--echo # Sending:
|
||||
#--send ALTER TABLE t1 ADD UNIQUE (b)
|
||||
#
|
||||
#--echo # Connection con1
|
||||
#connection con1;
|
||||
#SET DEBUG_SYNC= "now WAIT_FOR manage";
|
||||
#SELECT * FROM t1;
|
||||
#SET DEBUG_SYNC= "now SIGNAL query";
|
||||
#
|
||||
#--echo # Connection default
|
||||
#connection default;
|
||||
#--echo # Reaping: ALTER TABLE t1 ADD UNIQUE (b)
|
||||
#--reap
|
||||
#
|
||||
#disconnect con1;
|
||||
#disconnect con2;
|
||||
#SET DEBUG_SYNC= "RESET";
|
||||
#DROP TABLE t1;
|
||||
connect(con1,localhost,root);
|
||||
connect(con2,localhost,root);
|
||||
|
||||
--echo # Test 1: Secondary index, should not block reads (original test case).
|
||||
|
||||
--echo # Connection default
|
||||
connection default;
|
||||
CREATE DATABASE db1;
|
||||
CREATE TABLE db1.t1(id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, value INT) engine=innodb;
|
||||
INSERT INTO db1.t1(value) VALUES (1), (2);
|
||||
SET DEBUG_SYNC= "alter_table_manage_keys SIGNAL manage WAIT_FOR query";
|
||||
--echo # Sending:
|
||||
--send ALTER TABLE db1.t1 ADD INDEX(value)
|
||||
|
||||
--echo # Connection con1
|
||||
connection con1;
|
||||
SET DEBUG_SYNC= "now WAIT_FOR manage";
|
||||
# Neither of these two statements should be blocked
|
||||
USE db1;
|
||||
SELECT * FROM t1;
|
||||
SET DEBUG_SYNC= "now SIGNAL query";
|
||||
|
||||
--echo # Connection default
|
||||
connection default;
|
||||
--echo # Reaping: ALTER TABLE db1.t1 ADD INDEX(value)
|
||||
--reap
|
||||
DROP DATABASE db1;
|
||||
|
||||
--echo # Test 2: Primary index (implicit), should block reads.
|
||||
|
||||
CREATE TABLE t1(a INT NOT NULL, b INT NOT NULL) engine=innodb;
|
||||
SET DEBUG_SYNC= "alter_table_manage_keys SIGNAL manage WAIT_FOR query";
|
||||
--echo # Sending:
|
||||
--send ALTER TABLE t1 ADD UNIQUE INDEX(a)
|
||||
|
||||
--echo # Connection con1
|
||||
connection con1;
|
||||
SET DEBUG_SYNC= "now WAIT_FOR manage";
|
||||
USE test;
|
||||
--echo # Sending:
|
||||
--send SELECT * FROM t1
|
||||
|
||||
--echo # Connection con2
|
||||
connection con2;
|
||||
--echo # Waiting for SELECT to be blocked by the metadata lock on t1
|
||||
let $wait_condition= SELECT COUNT(*)= 1 FROM information_schema.processlist
|
||||
WHERE state= 'Waiting for table metadata lock'
|
||||
AND info='SELECT * FROM t1';
|
||||
--source include/wait_condition.inc
|
||||
SET DEBUG_SYNC= "now SIGNAL query";
|
||||
|
||||
--echo # Connection default
|
||||
connection default;
|
||||
--echo # Reaping: ALTER TABLE t1 ADD UNIQUE INDEX(a)
|
||||
--reap
|
||||
|
||||
--echo # Connection con1
|
||||
connection con1;
|
||||
--echo # Reaping: SELECT * FROM t1
|
||||
--reap
|
||||
|
||||
--echo # Test 3: Primary index (explicit), should block reads.
|
||||
|
||||
--echo # Connection default
|
||||
connection default;
|
||||
ALTER TABLE t1 DROP INDEX a;
|
||||
SET DEBUG_SYNC= "alter_table_manage_keys SIGNAL manage WAIT_FOR query";
|
||||
--echo # Sending:
|
||||
--send ALTER TABLE t1 ADD PRIMARY KEY (a)
|
||||
|
||||
--echo # Connection con1
|
||||
connection con1;
|
||||
SET DEBUG_SYNC= "now WAIT_FOR manage";
|
||||
--echo # Sending:
|
||||
--send SELECT * FROM t1
|
||||
|
||||
--echo # Connection con2
|
||||
connection con2;
|
||||
--echo # Waiting for SELECT to be blocked by the metadata lock on t1
|
||||
let $wait_condition= SELECT COUNT(*)= 1 FROM information_schema.processlist
|
||||
WHERE state= 'Waiting for table metadata lock'
|
||||
AND info='SELECT * FROM t1';
|
||||
--source include/wait_condition.inc
|
||||
SET DEBUG_SYNC= "now SIGNAL query";
|
||||
|
||||
--echo # Connection default
|
||||
connection default;
|
||||
--echo # Reaping: ALTER TABLE t1 ADD PRIMARY KEY (a)
|
||||
--reap
|
||||
|
||||
--echo # Connection con1
|
||||
connection con1;
|
||||
--echo # Reaping: SELECT * FROM t1
|
||||
--reap
|
||||
|
||||
--echo # Test 4: Secondary unique index, should not block reads.
|
||||
|
||||
--echo # Connection default
|
||||
connection default;
|
||||
SET DEBUG_SYNC= "alter_table_manage_keys SIGNAL manage WAIT_FOR query";
|
||||
--echo # Sending:
|
||||
--send ALTER TABLE t1 ADD UNIQUE (b)
|
||||
|
||||
--echo # Connection con1
|
||||
connection con1;
|
||||
SET DEBUG_SYNC= "now WAIT_FOR manage";
|
||||
SELECT * FROM t1;
|
||||
SET DEBUG_SYNC= "now SIGNAL query";
|
||||
|
||||
--echo # Connection default
|
||||
connection default;
|
||||
--echo # Reaping: ALTER TABLE t1 ADD UNIQUE (b)
|
||||
--reap
|
||||
|
||||
disconnect con1;
|
||||
disconnect con2;
|
||||
SET DEBUG_SYNC= "RESET";
|
||||
DROP TABLE t1;
|
||||
|
||||
|
||||
# Check that all connections opened by test cases in this file are really
|
||||
|
||||
Reference in New Issue
Block a user