1 files changed, 31 insertions, 31 deletions

diff --git a/storage/innobase/log/log0recv.cc b/storage/innobase/log/log0recv.cc
index 6f5ef55d958..3437f3182aa 100644
--- a/storage/innobase/log/log0recv.cc
+++ b/storage/innobase/log/log0recv.cc
@@ -165,7 +165,7 @@ public:
                       free + len + 6 >= srv_page_size - FIL_PAGE_DATA_END))
     {
       ib::error() << "Not applying UNDO_APPEND due to corruption on "
-                  << block.page.id;
+                  << block.page.id();
       return true;
     }
 
@@ -224,13 +224,13 @@ public:
         size_t idlen= mlog_decode_varint_length(*l);
         ut_ad(idlen <= 5);
         ut_ad(idlen < rlen);
-        ut_ad(mlog_decode_varint(l) == block.page.id.space());
+        ut_ad(mlog_decode_varint(l) == block.page.id().space());
         l+= idlen;
         rlen-= idlen;
         idlen= mlog_decode_varint_length(*l);
         ut_ad(idlen <= 5);
         ut_ad(idlen <= rlen);
-        ut_ad(mlog_decode_varint(l) == block.page.id.page_no());
+        ut_ad(mlog_decode_varint(l) == block.page.id().page_no());
         l+= idlen;
         rlen-= idlen;
         last_offset= 0;
@@ -244,9 +244,9 @@ public:
         if (UNIV_LIKELY(rlen == 0))
         {
           memset_aligned<UNIV_ZIP_SIZE_MIN>(frame, 0, size);
-          mach_write_to_4(frame + FIL_PAGE_OFFSET, block.page.id.page_no());
+          mach_write_to_4(frame + FIL_PAGE_OFFSET, block.page.id().page_no());
           memset_aligned<8>(FIL_PAGE_PREV + frame, 0xff, 8);
-          mach_write_to_4(frame + FIL_PAGE_SPACE_ID, block.page.id.space());
+          mach_write_to_4(frame + FIL_PAGE_SPACE_ID, block.page.id().space());
           last_offset= FIL_PAGE_TYPE;
       next_after_applying:
           if (applied == APPLIED_NO)
@@ -269,9 +269,9 @@ public:
       }
 
       ut_ad(mach_read_from_4(frame + FIL_PAGE_OFFSET) ==
-            block.page.id.page_no());
+            block.page.id().page_no());
       ut_ad(mach_read_from_4(frame + FIL_PAGE_SPACE_ID) ==
-            block.page.id.space());
+            block.page.id().space());
       ut_ad(last_offset <= 1 || last_offset > 8);
       ut_ad(last_offset <= size);
 
@@ -279,7 +279,7 @@ public:
       case OPTION:
         goto next;
       case EXTENDED:
-        if (UNIV_UNLIKELY(block.page.id.page_no() < 3 ||
+        if (UNIV_UNLIKELY(block.page.id().page_no() < 3 ||
                           block.page.zip.ssize))
           goto record_corrupted;
         static_assert(INIT_ROW_FORMAT_REDUNDANT == 0, "compatiblity");
@@ -462,7 +462,7 @@ page_corrupted:
           if (UNIV_UNLIKELY(rlen + last_offset > size))
             goto record_corrupted;
           memcpy(frame + last_offset, l, llen);
-          if (UNIV_LIKELY(block.page.id.page_no()));
+          if (UNIV_LIKELY(block.page.id().page_no()));
           else if (llen == 11 + MY_AES_BLOCK_SIZE &&
                    last_offset == FSP_HEADER_OFFSET + MAGIC_SZ +
                    fsp_header_get_encryption_offset(block.zip_size()))
@@ -675,7 +675,7 @@ public:
 							break;
 						}
 						ib::error() << "corrupted "
-							    << block->page.id;
+							    << block->page.id();
 					}
 				}
 				if (recv_no_ibuf_operations) {
@@ -685,7 +685,7 @@ public:
 				}
 				mutex_exit(&recv_sys.mutex);
 				block->page.ibuf_exist = ibuf_page_exists(
-					block->page.id, block->zip_size());
+					block->page.id(), block->zip_size());
 				mtr.commit();
 				mtr.start();
 				mutex_enter(&recv_sys.mutex);
@@ -966,7 +966,7 @@ DECLARE_THREAD(recv_writer_thread)(
 
 		/* Flush pages from end of LRU if required */
 		os_event_reset(recv_sys.flush_end);
-		recv_sys.flush_type = BUF_FLUSH_LRU;
+		recv_sys.flush_lru = true;
 		os_event_set(recv_sys.flush_start);
 		os_event_wait(recv_sys.flush_end);
 
@@ -999,7 +999,7 @@ void recv_sys_t::create()
 		flush_end = os_event_create(0);
 	}
 
-	flush_type = BUF_FLUSH_LRU;
+	flush_lru = true;
 	apply_log_recs = false;
 	apply_batch_on = false;
 
@@ -1035,7 +1035,7 @@ inline void recv_sys_t::clear()
   for (buf_block_t *block= UT_LIST_GET_LAST(blocks); block; )
   {
     buf_block_t *prev_block= UT_LIST_GET_PREV(unzip_LRU, block);
-    ut_ad(buf_block_get_state(block) == BUF_BLOCK_MEMORY);
+    ut_ad(block->page.state() == BUF_BLOCK_MEMORY);
     UT_LIST_REMOVE(blocks, block);
     buf_block_free(block);
     block= prev_block;
@@ -1128,7 +1128,7 @@ inline void recv_sys_t::free(const void *data)
       continue;
     buf_block_t *block= &chunk->blocks[offs];
     ut_ad(block->frame == data);
-    ut_ad(buf_block_get_state(block) == BUF_BLOCK_MEMORY);
+    ut_ad(block->page.state() == BUF_BLOCK_MEMORY);
     ut_ad(static_cast<uint16_t>(block->page.access_time - 1) <
           srv_page_size);
     ut_ad(block->page.access_time >= 1U << 16);
@@ -2234,18 +2234,18 @@ static void recv_recover_page(buf_block_t* block, mtr_t& mtr,
 	ut_ad(recv_needed_recovery);
 	ut_ad(!init || init->created);
 	ut_ad(!init || init->lsn);
-	ut_ad(block->page.id == p->first);
+	ut_ad(block->page.id() == p->first);
 	ut_ad(!p->second.is_being_processed());
-	ut_ad(!space || space->id == block->page.id.space());
+	ut_ad(!space || space->id == block->page.id().space());
 	ut_ad(log_sys.is_physical());
 
 	if (UNIV_UNLIKELY(srv_print_verbose_log == 2)) {
-		ib::info() << "Applying log to page " << block->page.id;
+		ib::info() << "Applying log to page " << block->page.id();
 	}
 
 	DBUG_PRINT("ib_log", ("Applying log to page %u:%u",
-			      block->page.id.space(),
-			      block->page.id.page_no()));
+			      block->page.id().space(),
+			      block->page.id().page_no()));
 
 	p->second.state = page_recv_t::RECV_BEING_PROCESSED;
 
@@ -2277,8 +2277,8 @@ static void recv_recover_page(buf_block_t* block, mtr_t& mtr,
 			/* This record has already been applied. */
 			DBUG_PRINT("ib_log", ("apply skip %u:%u LSN " LSN_PF
 					      " < " LSN_PF,
-					      block->page.id.space(),
-					      block->page.id.page_no(),
+					      block->page.id().space(),
+					      block->page.id().page_no(),
 					      l->start_lsn, page_lsn));
 			continue;
 		}
@@ -2286,8 +2286,8 @@ static void recv_recover_page(buf_block_t* block, mtr_t& mtr,
 		if (l->start_lsn < init_lsn) {
 			DBUG_PRINT("ib_log", ("init skip %u:%u LSN " LSN_PF
 					      " < " LSN_PF,
-					      block->page.id.space(),
-					      block->page.id.page_no(),
+					      block->page.id().space(),
+					      block->page.id().page_no(),
 					      l->start_lsn, init_lsn));
 			continue;
 		}
@@ -2295,13 +2295,13 @@ static void recv_recover_page(buf_block_t* block, mtr_t& mtr,
 
 		if (UNIV_UNLIKELY(srv_print_verbose_log == 2)) {
 			ib::info() << "apply " << l->start_lsn
-				   << ": " << block->page.id;
+				   << ": " << block->page.id();
 		}
 
 		DBUG_PRINT("ib_log", ("apply " LSN_PF ": %u:%u",
 				      l->start_lsn,
-				      block->page.id.space(),
-				      block->page.id.page_no()));
+				      block->page.id().space(),
+				      block->page.id().page_no()));
 
 		log_phys_t::apply_status a= l->apply(*block,
 						     p->second.last_offset);
@@ -2321,7 +2321,7 @@ static void recv_recover_page(buf_block_t* block, mtr_t& mtr,
 
 		if (fil_space_t* s = space
 		    ? space
-		    : fil_space_acquire(block->page.id.space())) {
+		    : fil_space_acquire(block->page.id().space())) {
 			switch (a) {
 			case log_phys_t::APPLIED_TO_FSP_HEADER:
 				s->flags = mach_read_from_4(
@@ -2448,7 +2448,7 @@ void recv_recover_page(fil_space_t* space, buf_page_t* bpage)
 	mtr.start();
 	mtr.set_log_mode(MTR_LOG_NONE);
 
-	ut_ad(buf_page_get_state(bpage) == BUF_BLOCK_FILE_PAGE);
+	ut_ad(bpage->state() == BUF_BLOCK_FILE_PAGE);
 	buf_block_t* block = reinterpret_cast<buf_block_t*>(bpage);
 
 	/* Move the ownership of the x-latch on the page to
@@ -2462,7 +2462,7 @@ void recv_recover_page(fil_space_t* space, buf_page_t* bpage)
 
 	mutex_enter(&recv_sys.mutex);
 	if (recv_sys.apply_log_recs) {
-		recv_sys_t::map::iterator p = recv_sys.pages.find(bpage->id);
+		recv_sys_t::map::iterator p = recv_sys.pages.find(bpage->id());
 		if (p != recv_sys.pages.end()
 		    && !p->second.is_being_processed()) {
 			recv_recover_page(block, mtr, p, space);
@@ -2702,7 +2702,7 @@ void recv_sys_t::apply(bool last_batch)
     buf_flush_wait_LRU_batch_end();
 
     os_event_reset(flush_end);
-    flush_type = BUF_FLUSH_LIST;
+    flush_lru= false;
     os_event_set(flush_start);
     os_event_wait(flush_end);