mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
A fix and a test case for Bug#26141 mixing table types in trigger
causes full table lock on innodb table. Also fixes Bug#28502 Triggers that update another innodb table will block on X lock unnecessarily (duplciate). Code review fixes. Both bugs' synopses are misleading: InnoDB table is not X locked. The statements, however, cannot proceed concurrently, but this happens due to lock conflicts for tables used in triggers, not for the InnoDB table. If a user had an InnoDB table, and two triggers, AFTER UPDATE and AFTER INSERT, competing for different resources (e.g. two distinct MyISAM tables), then these two triggers would not be able to execute concurrently. Moreover, INSERTS/UPDATES of the InnoDB table would not be able to run concurrently. The problem had other side-effects (see respective bug reports). This behavior was a consequence of a shortcoming of the pre-locking algorithm, which would not distinguish between different DML operations (e.g. INSERT and DELETE) and pre-lock all the tables that are used by any trigger defined on the subject table. The idea of the fix is to extend the pre-locking algorithm to keep track, for each table, what DML operation it is used for and not load triggers that are known to never be fired. mysql-test/r/trigger-trans.result: Update results (Bug#26141) mysql-test/r/trigger.result: Update results (Bug#28502) mysql-test/t/trigger-trans.test: Add a test case for Bug#26141 mixing table types in trigger causes full table lock on innodb table. mysql-test/t/trigger.test: Add a test case for Bug#28502 Triggers that update another innodb table will block echo on X lock unnecessarily. Add more test coverage for triggers. sql/item.h: enum trg_event_type is needed in table.h sql/sp.cc: Take into account table_list->trg_event_map when determining what tables to pre-lock. After this change, if we attempt to fire a trigger for which we had not pre-locked any tables, error 'Table was not locked with LOCK TABLES' will be printed. This, however, should never happen, provided the pre-locking algorithm has no programming bugs. Previously a trigger key in the sroutines hash was based on the name of the table the trigger belongs to. This was possible because we would always add to the pre-locking list all the triggers defined for a table when handling this table. Now the key is based on the name of the trigger, owing to the fact that a trigger name must be unique in the database it belongs to. sql/sp_head.cc: Generate sroutines hash key in init_spname(). This is a convenient place since there we have all the necessary information and can avoid an extra alloc. Maintain and merge trg_event_map when adding and merging elements of the pre-locking list. sql/sp_head.h: Add ,m_sroutines_key member, used when inserting the sphead for a trigger into the cache of routines used by a statement. Previously the key was based on the table name the trigger belonged to, since for a given table we would add to the sroutines list all the triggers defined on it. sql/sql_lex.cc: Introduce a new lex step: set_trg_event_type_for_tables(). It is called when we have finished parsing but before opening and locking tables. Now this step is used to evaluate for each TABLE_LIST instance which INSERT/UPDATE/DELETE operation, if any, it is used in. In future this method could be extended to aggregate other information that is hard to aggregate during parsing. sql/sql_lex.h: Add declaration for set_trg_event_type_for_tables(). sql/sql_parse.cc: Call set_trg_event_type_for_tables() after MYSQLparse(). Remove tabs. sql/sql_prepare.cc: Call set_trg_event_type_for_tables() after MYSQLparse(). sql/sql_trigger.cc: Call set_trg_event_type_for_tables() after MYSQLparse(). sql/sql_trigger.h: Remove an obsolete member. sql/sql_view.cc: Call set_trg_event_type_for_tables() after MYSQLparse(). sql/sql_yacc.yy: Move assignment of sp_head::m_type before calling sp_head::init_spname(), one is now used inside another. sql/table.cc: Implement TABLE_LIST::set_trg_event_map() - a method that calculates wh triggers may be fired on this table when executing a statement. sql/table.h: Add missing declarations. Move declaration of trg_event_type from item.h (it will be needed for trg_event_map bitmap when we start using Bitmap template instead of uint8).
This commit is contained in:
unknown
@@ -1828,5 +1828,370 @@ DROP TRIGGER t1_test;
|
||||
DROP TABLE t1,t2;
|
||||
SET SESSION LOW_PRIORITY_UPDATES=DEFAULT;
|
||||
SET GLOBAL LOW_PRIORITY_UPDATES=DEFAULT;
|
||||
--echo
|
||||
--echo Bug#28502 Triggers that update another innodb table will block
|
||||
--echo on X lock unnecessarily
|
||||
--echo
|
||||
--echo Ensure we do not open and lock tables for triggers we do not fire.
|
||||
--echo
|
||||
--disable_warnings
|
||||
drop table if exists t1, t2;
|
||||
drop trigger if exists trg_bug28502_au;
|
||||
--enable_warnings
|
||||
|
||||
create table t1 (id int, count int);
|
||||
create table t2 (id int);
|
||||
delimiter |;
|
||||
|
||||
create trigger trg_bug28502_au before update on t2
|
||||
for each row
|
||||
begin
|
||||
if (new.id is not null) then
|
||||
update t1 set count= count + 1 where id = old.id;
|
||||
end if;
|
||||
end|
|
||||
|
||||
delimiter ;|
|
||||
insert into t1 (id, count) values (1, 0);
|
||||
|
||||
lock table t1 write;
|
||||
|
||||
--connect (connection_insert, localhost, root, , test, , )
|
||||
connection connection_insert;
|
||||
# Is expected to pass.
|
||||
insert into t2 set id=1;
|
||||
connection default;
|
||||
unlock tables;
|
||||
update t2 set id=1 where id=1;
|
||||
select * from t1;
|
||||
select * from t2;
|
||||
# Will drop the trigger
|
||||
drop table t1, t2;
|
||||
disconnect connection_insert;
|
||||
--echo
|
||||
--echo Additionally, provide test coverage for triggers and
|
||||
--echo all MySQL data changing commands.
|
||||
--echo
|
||||
--disable_warnings
|
||||
drop table if exists t1, t2, t1_op_log;
|
||||
drop view if exists v1;
|
||||
drop trigger if exists trg_bug28502_bi;
|
||||
drop trigger if exists trg_bug28502_ai;
|
||||
drop trigger if exists trg_bug28502_bu;
|
||||
drop trigger if exists trg_bug28502_au;
|
||||
drop trigger if exists trg_bug28502_bd;
|
||||
drop trigger if exists trg_bug28502_ad;
|
||||
--enable_warnings
|
||||
create table t1 (id int primary key auto_increment, operation varchar(255));
|
||||
create table t2 (id int primary key);
|
||||
create table t1_op_log(operation varchar(255));
|
||||
create view v1 as select * from t1;
|
||||
create trigger trg_bug28502_bi before insert on t1
|
||||
for each row
|
||||
insert into t1_op_log (operation)
|
||||
values (concat("Before INSERT, new=", new.operation));
|
||||
|
||||
create trigger trg_bug28502_ai after insert on t1
|
||||
for each row
|
||||
insert into t1_op_log (operation)
|
||||
values (concat("After INSERT, new=", new.operation));
|
||||
|
||||
create trigger trg_bug28502_bu before update on t1
|
||||
for each row
|
||||
insert into t1_op_log (operation)
|
||||
values (concat("Before UPDATE, new=", new.operation,
|
||||
", old=", old.operation));
|
||||
|
||||
create trigger trg_bug28502_au after update on t1
|
||||
for each row
|
||||
insert into t1_op_log (operation)
|
||||
values (concat("After UPDATE, new=", new.operation,
|
||||
", old=", old.operation));
|
||||
|
||||
create trigger trg_bug28502_bd before delete on t1
|
||||
for each row
|
||||
insert into t1_op_log (operation)
|
||||
values (concat("Before DELETE, old=", old.operation));
|
||||
|
||||
create trigger trg_bug28502_ad after delete on t1
|
||||
for each row
|
||||
insert into t1_op_log (operation)
|
||||
values (concat("After DELETE, old=", old.operation));
|
||||
|
||||
insert into t1 (operation) values ("INSERT");
|
||||
|
||||
set @id=last_insert_id();
|
||||
|
||||
select * from t1;
|
||||
select * from t1_op_log;
|
||||
truncate t1_op_log;
|
||||
|
||||
update t1 set operation="UPDATE" where id=@id;
|
||||
|
||||
select * from t1;
|
||||
select * from t1_op_log;
|
||||
truncate t1_op_log;
|
||||
|
||||
delete from t1 where id=@id;
|
||||
|
||||
select * from t1;
|
||||
select * from t1_op_log;
|
||||
truncate t1;
|
||||
truncate t1_op_log;
|
||||
|
||||
insert into t1 (id, operation) values
|
||||
(NULL, "INSERT ON DUPLICATE KEY UPDATE, inserting a new key")
|
||||
on duplicate key update id=NULL, operation="Should never happen";
|
||||
|
||||
set @id=last_insert_id();
|
||||
|
||||
select * from t1;
|
||||
select * from t1_op_log;
|
||||
truncate t1_op_log;
|
||||
|
||||
insert into t1 (id, operation) values
|
||||
(@id, "INSERT ON DUPLICATE KEY UPDATE, the key value is the same")
|
||||
on duplicate key update id=NULL,
|
||||
operation="INSERT ON DUPLICATE KEY UPDATE, updating the duplicate";
|
||||
|
||||
select * from t1;
|
||||
select * from t1_op_log;
|
||||
truncate t1;
|
||||
truncate t1_op_log;
|
||||
|
||||
replace into t1 values (NULL, "REPLACE, inserting a new key");
|
||||
|
||||
set @id=last_insert_id();
|
||||
|
||||
select * from t1;
|
||||
select * from t1_op_log;
|
||||
truncate t1_op_log;
|
||||
|
||||
replace into t1 values (@id, "REPLACE, deleting the duplicate");
|
||||
|
||||
select * from t1;
|
||||
select * from t1_op_log;
|
||||
truncate t1;
|
||||
truncate t1_op_log;
|
||||
|
||||
create table if not exists t1
|
||||
select NULL, "CREATE TABLE ... SELECT, inserting a new key";
|
||||
|
||||
set @id=last_insert_id();
|
||||
|
||||
select * from t1;
|
||||
select * from t1_op_log;
|
||||
truncate t1_op_log;
|
||||
|
||||
create table if not exists t1 replace
|
||||
select @id, "CREATE TABLE ... REPLACE SELECT, deleting a duplicate key";
|
||||
|
||||
select * from t1;
|
||||
select * from t1_op_log;
|
||||
truncate t1;
|
||||
truncate t1_op_log;
|
||||
|
||||
insert into t1 (id, operation)
|
||||
select NULL, "INSERT ... SELECT, inserting a new key";
|
||||
|
||||
set @id=last_insert_id();
|
||||
|
||||
select * from t1;
|
||||
select * from t1_op_log;
|
||||
truncate t1_op_log;
|
||||
|
||||
insert into t1 (id, operation)
|
||||
select @id,
|
||||
"INSERT ... SELECT ... ON DUPLICATE KEY UPDATE, updating a duplicate"
|
||||
on duplicate key update id=NULL,
|
||||
operation="INSERT ... SELECT ... ON DUPLICATE KEY UPDATE, updating a duplicate";
|
||||
|
||||
select * from t1;
|
||||
select * from t1_op_log;
|
||||
truncate t1;
|
||||
truncate t1_op_log;
|
||||
|
||||
replace into t1 (id, operation)
|
||||
select NULL, "REPLACE ... SELECT, inserting a new key";
|
||||
|
||||
set @id=last_insert_id();
|
||||
|
||||
select * from t1;
|
||||
select * from t1_op_log;
|
||||
truncate t1_op_log;
|
||||
|
||||
replace into t1 (id, operation)
|
||||
select @id, "REPLACE ... SELECT, deleting a duplicate";
|
||||
|
||||
select * from t1;
|
||||
select * from t1_op_log;
|
||||
truncate t1;
|
||||
truncate t1_op_log;
|
||||
|
||||
insert into t1 (id, operation) values (1, "INSERT for multi-DELETE");
|
||||
insert into t2 (id) values (1);
|
||||
|
||||
delete t1.*, t2.* from t1, t2 where t1.id=1;
|
||||
|
||||
select * from t1;
|
||||
select * from t2;
|
||||
select * from t1_op_log;
|
||||
truncate t1;
|
||||
truncate t2;
|
||||
truncate t1_op_log;
|
||||
|
||||
insert into t1 (id, operation) values (1, "INSERT for multi-UPDATE");
|
||||
insert into t2 (id) values (1);
|
||||
update t1, t2 set t1.id=2, operation="multi-UPDATE" where t1.id=1;
|
||||
update t1, t2
|
||||
set t2.id=3, operation="multi-UPDATE, SET for t2, but the trigger is fired" where t1.id=2;
|
||||
|
||||
select * from t1;
|
||||
select * from t2;
|
||||
select * from t1_op_log;
|
||||
truncate table t1;
|
||||
truncate table t2;
|
||||
truncate table t1_op_log;
|
||||
|
||||
--echo
|
||||
--echo Now do the same but use a view instead of the base table.
|
||||
--echo
|
||||
|
||||
insert into v1 (operation) values ("INSERT");
|
||||
|
||||
set @id=last_insert_id();
|
||||
|
||||
select * from t1;
|
||||
select * from t1_op_log;
|
||||
truncate t1_op_log;
|
||||
|
||||
update v1 set operation="UPDATE" where id=@id;
|
||||
|
||||
select * from t1;
|
||||
select * from t1_op_log;
|
||||
truncate t1_op_log;
|
||||
|
||||
delete from v1 where id=@id;
|
||||
|
||||
select * from t1;
|
||||
select * from t1_op_log;
|
||||
truncate t1;
|
||||
truncate t1_op_log;
|
||||
|
||||
insert into v1 (id, operation) values
|
||||
(NULL, "INSERT ON DUPLICATE KEY UPDATE, inserting a new key")
|
||||
on duplicate key update id=NULL, operation="Should never happen";
|
||||
|
||||
set @id=last_insert_id();
|
||||
|
||||
select * from t1;
|
||||
select * from t1_op_log;
|
||||
truncate t1_op_log;
|
||||
|
||||
insert into v1 (id, operation) values
|
||||
(@id, "INSERT ON DUPLICATE KEY UPDATE, the key value is the same")
|
||||
on duplicate key update id=NULL,
|
||||
operation="INSERT ON DUPLICATE KEY UPDATE, updating the duplicate";
|
||||
|
||||
select * from t1;
|
||||
select * from t1_op_log;
|
||||
truncate t1;
|
||||
truncate t1_op_log;
|
||||
|
||||
replace into v1 values (NULL, "REPLACE, inserting a new key");
|
||||
|
||||
set @id=last_insert_id();
|
||||
|
||||
select * from t1;
|
||||
select * from t1_op_log;
|
||||
truncate t1_op_log;
|
||||
|
||||
replace into v1 values (@id, "REPLACE, deleting the duplicate");
|
||||
|
||||
select * from t1;
|
||||
select * from t1_op_log;
|
||||
truncate t1;
|
||||
truncate t1_op_log;
|
||||
|
||||
create table if not exists v1
|
||||
select NULL, "CREATE TABLE ... SELECT, inserting a new key";
|
||||
|
||||
set @id=last_insert_id();
|
||||
|
||||
select * from t1;
|
||||
select * from t1_op_log;
|
||||
truncate t1_op_log;
|
||||
|
||||
create table if not exists v1 replace
|
||||
select @id, "CREATE TABLE ... REPLACE SELECT, deleting a duplicate key";
|
||||
|
||||
select * from t1;
|
||||
select * from t1_op_log;
|
||||
truncate t1;
|
||||
truncate t1_op_log;
|
||||
|
||||
insert into v1 (id, operation)
|
||||
select NULL, "INSERT ... SELECT, inserting a new key";
|
||||
|
||||
set @id=last_insert_id();
|
||||
|
||||
select * from t1;
|
||||
select * from t1_op_log;
|
||||
truncate t1_op_log;
|
||||
|
||||
insert into v1 (id, operation)
|
||||
select @id,
|
||||
"INSERT ... SELECT ... ON DUPLICATE KEY UPDATE, updating a duplicate"
|
||||
on duplicate key update id=NULL,
|
||||
operation="INSERT ... SELECT ... ON DUPLICATE KEY UPDATE, updating a duplicate";
|
||||
|
||||
select * from t1;
|
||||
select * from t1_op_log;
|
||||
truncate t1;
|
||||
truncate t1_op_log;
|
||||
|
||||
replace into v1 (id, operation)
|
||||
select NULL, "REPLACE ... SELECT, inserting a new key";
|
||||
|
||||
set @id=last_insert_id();
|
||||
|
||||
select * from t1;
|
||||
select * from t1_op_log;
|
||||
truncate t1_op_log;
|
||||
|
||||
replace into v1 (id, operation)
|
||||
select @id, "REPLACE ... SELECT, deleting a duplicate";
|
||||
|
||||
select * from t1;
|
||||
select * from t1_op_log;
|
||||
truncate t1;
|
||||
truncate t1_op_log;
|
||||
|
||||
insert into v1 (id, operation) values (1, "INSERT for multi-DELETE");
|
||||
insert into t2 (id) values (1);
|
||||
|
||||
delete v1.*, t2.* from v1, t2 where v1.id=1;
|
||||
|
||||
select * from t1;
|
||||
select * from t2;
|
||||
select * from t1_op_log;
|
||||
truncate t1;
|
||||
truncate t2;
|
||||
truncate t1_op_log;
|
||||
|
||||
insert into v1 (id, operation) values (1, "INSERT for multi-UPDATE");
|
||||
insert into t2 (id) values (1);
|
||||
update v1, t2 set v1.id=2, operation="multi-UPDATE" where v1.id=1;
|
||||
update v1, t2
|
||||
set t2.id=3, operation="multi-UPDATE, SET for t2, but the trigger is fired" where v1.id=2;
|
||||
|
||||
select * from t1;
|
||||
select * from t2;
|
||||
select * from t1_op_log;
|
||||
|
||||
drop view v1;
|
||||
drop table t1, t2, t1_op_log;
|
||||
|
||||
#
|
||||
# TODO: test LOAD DATA INFILE
|
||||
--echo End of 5.0 tests
|
||||
|
||||
Reference in New Issue
Block a user