Commit ef701bfd authored by Marko Mäkelä's avatar Marko Mäkelä

Remove the unused function btr_page_get()

btr_block_get(): Remove #ifdef around the definition
parent ab9f378b
...@@ -236,7 +236,6 @@ btr_block_get_func( ...@@ -236,7 +236,6 @@ btr_block_get_func(
dict_index_t* index, dict_index_t* index,
mtr_t* mtr); mtr_t* mtr);
# ifdef UNIV_DEBUG
/** Gets a buffer page and declares its latching order level. /** Gets a buffer page and declares its latching order level.
@param page_id tablespace/page identifier @param page_id tablespace/page identifier
@param page_size page size @param page_size page size
...@@ -244,37 +243,9 @@ btr_block_get_func( ...@@ -244,37 +243,9 @@ btr_block_get_func(
@param index index tree, may be NULL if not the insert buffer tree @param index index tree, may be NULL if not the insert buffer tree
@param mtr mini-transaction handle @param mtr mini-transaction handle
@return the block descriptor */ @return the block descriptor */
# define btr_block_get(page_id, page_size, mode, index, mtr) \ # define btr_block_get(page_id, page_size, mode, index, mtr) \
btr_block_get_func(page_id, page_size, mode, \ btr_block_get_func(page_id, page_size, mode, \
__FILE__, __LINE__, (dict_index_t*)index, mtr) __FILE__, __LINE__, (dict_index_t*)index, mtr)
# else /* UNIV_DEBUG */
/** Gets a buffer page and declares its latching order level.
@param page_id tablespace/page identifier
@param page_size page size
@param mode latch mode
@param index index tree, may be NULL if not the insert buffer tree
@param mtr mini-transaction handle
@return the block descriptor */
# define btr_block_get(page_id, page_size, mode, index, mtr) \
btr_block_get_func(page_id, page_size, mode, __FILE__, __LINE__, (dict_index_t*)index, mtr)
# endif /* UNIV_DEBUG */
/** Gets a buffer page and declares its latching order level.
@param page_id tablespace/page identifier
@param page_size page size
@param mode latch mode
@param index index tree, may be NULL if not the insert buffer tree
@param mtr mini-transaction handle
@return the uncompressed page frame */
UNIV_INLINE
page_t*
btr_page_get(
/*=========*/
const page_id_t page_id,
const page_size_t& page_size,
ulint mode,
dict_index_t* index,
mtr_t* mtr)
MY_ATTRIBUTE((warn_unused_result));
/**************************************************************//** /**************************************************************//**
Gets the index id field of a page. Gets the index id field of a page.
@return index id */ @return index id */
......
...@@ -101,36 +101,6 @@ btr_page_set_index_id( ...@@ -101,36 +101,6 @@ btr_page_set_index_id(
} }
} }
/** Gets a buffer page and declares its latching order level.
@param space tablespace identifier
@param zip_size compressed page size in bytes or 0 for uncompressed pages
@param page_no page number
@param mode latch mode
@param idx index tree, may be NULL if not the insert buffer tree
@param mtr mini-transaction handle
@return the uncompressed page frame */
UNIV_INLINE
page_t*
btr_page_get(
/*=========*/
const page_id_t page_id,
const page_size_t& page_size,
ulint mode,
dict_index_t* index,
mtr_t* mtr)
{
buf_block_t* block=NULL;
buf_frame_t* frame=NULL;
block = btr_block_get(page_id, page_size, mode, index, mtr);
if (block) {
frame = buf_block_get_frame(block);
}
return ((page_t*)frame);
}
/**************************************************************//** /**************************************************************//**
Gets the index id field of a page. Gets the index id field of a page.
@return index id */ @return index id */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment