1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-12266: Pass fil_space_t* to fseg_free_page()

Browse Source 
fseg_free_page_func(): Avoid an unnecessary tablespace ID lookup.
The callers should pass the tablespace that they already know.
This commit is contained in:
Marko Mäkelä 2019-04-08 17:13:37 +03:00
parent 05b84b2568
commit ee7a4f4462
5 changed files with 51 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
storage/innobase/btr/btr0btr.cc
View File

@ -750,8 +750,7 @@ void btr_page_free(dict_index_t* index, buf_block_t* block, mtr_t* mtr,
? PAGE_HEADER + PAGE_BTR_SEG_LEAF ? PAGE_HEADER + PAGE_BTR_SEG_LEAF
: PAGE_HEADER + PAGE_BTR_SEG_TOP]; : PAGE_HEADER + PAGE_BTR_SEG_TOP];
fseg_free_page(seg_header, fseg_free_page(seg_header,
block->page.id.space(), index->table->space, block->page.id.page_no(),
block->page.id.page_no(),
block->index != NULL, mtr); block->index != NULL, mtr);
/* The page was marked free in the allocation bitmap, but it /* The page was marked free in the allocation bitmap, but it

34
storage/innobase/fsp/fsp0fsp.cc
View File

@ -1360,7 +1360,7 @@ fsp_alloc_free_page(
/** Frees a single page of a space. /** Frees a single page of a space.
The page is marked as free and clean. The page is marked as free and clean.
@param[in,out] space tablespace @param[in,out] space tablespace
@param[in] page_id page id @param[in] offset page number
@param[in] page_size page size @param[in] page_size page size
@param[in,out] mtr mini-transaction */ @param[in,out] mtr mini-transaction */
static static
@ -2923,35 +2923,39 @@ fseg_free_page_low(
fseg_free_page_low(inode, space, offset, page_size, mtr) fseg_free_page_low(inode, space, offset, page_size, mtr)
#endif /* !BTR_CUR_HASH_ADAPT */ #endif /* !BTR_CUR_HASH_ADAPT */
/**********************************************************************//** /** Free a page in a file segment.
Frees a single page of a segment. */ @param[in,out] seg_header file segment header
@param[in,out] space tablespace
@param[in] offset page number
@param[in] ahi whether we may need to drop the adaptive
hash index
@param[in,out] mtr mini-transaction */
void void
fseg_free_page_func( fseg_free_page_func(
fseg_header_t* seg_header, /*!< in: segment header */ fseg_header_t* seg_header,
ulint space_id,/*!< in: space id */ fil_space_t* space,
ulint page, /*!< in: page offset */ ulint offset,
#ifdef BTR_CUR_HASH_ADAPT #ifdef BTR_CUR_HASH_ADAPT
bool ahi, /*!< in: whether we may need to drop bool ahi,
the adaptive hash index */
#endif /* BTR_CUR_HASH_ADAPT */ #endif /* BTR_CUR_HASH_ADAPT */
mtr_t* mtr) /*!< in/out: mini-transaction */ mtr_t* mtr)
{ {
DBUG_ENTER("fseg_free_page"); DBUG_ENTER("fseg_free_page");
fseg_inode_t* seg_inode; fseg_inode_t* seg_inode;
buf_block_t* iblock; buf_block_t* iblock;
fil_space_t* space = mtr_x_lock_space(space_id, mtr); mtr_x_lock(&space->latch, mtr);
const page_size_t page_size(space->flags); const page_size_t page_size(space->flags);
DBUG_LOG("fseg_free_page", "space_id: " << space_id DBUG_LOG("fseg_free_page", "space_id: " << space->id
<< ", page_no: " << page); << ", page_no: " << offset);
seg_inode = fseg_inode_get(seg_header, space_id, page_size, mtr, seg_inode = fseg_inode_get(seg_header, space->id, page_size, mtr,
&iblock); &iblock);
fil_block_check_type(*iblock, FIL_PAGE_INODE, mtr); fil_block_check_type(*iblock, FIL_PAGE_INODE, mtr);
fseg_free_page_low(seg_inode, space, page, page_size, ahi, mtr); fseg_free_page_low(seg_inode, space, offset, page_size, ahi, mtr);
ut_d(buf_page_set_file_page_was_freed(page_id_t(space_id, page))); ut_d(buf_page_set_file_page_was_freed(page_id_t(space->id, offset)));
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }

3
storage/innobase/ibuf/ibuf0ibuf.cc
View File

@ -2139,8 +2139,9 @@ ibuf_remove_free_page(void)
the free list was so long that they cannot have taken the last the free list was so long that they cannot have taken the last
page from it. */ page from it. */
compile_time_assert(IBUF_SPACE_ID == 0);
fseg_free_page(header_page + IBUF_HEADER + IBUF_TREE_SEG_HEADER, fseg_free_page(header_page + IBUF_HEADER + IBUF_TREE_SEG_HEADER,
IBUF_SPACE_ID, page_no, false, &mtr); fil_system.sys_space, page_no, false, &mtr);
const page_id_t page_id(IBUF_SPACE_ID, page_no); const page_id_t page_id(IBUF_SPACE_ID, page_no);

28
storage/innobase/include/fsp0fsp.h
View File

@ -508,24 +508,28 @@ fsp_reserve_free_extents(
mtr_t* mtr, mtr_t* mtr,
ulint n_pages = 2); ulint n_pages = 2);
/**********************************************************************//** /** Free a page in a file segment.
Frees a single page of a segment. */ @param[in,out] seg_header file segment header
@param[in,out] space tablespace
@param[in] offset page number
@param[in] ahi whether we may need to drop the adaptive
hash index
@param[in,out] mtr mini-transaction */
void void
fseg_free_page_func( fseg_free_page_func(
fseg_header_t* seg_header, /*!< in: segment header */ fseg_header_t* seg_header,
ulint space_id, /*!< in: space id */ fil_space_t* space,
ulint page, /*!< in: page offset */ ulint offset,
#ifdef BTR_CUR_HASH_ADAPT #ifdef BTR_CUR_HASH_ADAPT
bool ahi, /*!< in: whether we may need to drop bool ahi,
the adaptive hash index */
#endif /* BTR_CUR_HASH_ADAPT */ #endif /* BTR_CUR_HASH_ADAPT */
mtr_t* mtr); /*!< in/out: mini-transaction */ mtr_t* mtr);
#ifdef BTR_CUR_HASH_ADAPT #ifdef BTR_CUR_HASH_ADAPT
# define fseg_free_page(header, space_id, page, ahi, mtr) \ # define fseg_free_page(header, space, offset, ahi, mtr) \
fseg_free_page_func(header, space_id, page, ahi, mtr) fseg_free_page_func(header, space, offset, ahi, mtr)
#else /* BTR_CUR_HASH_ADAPT */ #else /* BTR_CUR_HASH_ADAPT */
# define fseg_free_page(header, space_id, page, ahi, mtr) \ # define fseg_free_page(header, space, offset, ahi, mtr) \
fseg_free_page_func(header, space_id, page, mtr) fseg_free_page_func(header, space, offset, mtr)
#endif /* BTR_CUR_HASH_ADAPT */ #endif /* BTR_CUR_HASH_ADAPT */
/** Determine whether a page is free. /** Determine whether a page is free.
@param[in,out] space tablespace @param[in,out] space tablespace

31
storage/innobase/trx/trx0undo.cc
View File

@ -831,35 +831,30 @@ trx_undo_free_page(
undo log page; the caller must have reserved undo log page; the caller must have reserved
the rollback segment mutex */ the rollback segment mutex */
{ {
page_t* header_page;
page_t* undo_page;
fil_addr_t last_addr;
trx_rsegf_t* rseg_header;
ulint hist_size;
const ulint space = rseg->space->id; const ulint space = rseg->space->id;
ut_a(hdr_page_no != page_no); ut_a(hdr_page_no != page_no);
ut_ad(mutex_own(&(rseg->mutex))); ut_ad(mutex_own(&(rseg->mutex)));
undo_page = trx_undo_page_get(page_id_t(space, page_no), mtr); page_t* undo_page = trx_undo_page_get(page_id_t(space, page_no), mtr);
page_t* header_page = trx_undo_page_get(page_id_t(space, hdr_page_no),
mtr);
header_page = trx_undo_page_get(page_id_t(space, hdr_page_no), mtr); flst_remove(TRX_UNDO_SEG_HDR + TRX_UNDO_PAGE_LIST + header_page,
TRX_UNDO_PAGE_HDR + TRX_UNDO_PAGE_NODE + undo_page, mtr);
flst_remove(header_page + TRX_UNDO_SEG_HDR + TRX_UNDO_PAGE_LIST, fseg_free_page(TRX_UNDO_SEG_HDR + TRX_UNDO_FSEG_HEADER + header_page,
undo_page + TRX_UNDO_PAGE_HDR + TRX_UNDO_PAGE_NODE, mtr); rseg->space, page_no, false, mtr);
fseg_free_page(header_page + TRX_UNDO_SEG_HDR + TRX_UNDO_FSEG_HEADER, const fil_addr_t last_addr = flst_get_last(
space, page_no, false, mtr); TRX_UNDO_SEG_HDR + TRX_UNDO_PAGE_LIST + header_page, mtr);
last_addr = flst_get_last(header_page + TRX_UNDO_SEG_HDR
+ TRX_UNDO_PAGE_LIST, mtr);
rseg->curr_size--; rseg->curr_size--;
if (in_history) { if (in_history) {
rseg_header = trx_rsegf_get(rseg->space, rseg->page_no, mtr); trx_rsegf_t* rseg_header = trx_rsegf_get(
rseg->space, rseg->page_no, mtr);
hist_size = mtr_read_ulint(rseg_header + TRX_RSEG_HISTORY_SIZE, uint32_t hist_size = mach_read_from_4(
MLOG_4BYTES, mtr); rseg_header + TRX_RSEG_HISTORY_SIZE);
ut_ad(hist_size > 0); ut_ad(hist_size > 0);
mlog_write_ulint(rseg_header + TRX_RSEG_HISTORY_SIZE, mlog_write_ulint(rseg_header + TRX_RSEG_HISTORY_SIZE,
hist_size - 1, MLOG_4BYTES, mtr); hist_size - 1, MLOG_4BYTES, mtr);