MDEV-26195: Use a 32-bit data type for some tablespace fields

In the InnoDB data files, we allocate 32 bits for tablespace identifiers
and page numbers as well as tablespace flags. But, in main memory
data structures we allocate 32 or 64 bits, depending on the register
width of the processor. Let us always use 32-bit fields to eliminate
a mismatch and reduce the memory footprint on 64-bit systems.

Author: dr-m

extra/innochecksum.cc

@@ -70,7 +70,7 @@ static my_bool per_page_details;
 static ulint n_merge;
 static ulint physical_page_size;  /* Page size in bytes on disk. */
 ulong srv_page_size;
-ulong srv_page_size_shift;
+uint32_t srv_page_size_shift;
 /* Current page number (0 based). */
 unsigned long long		cur_page_num;
 /* Current space. */

extra/mariabackup/backup_mysql.cc

@@ -514,7 +514,8 @@ bool get_mysql_vars(MYSQL *connection)
 
   if (innodb_undo_tablespaces_var)
   {
-    srv_undo_tablespaces= strtoul(innodb_undo_tablespaces_var, &endptr, 10);
+    srv_undo_tablespaces= static_cast<uint32_t>
+      (strtoul(innodb_undo_tablespaces_var, &endptr, 10));
     ut_ad(*endptr == 0);
   }
 

extra/mariabackup/common.h

@@ -149,10 +149,9 @@ static inline ATTRIBUTE_FORMAT(printf, 1,2) ATTRIBUTE_NORETURN void die(const ch
 /***********************************************************************
 Computes bit shift for a given value. If the argument is not a power
 of 2, returns 0.*/
-static inline size_t
-get_bit_shift(size_t value)
+static inline unsigned get_bit_shift(size_t value)
 {
-    size_t shift;
+    unsigned shift;
 
     if (value == 0)
 	return 0;

extra/mariabackup/ds_local.cc

@@ -181,8 +181,8 @@ static void init_ibd_data(ds_local_file_t *local_file, const uchar *buf, size_t
 		return;
 	}
 
-	ulint flags = mach_read_from_4(&buf[FIL_PAGE_DATA + FSP_SPACE_FLAGS]);
-	ulint ssize = FSP_FLAGS_GET_PAGE_SSIZE(flags);
+	auto flags = mach_read_from_4(&buf[FIL_PAGE_DATA + FSP_SPACE_FLAGS]);
+	auto ssize = FSP_FLAGS_GET_PAGE_SSIZE(flags);
 	local_file->pagesize= ssize == 0 ? UNIV_PAGE_SIZE_ORIG : ((UNIV_ZIP_SIZE_MIN >> 1) << ssize);
 	local_file->compressed = fil_space_t::full_crc32(flags)
 		? fil_space_t::is_compressed(flags)

extra/mariabackup/fil_cur.cc

@@ -232,8 +232,8 @@ xb_fil_cur_open(
 		mysql_mutex_unlock(&fil_system.mutex);
 	}
 
-	cursor->space_size = (ulint)(cursor->statinfo.st_size
-				     / cursor->page_size);
+	cursor->space_size = uint32_t(cursor->statinfo.st_size
+				      / cursor->page_size);
 
 	cursor->read_filter = read_filter;
 	cursor->read_filter->init(&cursor->read_filter_ctxt, cursor,
@@ -441,8 +441,8 @@ xb_fil_cur_result_t xb_fil_cur_read(xb_fil_cur_t*	cursor,
 				    "corrupted.%s", cursor->abs_path, ignore_corruption_warn);
 				ut_print_buf(stderr, page, page_size);
 				if (opt_log_innodb_page_corruption) {
-					corrupted_pages.add_page(cursor->node->name, cursor->node->space->id,
-						page_no);
+					corrupted_pages.add_page(cursor->node->name,
+								 {cursor->node->space->id, page_no});
 					retry_count = 1;
 				}
 				else {
@@ -465,8 +465,9 @@ xb_fil_cur_result_t xb_fil_cur_read(xb_fil_cur_t*	cursor,
 				unsigned corrupted_page_no =
 					static_cast<unsigned>(strtoul(dbug_val, NULL, 10));
 				if (page_no == corrupted_page_no)
-					corrupted_pages.add_page(cursor->node->name, cursor->node->space->id,
-						corrupted_page_no);
+					corrupted_pages.add_page(cursor->node->name,
+								 {cursor->node->space->id,
+								  corrupted_page_no});
 			});
 		cursor->buf_read += page_size;
 		cursor->buf_npages++;

extra/mariabackup/fil_cur.h

@@ -56,8 +56,8 @@ struct xb_fil_cur_t {
 	unsigned		buf_page_no;	/*!< number of the first page in
 					buffer */
 	uint		thread_n;	/*!< thread number for diagnostics */
-	ulint		space_id;	/*!< ID of tablespace */
-	ulint		space_size;	/*!< space size in pages */
+	uint32_t	space_id;	/*!< ID of tablespace */
+	uint32_t	space_size;	/*!< space size in pages */
 
 	/** @return whether this is not a file-per-table tablespace */
 	bool is_system() const

extra/mariabackup/read_filt.h

@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA
 
 #include "changed_page_bitmap.h"
 
-typedef ulint space_id_t;
+typedef uint32_t space_id_t;
 
 struct xb_fil_cur_t;
 

extra/mariabackup/write_filt.cc

@@ -124,8 +124,8 @@ wf_incremental_process(xb_write_filt_ctxt_t *ctxt, ds_file_t *dstfile)
 	     i++, page += page_size) {
 
 		if ((!cp->corrupted_pages ||
-				!cp->corrupted_pages->contains(cursor->node->space->id,
-					cursor->buf_page_no + i)) &&
+		     !cp->corrupted_pages->contains({cursor->node->space->id,
+			 cursor->buf_page_no + i})) &&
 				incremental_lsn >= mach_read_from_8(page + FIL_PAGE_LSN))
 			continue;