Preliminary updates for Postgres 9.3.

diff --git a/Makefile b/Makefile
index 541861027b6a2b1f8c460421598b57068409d51f..c64dfbf577ee0770519590f89098fc78e6504726 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # View README.pg_filedump first
 
 # note this must match version macros in pg_filedump.h
-FD_VERSION=9.2.0
+FD_VERSION=9.3.0
 
 CC=gcc
 CFLAGS=-g -O -Wall -Wmissing-prototypes -Wmissing-declarations

diff --git a/pg_filedump.c b/pg_filedump.c
index eff02ab54e3d295436f7502c0e59fea209cb0705..e5686ea401adca8a46cebe07e359114278e0403f 100644 (file)
--- a/pg_filedump.c
+++ b/pg_filedump.c
@@ -609,15 +609,15 @@ FormatHeader (Page page)
         " Block: Size %4d  Version %4u            Upper    %4u (0x%04hx)\n"
         " LSN:  logid %6d recoff 0x%08x      Special  %4u (0x%04hx)\n"
         " Items: %4d                      Free Space: %4u\n"
-        " TLI: 0x%04x  Prune XID: 0x%08x  Flags: 0x%04x (%s)\n"
+        " Checksum: 0x%04x  Prune XID: 0x%08x  Flags: 0x%04x (%s)\n"
         " Length (including item array): %u\n\n",
         pageOffset, pageHeader->pd_lower, pageHeader->pd_lower,
         (int) PageGetPageSize (page), blockVersion,
         pageHeader->pd_upper, pageHeader->pd_upper,
-        pageLSN.xlogid, pageLSN.xrecoff,
+        (uint32) (pageLSN >> 32), (uint32) pageLSN,
         pageHeader->pd_special, pageHeader->pd_special,
         maxOffset, pageHeader->pd_upper - pageHeader->pd_lower,
-        pageHeader->pd_tli, pageHeader->pd_prune_xid,
+        pageHeader->pd_checksum, pageHeader->pd_prune_xid,
         pageHeader->pd_flags, flagString,
         headerBytes);
 
@@ -933,7 +933,7 @@ FormatItem (unsigned int numBytes, unsigned int startIndex,
 
          printf ("  XMIN: %u  XMAX: %u  CID|XVAC: %u",
                  HeapTupleHeaderGetXmin(htup),
-                 HeapTupleHeaderGetXmax(htup),
+                 HeapTupleHeaderGetRawXmax(htup),
                  HeapTupleHeaderGetRawCommandId(htup));
 
          if (infoMask & HEAP_HASOID)
@@ -958,12 +958,14 @@ FormatItem (unsigned int numBytes, unsigned int startIndex,
            strcat (flagString, "HASEXTERNAL|");
          if (infoMask & HEAP_HASOID)
            strcat (flagString, "HASOID|");
+         if (infoMask & HEAP_XMAX_KEYSHR_LOCK)
+           strcat (flagString, "XMAX_KEYSHR_LOCK|");
          if (infoMask & HEAP_COMBOCID)
            strcat (flagString, "COMBOCID|");
          if (infoMask & HEAP_XMAX_EXCL_LOCK)
            strcat (flagString, "XMAX_EXCL_LOCK|");
-         if (infoMask & HEAP_XMAX_SHARED_LOCK)
-           strcat (flagString, "XMAX_SHARED_LOCK|");
+         if (infoMask & HEAP_XMAX_LOCK_ONLY)
+           strcat (flagString, "XMAX_LOCK_ONLY|");
          if (infoMask & HEAP_XMIN_COMMITTED)
            strcat (flagString, "XMIN_COMMITTED|");
          if (infoMask & HEAP_XMIN_INVALID)
@@ -981,6 +983,8 @@ FormatItem (unsigned int numBytes, unsigned int startIndex,
          if (infoMask & HEAP_MOVED_IN)
            strcat (flagString, "MOVED_IN|");
 
+         if (infoMask2 & HEAP_KEYS_UPDATED)
+           strcat (flagString, "KEYS_UPDATED|");
          if (infoMask2 & HEAP_HOT_UPDATED)
            strcat (flagString, "HOT_UPDATED|");
          if (infoMask2 & HEAP_ONLY_TUPLE)
@@ -1340,15 +1344,15 @@ FormatControl ()
              controlData->system_identifier,
              dbState,
              ctime (&(cd_time)),
-             controlData->checkPoint.xlogid, controlData->checkPoint.xrecoff,
-             controlData->prevCheckPoint.xlogid, controlData->prevCheckPoint.xrecoff,
-             checkPoint->redo.xlogid, checkPoint->redo.xrecoff,
+             (uint32) (controlData->checkPoint >> 32), (uint32) controlData->checkPoint,
+             (uint32) (controlData->prevCheckPoint >> 32), (uint32) controlData->prevCheckPoint,
+             (uint32) (checkPoint->redo >> 32), (uint32) checkPoint->redo,
              checkPoint->ThisTimeLineID,
              checkPoint->nextXidEpoch, checkPoint->nextXid,
              checkPoint->nextOid,
              checkPoint->nextMulti, checkPoint->nextMultiOffset,
              ctime (&cp_time),
-             controlData->minRecoveryPoint.xlogid, controlData->minRecoveryPoint.xrecoff,
+             (uint32) (controlData->minRecoveryPoint >> 32), (uint32) controlData->minRecoveryPoint,
              controlData->maxAlign,
              controlData->floatFormat,
              (controlData->floatFormat == FLOATFORMAT_VALUE ?

diff --git a/pg_filedump.h b/pg_filedump.h
index e044eac98ccd59da2af099ad16756abdf0708e53..e0c61be2d7dc96f65c9528b269e8bd0a8712ccac 100644 (file)
--- a/pg_filedump.h
+++ b/pg_filedump.h
@@ -22,8 +22,8 @@
  * Original Author: Patrick Macdonald <patrickm@redhat.com>
  */
 
-#define FD_VERSION     "9.2.0"                 /* version ID of pg_filedump */
-#define FD_PG_VERSION  "PostgreSQL 9.2.x"      /* PG version it works with */
+#define FD_VERSION     "9.3.0"                 /* version ID of pg_filedump */
+#define FD_PG_VERSION  "PostgreSQL 9.3.x"      /* PG version it works with */
 
 #include "postgres.h"
 
@@ -34,6 +34,7 @@
 #include "access/gist.h"
 #include "access/hash.h"
 #include "access/htup.h"
+#include "access/htup_details.h"
 #include "access/itup.h"
 #include "access/nbtree.h"
 #include "access/spgist_private.h"