mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-35049: Always enable page_cur_search_with_match_bytes()

Browse source 
For some reason, page_cur_search_with_match_bytes(), which can speed
up append operations (PAGE_CUR_LE used by INSERT), was only enabled
if innodb_adaptive_hash_index=ON even though it has nothing to do with
the adaptive hash index.

Furthermore, mysql/mysql-server@c9bbc83d11
a.k.a. commit c9bbc83d11 reduced a limit
from 3 to 2 but forgot to adjust the PAGE_N_DIRECTION limit accordingly.
We are adjusting that as well.

Reviewed by: Vladislav Lesin
This commit is contained in:
Marko Mäkelä 2025-01-10 16:40:37 +02:00
parent 4221ed1d7d
commit 793a2fc8ba
2 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
storage/innobase/btr/btr0cur.cc
View file

@ -1400,18 +1400,15 @@ release_tree:
} }
reached_latched_leaf: reached_latched_leaf:
#ifdef BTR_CUR_HASH_ADAPT if (!(tuple->info_bits & REC_INFO_MIN_REC_FLAG))
if (!(tuple->info_bits & REC_INFO_MIN_REC_FLAG) && btr_search.enabled)
{ {
if (page_cur_search_with_match_bytes(*tuple, mode, &up_match, &low_match, if (page_cur_search_with_match_bytes(*tuple, mode, &up_match, &low_match,
&page_cur, &up_bytes, &low_bytes)) &page_cur, &up_bytes, &low_bytes))
goto corrupted; goto corrupted;
} }
else else if (page_cur_search_with_match(tuple, mode, &up_match, &low_match,
#endif /* BTR_CUR_HASH_ADAPT */ &page_cur, nullptr))
if (page_cur_search_with_match(tuple, mode, &up_match, &low_match, goto corrupted;
&page_cur, nullptr))
goto corrupted;
ut_ad(up_match != uint16_t(~0U) || mode != PAGE_CUR_GE); ut_ad(up_match != uint16_t(~0U) || mode != PAGE_CUR_GE);
ut_ad(up_match != uint16_t(~0U) || mode != PAGE_CUR_LE); ut_ad(up_match != uint16_t(~0U) || mode != PAGE_CUR_LE);

10
storage/innobase/page/page0cur.cc
View file

@ -36,7 +36,6 @@ Created 10/4/1994 Heikki Tuuri
# include "trx0roll.h" # include "trx0roll.h"
#endif #endif
#ifdef BTR_CUR_HASH_ADAPT
/** Get the pad character code point for a type. /** Get the pad character code point for a type.
@param type @param type
@return pad character code point @return pad character code point
@ -422,7 +421,7 @@ bool page_cur_search_with_match_bytes(const dtuple_t &tuple,
else if (uint16_t last= page_header_get_offs(page, PAGE_LAST_INSERT)) else if (uint16_t last= page_header_get_offs(page, PAGE_LAST_INSERT))
{ {
const rec_t *rec= page + last; const rec_t *rec= page + last;
if (page_header_get_field(page, PAGE_N_DIRECTION) > 3 && if (page_header_get_field(page, PAGE_N_DIRECTION) > 2 &&
page_cur_try_search_shortcut_bytes(page, rec, index, tuple, page_cur_try_search_shortcut_bytes(page, rec, index, tuple,
iup_fields, ilow_fields, iup_fields, ilow_fields,
iup_bytes, ilow_bytes)) iup_bytes, ilow_bytes))
@ -658,6 +657,7 @@ static int cmp_dtuple_rec_leaf(const dtuple_t &dtuple, const rec_t *rec,
return ret; return ret;
} }
#ifdef BTR_CUR_HASH_ADAPT
bool btr_cur_t::check_mismatch(const dtuple_t &tuple, bool ge, ulint comp) bool btr_cur_t::check_mismatch(const dtuple_t &tuple, bool ge, ulint comp)
noexcept noexcept
{ {
@ -731,6 +731,7 @@ bool btr_cur_t::check_mismatch(const dtuple_t &tuple, bool ge, ulint comp)
return cmp_dtuple_rec_leaf(tuple, rec, *index(), &match, comp) <= 0; return cmp_dtuple_rec_leaf(tuple, rec, *index(), &match, comp) <= 0;
} }
} }
#endif /* BTR_CUR_HASH_ADAPT */
/** Try a search shortcut based on the last insert. /** Try a search shortcut based on the last insert.
@param page index page @param page index page
@ -782,7 +783,6 @@ static bool page_cur_try_search_shortcut(const page_t *page, const rec_t *rec,
*ilow= low; *ilow= low;
return true; return true;
} }
#endif /* BTR_CUR_HASH_ADAPT */
/****************************************************************//** /****************************************************************//**
Searches the right position for a page cursor. */ Searches the right position for a page cursor. */
@ -847,13 +847,12 @@ page_cur_search_with_match(
block, (dict_index_t*)index, tuple, mode, block, (dict_index_t*)index, tuple, mode,
cursor, rtr_info); cursor, rtr_info);
} }
#ifdef BTR_CUR_HASH_ADAPT
} else if (!n_core || mode != PAGE_CUR_LE || !page_is_leaf(page) } else if (!n_core || mode != PAGE_CUR_LE || !page_is_leaf(page)
|| page_get_direction(page) != PAGE_RIGHT || page_get_direction(page) != PAGE_RIGHT
|| (tuple->info_bits & REC_INFO_MIN_REC_FLAG)) { || (tuple->info_bits & REC_INFO_MIN_REC_FLAG)) {
} else if (uint16_t last = } else if (uint16_t last =
page_header_get_offs(page, PAGE_LAST_INSERT)) { page_header_get_offs(page, PAGE_LAST_INSERT)) {
if (page_header_get_field(page, PAGE_N_DIRECTION) > 3 if (page_header_get_field(page, PAGE_N_DIRECTION) > 2
&& page_cur_try_search_shortcut(page, page + last, *index, && page_cur_try_search_shortcut(page, page + last, *index,
*tuple, *tuple,
iup_matched_fields, iup_matched_fields,
@ -861,7 +860,6 @@ page_cur_search_with_match(
page_cur_position(page + last, block, cursor); page_cur_position(page + last, block, cursor);
return false; return false;
} }
#endif /* BTR_CUR_HASH_ADAPT */
} }
/* If mode PAGE_CUR_G is specified, we are trying to position the /* If mode PAGE_CUR_G is specified, we are trying to position the