Update for Postgres 9.1; add knowledge of some more flag bits;

improve Makefile to be able to build a release tarball.

diff --git a/Makefile b/Makefile
index 429971b63233d9c6a76a0f8e2722b21e6c4cf1b1..e78cfa747bbbf34b3f6f45dcfbbfd17213bc9c88 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,8 @@
 # View README.pg_filedump first
 
+# note this must match macro in pg_filedump.h
+FD_VERSION=9.1.0
+
 CC=gcc
 CFLAGS=-g -O -Wall -Wmissing-prototypes -Wmissing-declarations
 
@@ -10,6 +13,10 @@ CRC_SRC_DIR=${PGSQL}/src/backend/utils/hash
 
 INCLUDE_DIR=${PGSQL}/src/include
 
+DISTFILES= README.pg_filedump Makefile Makefile.contrib \
+       pg_filedump.h pg_filedump.c
+
+
 all: pg_filedump
 
 pg_filedump: pg_filedump.o pg_crc.o 
@@ -21,5 +28,12 @@ pg_filedump.o: pg_filedump.c
 pg_crc.o: ${CRC_SRC_DIR}/pg_crc.c
        ${CC} ${CFLAGS} -I${INCLUDE_DIR} ${CRC_SRC_DIR}/pg_crc.c -c 
 
+dist:
+       rm -rf pg_filedump-${FD_VERSION} pg_filedump-${FD_VERSION}.tar.gz
+       mkdir pg_filedump-${FD_VERSION}
+       cp -p ${DISTFILES} pg_filedump-${FD_VERSION}
+       tar cfz pg_filedump-${FD_VERSION}.tar.gz pg_filedump-${FD_VERSION}
+       rm -rf pg_filedump-${FD_VERSION}
+
 clean:
        rm -f *.o pg_filedump

diff --git a/pg_filedump.c b/pg_filedump.c
index 7bb355c7c98fcc3a143705d55f2c4f837ccc002d..d5b449b43be9c001bbf93e9bf523259f2514509a 100644 (file)
--- a/pg_filedump.c
+++ b/pg_filedump.c
@@ -583,6 +583,8 @@ FormatHeader (Page page)
          strcat (flagString, "HAS_FREE_LINES|");
       if (pageHeader->pd_flags & PD_PAGE_FULL)
          strcat (flagString, "PAGE_FULL|");
+      if (pageHeader->pd_flags & PD_ALL_VISIBLE)
+         strcat (flagString, "ALL_VISIBLE|");
       if (strlen (flagString))
          flagString[strlen (flagString) - 1] = '\0';
 
@@ -1000,6 +1002,8 @@ FormatSpecial ()
          strcat (flagString, "DELETED|");
        if (gistSection->flags & F_TUPLES_DELETED)
          strcat (flagString, "TUPLES_DELETED|");
+       if (gistSection->flags & F_FOLLOW_RIGHT)
+         strcat (flagString, "FOLLOW_RIGHT|");
        if (strlen (flagString))
          flagString[strlen (flagString) - 1] = '\0';
        printf (" GIST Index Section:\n"
@@ -1022,6 +1026,12 @@ FormatSpecial ()
          strcat (flagString, "LEAF|");
        if (ginSection->flags & GIN_DELETED)
          strcat (flagString, "DELETED|");
+       if (ginSection->flags & GIN_META)
+         strcat (flagString, "META|");
+       if (ginSection->flags & GIN_LIST)
+         strcat (flagString, "LIST|");
+       if (ginSection->flags & GIN_LIST_FULLROW)
+         strcat (flagString, "FULLROW|");
        if (strlen (flagString))
          flagString[strlen (flagString) - 1] = '\0';
        printf (" GIN Index Section:\n"

diff --git a/pg_filedump.h b/pg_filedump.h
index 4defde8437517b0ddace19ff2f370c3fb81fdfcb..1976082c5ccee924e865e7dbb112fc69f258c56a 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.0.0"                 /* version ID of pg_filedump */
-#define FD_PG_VERSION  "PostgreSQL 9.0.x"      /* PG version it works with */
+#define FD_VERSION     "9.1.0"                 /* version ID of pg_filedump */
+#define FD_PG_VERSION  "PostgreSQL 9.1.x"      /* PG version it works with */
 
 #include "postgres.h"
 
@@ -31,6 +31,7 @@
 #include <ctype.h>
 
 #include "access/gin.h"
+#include "access/gin_private.h"
 #include "access/gist.h"
 #include "access/hash.h"
 #include "access/htup.h"