Cleanup: Compare page_id_t directly

MariaDB · Oct 15, 2020 · ecb913c · ecb913c
1 parent abb678b
commit ecb913c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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 */