mirror of
https://github.com/MariaDB/server.git
synced 2025-01-28 17:54:16 +01:00
MDEV-23938: innodb row_search_idx_cond_check handle ICP_ABORTED_BY_USER
- row_search_mvcc() should return DB_INTERRUPTED when it got killed. - Add a syncpoint for the ICP check. - Add test coverage for killed-during-ICP-check scenario Backport of MDEV-22761 fixes for ICP from 10.4 commits: *a6f956488c*c03885cd9cXtraDB was fixed indeb3b9a174Reviewer: Daniel Black
This commit is contained in:
Sergei Petrunia
Daniel Black
parent
72cb20820b
commit
3e807d255e
9 changed files with 176 additions and 6 deletions
50
mysql-test/include/icp_debug_kill.inc
Normal file
50
mysql-test/include/icp_debug_kill.inc
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
--source include/have_debug.inc
|
||||
--source include/have_debug_sync.inc
|
||||
--source include/count_sessions.inc
|
||||
|
||||
--disable_warnings
|
||||
drop table if exists t0,t1,t2;
|
||||
--enable_warnings
|
||||
|
||||
create table t0(a int primary key);
|
||||
insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
|
||||
|
||||
create table t1(a int primary key);
|
||||
insert into t1 select A.a + B.a* 10 + C.a * 100 from t0 A, t0 B, t0 C;
|
||||
|
||||
create table t2 (
|
||||
kp1 int,
|
||||
kp2 int,
|
||||
col char(100),
|
||||
key(kp1, kp2)
|
||||
);
|
||||
insert into t2 select a, a, a from t1;
|
||||
|
||||
select engine from information_schema.tables
|
||||
where table_schema=database() and table_name='t2';
|
||||
|
||||
explain
|
||||
select * from t2 where kp1 between 10 and 20 and kp2 +1 >100;
|
||||
|
||||
let $target_id= `select connection_id()`;
|
||||
|
||||
set debug_sync='handler_index_cond_check SIGNAL at_icp_check WAIT_FOR go';
|
||||
send
|
||||
select * from t2 where kp1 between 10 and 20 and kp2 +1 >100;
|
||||
|
||||
connect (con1, localhost, root,,);
|
||||
connection con1;
|
||||
set debug_sync='now WAIT_FOR at_icp_check';
|
||||
evalp kill query $target_id;
|
||||
set debug_sync='now SIGNAL go';
|
||||
|
||||
connection default;
|
||||
|
||||
--error ER_QUERY_INTERRUPTED
|
||||
reap;
|
||||
set debug_sync='RESET';
|
||||
|
||||
disconnect con1;
|
||||
drop table t0,t1,t2;
|
||||
--source include/wait_until_count_sessions.inc
|
||||
|
||||
34
mysql-test/t/aria_icp_debug.result
Normal file
34
mysql-test/t/aria_icp_debug.result
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
set default_storage_engine=aria;
|
||||
drop table if exists t0,t1,t2;
|
||||
create table t0(a int primary key);
|
||||
insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
|
||||
create table t1(a int primary key);
|
||||
insert into t1 select A.a + B.a* 10 + C.a * 100 from t0 A, t0 B, t0 C;
|
||||
create table t2 (
|
||||
kp1 int,
|
||||
kp2 int,
|
||||
col char(100),
|
||||
key(kp1, kp2)
|
||||
);
|
||||
insert into t2 select a, a, a from t1;
|
||||
select engine from information_schema.tables
|
||||
where table_schema=database() and table_name='t2';
|
||||
engine
|
||||
Aria
|
||||
explain
|
||||
select * from t2 where kp1 between 10 and 20 and kp2 +1 >100;
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE t2 range kp1 kp1 5 NULL 10 Using index condition
|
||||
set debug_sync='handler_index_cond_check SIGNAL at_icp_check WAIT_FOR go';
|
||||
select * from t2 where kp1 between 10 and 20 and kp2 +1 >100;
|
||||
connect con1, localhost, root,,;
|
||||
connection con1;
|
||||
set debug_sync='now WAIT_FOR at_icp_check';
|
||||
kill query $target_id;
|
||||
set debug_sync='now SIGNAL go';
|
||||
connection default;
|
||||
ERROR 70100: Query execution was interrupted
|
||||
set debug_sync='RESET';
|
||||
disconnect con1;
|
||||
drop table t0,t1,t2;
|
||||
set default_storage_engine=default;
|
||||
5
mysql-test/t/aria_icp_debug.test
Normal file
5
mysql-test/t/aria_icp_debug.test
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
|
||||
set default_storage_engine=aria;
|
||||
--source include/icp_debug_kill.inc
|
||||
set default_storage_engine=default;
|
||||
|
||||
34
mysql-test/t/innodb_icp_debug.result
Normal file
34
mysql-test/t/innodb_icp_debug.result
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
set default_storage_engine=innodb;
|
||||
drop table if exists t0,t1,t2;
|
||||
create table t0(a int primary key);
|
||||
insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
|
||||
create table t1(a int primary key);
|
||||
insert into t1 select A.a + B.a* 10 + C.a * 100 from t0 A, t0 B, t0 C;
|
||||
create table t2 (
|
||||
kp1 int,
|
||||
kp2 int,
|
||||
col char(100),
|
||||
key(kp1, kp2)
|
||||
);
|
||||
insert into t2 select a, a, a from t1;
|
||||
select engine from information_schema.tables
|
||||
where table_schema=database() and table_name='t2';
|
||||
engine
|
||||
InnoDB
|
||||
explain
|
||||
select * from t2 where kp1 between 10 and 20 and kp2 +1 >100;
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE t2 range kp1 kp1 5 NULL 11 Using index condition
|
||||
set debug_sync='handler_index_cond_check SIGNAL at_icp_check WAIT_FOR go';
|
||||
select * from t2 where kp1 between 10 and 20 and kp2 +1 >100;
|
||||
connect con1, localhost, root,,;
|
||||
connection con1;
|
||||
set debug_sync='now WAIT_FOR at_icp_check';
|
||||
kill query $target_id;
|
||||
set debug_sync='now SIGNAL go';
|
||||
connection default;
|
||||
ERROR 70100: Query execution was interrupted
|
||||
set debug_sync='RESET';
|
||||
disconnect con1;
|
||||
drop table t0,t1,t2;
|
||||
set default_storage_engine=default;
|
||||
6
mysql-test/t/innodb_icp_debug.test
Normal file
6
mysql-test/t/innodb_icp_debug.test
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
--source include/have_innodb.inc
|
||||
|
||||
set default_storage_engine=innodb;
|
||||
--source include/icp_debug_kill.inc
|
||||
set default_storage_engine=default;
|
||||
|
||||
32
mysql-test/t/myisam_icp_debug.result
Normal file
32
mysql-test/t/myisam_icp_debug.result
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
drop table if exists t0,t1,t2;
|
||||
create table t0(a int primary key);
|
||||
insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
|
||||
create table t1(a int primary key);
|
||||
insert into t1 select A.a + B.a* 10 + C.a * 100 from t0 A, t0 B, t0 C;
|
||||
create table t2 (
|
||||
kp1 int,
|
||||
kp2 int,
|
||||
col char(100),
|
||||
key(kp1, kp2)
|
||||
);
|
||||
insert into t2 select a, a, a from t1;
|
||||
select engine from information_schema.tables
|
||||
where table_schema=database() and table_name='t2';
|
||||
engine
|
||||
MyISAM
|
||||
explain
|
||||
select * from t2 where kp1 between 10 and 20 and kp2 +1 >100;
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE t2 range kp1 kp1 5 NULL 11 Using index condition
|
||||
set debug_sync='handler_index_cond_check SIGNAL at_icp_check WAIT_FOR go';
|
||||
select * from t2 where kp1 between 10 and 20 and kp2 +1 >100;
|
||||
connect con1, localhost, root,,;
|
||||
connection con1;
|
||||
set debug_sync='now WAIT_FOR at_icp_check';
|
||||
kill query $target_id;
|
||||
set debug_sync='now SIGNAL go';
|
||||
connection default;
|
||||
ERROR 70100: Query execution was interrupted
|
||||
set debug_sync='RESET';
|
||||
disconnect con1;
|
||||
drop table t0,t1,t2;
|
||||
1
mysql-test/t/myisam_icp_debug.test
Normal file
1
mysql-test/t/myisam_icp_debug.test
Normal file
|
|
@ -0,0 +1 @@
|
|||
--source include/icp_debug_kill.inc
|
||||
|
|
@ -5519,6 +5519,7 @@ extern "C" enum icp_result handler_index_cond_check(void* h_arg)
|
|||
THD *thd= h->table->in_use;
|
||||
enum icp_result res;
|
||||
|
||||
DEBUG_SYNC(thd, "handler_index_cond_check");
|
||||
enum thd_kill_levels abort_at= h->has_transactions() ?
|
||||
THD_ABORT_SOFTLY : THD_ABORT_ASAP;
|
||||
if (thd_kill_level(thd) > abort_at)
|
||||
|
|
|
|||
|
|
@ -3588,7 +3588,7 @@ row_sel_try_search_shortcut_for_mysql(
|
|||
|
||||
/*********************************************************************//**
|
||||
Check a pushed-down index condition.
|
||||
@return ICP_NO_MATCH, ICP_MATCH, or ICP_OUT_OF_RANGE */
|
||||
@return ICP_ABORTED_BY_USER, ICP_NO_MATCH, ICP_MATCH, or ICP_OUT_OF_RANGE */
|
||||
static
|
||||
enum icp_result
|
||||
row_search_idx_cond_check(
|
||||
|
|
@ -4110,10 +4110,13 @@ row_search_for_mysql(
|
|||
switch (row_search_idx_cond_check(
|
||||
buf, prebuilt,
|
||||
rec, offsets)) {
|
||||
case ICP_ABORTED_BY_USER:
|
||||
mtr_commit(&mtr);
|
||||
err = DB_INTERRUPTED;
|
||||
goto release_search_latch_if_needed;
|
||||
case ICP_ERROR:
|
||||
case ICP_NO_MATCH:
|
||||
case ICP_OUT_OF_RANGE:
|
||||
case ICP_ABORTED_BY_USER:
|
||||
case ICP_ERROR:
|
||||
goto shortcut_mismatch;
|
||||
case ICP_MATCH:
|
||||
goto shortcut_match;
|
||||
|
|
@ -4849,8 +4852,10 @@ no_gap_lock:
|
|||
buf, prebuilt, rec, offsets)) {
|
||||
case ICP_NO_MATCH:
|
||||
goto next_rec;
|
||||
case ICP_OUT_OF_RANGE:
|
||||
case ICP_ABORTED_BY_USER:
|
||||
err = DB_INTERRUPTED;
|
||||
goto idx_cond_failed;
|
||||
case ICP_OUT_OF_RANGE:
|
||||
case ICP_ERROR:
|
||||
err = DB_RECORD_NOT_FOUND;
|
||||
goto idx_cond_failed;
|
||||
|
|
@ -4904,9 +4909,11 @@ locks_ok_del_marked:
|
|||
row_unlock_for_mysql(prebuilt, TRUE);
|
||||
}
|
||||
goto next_rec;
|
||||
case ICP_ABORTED_BY_USER:
|
||||
err = DB_INTERRUPTED;
|
||||
goto idx_cond_failed;
|
||||
case ICP_OUT_OF_RANGE:
|
||||
case ICP_ABORTED_BY_USER:
|
||||
case ICP_ERROR:
|
||||
case ICP_ERROR:
|
||||
err = DB_RECORD_NOT_FOUND;
|
||||
goto idx_cond_failed;
|
||||
case ICP_MATCH:
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue