MDEV-35049: Improve btr_search_drop_page_hash_index()

btr_search_drop_page_hash_index(): Replace the Boolean parameter with const dict_index_t *not_garbage. If buf_block_t::index points to that, there is no need to acquire btr_sea::partition::latch. The old parameter bool garbage_collect=false is equivalent to the parameter not_garbage=nullptr. The parameter garbage_collect=true will be replaced either with the actual index that is associated with the buffer page, or with a bogus pointer not_garbage=-1 to indicate that any lazily entries for a freed index need to be removed. buf_page_get_low(), buf_page_get_gen(), mtr_t::page_lock(), mtr_t::upgrade_buffer_fix(): Do not invoke btr_search_drop_page_hash_index(). Our caller will have to do it when appropriate. buf_page_create_low(): Keep invoking btr_search_drop_page_hash_index(). This is the normal way of lazily dropping the adaptive hash index after a DDL operation such as DROP INDEX operation. btr_block_get(), btr_root_block_get(), btr_root_adjust_on_import(), btr_read_autoinc_with_fallback(), btr_cur_instant_init_low(), btr_cur_t::search_leaf(), btr_cur_t::pessimistic_search_leaf(), btr_pcur_optimistic_latch_leaves(), dict_stats_analyze_index_below_cur(): Invoke btr_search_drop_page_hash_index(block, index) for pages that may be leaf pages. No adaptive hash index may have been created on anything else than a B-tree leaf page. btr_cur_search_to_nth_level(): Do not invoke btr_search_drop_page_hash_index(), because we are only accessing non-leaf pages and the adaptive hash index may only have been created on leaf pages. btr_page_alloc_for_ibuf() and many other callers of buf_page_get_gen() or similar functions do not invoke btr_search_drop_page_hash_index(), because the adaptive hash index is never created on such pages. If a page in the tablespace was freed as part of a DDL operation and reused for something else, then buf_page_create_low() will take care of dropping the adaptive hash index before the freed page will be modified. It is notable that while the flst_ functions may access pages that are related to allocating B-tree index pages (the BTR_SEG_TOP and BTR_SEG_LEAF linked from the index root page), those pages themselves can never be stored in the adaptive hash index. Therefore, it is not necessary to invoke btr_search_drop_page_hash_index() on them. Reviewed by: Vladislav Lesin

Author: dr-m

storage/innobase/btr/btr0btr.cc

@@ -238,6 +238,7 @@ buf_block_t *btr_block_get(const dict_index_t &index, uint32_t page,
 
  if (UNIV_LIKELY(block != nullptr))
  {
+ btr_search_drop_page_hash_index(block, &index);
  if (!!page_is_comp(block->page.frame) != index.table->not_redundant() ||
  btr_page_get_index_id(block->page.frame) != index.id ||
  !fil_page_index_page_check(block->page.frame) ||
@@ -291,6 +292,7 @@ btr_root_block_get(
 
  if (UNIV_LIKELY(block != nullptr))
  {
+ btr_search_drop_page_hash_index(block, index);
  if (!!page_is_comp(block->page.frame) !=
  index->table->not_redundant() ||
  btr_page_get_index_id(block->page.frame) != index->id ||
@@ -397,6 +399,7 @@ btr_root_adjust_on_import(
 goto func_exit;
 }
 
+btr_search_drop_page_hash_index(block, index);
 page = buf_block_get_frame(block);
 page_zip = buf_block_get_page_zip(block);
 
@@ -865,7 +868,7 @@ static void btr_free_root(buf_block_t *block, const fil_space_t &space,
  MTR_MEMO_PAGE_SX_FIX));
  ut_ad(mtr->is_named_space(&space));
 
- btr_search_drop_page_hash_index(block, false);
+ btr_search_drop_page_hash_index(block, nullptr);
 
  if (btr_root_fseg_validate(PAGE_HEADER + PAGE_BTR_SEG_TOP, *block, space))
  {
@@ -893,15 +896,18 @@ buf_block_t *btr_free_root_check(const page_id_t page_id, ulint zip_size,
  buf_block_t *block= buf_page_get_gen(page_id, zip_size, RW_X_LATCH,
  nullptr, BUF_GET_POSSIBLY_FREED, mtr);
 
- if (!block);
- else if (fil_page_index_page_check(block->page.frame) &&
- index_id == btr_page_get_index_id(block->page.frame))
- /* This should be a root page. It should not be possible to
- reassign the same index_id for some other index in the
- tablespace. */
- ut_ad(!page_has_siblings(block->page.frame));
- else
- block= nullptr;
+ if (block)
+ {
+ btr_search_drop_page_hash_index(block,reinterpret_cast<dict_index_t*>(-1));
+ if (fil_page_index_page_check(block->page.frame) &&
+ index_id == btr_page_get_index_id(block->page.frame))
+ /* This should be a root page. It should not be possible to
+ reassign the same index_id for some other index in the
+ tablespace. */
+ ut_ad(!page_has_siblings(block->page.frame));
+ else
+ block= nullptr;
+ }
 
  return block;
 }
@@ -1098,7 +1104,7 @@ dberr_t dict_index_t::clear(que_thr_t *thr)
  ,any_ahi_pages()
 #endif
  );
- btr_search_drop_page_hash_index(root_block, false);
+ btr_search_drop_page_hash_index(root_block, nullptr);
 #ifdef BTR_CUR_HASH_ADAPT
  ut_ad(!any_ahi_pages());
 #endif
@@ -1211,12 +1217,13 @@ uint64_t btr_read_autoinc_with_fallback(const dict_table_t *table,
  uint64_t autoinc= 0;
  mtr_t mtr;
  mtr.start();
+ const dict_index_t *const first_index= dict_table_get_first_index(table);
 
  if (buf_block_t *block=
- buf_page_get(page_id_t(table->space_id,
- dict_table_get_first_index(table)->page),
+ buf_page_get(page_id_t(table->space_id, first_index->page),
  table->space->zip_size(), RW_SX_LATCH, &mtr))
  {
+ btr_search_drop_page_hash_index(block, first_index);
  autoinc= page_get_autoinc(block->page.frame);
 
  if (autoinc > 0 && autoinc <= max && mysql_version >= 100210);
@@ -1269,6 +1276,9 @@ btr_write_autoinc(dict_index_t* index, ib_uint64_t autoinc, bool reset)
  if (buf_block_t *root= buf_page_get(page_id_t(space->id, index->page),
  space->zip_size(), RW_SX_LATCH, &mtr))
  {
+#ifdef BTR_CUR_HASH_ADAPT
+ ut_d(if (dict_index_t *ri= root->index)) ut_ad(ri == index);
+#endif /* BTR_CUR_HASH_ADAPT */
  buf_page_make_young_if_needed(&root->page);
  mtr.set_named_space(space);
  page_set_autoinc(root, autoinc, &mtr, reset);
@@ -1299,7 +1309,7 @@ static dberr_t btr_page_reorganize_low(page_cur_t *cursor, mtr_t *mtr)
  if (UNIV_UNLIKELY(pos == ULINT_UNDEFINED))
  return DB_CORRUPTION;
 
- btr_search_drop_page_hash_index(block, false);
+ btr_search_drop_page_hash_index(block, nullptr);
 
  buf_block_t *old= buf_block_alloc();
  /* Copy the old page to temporary space */
@@ -1613,7 +1623,7 @@ btr_page_empty(
  || page_zip_validate(page_zip, block->page.frame, index));
 #endif /* UNIV_ZIP_DEBUG */
 
-btr_search_drop_page_hash_index(block, false);
+btr_search_drop_page_hash_index(block, nullptr);
 
 /* Recreate the page: note that global data on page (possible
 segment headers, next page-field, etc.) is preserved intact */
@@ -3384,7 +3394,7 @@ btr_lift_page_up(
 mem_heap_free(heap);
 }
 
-btr_search_drop_page_hash_index(block, false);
+btr_search_drop_page_hash_index(block, nullptr);
 
 /* Make the father empty */
 btr_page_empty(father_block, father_page_zip, index, page_level, mtr);
@@ -3702,7 +3712,7 @@ btr_compress(
 goto err_exit;
 }
 
-btr_search_drop_page_hash_index(block, false);
+btr_search_drop_page_hash_index(block, nullptr);
 
 /* Remove the page from the level list */
 err = btr_level_list_remove(*block, *index, mtr);
@@ -3805,7 +3815,7 @@ btr_compress(
 goto err_exit;
 }
 
-btr_search_drop_page_hash_index(block, false);
+btr_search_drop_page_hash_index(block, nullptr);
 
 if (merge_page_zip && left_page_no == FIL_NULL) {
 
@@ -3967,7 +3977,7 @@ btr_discard_only_page_on_level(
 ut_ad(fil_page_index_page_check(page));
 ut_ad(block->page.id().space() == index->table->space->id);
 ut_ad(mtr->memo_contains_flagged(block, MTR_MEMO_PAGE_X_FIX));
-btr_search_drop_page_hash_index(block, false);
+btr_search_drop_page_hash_index(block, nullptr);
 cursor.page_cur.index = index;
 cursor.page_cur.block = block;
 
@@ -4163,7 +4173,7 @@ btr_discard_page(
 return DB_CORRUPTION;
 }
 
-btr_search_drop_page_hash_index(block, false);
+btr_search_drop_page_hash_index(block, nullptr);
 
 if (dict_index_is_spatial(index)) {
 rtr_node_ptr_delete(&parent_cursor, mtr);

storage/innobase/btr/btr0cur.cc

@@ -358,6 +358,8 @@ static dberr_t btr_cur_instant_init_low(dict_index_t* index, mtr_t* mtr)
 goto incompatible;
 }
 
+btr_search_drop_page_hash_index(block, index);
+
 if (fil_page_get_type(block->page.frame) != FIL_PAGE_TYPE_BLOB
  || mach_read_from_4(&block->page.frame
 [FIL_PAGE_DATA
@@ -1232,6 +1234,8 @@ dberr_t btr_cur_t::search_leaf(const dtuple_t *tuple, page_cur_mode_t mode,
  goto func_exit;
  }
 
+ btr_search_drop_page_hash_index(block, index());
+
  if (!!page_is_comp(block->page.frame) != index()->table->not_redundant() ||
  btr_page_get_index_id(block->page.frame) != index()->id ||
  fil_page_get_type(block->page.frame) == FIL_PAGE_RTREE ||
@@ -1344,9 +1348,7 @@ dberr_t btr_cur_t::search_leaf(const dtuple_t *tuple, page_cur_mode_t mode,
  mtr->rollback_to_savepoint(savepoint, savepoint + 1);
  reached_index_root_and_leaf:
  ut_ad(rw_latch == RW_X_LATCH);
-#ifdef BTR_CUR_HASH_ADAPT
- btr_search_drop_page_hash_index(block, true);
-#endif
+ btr_search_drop_page_hash_index(block, index());
  if (page_cur_search_with_match(tuple, mode, &up_match, &low_match,
  &page_cur, nullptr))
  goto corrupted;
@@ -1631,6 +1633,7 @@ dberr_t btr_cur_t::pessimistic_search_leaf(const dtuple_t *tuple,
  const page_cur_mode_t page_mode{btr_cur_nonleaf_mode(mode)};
 
  mtr->page_lock(block, RW_X_LATCH);
+ btr_search_drop_page_hash_index(block, index());
 
  up_match= 0;
  up_bytes= 0;
@@ -1700,6 +1703,8 @@ dberr_t btr_cur_t::pessimistic_search_leaf(const dtuple_t *tuple,
  goto func_exit;
  }
 
+ btr_search_drop_page_hash_index(block, index());
+
  if (!!page_is_comp(block->page.frame) != index()->table->not_redundant() ||
  btr_page_get_index_id(block->page.frame) != index()->id ||
  fil_page_get_type(block->page.frame) == FIL_PAGE_RTREE ||
@@ -1808,7 +1813,10 @@ dberr_t btr_cur_search_to_nth_level(ulint level,
  goto func_exit;
  }
  else
+ {
+ btr_search_drop_page_hash_index(block, index);
  btr_cur_nonleaf_make_young(&block->page);
+ }
 
 #ifdef UNIV_ZIP_DEBUG
  if (const page_zip_des_t *page_zip= buf_block_get_page_zip(block))
@@ -3335,6 +3343,9 @@ static void btr_cur_trim_alter_metadata(dtuple_t* entry,
 mtr.commit();
 return;
 }
+
+btr_search_drop_page_hash_index(block, index);
+
 ut_ad(fil_page_get_type(block->page.frame) == FIL_PAGE_TYPE_BLOB);
 ut_ad(mach_read_from_4(&block->page.frame
  [FIL_PAGE_DATA + BTR_BLOB_HDR_NEXT_PAGE_NO])

storage/innobase/btr/btr0pcur.cc

@@ -26,8 +26,8 @@ Created 2/23/1996 Heikki Tuuri
 
 #include "btr0pcur.h"
 #include "buf0rea.h"
+#include "btr0sea.h"
 #include "rem0cmp.h"
-#include "trx0trx.h"
 #include "ibuf0ibuf.h"
 
 /**************************************************************//**
@@ -259,11 +259,13 @@ static bool btr_pcur_optimistic_latch_leaves(btr_pcur_t *pcur,
  memcmp_aligned<2>(block->page.frame + PAGE_HEADER + PAGE_INDEX_ID,
  prev->page.frame + PAGE_HEADER + PAGE_INDEX_ID, 8))
  goto fail;
+ btr_search_drop_page_hash_index(prev, pcur->index());
  }
  else
  prev= nullptr;
 
  mtr->upgrade_buffer_fix(savepoint, RW_S_LATCH);
+ btr_search_drop_page_hash_index(block, pcur->index());
 
  if (UNIV_UNLIKELY(block->modify_clock != modify_clock) ||
  UNIV_UNLIKELY(block->page.is_freed()) ||

storage/innobase/btr/btr0sea.cc

@@ -633,7 +633,7 @@ static uint32_t btr_search_info_update_hash(const btr_cur_t &cursor) noexcept
  else if (UNIV_UNLIKELY(block_index != index))
  {
  ut_ad(block_index->id == index->id);
- btr_search_drop_page_hash_index(block, false);
+ btr_search_drop_page_hash_index(block, nullptr);
  }
  else if (cursor.flag == BTR_CUR_HASH_FAIL)
  btr_search_update_hash_ref(cursor, block, left_bytes_fields);
@@ -1220,15 +1220,15 @@ static constexpr size_t REC_FOLD_IN_STACK= 128;
 /** Drop any adaptive hash index entries that point to an index page.
 @param block latched block containing index page, or a buffer-unfixed
  index page or a block in state BUF_BLOCK_REMOVE_HASH
-@param garbage_collect drop ahi only if the index is marked as freed
+@param not_garbage drop only if the index is set and NOT this
 @param folds work area for REC_FOLD_IN_STACK rec_fold() values */
 static void btr_search_drop_page_hash_index(buf_block_t *block,
- bool garbage_collect,
+ const dict_index_t *not_garbage,
  uint32_t *folds) noexcept
 {
 retry:
  dict_index_t *index= block->index;
- if (!index)
+ if (!index || index == not_garbage)
  return;
 
  ut_d(const auto state= block->page.state());
@@ -1268,8 +1268,12 @@ static void btr_search_drop_page_hash_index(buf_block_t *block,
  goto retry;
  }
  }
- else if (garbage_collect)
+ else if (not_garbage != nullptr)
+ {
+ ut_ad(!index || index == not_garbage ||
+ not_garbage == reinterpret_cast<dict_index_t*>(-1));
  goto unlock_and_return;
+ }
 
  assert_block_ahi_valid(block);
 
@@ -1394,10 +1398,10 @@ static void btr_search_drop_page_hash_index(buf_block_t *block,
 }
 
 void btr_search_drop_page_hash_index(buf_block_t *block,
- bool garbage_collect) noexcept
+ const dict_index_t *not_garbage) noexcept
 {
  uint32_t folds[REC_FOLD_IN_STACK];
- btr_search_drop_page_hash_index(block, garbage_collect, folds);
+ btr_search_drop_page_hash_index(block, not_garbage, folds);
 }
 
 void btr_search_drop_page_hash_when_freed(const page_id_t page_id) noexcept
@@ -1411,14 +1415,11 @@ void btr_search_drop_page_hash_when_freed(const page_id_t page_id) noexcept
  if (buf_block_t *block= buf_page_get_gen(page_id, 0, RW_X_LATCH, nullptr,
  BUF_PEEK_IF_IN_POOL, &mtr))
  {
- if (IF_DBUG(dict_index_t *index=,) block->index)
- {
- /* In all our callers, the table handle should be open, or we
- should be in the process of dropping the table (preventing
- eviction). */
- DBUG_ASSERT(index->table->get_ref_count() || dict_sys.locked());
- btr_search_drop_page_hash_index(block, false);
- }
+ /* In all our callers, the table handle should be open, or we
+ should be in the process of dropping the table (preventing eviction). */
+ ut_d(if (dict_index_t *i= block->index))
+ ut_ad(i->table->get_ref_count() || dict_sys.locked());
+ btr_search_drop_page_hash_index(block, nullptr);
  }
 
  mtr.commit();
@@ -1465,7 +1466,7 @@ static void btr_search_build_page_hash_index(dict_index_t *index,
  struct{uint32_t fold;uint32_t offset;} fr[REC_FOLD_IN_STACK / 2];
 
  if (rebuild)
- btr_search_drop_page_hash_index(block, false, &fr[0].fold);
+ btr_search_drop_page_hash_index(block, nullptr, &fr[0].fold);
 
  const uint32_t n_bytes_fields{left_bytes_fields & ~buf_block_t::LEFT_SIDE};
 
@@ -1613,7 +1614,7 @@ void btr_search_move_or_delete_hash_entries(buf_block_t *new_block,
  {
  ut_ad(!index || index == new_block_index);
 drop_exit:
- btr_search_drop_page_hash_index(block, false);
+ btr_search_drop_page_hash_index(block, nullptr);
  return;
  }
 
@@ -1660,7 +1661,7 @@ void btr_search_update_hash_on_delete(btr_cur_t *cursor) noexcept
 
  if (UNIV_UNLIKELY(index != cursor->index()))
  {
- btr_search_drop_page_hash_index(block, false);
+ btr_search_drop_page_hash_index(block, nullptr);
  return;
  }
 
@@ -1715,7 +1716,7 @@ void btr_search_update_hash_on_insert(btr_cur_t *cursor, bool reorg) noexcept
  {
  ut_ad(index->id == cursor->index()->id);
  drop:
- btr_search_drop_page_hash_index(block, false);
+ btr_search_drop_page_hash_index(block, nullptr);
  return;
  }