diff options
Diffstat (limited to 'storage/innobase/btr')
-rw-r--r-- | storage/innobase/btr/btr0btr.cc | 90 | ||||
-rw-r--r-- | storage/innobase/btr/btr0cur.cc | 40 | ||||
-rw-r--r-- | storage/innobase/btr/btr0defragment.cc | 2 | ||||
-rw-r--r-- | storage/innobase/btr/btr0pcur.cc | 6 | ||||
-rw-r--r-- | storage/innobase/btr/btr0scrub.cc | 10 | ||||
-rw-r--r-- | storage/innobase/btr/btr0sea.cc | 10 |
6 files changed, 68 insertions, 90 deletions
diff --git a/storage/innobase/btr/btr0btr.cc b/storage/innobase/btr/btr0btr.cc index ac794cc8d10..b9975bfa194 100644 --- a/storage/innobase/btr/btr0btr.cc +++ b/storage/innobase/btr/btr0btr.cc @@ -321,26 +321,24 @@ btr_root_fseg_adjust_on_import( fseg_header_t* seg_header, /*!< in/out: segment header */ page_zip_des_t* page_zip, /*!< in/out: compressed page, or NULL */ - ulint space, /*!< in: tablespace identifier */ - mtr_t* mtr) /*!< in/out: mini-transaction */ + ulint space) /*!< in: tablespace identifier */ { ulint offset = mach_read_from_2(seg_header + FSEG_HDR_OFFSET); if (offset < FIL_PAGE_DATA || offset > srv_page_size - FIL_PAGE_DATA_END) { + return false; + } - return(FALSE); + seg_header += FSEG_HDR_SPACE; - } else if (page_zip) { - mach_write_to_4(seg_header + FSEG_HDR_SPACE, space); - page_zip_write_header(page_zip, seg_header + FSEG_HDR_SPACE, - 4, mtr); - } else { - mlog_write_ulint(seg_header + FSEG_HDR_SPACE, - space, MLOG_4BYTES, mtr); + mach_write_to_4(seg_header, space); + if (UNIV_LIKELY_NULL(page_zip)) { + memcpy(page_zip->data + page_offset(seg_header), seg_header, + 4); } - return(TRUE); + return true; } /**************************************************************//** @@ -410,10 +408,10 @@ btr_root_adjust_on_import( if (err == DB_SUCCESS && (!btr_root_fseg_adjust_on_import( FIL_PAGE_DATA + PAGE_BTR_SEG_LEAF - + page, page_zip, table->space_id, &mtr) + + page, page_zip, table->space_id) || !btr_root_fseg_adjust_on_import( FIL_PAGE_DATA + PAGE_BTR_SEG_TOP - + page, page_zip, table->space_id, &mtr))) { + + page, page_zip, table->space_id))) { err = DB_CORRUPTION; } @@ -2041,13 +2039,7 @@ btr_root_raise_and_insert( btr_set_instant(root_block, *index, mtr); } - /* Set the next node and previous node fields, although - they should already have been set. The previous node field - must be FIL_NULL if root_page_zip != NULL, because the - REC_INFO_MIN_REC_FLAG (of the first user record) will be - set if and only if !page_has_prev(). */ - btr_page_set_next(root, root_page_zip, FIL_NULL, mtr); - btr_page_set_prev(root, root_page_zip, FIL_NULL, mtr); + ut_ad(!page_has_siblings(root)); page_cursor = btr_cur_get_page_cur(cursor); @@ -2549,8 +2541,8 @@ btr_attach_half_pages( } /* Get the previous and next pages of page */ - prev_page_no = btr_page_get_prev(page, mtr); - next_page_no = btr_page_get_next(page, mtr); + prev_page_no = btr_page_get_prev(page); + next_page_no = btr_page_get_next(page); const ulint space = block->page.id.space(); @@ -2590,7 +2582,7 @@ btr_attach_half_pages( if (prev_block) { #ifdef UNIV_BTR_DEBUG ut_a(page_is_comp(prev_block->frame) == page_is_comp(page)); - ut_a(btr_page_get_next(prev_block->frame, mtr) + ut_a(btr_page_get_next(prev_block->frame) == block->page.id.page_no()); #endif /* UNIV_BTR_DEBUG */ @@ -2602,7 +2594,7 @@ btr_attach_half_pages( if (next_block) { #ifdef UNIV_BTR_DEBUG ut_a(page_is_comp(next_block->frame) == page_is_comp(page)); - ut_a(btr_page_get_prev(next_block->frame, mtr) + ut_a(btr_page_get_prev(next_block->frame) == page_get_page_no(page)); #endif /* UNIV_BTR_DEBUG */ @@ -2616,7 +2608,7 @@ btr_attach_half_pages( btr_page_set_prev(lower_page, lower_page_zip, prev_page_no, mtr); } else { - ut_ad(btr_page_get_prev(lower_page, mtr) == prev_page_no); + ut_ad(btr_page_get_prev(lower_page) == prev_page_no); } btr_page_set_next(lower_page, lower_page_zip, upper_page_no, mtr); @@ -2627,7 +2619,7 @@ btr_attach_half_pages( btr_page_set_next(upper_page, upper_page_zip, next_page_no, mtr); } else { - ut_ad(btr_page_get_next(upper_page, mtr) == next_page_no); + ut_ad(btr_page_get_next(upper_page) == next_page_no); } } @@ -2688,7 +2680,7 @@ btr_insert_into_right_sibling( { buf_block_t* block = btr_cur_get_block(cursor); page_t* page = buf_block_get_frame(block); - ulint next_page_no = btr_page_get_next(page, mtr); + const uint32_t next_page_no = btr_page_get_next(page); ut_ad(mtr_memo_contains_flagged( mtr, dict_index_get_lock(cursor->index), @@ -3219,8 +3211,8 @@ btr_level_list_remove_func( ut_ad(space == page_get_space_id(page)); /* Get the previous and next page numbers of page */ - const ulint prev_page_no = btr_page_get_prev(page, mtr); - const ulint next_page_no = btr_page_get_next(page, mtr); + const uint32_t prev_page_no = btr_page_get_prev(page); + const uint32_t next_page_no = btr_page_get_next(page); /* Update page links of the level */ @@ -3233,8 +3225,8 @@ btr_level_list_remove_func( = buf_block_get_frame(prev_block); #ifdef UNIV_BTR_DEBUG ut_a(page_is_comp(prev_page) == page_is_comp(page)); - ut_a(btr_page_get_next(prev_page, mtr) - == page_get_page_no(page)); + ut_a(!memcmp(prev_page + FIL_PAGE_NEXT, page + FIL_PAGE_OFFSET, + 4)); #endif /* UNIV_BTR_DEBUG */ btr_page_set_next(prev_page, @@ -3252,8 +3244,8 @@ btr_level_list_remove_func( = buf_block_get_frame(next_block); #ifdef UNIV_BTR_DEBUG ut_a(page_is_comp(next_page) == page_is_comp(page)); - ut_a(btr_page_get_prev(next_page, mtr) - == page_get_page_no(page)); + ut_a(!memcmp(next_page + FIL_PAGE_PREV, page + FIL_PAGE_OFFSET, + 4)); #endif /* UNIV_BTR_DEBUG */ btr_page_set_prev(next_page, @@ -3591,8 +3583,8 @@ btr_compress( MONITOR_INC(MONITOR_INDEX_MERGE_ATTEMPTS); - left_page_no = btr_page_get_prev(page, mtr); - right_page_no = btr_page_get_next(page, mtr); + left_page_no = btr_page_get_prev(page); + right_page_no = btr_page_get_next(page); #ifdef UNIV_DEBUG if (!page_is_leaf(page) && left_page_no == FIL_NULL) { @@ -3666,10 +3658,10 @@ retry: #ifdef UNIV_BTR_DEBUG if (is_left) { - ut_a(btr_page_get_next(merge_page, mtr) + ut_a(btr_page_get_next(merge_page) == block->page.id.page_no()); } else { - ut_a(btr_page_get_prev(merge_page, mtr) + ut_a(btr_page_get_prev(merge_page) == block->page.id.page_no()); } #endif /* UNIV_BTR_DEBUG */ @@ -4214,8 +4206,8 @@ btr_discard_page( /* Decide the page which will inherit the locks */ - left_page_no = btr_page_get_prev(buf_block_get_frame(block), mtr); - right_page_no = btr_page_get_next(buf_block_get_frame(block), mtr); + left_page_no = btr_page_get_prev(buf_block_get_frame(block)); + right_page_no = btr_page_get_next(buf_block_get_frame(block)); const ulint zip_size = index->table->space->zip_size(); ut_d(bool parent_is_different = false); @@ -4226,7 +4218,7 @@ btr_discard_page( merge_page = buf_block_get_frame(merge_block); #ifdef UNIV_BTR_DEBUG - ut_a(btr_page_get_next(merge_page, mtr) + ut_a(btr_page_get_next(merge_page) == block->page.id.page_no()); #endif /* UNIV_BTR_DEBUG */ ut_d(parent_is_different = @@ -4242,7 +4234,7 @@ btr_discard_page( merge_page = buf_block_get_frame(merge_block); #ifdef UNIV_BTR_DEBUG - ut_a(btr_page_get_prev(merge_page, mtr) + ut_a(btr_page_get_prev(merge_page) == block->page.id.page_no()); #endif /* UNIV_BTR_DEBUG */ ut_d(parent_is_different = page_rec_is_supremum( @@ -4883,7 +4875,7 @@ btr_validate_level( does not use such scan for any of its DML or query operations */ if (dict_index_is_spatial(index)) { - left_page_no = btr_page_get_prev(page, &mtr); + left_page_no = btr_page_get_prev(page); while (left_page_no != FIL_NULL) { /* To obey latch order of tree blocks, @@ -4899,7 +4891,7 @@ btr_validate_level( zip_size, RW_SX_LATCH, index, &mtr); page = buf_block_get_frame(block); - left_page_no = btr_page_get_prev(page, &mtr); + left_page_no = btr_page_get_prev(page); } } } @@ -4954,8 +4946,8 @@ loop: ut_a(btr_page_get_level(page) == level); - right_page_no = btr_page_get_next(page, &mtr); - left_page_no = btr_page_get_prev(page, &mtr); + right_page_no = btr_page_get_next(page); + left_page_no = btr_page_get_prev(page); ut_a(!page_is_empty(page) || (level == 0 @@ -4972,9 +4964,7 @@ loop: right_page = buf_block_get_frame(right_block); - if (btr_page_get_prev(right_page, &mtr) - != page_get_page_no(page)) { - + if (btr_page_get_prev(right_page) != page_get_page_no(page)) { btr_validate_report2(index, level, block, right_block); fputs("InnoDB: broken FIL_PAGE_NEXT" " or FIL_PAGE_PREV links\n", stderr); @@ -5055,7 +5045,7 @@ loop: node_ptr = btr_cur_get_rec(&node_cur); parent_page_no = page_get_page_no(father_page); - parent_right_page_no = btr_page_get_next(father_page, &mtr); + parent_right_page_no = btr_page_get_next(father_page); rightmost_child = page_rec_is_supremum( page_rec_get_next(node_ptr)); @@ -5196,7 +5186,7 @@ loop: } if (page_get_page_no(right_father_page) - != btr_page_get_next(father_page, &mtr)) { + != btr_page_get_next(father_page)) { ret = false; fputs("InnoDB: node pointer 3 to" diff --git a/storage/innobase/btr/btr0cur.cc b/storage/innobase/btr/btr0cur.cc index 2492988eaef..5edf91c3e68 100644 --- a/storage/innobase/btr/btr0cur.cc +++ b/storage/innobase/btr/btr0cur.cc @@ -270,7 +270,7 @@ btr_cur_latch_leaves( dict_index_get_lock(cursor->index), MTR_MEMO_X_LOCK | MTR_MEMO_SX_LOCK)); /* x-latch also siblings from left to right */ - left_page_no = btr_page_get_prev(page, mtr); + left_page_no = btr_page_get_prev(page); mode = latch_mode; if (left_page_no != FIL_NULL) { @@ -306,10 +306,9 @@ btr_cur_latch_leaves( /* Sanity check only after both the blocks are latched. */ if (latch_leaves.blocks[0] != NULL) { ut_a(page_is_comp(latch_leaves.blocks[0]->frame) - == page_is_comp(page)); - ut_a(btr_page_get_next( - latch_leaves.blocks[0]->frame, mtr) - == page_get_page_no(page)); + == page_is_comp(page)); + ut_a(btr_page_get_next(latch_leaves.blocks[0]->frame) + == page_get_page_no(page)); } ut_a(page_is_comp(get_block->frame) == page_is_comp(page)); #endif /* UNIV_BTR_DEBUG */ @@ -319,7 +318,7 @@ btr_cur_latch_leaves( = get_block; } - right_page_no = btr_page_get_next(page, mtr); + right_page_no = btr_page_get_next(page); if (right_page_no != FIL_NULL) { if (spatial) { @@ -335,7 +334,7 @@ btr_cur_latch_leaves( #ifdef UNIV_BTR_DEBUG ut_a(page_is_comp(get_block->frame) == page_is_comp(page)); - ut_a(btr_page_get_prev(get_block->frame, mtr) + ut_a(btr_page_get_prev(get_block->frame) == page_get_page_no(page)); #endif /* UNIV_BTR_DEBUG */ if (spatial) { @@ -351,7 +350,7 @@ btr_cur_latch_leaves( mode = latch_mode == BTR_SEARCH_PREV ? RW_S_LATCH : RW_X_LATCH; /* latch also left sibling */ rw_lock_s_lock(&block->lock); - left_page_no = btr_page_get_prev(page, mtr); + left_page_no = btr_page_get_prev(page); rw_lock_s_unlock(&block->lock); if (left_page_no != FIL_NULL) { @@ -364,7 +363,7 @@ btr_cur_latch_leaves( #ifdef UNIV_BTR_DEBUG ut_a(page_is_comp(get_block->frame) == page_is_comp(page)); - ut_a(btr_page_get_next(get_block->frame, mtr) + ut_a(btr_page_get_next(get_block->frame) == page_get_page_no(page)); #endif /* UNIV_BTR_DEBUG */ } @@ -758,7 +757,7 @@ btr_cur_optimistic_latch_leaves( goto unpin_failed; } left_page_no = btr_page_get_prev( - buf_block_get_frame(block), mtr); + buf_block_get_frame(block)); rw_lock_s_unlock(&block->lock); if (left_page_no != FIL_NULL) { @@ -773,7 +772,7 @@ btr_cur_optimistic_latch_leaves( if (buf_page_optimistic_get(mode, block, modify_clock, file, line, mtr)) { - if (btr_page_get_prev(buf_block_get_frame(block), mtr) + if (btr_page_get_prev(buf_block_get_frame(block)) == left_page_no) { buf_block_buf_fix_dec(block); *latch_mode = mode; @@ -1650,8 +1649,7 @@ retry_page_get: rw_latch = upper_rw_latch; rw_lock_s_lock(&block->lock); - left_page_no = btr_page_get_prev( - buf_block_get_frame(block), mtr); + left_page_no = btr_page_get_prev(buf_block_get_frame(block)); rw_lock_s_unlock(&block->lock); if (left_page_no != FIL_NULL) { @@ -3754,10 +3752,7 @@ btr_cur_pessimistic_insert( } if (!page_rec_is_infimum(btr_cur_get_rec(cursor)) - || btr_page_get_prev( - buf_block_get_frame( - btr_cur_get_block(cursor)), mtr) - == FIL_NULL) { + || !page_has_prev(btr_cur_get_page(cursor))) { /* split and inserted need to call lock_update_insert() always. */ inherit = true; @@ -4743,7 +4738,7 @@ btr_cur_pess_upd_restore_supremum( return; } - const ulint prev_page_no = btr_page_get_prev(page, mtr); + const uint32_t prev_page_no = btr_page_get_prev(page); const page_id_t page_id(block->page.id.space(), prev_page_no); @@ -4751,8 +4746,7 @@ btr_cur_pess_upd_restore_supremum( prev_block = buf_page_get_with_no_latch(page_id, block->zip_size(), mtr); #ifdef UNIV_BTR_DEBUG - ut_a(btr_page_get_next(prev_block->frame, mtr) - == page_get_page_no(page)); + ut_a(btr_page_get_next(prev_block->frame) == block->page.id.page_no()); #endif /* UNIV_BTR_DEBUG */ /* We must already have an x-latch on prev_block! */ @@ -6305,7 +6299,7 @@ btr_estimate_n_rows_in_range_on_level( n_rows += page_get_n_recs(page); } - page_id.set_page_no(btr_page_get_next(page, &mtr)); + page_id.set_page_no(btr_page_get_next(page)); mtr_commit(&mtr); @@ -7907,8 +7901,8 @@ next_zip_page: extern_len -= store_len; - mlog_write_ulint(field_ref + BTR_EXTERN_LEN, 0, - MLOG_4BYTES, &mtr); + ut_ad(!mach_read_from_4(BTR_EXTERN_LEN + + field_ref)); mlog_write_ulint(field_ref + BTR_EXTERN_LEN + 4, big_rec_vec->fields[i].len diff --git a/storage/innobase/btr/btr0defragment.cc b/storage/innobase/btr/btr0defragment.cc index 6a1d23fb472..f8d2026ecba 100644 --- a/storage/innobase/btr/btr0defragment.cc +++ b/storage/innobase/btr/btr0defragment.cc @@ -582,7 +582,7 @@ btr_defragment_n_pages( blocks[0] = block; for (uint i = 1; i <= n_pages; i++) { page_t* page = buf_block_get_frame(blocks[i-1]); - ulint page_no = btr_page_get_next(page, mtr); + ulint page_no = btr_page_get_next(page); total_data_size += page_get_data_size(page); total_n_recs += page_get_n_recs(page); if (page_no == FIL_NULL) { diff --git a/storage/innobase/btr/btr0pcur.cc b/storage/innobase/btr/btr0pcur.cc index a66fcc15187..2848f8d3e96 100644 --- a/storage/innobase/btr/btr0pcur.cc +++ b/storage/innobase/btr/btr0pcur.cc @@ -457,7 +457,7 @@ btr_pcur_move_to_next_page( return; } - next_page_no = btr_page_get_next(page, mtr); + next_page_no = btr_page_get_next(page); ut_ad(next_page_no != FIL_NULL); @@ -484,7 +484,7 @@ btr_pcur_move_to_next_page( next_page = buf_block_get_frame(next_block); #ifdef UNIV_BTR_DEBUG ut_a(page_is_comp(next_page) == page_is_comp(page)); - ut_a(btr_page_get_prev(next_page, mtr) + ut_a(btr_page_get_prev(next_page) == btr_pcur_get_block(cursor)->page.id.page_no()); #endif /* UNIV_BTR_DEBUG */ @@ -546,7 +546,7 @@ btr_pcur_move_backward_from_page( page = btr_pcur_get_page(cursor); - prev_page_no = btr_page_get_prev(page, mtr); + prev_page_no = btr_page_get_prev(page); if (prev_page_no == FIL_NULL) { } else if (btr_pcur_is_before_first_on_page(cursor)) { diff --git a/storage/innobase/btr/btr0scrub.cc b/storage/innobase/btr/btr0scrub.cc index 3c367fb2784..8819e30f0c7 100644 --- a/storage/innobase/btr/btr0scrub.cc +++ b/storage/innobase/btr/btr0scrub.cc @@ -431,9 +431,9 @@ btr_pessimistic_scrub( } /* read block variables */ - const ulint page_no = mach_read_from_4(page + FIL_PAGE_OFFSET); - const ulint left_page_no = mach_read_from_4(page + FIL_PAGE_PREV); - const ulint right_page_no = mach_read_from_4(page + FIL_PAGE_NEXT); + const uint32_t page_no = mach_read_from_4(page + FIL_PAGE_OFFSET); + const uint32_t left_page_no = btr_page_get_prev(page); + const uint32_t right_page_no = btr_page_get_next(page); const ulint zip_size = index->table->space->zip_size(); /** @@ -465,8 +465,8 @@ btr_pessimistic_scrub( /** * structure should be unchanged */ - ut_a(left_page_no == btr_page_get_prev(page, mtr)); - ut_a(right_page_no == btr_page_get_next(page, mtr)); + ut_a(left_page_no == btr_page_get_prev(page)); + ut_a(right_page_no == btr_page_get_next(page)); } if (right_page_no != FIL_NULL) { diff --git a/storage/innobase/btr/btr0sea.cc b/storage/innobase/btr/btr0sea.cc index a220acd185c..7d1933f9486 100644 --- a/storage/innobase/btr/btr0sea.cc +++ b/storage/innobase/btr/btr0sea.cc @@ -782,10 +782,7 @@ btr_search_check_guess( const rec_t* prev_rec = page_rec_get_prev(rec); if (page_rec_is_infimum(prev_rec)) { - success = *reinterpret_cast<const uint32_t*>( - page_align(prev_rec) + FIL_PAGE_PREV) - == FIL_NULL; - + success = !page_has_prev(page_align(prev_rec)); goto exit_func; } @@ -804,10 +801,7 @@ btr_search_check_guess( const rec_t* next_rec = page_rec_get_next(rec); if (page_rec_is_supremum(next_rec)) { - if (*reinterpret_cast<const uint32_t*>( - page_align(next_rec) + FIL_PAGE_NEXT) - == FIL_NULL) { - + if (!page_has_next(page_align(next_rec))) { cursor->up_match = 0; success = TRUE; } |