mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 02:51:44 +01:00
f9cac8d2cb
This also fixes part of MDEV-29835 Partial server freeze which is caused by violations of the latching order that was defined in https://dev.mysql.com/worklog/task/?id=6326 (WL#6326: InnoDB: fix index->lock contention). Unless the current thread is holding an exclusive dict_index_t::lock, it must acquire page latches in a strict parent-to-child, left-to-right order. Not all cases are fixed yet. Failure to follow the correct latching order will cause deadlocks of threads due to lock order inversion. As part of these changes, the BTR_MODIFY_TREE mode is modified so that an Update latch (U a.k.a. SX) will be acquired on the root page, and eXclusive latches (X) will be acquired on all pages leading to the leaf page, as well as any left and right siblings of the pages along the path. The test innodb.innodb_wl6326 will be removed, because at the time the DEBUG_SYNC point is hit, the thread is actually holding several page latches that will be blocking a concurrent SELECT statement. We also remove double bookkeeping that was caused due to excessive information hiding in mtr_t::m_memo. We simply let mtr_t::m_memo store information of latched pages, and ensure that mtr_memo_slot_t::object is never a null pointer. The tree_blocks[] and tree_savepoints[] were redundant. mtr_t::get_already_latched(): Look up a latched page in mtr_t::m_memo. This avoids many redundant entries in mtr_t::m_memo, as well as redundant calls to buf_page_get_gen() for blocks that had already been looked up in a mini-transaction. btr_get_latched_root(): Return a pointer to an already latched root page. This replaces btr_root_block_get() in cases where the mini-transaction has already latched the root page. btr_page_get_parent(): Fetch a parent page that was already latched in BTR_MODIFY_TREE, by invoking mtr_t::get_already_latched(). If needed, upgrade the root page U latch to X. This avoids bloating mtr_t::m_memo as well as redundant buf_pool.page_hash lookups. For non-QUICK CHECK TABLE as well as for B-tree defragmentation, we will invoke btr_cur_search_to_nth_level(). btr_cur_search_to_nth_level(): This will only be used for non-leaf (level>0) B-tree searches that were formerly named BTR_CONT_SEARCH_TREE or BTR_CONT_MODIFY_TREE. In MDEV-29835, this function could be removed altogether, or retained for the case of CHECK TABLE without QUICK. btr_cur_t::search_leaf(): Replaces btr_cur_search_to_nth_level() for searches to level=0 (the leaf level). btr_cur_t::pessimistic_search_leaf(): Implement the new BTR_MODIFY_TREE latching logic in the case that page splits or merges will be needed. The parent pages (and their siblings) should already be latched on the first dive to the leaf and be present in mtr_t::m_memo; there should be no need for BTR_CONT_MODIFY_TREE. This pre-latching almost suffices; MDEV-29835 will have to revise it and remove work-arounds where mtr_t::get_already_latched() fails to find a block. rtr_search_to_nth_level(): A SPATIAL INDEX version of btr_search_to_nth_level() that can search to any level (including the leaf level). rtr_search_leaf(), rtr_insert_leaf(): Wrappers for rtr_search_to_nth_level(). rtr_search(): Replaces rtr_pcur_open(). rtr_cur_restore_position(): Remove an unused constant parameter. btr_pcur_open_on_user_rec(): Remove the constant parameter mode=PAGE_CUR_GE. btr_cur_latch_leaves(): Update a pre-existing mtr_t::m_memo entry for the current leaf page. row_ins_clust_index_entry_low(): Use a new mode=BTR_MODIFY_ROOT_AND_LEAF to gain access to the root page when mode!=BTR_MODIFY_TREE, to write the PAGE_ROOT_AUTO_INC. btr_cur_t::open_leaf(): Some clean-up. mtr_t::lock_register(): Register a page latch on a buffer-fixed block. BTR_SEARCH_TREE, BTR_CONT_SEARCH_TREE: Remove. BTR_CONT_MODIFY_TREE: Note that this is only used by rtr_search_to_nth_level(). btr_pcur_optimistic_latch_leaves(): Replaces btr_cur_optimistic_latch_leaves(). ibuf_delete_rec(): Acquire ibuf.index->lock.u_lock() in order to avoid a deadlock with ibuf_insert_low(BTR_MODIFY_PREV). Tested by: Matthias Leich
90 lines
2.6 KiB
Text
90 lines
2.6 KiB
Text
# WL#6745 InnoDB R-tree support
|
|
# This test case will test R-tree split, mostly on duplicate records.
|
|
|
|
# Not supported in embedded
|
|
--source include/not_embedded.inc
|
|
|
|
--source include/have_innodb.inc
|
|
--source include/big_test.inc
|
|
--source include/not_valgrind.inc
|
|
--source include/have_debug.inc
|
|
--source include/have_sequence.inc
|
|
let $restart_noprint=2;
|
|
|
|
# Create table with R-tree index.
|
|
create table t1 (c1 int, c2 geometry not null, spatial index (c2))engine=innodb;
|
|
|
|
begin;
|
|
# Insert enough values to let R-tree split.
|
|
insert into t1 select @s:=1+(seq mod 9), point(@s, @s)
|
|
from seq_1_to_576;
|
|
|
|
#Check second round spliting.
|
|
SET @saved_dbug = @@SESSION.debug_dbug;
|
|
SET debug_dbug = '+d,rtr_page_need_second_split';
|
|
insert into t1 select @s:=1+(seq mod 9), point(@s, @s)
|
|
from seq_1_to_576;
|
|
SET debug_dbug = @saved_dbug;
|
|
rollback;
|
|
|
|
insert into t1 select @s:=1+(seq mod 9), point(@s, @s)
|
|
from seq_1_to_2304;
|
|
begin;
|
|
insert into t1 select @s:=1+(seq mod 9), point(@s, @s)
|
|
from seq_1_to_2304;
|
|
rollback;
|
|
check table t1;
|
|
insert into t1 select @s:=1+(seq mod 9), point(@s, @s)
|
|
from seq_1_to_71424;
|
|
check table t1;
|
|
|
|
select count(*) from t1;
|
|
|
|
set @g1 = ST_GeomFromText('Polygon((0 0,0 100,100 100,100 0,0 0))');
|
|
select count(*) from t1 where MBRWithin(t1.c2, @g1);
|
|
|
|
set @g1 = ST_GeomFromText('Polygon((10 10,10 800,800 800,800 10,10 10))');
|
|
select count(*) from t1 where MBRWithin(t1.c2, @g1);
|
|
|
|
drop index c2 on t1;
|
|
|
|
# Test create index with algorithm=inplace
|
|
--enable_info
|
|
create spatial index idx2 on t1(c2);
|
|
--disable_info
|
|
|
|
show create table t1;
|
|
|
|
# test read only case
|
|
let $restart_parameters = --innodb-read-only;
|
|
--source include/restart_mysqld.inc
|
|
set @g1 = ST_GeomFromText('Polygon((0 0,0 100,100 100,100 0,0 0))');
|
|
select count(*) from t1 where MBRWithin(t1.c2, @g1);
|
|
set @g1 = ST_GeomFromText('Polygon((2 2,2 800,800 800,800 2,2 2))');
|
|
select count(*) from t1 where MBRWithin(t1.c2, @g1);
|
|
|
|
let $restart_parameters =;
|
|
--source include/restart_mysqld.inc
|
|
|
|
set @g1 = ST_GeomFromText('Polygon((0 0,0 100,100 100,100 0,0 0))');
|
|
select count(*) from t1 where MBRWithin(t1.c2, @g1);
|
|
set @g1 = ST_GeomFromText('Polygon((2 2,2 800,800 800,800 2,2 2))');
|
|
select count(*) from t1 where MBRWithin(t1.c2, @g1);
|
|
|
|
# Clean up.
|
|
drop table t1;
|
|
|
|
--echo #
|
|
--echo # MDEV-30400 Assertion height == btr_page_get_level ... on INSERT
|
|
--echo #
|
|
|
|
CREATE TABLE t1 (c POINT NOT NULL,SPATIAL (c)) ENGINE=InnoDB;
|
|
SET @save_limit=@@GLOBAL.innodb_limit_optimistic_insert_debug;
|
|
SET GLOBAL innodb_limit_optimistic_insert_debug=2;
|
|
BEGIN;
|
|
INSERT INTO t1 SELECT POINTFROMTEXT ('POINT(0 0)') FROM seq_1_to_366;
|
|
ROLLBACK;
|
|
SET GLOBAL innodb_limit_optimistic_insert_debug=@save_limit;
|
|
DROP TABLE t1;
|
|
|
|
--echo # End of 10.6 tests
|