Remove beginLoc from rm_desc routines signature.

Upstream doesn't have it and not used anymore in Greenplum, so loose it.

src/backend/access/bitmap/bitmapxlog.c

@@ -662,7 +662,7 @@ out_target(StringInfo buf, RelFileNode *node)
 }
 
 void
-bitmap_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record)
+bitmap_desc(StringInfo buf, XLogRecord *record)
 {
 	uint8		info = record->xl_info & ~XLR_INFO_MASK;
 	char		*rec = XLogRecGetData(record);

src/backend/access/gin/ginxlog.c

@@ -705,7 +705,7 @@ desc_node(StringInfo buf, RelFileNode node, BlockNumber blkno)
 }
 
 void
-gin_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record)
+gin_desc(StringInfo buf, XLogRecord *record)
 {
 	uint8		info = record->xl_info & ~XLR_INFO_MASK;
 	char		*rec = XLogRecGetData(record);

src/backend/access/gist/gistxlog.c

@@ -363,7 +363,7 @@ out_gistxlogPageSplit(StringInfo buf, gistxlogPageSplit *xlrec)
 }
 
 void
-gist_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record)
+gist_desc(StringInfo buf, XLogRecord *record)
 {
 	uint8		info = record->xl_info & ~XLR_INFO_MASK;
 	char		*rec = XLogRecGetData(record);

src/backend/access/hash/hash.c

@@ -719,6 +719,6 @@ hash_redo(XLogRecPtr beginLoc __attribute__((unused)), XLogRecPtr lsn __attribut
 }
 
 void
-hash_desc(StringInfo buf __attribute__((unused)), XLogRecPtr beginLoc, XLogRecord *record __attribute__((unused)))
+hash_desc(StringInfo buf __attribute__((unused)), XLogRecord *record __attribute__((unused)))
 {
 }

src/backend/access/heap/heapam.c

@@ -5506,7 +5506,7 @@ out_target(StringInfo buf, xl_heaptid *target)
 }
 
 void
-heap_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record)
+heap_desc(StringInfo buf, XLogRecord *record)
 {
 	char	   *rec = XLogRecGetData(record);
 	uint8		xl_info = record->xl_info;
@@ -5647,7 +5647,7 @@ bool heap_getrelfilenode(
 }
 
 void
-heap2_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record)
+heap2_desc(StringInfo buf, XLogRecord *record)
 {
 	char	   *rec = XLogRecGetData(record);
 	uint8		xl_info = record->xl_info;

src/backend/access/nbtree/nbtxlog.c

@@ -1144,7 +1144,7 @@ out_delete_page(StringInfo buf, uint8 info, XLogRecord *record)
 }
 
 void
-btree_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record)
+btree_desc(StringInfo buf, XLogRecord *record)
 {
 	char	   *rec = XLogRecGetData(record);
 	uint8		xl_info = record->xl_info;

src/backend/access/transam/clog.c

@@ -831,7 +831,7 @@ clog_redo(XLogRecPtr beginLoc, XLogRecPtr lsn, XLogRecord *record)
 }
 
 void
-clog_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record)
+clog_desc(StringInfo buf, XLogRecord *record)
 {
 	uint8		info = record->xl_info & ~XLR_INFO_MASK;
 	char		*rec = XLogRecGetData(record);

src/backend/access/transam/distributedlog.c

@@ -1010,7 +1010,7 @@ DistributedLog_redo(XLogRecPtr beginLoc, XLogRecPtr lsn, XLogRecord *record)
 }
 
 void
-DistributedLog_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record)
+DistributedLog_desc(StringInfo buf, XLogRecord *record)
 {
 	uint8		info = record->xl_info & ~XLR_INFO_MASK;
 	char		*rec = XLogRecGetData(record);

src/backend/access/transam/multixact.c

@@ -2050,7 +2050,7 @@ multixact_redo(XLogRecPtr beginLoc __attribute__((unused)), XLogRecPtr lsn __att
 }
 
 void
-multixact_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record)
+multixact_desc(StringInfo buf, XLogRecord *record)
 {
 	uint8		info = record->xl_info & ~XLR_INFO_MASK;
 	char		*rec = XLogRecGetData(record);

src/backend/access/transam/xact.c

@@ -6174,7 +6174,7 @@ xact_desc_assignment(StringInfo buf, xl_xact_assignment *xlrec)
 }
 
 void
-xact_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record)
+xact_desc(StringInfo buf, XLogRecord *record)
 {
 	uint8		info = record->xl_info & ~XLR_INFO_MASK;
 	char		*rec = XLogRecGetData(record);

src/backend/access/transam/xlog.c

@@ -1271,7 +1271,7 @@ begin:;
 
 		contiguousCopy = XLogContiguousCopy(record, rdata);
 		appendStringInfo(&buf, " - ");
-		RmgrTable[record->xl_rmid].rm_desc(&buf, RecPtr, (XLogRecord*)contiguousCopy);
+		RmgrTable[record->xl_rmid].rm_desc(&buf, (XLogRecord*)contiguousCopy);
 		pfree(contiguousCopy);
 
 		elog(LOG, "%s", buf.data);
@@ -7308,7 +7308,6 @@ StartupXLOG(void)
 					xlog_outrec(&buf, record);
 					appendStringInfo(&buf, " - ");
 					RmgrTable[record->xl_rmid].rm_desc(&buf,
-													   record->xl_info,
 													 XLogRecGetData(record));
 					elog(LOG, "%s", buf.data);
 					pfree(buf.data);
@@ -10108,7 +10107,7 @@ xlog_redo(XLogRecPtr beginLoc __attribute__((unused)), XLogRecPtr lsn __attribut
 }
 
 void
-xlog_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record)
+xlog_desc(StringInfo buf, XLogRecord *record)
 {
 	uint8		info = record->xl_info & ~XLR_INFO_MASK;
 	char		*rec = XLogRecGetData(record);
@@ -11460,7 +11459,6 @@ rm_redo_error_callback(void *arg)
 	initStringInfo(&buf);
 	RmgrTable[redoErrorCallBack->record->xl_rmid].rm_desc(
 												   &buf,
-												   redoErrorCallBack->location,
 												   redoErrorCallBack->record);
 
 	/* don't bother emitting empty description */

src/backend/catalog/storage.c

@@ -564,7 +564,7 @@ smgr_redo(XLogRecPtr beginLoc, XLogRecPtr lsn, XLogRecord *record)
 }
 
 void
-smgr_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record)
+smgr_desc(StringInfo buf, XLogRecord *record)
 {
 	uint8           info = record->xl_info & ~XLR_INFO_MASK;
 	char            *rec = XLogRecGetData(record);

src/backend/cdb/cdbappendonlystorage.c

@@ -48,7 +48,7 @@ appendonly_redo(XLogRecPtr beginLoc, XLogRecPtr lsn, XLogRecord *record)
 }
 
 void
-appendonly_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record)
+appendonly_desc(StringInfo buf, XLogRecord *record)
 {
 	uint8		  xl_info = record->xl_info;
 	uint8		  info = xl_info & ~XLR_INFO_MASK;

src/backend/commands/dbcommands.c

@@ -2173,7 +2173,7 @@ dbase_redo(XLogRecPtr beginLoc  __attribute__((unused)), XLogRecPtr lsn  __attri
 }
 
 void
-dbase_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record)
+dbase_desc(StringInfo buf, XLogRecord *record)
 {
 	uint8		info = record->xl_info & ~XLR_INFO_MASK;
 	char		*rec = XLogRecGetData(record);

src/backend/commands/sequence.c

@@ -1758,7 +1758,7 @@ seq_redo(XLogRecPtr beginLoc, XLogRecPtr lsn, XLogRecord *record)
 }
 
 void
-seq_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record)
+seq_desc(StringInfo buf, XLogRecord *record)
 {
 	uint8		info = record->xl_info & ~XLR_INFO_MASK;
 	char		*rec = XLogRecGetData(record);

src/backend/commands/tablespace.c

@@ -1695,7 +1695,7 @@ tblspc_redo(XLogRecPtr beginLoc, XLogRecPtr lsn, XLogRecord *record)
 }
 
 void
-tblspc_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record)
+tblspc_desc(StringInfo buf, XLogRecord *record)
 {
 	uint8		info = record->xl_info & ~XLR_INFO_MASK;
 	char		*rec = XLogRecGetData(record);

src/backend/storage/ipc/standby.c

@@ -747,7 +747,7 @@ standby_desc_running_xacts(StringInfo buf, xl_running_xacts *xlrec)
 }
 
 void
-standby_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record)
+standby_desc(StringInfo buf, XLogRecord *record)
 {
 	uint8		info = record->xl_info & ~XLR_INFO_MASK;
 	char		*rec = XLogRecGetData(record);

src/backend/utils/cache/relmapper.c

@@ -896,7 +896,7 @@ relmap_redo(XLogRecPtr beginLoc, XLogRecPtr lsn, XLogRecord *record)
 }
 
 void
-relmap_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record)
+relmap_desc(StringInfo buf, XLogRecord *record)
 {
 	uint8		info = record->xl_info & ~XLR_INFO_MASK;
 	char		*rec = XLogRecGetData(record);

src/include/access/bitmap.h

@@ -844,7 +844,7 @@ extern bool _bitmap_findvalue(Relation lovHeap, Relation lovIndex,
  * prototypes for functions in bitmapxlog.c
  */
 extern void bitmap_redo(XLogRecPtr beginLoc, XLogRecPtr lsn, XLogRecord *record);
-extern void bitmap_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record);
+extern void bitmap_desc(StringInfo buf, XLogRecord *record);
 extern void bitmap_xlog_startup(void);
 extern void bitmap_xlog_cleanup(void);
 extern bool bitmap_safe_restartpoint(void);

src/include/access/clog.h

@@ -54,6 +54,6 @@ extern bool CLOGTransactionIsOld(TransactionId xid);
 #define CLOG_TRUNCATE		0x10
 
 extern void clog_redo(XLogRecPtr beginLoc, XLogRecPtr lsn, XLogRecord *record);
-extern void clog_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record);
+extern void clog_desc(StringInfo buf, XLogRecord *record);
 
 #endif   /* CLOG_H */

src/include/access/distributedlog.h

@@ -81,6 +81,6 @@ extern bool DistributedLog_GetLowWaterXid(
 #define DISTRIBUTEDLOG_TRUNCATE		0x10
 
 extern void DistributedLog_redo(XLogRecPtr beginLoc, XLogRecPtr lsn, XLogRecord *record);
-extern void DistributedLog_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record);
+extern void DistributedLog_desc(StringInfo buf, XLogRecord *record);
 
 #endif							/* DISTRIBUTEDLOG_H */

src/include/access/gin.h

@@ -63,7 +63,7 @@ extern void ginUpdateStats(Relation index, const GinStatsData *stats);
 
 /* ginxlog.c */
 extern void gin_redo(XLogRecPtr beginLoc, XLogRecPtr lsn, XLogRecord *record);
-extern void gin_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record);
+extern void gin_desc(StringInfo buf, XLogRecord *record);
 extern void gin_xlog_startup(void);
 extern void gin_xlog_cleanup(void);
 extern bool gin_safe_restartpoint(void);

src/include/access/gist_private.h

@@ -297,7 +297,7 @@ extern GISTInsertStack *gistFindPath(Relation r, BlockNumber child);
 
 /* gistxlog.c */
 extern void gist_redo(XLogRecPtr beginLoc, XLogRecPtr lsn, XLogRecord *record);
-extern void gist_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record);
+extern void gist_desc(StringInfo buf, XLogRecord *record);
 extern void gist_xlog_startup(void);
 extern void gist_xlog_cleanup(void);
 extern void gist_mask(char *pagedata, BlockNumber blkno);

src/include/access/hash.h

@@ -354,6 +354,6 @@ extern OffsetNumber _hash_binsearch_last(Page page, uint32 hash_value);
 
 /* hash.c */
 extern void hash_redo(XLogRecPtr beginLoc, XLogRecPtr lsn, XLogRecord *record);
-extern void hash_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record);
+extern void hash_desc(StringInfo buf, XLogRecord *record);
 
 #endif   /* HASH_H */

src/include/access/heapam.h

@@ -147,12 +147,12 @@ extern void heap_restrpos(HeapScanDesc scan);
 extern void heap_sync(Relation relation);
 
 extern void heap_redo(XLogRecPtr beginLoc, XLogRecPtr lsn, XLogRecord *rptr);
-extern void heap_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record);
+extern void heap_desc(StringInfo buf, XLogRecord *record);
 extern bool heap_getrelfilenode(
 	XLogRecord 		*record,
 	RelFileNode		*relFileNode);
 extern void heap2_redo(XLogRecPtr beginLoc, XLogRecPtr lsn, XLogRecord *rptr);
-extern void heap2_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record);
+extern void heap2_desc(StringInfo buf, XLogRecord *record);
 extern void heap_mask(char *pagedata, BlockNumber blkno);
 
 extern void log_heap_newpage(Relation rel, 

src/include/access/multixact.h

@@ -78,6 +78,6 @@ extern void multixact_twophase_postabort(TransactionId xid, uint16 info,
 
 extern void multixact_redo(XLogRecPtr beginLoc __attribute__((unused)),
 						   XLogRecPtr lsn __attribute__((unused)), XLogRecord *record);
-extern void multixact_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record);
+extern void multixact_desc(StringInfo buf, XLogRecord *record);
 
 #endif   /* MULTIXACT_H */

src/include/access/nbtree.h

@@ -646,7 +646,7 @@ extern void _bt_leafbuild(BTSpool *btspool, BTSpool *spool2);
  * prototypes for functions in nbtxlog.c
  */
 extern void btree_redo(XLogRecPtr beginLoc, XLogRecPtr lsn, XLogRecord *record);
-extern void btree_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record);
+extern void btree_desc(StringInfo buf, XLogRecord *record);
 extern void btree_xlog_startup(void);
 extern void btree_xlog_cleanup(void);
 extern bool btree_safe_restartpoint(void);

src/include/access/xact.h

@@ -274,7 +274,7 @@ extern void RecordDistributedForgetCommitted(struct TMGXACT_LOG *gxact_log);
 extern int	xactGetCommittedChildren(TransactionId **ptr);
 
 extern void xact_redo(XLogRecPtr beginLoc, XLogRecPtr lsn, XLogRecord *record);
-extern void xact_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record);
+extern void xact_desc(StringInfo buf, XLogRecord *record);
 extern const char *IsoLevelAsUpperString(int IsoLevel);
 
 #endif   /* XACT_H */

src/include/access/xlog.h

@@ -314,7 +314,7 @@ extern XLogRecPtr XLogSaveBufferForHint(Buffer buffer);
 extern void RestoreBkpBlocks(XLogRecPtr lsn, XLogRecord *record, bool cleanup);
 
 extern void xlog_redo(XLogRecPtr beginLoc __attribute__((unused)), XLogRecPtr lsn __attribute__((unused)), XLogRecord *record);
-extern void xlog_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record);
+extern void xlog_desc(StringInfo buf, XLogRecord *record);
 
 extern void issue_xlog_fsync(int fd, uint32 log, uint32 seg);
 

src/include/access/xlog_internal.h

@@ -254,7 +254,7 @@ typedef struct RmgrData
 {
 	const char *rm_name;
 	void		(*rm_redo) (XLogRecPtr beginLoc, XLogRecPtr lsn, XLogRecord *rptr);
-	void		(*rm_desc) (StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record);
+	void		(*rm_desc) (StringInfo buf, XLogRecord *record);
 	void		(*rm_startup) (void);
 	void		(*rm_cleanup) (void);
 	bool		(*rm_safe_restartpoint) (void);

src/include/catalog/storage.h

@@ -38,6 +38,6 @@ extern void PostPrepare_smgr(void);
 extern void log_smgrcreate(RelFileNode *rnode, ForkNumber forkNum);
 
 extern void smgr_redo(XLogRecPtr beginLoc, XLogRecPtr lsn, XLogRecord *record);
-extern void smgr_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record);
+extern void smgr_desc(StringInfo buf, XLogRecord *record);
 
 #endif   /* STORAGE_H */

src/include/cdb/cdbappendonlyam.h

@@ -400,7 +400,7 @@ typedef struct
 } xl_ao_truncate;
 
 extern void appendonly_redo(XLogRecPtr beginLoc, XLogRecPtr lsn, XLogRecord *record);
-extern void appendonly_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record);
+extern void appendonly_desc(StringInfo buf, XLogRecord *record);
 
 extern void appendonly_update_finish(AppendOnlyUpdateDesc aoUpdateDesc);
 

src/include/commands/dbcommands.h

@@ -63,7 +63,7 @@ extern Oid	get_database_oid(const char *dbname, bool missingok);
 extern char *get_database_name(Oid dbid);
 
 extern void dbase_redo(XLogRecPtr beginLoc  __attribute__((unused)), XLogRecPtr lsn  __attribute__((unused)), XLogRecord *rptr);
-extern void dbase_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record);
+extern void dbase_desc(StringInfo buf, XLogRecord *record);
 
 extern void check_encoding_locale_matches(int encoding, const char *collate, const char *ctype);
 

src/include/commands/sequence.h

@@ -80,7 +80,7 @@ extern void AlterSequence(AlterSeqStmt *stmt);
 extern void ResetSequence(Oid seq_relid);
 
 extern void seq_redo(XLogRecPtr beginLoc, XLogRecPtr lsn, XLogRecord *rptr);
-extern void seq_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record);
+extern void seq_desc(StringInfo buf, XLogRecord *record);
 
 /*
  * CDB: nextval entry point called by sequence server

src/include/commands/tablespace.h

@@ -59,7 +59,7 @@ extern char *get_tablespace_name(Oid spc_oid);
 extern bool directory_is_empty(const char *path);
 
 extern void tblspc_redo(XLogRecPtr beginLoc, XLogRecPtr lsn, XLogRecord *rptr);
-extern void tblspc_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record);
+extern void tblspc_desc(StringInfo buf, XLogRecord *record);
 extern void set_short_version(const char *path);
 
 #endif   /* TABLESPACE_H */

src/include/storage/standby.h

@@ -81,7 +81,7 @@ typedef struct xl_running_xacts
 
 /* Recovery handlers for the Standby Rmgr (RM_STANDBY_ID) */
 extern void standby_redo(XLogRecPtr beginLoc, XLogRecPtr lsn, XLogRecord *record);
-extern void standby_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record);
+extern void standby_desc(StringInfo buf, XLogRecord *record);
 
 /*
  * Declarations for GetRunningTransactionData(). Similar to Snapshots, but

src/include/utils/relmapper.h

@@ -57,6 +57,6 @@ extern void RelationMapInitializePhase2(void);
 extern void RelationMapInitializePhase3(void);
 
 extern void relmap_redo(XLogRecPtr beginLoc, XLogRecPtr lsn, XLogRecord *record);
-extern void relmap_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record);
+extern void relmap_desc(StringInfo buf, XLogRecord *record);
 
 #endif   /* RELMAPPER_H */