diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-17 08:19:01 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-17 08:19:01 +0200 |
| commit | 24fe53477c07f700e50beb172cb6e0cf3fb1d409 (patch) | |
| tree | 32a12a0af7300b785a405ddace9bf45b584249ff /storage/innobase/fts | |
| parent | 89ec4b53ac4c7568b9c9765fff50d9bec7cf3534 (diff) | |
| download | mariadb-git-24fe53477c07f700e50beb172cb6e0cf3fb1d409.tar.gz | |
MDEV-29603 btr_cur_open_at_index_side() is missing some consistency checks
btr_cur_t: Zero-initialize all fields in the default constructor.
btr_cur_t::index: Remove; it duplicated page_cur.index.
Many functions: Remove arguments that were duplicating
page_cur_t::index and page_cur_t::block.
page_cur_open_level(), btr_pcur_open_level(): Replaces
btr_cur_open_at_index_side() for dict_stats_analyze_index().
At the end, release all latches except the dict_index_t::lock
and the buf_page_t::lock on the requested page.
dict_stats_analyze_index(): Rely on mtr_t::rollback_to_savepoint()
to release all uninteresting page latches.
btr_search_guess_on_hash(): Simplify the logic, and invoke
mtr_t::rollback_to_savepoint().
We will use plain C++ std::vector<mtr_memo_slot_t> for mtr_t::m_memo.
In this way, we can avoid setting mtr_memo_slot_t::object to nullptr
and instead just remove garbage from m_memo.
mtr_t::rollback_to_savepoint(): Shrink the vector. We will be needing this
in dict_stats_analyze_index(), where we will release page latches and
only retain the index->lock in mtr_t::m_memo.
mtr_t::release_last_page(): Release the last acquired page latch.
Replaces btr_leaf_page_release().
mtr_t::release(const buf_block_t&): Release a single page latch.
Used in btr_pcur_move_backward_from_page().
mtr_t::memo_release(): Replaced with mtr_t::release().
mtr_t::upgrade_buffer_fix(): Acquire a latch for a buffer-fixed page.
This replaces the double bookkeeping in btr_cur_t::open_leaf().
Reviewed by: Vladislav Lesin
Diffstat (limited to 'storage/innobase/fts')
| -rw-r--r-- | storage/innobase/fts/fts0fts.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/storage/innobase/fts/fts0fts.cc b/storage/innobase/fts/fts0fts.cc index 9adc01d9cf5..689fb58d7dc 100644 --- a/storage/innobase/fts/fts0fts.cc +++ b/storage/innobase/fts/fts0fts.cc @@ -3357,9 +3357,10 @@ fts_add_doc_by_id( mach_write_to_8((byte*) &temp_doc_id, doc_id); dfield_set_data(dfield, &temp_doc_id, sizeof(temp_doc_id)); + pcur.btr_cur.page_cur.index = fts_id_index; /* If we have a match, add the data to doc structure */ - if (btr_pcur_open_with_no_init(fts_id_index, tuple, PAGE_CUR_LE, + if (btr_pcur_open_with_no_init(tuple, PAGE_CUR_LE, BTR_SEARCH_LEAF, &pcur, &mtr) == DB_SUCCESS && btr_pcur_get_low_match(&pcur) == 1) { @@ -3386,7 +3387,6 @@ fts_add_doc_by_id( dtuple_t* clust_ref; ulint n_fields; - btr_pcur_init(&clust_pcur); n_fields = dict_index_get_n_unique(clust_index); clust_ref = dtuple_create(heap, n_fields); @@ -3394,8 +3394,9 @@ fts_add_doc_by_id( row_build_row_ref_in_tuple( clust_ref, rec, fts_id_index, NULL); + clust_pcur.btr_cur.page_cur.index = clust_index; - if (btr_pcur_open_with_no_init(clust_index, clust_ref, + if (btr_pcur_open_with_no_init(clust_ref, PAGE_CUR_LE, BTR_SEARCH_LEAF, &clust_pcur, &mtr) |