diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-15 13:21:52 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-15 17:06:16 +0300 |
| commit | ecb913c2a5f3f797f28cd0ded2cfe20881c52db7 (patch) | |
| tree | 0c0ad7bc6f03c856b50b456da6741b9e46beb997 | |
| parent | abb678b61894146fcb88eed7f4a5facf434aea7c (diff) | |
| download | mariadb-git-ecb913c2a5f3f797f28cd0ded2cfe20881c52db7.tar.gz | |
Cleanup: Compare page_id_t directly
| -rw-r--r-- | storage/innobase/btr/btr0btr.cc | 2 | ||||
| -rw-r--r-- | storage/innobase/ibuf/ibuf0ibuf.cc | 3 | ||||
| -rw-r--r-- | storage/innobase/trx/trx0sys.cc | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/storage/innobase/btr/btr0btr.cc b/storage/innobase/btr/btr0btr.cc index 8ed25db8cb7..e292815d00e 100644 --- a/storage/innobase/btr/btr0btr.cc +++ b/storage/innobase/btr/btr0btr.cc @@ -1049,7 +1049,7 @@ btr_create( return(FIL_NULL); } - ut_ad(block->page.id().page_no() == IBUF_TREE_ROOT_PAGE_NO); + ut_ad(block->page.id() == page_id_t(0,IBUF_TREE_ROOT_PAGE_NO)); buf_block_dbg_add_level(block, SYNC_IBUF_TREE_NODE_NEW); diff --git a/storage/innobase/ibuf/ibuf0ibuf.cc b/storage/innobase/ibuf/ibuf0ibuf.cc index ca13e2e33af..84003fb415c 100644 --- a/storage/innobase/ibuf/ibuf0ibuf.cc +++ b/storage/innobase/ibuf/ibuf0ibuf.cc @@ -934,8 +934,7 @@ ibuf_update_free_bits_for_two_pages_low( @return TRUE if a fixed address ibuf i/o page */ inline bool ibuf_fixed_addr_page(const page_id_t page_id, ulint zip_size) { - return((page_id.space() == IBUF_SPACE_ID - && page_id.page_no() == IBUF_TREE_ROOT_PAGE_NO) + return(page_id == page_id_t(IBUF_SPACE_ID, IBUF_TREE_ROOT_PAGE_NO) || ibuf_bitmap_page(page_id, zip_size)); } diff --git a/storage/innobase/trx/trx0sys.cc b/storage/innobase/trx/trx0sys.cc index a3ada6636fd..9011ca8f2e1 100644 --- a/storage/innobase/trx/trx0sys.cc +++ b/storage/innobase/trx/trx0sys.cc @@ -163,7 +163,7 @@ trx_sysf_create( mtr); buf_block_dbg_add_level(block, SYNC_TRX_SYS_HEADER); - ut_a(block->page.id().page_no() == TRX_SYS_PAGE_NO); + ut_a(block->page.id() == page_id_t(0, TRX_SYS_PAGE_NO)); mtr->write<2>(*block, FIL_PAGE_TYPE + block->frame, FIL_PAGE_TYPE_TRX_SYS); @@ -195,7 +195,7 @@ trx_sysf_create( slot_no, block, mtr); ut_a(slot_no == TRX_SYS_SYSTEM_RSEG_ID); - ut_a(rblock->page.id().page_no() == FSP_FIRST_RSEG_PAGE_NO); + ut_a(rblock->page.id() == page_id_t(0, FSP_FIRST_RSEG_PAGE_NO)); } /** Create the instance */ |