farrokhi/pg_filedump
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Preliminary updates for Postgres 9.3.

Browse Source
This commit is contained in:
Tom Lane
2013-06-06 18:33:16 +00:00
parent 4f71071d5b
commit bbd992bc26
3 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,7 +1,7 @@
# View README.pg_filedump first # View README.pg_filedump first
# note this must match version macros in pg_filedump.h # note this must match version macros in pg_filedump.h
FD_VERSION=9.2.0 FD_VERSION=9.3.0
CC=gcc CC=gcc
CFLAGS=-g -O -Wall -Wmissing-prototypes -Wmissing-declarations CFLAGS=-g -O -Wall -Wmissing-prototypes -Wmissing-declarations

24
pg_filedump.c
View File

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

5
pg_filedump.h
View File

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