MDEV-17491: Use the optimized page_id_t more

commit 8ccb3caa micro-optimized
page_id_t as a wrapper of uint64_t.

buf_dump_t: Remove, and replace with page_id_t, which uses
exactly the same encoding.

buf_page_info_t: Replace space_id,page_num with page_id_t id.

i_s_innodb_set_page_type(): Remove unnecessary code.
The buf_page_info_t::id was already assigned at the start
of the only caller, i_s_innodb_buffer_page_get_info().

storage/innobase/buf/buf0dump.cc

@@ -62,17 +62,6 @@ static volatile bool	buf_load_should_start;
 
 static bool	buf_load_abort_flag;
 
-/* Used to temporary store dump info in order to avoid IO while holding
-buffer pool mutex during dump and also to sort the contents of the dump
-before reading the pages from disk during load.
-We store the space id in the high 32 bits and page no in low 32 bits. */
-typedef ib_uint64_t	buf_dump_t;
-
-/* Aux macros to create buf_dump_t and to extract space and page from it */
-#define BUF_DUMP_CREATE(space, page)	ut_ull_create(space, page)
-#define BUF_DUMP_SPACE(a)		((ulint) ((a) >> 32))
-#define BUF_DUMP_PAGE(a)		((ulint) ((a) & 0xFFFFFFFFUL))
-
 /** Start the buffer pool dump/load task and instructs it to start a dump. */
 void buf_dump_start()
 {
@@ -283,7 +272,7 @@ buf_dump(
 		return;
 	}
 	const buf_page_t*	bpage;
-	buf_dump_t*		dump;
+	page_id_t*		dump;
 	ulint			n_pages;
 	ulint			j;
 
@@ -317,8 +306,8 @@ buf_dump(
 		}
 	}
 
-	dump = static_cast<buf_dump_t*>(ut_malloc_nokey(
-						n_pages * sizeof(*dump)));
+	dump = static_cast<page_id_t*>(ut_malloc_nokey(
+					       n_pages * sizeof(*dump)));
 
 	if (dump == NULL) {
 		mutex_exit(&buf_pool.mutex);
@@ -336,14 +325,14 @@ buf_dump(
 	     bpage = UT_LIST_GET_NEXT(LRU, bpage)) {
 
 		ut_a(buf_page_in_file(bpage));
+		const page_id_t id(bpage->id);
 
-		if (bpage->id.space() == SRV_TMP_SPACE_ID) {
+		if (id.space() == SRV_TMP_SPACE_ID) {
 			/* Ignore the innodb_temporary tablespace. */
 			continue;
 		}
 
-		dump[j++] = BUF_DUMP_CREATE(bpage->id.space(),
-					    bpage->id.page_no());
+		dump[j++] = id;
 	}
 
 	mutex_exit(&buf_pool.mutex);
@@ -352,9 +341,8 @@ buf_dump(
 	n_pages = j;
 
 	for (j = 0; j < n_pages && !SHOULD_QUIT(); j++) {
-		ret = fprintf(f, ULINTPF "," ULINTPF "\n",
-			      BUF_DUMP_SPACE(dump[j]),
-			      BUF_DUMP_PAGE(dump[j]));
+		ret = fprintf(f, "%u,%u\n",
+			      dump[j].space(), dump[j].page_no());
 		if (ret < 0) {
 			ut_free(dump);
 			fclose(f);
@@ -498,7 +486,7 @@ buf_load()
 	char		full_filename[OS_FILE_MAX_PATH];
 	char		now[32];
 	FILE*		f;
-	buf_dump_t*	dump;
+	page_id_t*	dump;
 	ulint		dump_n;
 	ulint		i;
 	ulint		space_id;
@@ -552,7 +540,7 @@ buf_load()
 	dump_n = std::min(dump_n, buf_pool.get_n_pages());
 
 	if (dump_n != 0) {
-		dump = static_cast<buf_dump_t*>(ut_malloc_nokey(
+		dump = static_cast<page_id_t*>(ut_malloc_nokey(
 				dump_n * sizeof(*dump)));
 	} else {
 		fclose(f);
@@ -609,7 +597,7 @@ buf_load()
 			return;
 		}
 
-		dump[i] = BUF_DUMP_CREATE(space_id, page_no);
+		dump[i] = page_id_t(space_id, page_no);
 	}
 
 	/* Set dump_n to the actual number of initialized elements,
@@ -638,7 +626,7 @@ buf_load()
 	/* Avoid calling the expensive fil_space_acquire_silent() for each
 	page within the same tablespace. dump[] is sorted by (space, page),
 	so all pages from a given tablespace are consecutive. */
-	ulint		cur_space_id = BUF_DUMP_SPACE(dump[0]);
+	ulint		cur_space_id = dump[0].space();
 	fil_space_t*	space = fil_space_acquire_silent(cur_space_id);
 	ulint		zip_size = space ? space->zip_size() : 0;
 
@@ -650,7 +638,7 @@ buf_load()
 	for (i = 0; i < dump_n && !SHUTTING_DOWN(); i++) {
 
 		/* space_id for this iteration of the loop */
-		const ulint	this_space_id = BUF_DUMP_SPACE(dump[i]);
+		const ulint	this_space_id = dump[i].space();
 
 		if (this_space_id == SRV_TMP_SPACE_ID) {
 			/* Ignore the innodb_temporary tablespace. */
@@ -679,10 +667,7 @@ buf_load()
 			continue;
 		}
 
-		buf_read_page_background(
-			page_id_t(this_space_id, BUF_DUMP_PAGE(dump[i])),
-			zip_size, true);
-
+		buf_read_page_background(dump[i], zip_size, true);
 
 		if (buf_load_abort_flag) {
 			if (space != NULL) {

storage/innobase/handler/i_s.cc

@@ -114,8 +114,8 @@ currently cached in the buffer pool. It will be used to populate
 table INFORMATION_SCHEMA.INNODB_BUFFER_PAGE */
 struct buf_page_info_t{
 	ulint		block_id;	/*!< Buffer Pool block ID */
-	unsigned	space_id:32;	/*!< Tablespace ID */
-	unsigned	page_num:32;	/*!< Page number/offset */
+	/** page identifier */
+	page_id_t	id;
 	unsigned	access_time:32;	/*!< Time of first access */
 	unsigned	flush_type:2;	/*!< Flush type */
 	unsigned	io_fix:2;	/*!< type of pending I/O operation */
@@ -3973,10 +3973,10 @@ i_s_innodb_buffer_page_fill(
 			   page_info->block_id, true));
 
 		OK(fields[IDX_BUFFER_PAGE_SPACE]->store(
-			   page_info->space_id, true));
+			   page_info->id.space(), true));
 
 		OK(fields[IDX_BUFFER_PAGE_NUM]->store(
-			   page_info->page_num, true));
+			   page_info->id.page_no(), true));
 
 		OK(field_store_string(
 			   fields[IDX_BUFFER_PAGE_TYPE],
@@ -4135,14 +4135,6 @@ i_s_innodb_set_page_type(
 
 		page_info->page_type = page_type & 0xf;
 	}
-
-	if (page_info->page_type == FIL_PAGE_TYPE_ZBLOB
-	    || page_info->page_type == FIL_PAGE_TYPE_ZBLOB2) {
-		page_info->page_num = mach_read_from_4(
-			frame + FIL_PAGE_OFFSET);
-		page_info->space_id = mach_read_from_4(
-			frame + FIL_PAGE_ARCH_LOG_NO_OR_SPACE_ID);
-	}
 }
 /*******************************************************************//**
 Scans pages in the buffer cache, and collect their general information
@@ -4169,9 +4161,7 @@ i_s_innodb_buffer_page_get_info(
 	if (buf_page_in_file(bpage)) {
 		const byte*	frame;
 
-		page_info->space_id = bpage->id.space();
-
-		page_info->page_num = bpage->id.page_no();
+		page_info->id = bpage->id;
 
 		page_info->flush_type = bpage->flush_type;
 
@@ -4488,10 +4478,10 @@ i_s_innodb_buf_page_lru_fill(
 			   page_info->block_id, true));
 
 		OK(fields[IDX_BUF_LRU_PAGE_SPACE]->store(
-			   page_info->space_id, true));
+			   page_info->id.space(), true));
 
 		OK(fields[IDX_BUF_LRU_PAGE_NUM]->store(
-			   page_info->page_num, true));
+			   page_info->id.page_no(), true));
 
 		OK(field_store_string(
 			   fields[IDX_BUF_LRU_PAGE_TYPE],