Support 9.5 and recognize more flags

This follows the CRC32 macro renames in 9.5 (we do not attempt to
maintain support for the older versions), adds support for the
DB_SHUTDOWNED_IN_RECOVERY dbState, and adds support for missing BTree
and GIN page flags.

Satoshi Nagayasu

.gitignore

@@ -0,0 +1,2 @@
+/pg_filedump.o
+/pg_filedump

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.5.0
 
 CC=gcc
 CFLAGS=-g -O -Wall -Wmissing-prototypes -Wmissing-declarations
@@ -9,7 +9,8 @@ CFLAGS=-g -O -Wall -Wmissing-prototypes -Wmissing-declarations
 # If working with a PG source directory, point PGSQL_INCLUDE_DIR to its
 # src/include subdirectory.  If working with an installed tree, point to
 # the server include subdirectory, eg /usr/local/include/postgresql/server
-PGSQL_INCLUDE_DIR=../../pgsql/src/include
+PG_CONFIG=pg_config
+PGSQL_INCLUDE_DIR=$(shell $(PG_CONFIG) --includedir-server)
 
 
 DISTFILES= README.pg_filedump Makefile Makefile.contrib \
@@ -18,7 +19,7 @@ DISTFILES= README.pg_filedump Makefile Makefile.contrib \
 all: pg_filedump
 
 pg_filedump: pg_filedump.o
-	${CC} ${CFLAGS} -o pg_filedump pg_filedump.o
+	${CC} ${CFLAGS} -o pg_filedump pg_filedump.o -lpgport
 
 pg_filedump.o: pg_filedump.c
 	${CC} ${CFLAGS} -I${PGSQL_INCLUDE_DIR} pg_filedump.c -c

Makefile.contrib

@@ -4,12 +4,12 @@ OBJS	= pg_filedump.o
 DOCS = README.pg_filedump
 
 ifdef USE_PGXS
-PG_CONFIG = pg_config
+	PG_CONFIG = pg_config
-PGXS := $(shell $(PG_CONFIG) --pgxs)
+	PGXS := $(shell $(PG_CONFIG) --pgxs)
-include $(PGXS)
+	include $(PGXS)
 else
-subdir = contrib/pg_filedump
+	subdir = contrib/pg_filedump
-top_builddir = ../..
+	top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
+	include $(top_builddir)/src/Makefile.global
-include $(top_srcdir)/contrib/contrib-global.mk
+	include $(top_srcdir)/contrib/contrib-global.mk
 endif

README.pg_filedump

@@ -2,7 +2,7 @@ pg_filedump - Display formatted contents of a PostgreSQL heap, index,
               or control file.
 
 Copyright (c) 2002-2010 Red Hat, Inc.
-Copyright (c) 2011-2012, PostgreSQL Global Development Group
+Copyright (c) 2011-2016, PostgreSQL Global Development Group
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -59,7 +59,7 @@ not require any manual adjustments of the Makefile.
 ------------------------------------------------------------------------
 Invocation:
 
-pg_filedump [-abcdfhixy] [-R startblock [endblock]] [-S blocksize] file
+pg_filedump [-abcdfhikxy] [-R startblock [endblock]] [-S blocksize] file
 
 Defaults are: relative addressing, range of the entire file, block size
               as listed on block 0 in the file
@@ -74,6 +74,7 @@ The following options are valid for heap and index files:
   -f  Display formatted block content dump along with interpretation
   -h  Display this information
   -i  Display interpreted item details
+  -k  Verify block checksums
   -R  Display specific block ranges within the file (Blocks are
       indexed from 0)
         [startblock]: block to start at

pg_filedump.h

@@ -1,9 +1,9 @@
 /*
  * pg_filedump.h - PostgreSQL file dump utility for dumping and
- *                 formatting heap (data), index and control files.
+ *				   formatting heap (data), index and control files.
  *
  * Copyright (c) 2002-2010 Red Hat, Inc.
- * Copyright (c) 2011-2012, PostgreSQL Global Development Group
+ * Copyright (c) 2011-2016, PostgreSQL Global Development Group
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,8 +22,8 @@
  * Original Author: Patrick Macdonald <patrickm@redhat.com>
  */
 
-#define FD_VERSION	"9.2.0"			/* version ID of pg_filedump */
+#define FD_VERSION	"9.5.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.5.x"		/* PG version it works with */
 
 #include "postgres.h"
 
@@ -34,89 +34,93 @@
 #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"
 #include "catalog/pg_control.h"
 #include "storage/bufpage.h"
 
-// Options for Block formatting operations
+/*	Options for Block formatting operations */
 static unsigned int blockOptions = 0;
-typedef enum
+
+typedef enum blockSwitches
 {
-  BLOCK_ABSOLUTE = 0x00000001,	// -a: Absolute (vs Relative) addressing
+	BLOCK_ABSOLUTE = 0x00000001,	/* -a: Absolute(vs Relative) addressing */
-  BLOCK_BINARY = 0x00000002,	// -b: Binary dump of block
+	BLOCK_BINARY = 0x00000002,	/* -b: Binary dump of block */
-  BLOCK_FORMAT = 0x00000004,	// -f: Formatted dump of blocks / control file
+	BLOCK_FORMAT = 0x00000004,	/* -f: Formatted dump of blocks / control file */
-  BLOCK_FORCED = 0x00000008,	// -S: Block size forced
+	BLOCK_FORCED = 0x00000008,	/* -S: Block size forced */
-  BLOCK_NO_INTR = 0x00000010,	// -d: Dump straight blocks
+	BLOCK_NO_INTR = 0x00000010, /* -d: Dump straight blocks */
-  BLOCK_RANGE = 0x00000020	// -R: Specific block range to dump
+	BLOCK_RANGE = 0x00000020,	/* -R: Specific block range to dump */
-}
+	BLOCK_CHECKSUMS = 0x00000040	/* -k: verify block checksums */
-blockSwitches;
+} blockSwitches;
 
-static int blockStart = -1;	// -R [start]: Block range start
+/* -R[start]:Block range start */
-static int blockEnd = -1;	// -R [end]: Block range end
+static int	blockStart = -1;
 
-// Options for Item formatting operations
+/* -R[end]:Block range end */
+static int	blockEnd = -1;
+
+/* Options for Item formatting operations */
 static unsigned int itemOptions = 0;
-typedef enum
-{
-  ITEM_DETAIL = 0x00000001,	// -i: Display interpreted items
-  ITEM_HEAP = 0x00000002,	// -y: Blocks contain HeapTuple items
-  ITEM_INDEX = 0x00000004,	// -x: Blocks contain IndexTuple items
-  ITEM_SPG_INNER = 0x00000008,	// Blocks contain SpGistInnerTuple items
-  ITEM_SPG_LEAF = 0x00000010	// Blocks contain SpGistLeafTuple items
-}
-itemSwitches;
 
-// Options for Control File formatting operations
+typedef enum itemSwitches
+{
+	ITEM_DETAIL = 0x00000001,	/* -i: Display interpreted items */
+	ITEM_HEAP = 0x00000002,		/* -y: Blocks contain HeapTuple items */
+	ITEM_INDEX = 0x00000004,	/* -x: Blocks contain IndexTuple items */
+	ITEM_SPG_INNER = 0x00000008,	/* Blocks contain SpGistInnerTuple items */
+	ITEM_SPG_LEAF = 0x00000010	/* Blocks contain SpGistLeafTuple items */
+} itemSwitches;
+
+/* Options for Control File formatting operations */
 static unsigned int controlOptions = 0;
-typedef enum
-{
-  CONTROL_DUMP = 0x00000001,	// -c: Dump control file
-  CONTROL_FORMAT = BLOCK_FORMAT,	// -f: Formatted dump of control file
-  CONTROL_FORCED = BLOCK_FORCED	// -S: Block size forced
-}
-controlSwitches;
 
-// Possible value types for the Special Section
+typedef enum controlSwitches
-typedef enum
 {
-  SPEC_SECT_NONE,		// No special section on block
+	CONTROL_DUMP = 0x00000001,	/* -c: Dump control file */
-  SPEC_SECT_SEQUENCE,		// Sequence info in special section
+	CONTROL_FORMAT = BLOCK_FORMAT,		/* -f: Formatted dump of control file */
-  SPEC_SECT_INDEX_BTREE,	// BTree index info in special section
+	CONTROL_FORCED = BLOCK_FORCED		/* -S: Block size forced */
-  SPEC_SECT_INDEX_HASH,		// Hash index info in special section
+} controlSwitches;
-  SPEC_SECT_INDEX_GIST,		// GIST index info in special section
+
-  SPEC_SECT_INDEX_GIN,		// GIN index info in special section
+/* Possible value types for the Special Section */
-  SPEC_SECT_INDEX_SPGIST,	// SP-GIST index info in special section
+typedef enum specialSectionTypes
-  SPEC_SECT_ERROR_UNKNOWN,	// Unknown error
+{
-  SPEC_SECT_ERROR_BOUNDARY	// Boundary error
+	SPEC_SECT_NONE,				/* No special section on block */
-}
+	SPEC_SECT_SEQUENCE,			/* Sequence info in special section */
-specialSectionTypes;
+	SPEC_SECT_INDEX_BTREE,		/* BTree index info in special section */
+	SPEC_SECT_INDEX_HASH,		/* Hash index info in special section */
+	SPEC_SECT_INDEX_GIST,		/* GIST index info in special section */
+	SPEC_SECT_INDEX_GIN,		/* GIN index info in special section */
+	SPEC_SECT_INDEX_SPGIST,		/* SP - GIST index info in special section */
+	SPEC_SECT_ERROR_UNKNOWN,	/* Unknown error */
+	SPEC_SECT_ERROR_BOUNDARY	/* Boundary error */
+}	specialSectionTypes;
+
 static unsigned int specialType = SPEC_SECT_NONE;
 
-// Possible return codes from option validation routine.
+/*	Possible return codes from option validation routine. */
-// pg_filedump doesn't do much with them now but maybe in
+/*	pg_filedump doesn't do much with them now but maybe in */
-// the future...
+/*	the future... */
-typedef enum
+typedef enum optionReturnCodes
 {
-  OPT_RC_VALID,			// All options are valid
+	OPT_RC_VALID,				/* All options are valid */
-  OPT_RC_INVALID,		// Improper option string
+	OPT_RC_INVALID,				/* Improper option string */
-  OPT_RC_FILE,			// File problems
+	OPT_RC_FILE,				/* File problems */
-  OPT_RC_DUPLICATE,		// Duplicate option encountered
+	OPT_RC_DUPLICATE,			/* Duplicate option encountered */
-  OPT_RC_COPYRIGHT		// Copyright should be displayed
+	OPT_RC_COPYRIGHT			/* Copyright should be displayed */
-}
+}	optionReturnCodes;
-optionReturnCodes;
 
-// Simple macro to check for duplicate options and then set
+/*	Simple macro to check for duplicate options and then set */
-// an option flag for later consumption
+/*	an option flag for later consumption */
-#define SET_OPTION(_x,_y,_z) if (_x & _y)               \
+#define SET_OPTION(_x,_y,_z) if (_x & _y)				\
-                               {                        \
+							   {						\
-                                 rc = OPT_RC_DUPLICATE; \
+								 rc = OPT_RC_DUPLICATE; \
-                                 duplicateSwitch = _z;  \
+								 duplicateSwitch = _z;	\
-                               }                        \
+							   }						\
-                             else                       \
+							 else						\
-                               _x |= _y;
+							   _x |= _y;
 
-#define SEQUENCE_MAGIC 0x1717	// PostgreSQL defined magic number
+#define SEQUENCE_MAGIC 0x1717	/* PostgreSQL defined magic number */
-#define EOF_ENCOUNTERED (-1)	// Indicator for partial read
+#define EOF_ENCOUNTERED (-1)	/* Indicator for partial read */
-#define BYTES_PER_LINE 16	// Format the binary 16 bytes per line
+#define BYTES_PER_LINE 16		/* Format the binary 16 bytes per line */