Fixes pg_xlogdump to work with Postgres-XC xlog, to handle BARRIER

log record correctly.

Submitted by Wang Diancheng.

Author: koichi-szk

contrib/pg_xlogdump/.gitignore

@@ -17,3 +17,4 @@
 /xactdesc.c
 /xlogdesc.c
 /xlogreader.c
+/pgxcdesc.c

contrib/pg_xlogdump/compat.c

@@ -39,6 +39,12 @@ timestamptz_to_time_t(TimestampTz t)
 	return result;
 }
 
+#ifdef PGXC
+/*
+ * used in common/relpath.c
+ */
+char *PGXCNodeName = NULL;
+#endif
 /*
  * Stopgap implementation of timestamptz_to_str that doesn't depend on backend
  * infrastructure.	This will work for timestamps that are within the range

contrib/pg_xlogdump/rmgrdesc.c

@@ -26,6 +26,9 @@
 #include "rmgrdesc.h"
 #include "storage/standby.h"
 #include "utils/relmapper.h"
+#ifdef PGXC
+#include "pgxc/barrier.h"
+#endif
 
 #define PG_RMGR(symname,name,redo,desc,startup,cleanup,restartpoint) \
 	{ name, desc, },

src/backend/access/rmgrdesc/Makefile

@@ -10,6 +10,6 @@ include $(top_builddir)/src/Makefile.global
 
 OBJS = clogdesc.o dbasedesc.o gindesc.o gistdesc.o hashdesc.o heapdesc.o \
 	   mxactdesc.o nbtdesc.o relmapdesc.o seqdesc.o smgrdesc.o spgdesc.o \
-	   standbydesc.o tblspcdesc.o xactdesc.o xlogdesc.o
+	   standbydesc.o tblspcdesc.o xactdesc.o xlogdesc.o pgxcdesc.o
 
 include $(top_srcdir)/src/backend/common.mk

src/backend/access/rmgrdesc/pgxcdesc.c

@@ -0,0 +1,31 @@
+/*-------------------------------------------------------------------------
+ *
+ * pgxcdesc.c
+ *	  rmgr descriptor routines for XC special
+ *
+ *
+ * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2010-2014 Postgres-XC Development Group
+ *
+ * IDENTIFICATION
+ *	  $$
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include "postgres.h"
+
+#include "pgxc/barrier.h"
+void
+barrier_redo(XLogRecPtr lsn, XLogRecord *record)
+{
+	/* Nothing to do */
+	return;
+}
+
+void
+barrier_desc(StringInfo buf, uint8 xl_info, char *rec)
+{
+	Assert(xl_info == XLOG_BARRIER_CREATE);
+	appendStringInfo(buf, "BARRIER %s", rec);
+}

src/backend/pgxc/barrier/barrier.c

@@ -492,17 +492,3 @@ RequestBarrier(const char *id, char *completionTag)
 	if (completionTag)
 		snprintf(completionTag, COMPLETION_TAG_BUFSIZE, "BARRIER %s", barrier_id);
 }
-
-void
-barrier_redo(XLogRecPtr lsn, XLogRecord *record)
-{
-	/* Nothing to do */
-	return;
-}
-
-void
-barrier_desc(StringInfo buf, uint8 xl_info, char *rec)
-{
-	Assert(xl_info == XLOG_BARRIER_CREATE);
-	appendStringInfo(buf, "BARRIER %s", rec);
-}