Merge lp:~gaul/percona-data-recovery-tool-for-innodb/dulint-to-uint64_t into lp:percona-data-recovery-tool-for-innodb

[Andrew Gaul]

Unmerged revisions

70. By Andrew Gaul <email address hidden> on 2012-08-23

Add dulint_to_uint64_t helper

Used several times in upcoming enhancements to page_printer.

=== modified file 'page_printer.c'
--- page_printer.c	2012-08-09 20:35:20 +0000
+++ page_printer.c	2012-08-23 05:06:25 +0000
@@ -27,6 +27,11 @@
 
 #define COLUMN_NAME_FMT "%-32s"
 
+static uint64_t dulint_to_uint64_t(dulint tuple)
+{
+  return (((uint64_t) tuple.high) << 32) | tuple.low;
+}
+
 static void print_page(uchar *p)
 {
   int type = mach_read_from_2(p + FIL_PAGE_TYPE);
@@ -46,11 +51,8 @@
       mach_read_from_4(p + FIL_PAGE_LSN));
   printf(COLUMN_NAME_FMT " %ld\n", "FIL_PAGE_TYPE",
       mach_read_from_2(p + FIL_PAGE_TYPE));
-  dulint flush_lsn_tuple = mach_read_from_6(p + FIL_PAGE_FILE_FLUSH_LSN);
-  uint64_t flush_lsn = (((uint64_t) flush_lsn_tuple.high) << 32) +
-      flush_lsn_tuple.low;
   printf(COLUMN_NAME_FMT " %" PRIu64 "\n", "FIL_PAGE_FILE_FLUSH_LSN",
-      flush_lsn);
+      dulint_to_uint64_t(mach_read_from_6(p + FIL_PAGE_FILE_FLUSH_LSN)));
   printf(COLUMN_NAME_FMT " %ld\n", "FIL_PAGE_ARCH_LOG_NO_OR_SPACE_ID",
       mach_read_from_4(p + FIL_PAGE_ARCH_LOG_NO_OR_SPACE_ID));
   printf(COLUMN_NAME_FMT " 0x%08lX\n", "FIL_PAGE_END_LSN_OLD_CHKSUM",
@@ -69,11 +71,8 @@
         mach_read_from_2(pd + PAGE_N_HEAP));
     printf(COLUMN_NAME_FMT " 0x%lX\n", "PAGE_FREE",
         mach_read_from_2(pd + PAGE_FREE));
-    dulint index_id_tuple = mach_read_from_8(pd + PAGE_INDEX_ID);
-    uint64_t index_id = (((uint64_t) index_id_tuple.high) << 32) +
-        index_id_tuple.low;
     printf(COLUMN_NAME_FMT " %" PRIu64 "\n", "PAGE_INDEX_ID",
-        index_id);
+        dulint_to_uint64_t(mach_read_from_8(pd + PAGE_INDEX_ID)));
     printf(COLUMN_NAME_FMT " %ld\n", "PAGE_BTR_SEG_LEAF",
         mach_read_from_4(pd + PAGE_BTR_SEG_LEAF + FSEG_HDR_SPACE));
     printf(COLUMN_NAME_FMT " %ld\n", "PAGE_BTR_SEG_TOP",