rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change the signature of rm_desc so that it's passed a XLogRecord. 

Just feels more natural, and is more consistent with rm_redo.
This commit is contained in:
Heikki Linnakangas 2014-06-14 10:46:48 +03:00
parent f3fdd257a4
commit 0ef0b6784c
37 changed files with 82 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/pg_xlogdump/pg_xlogdump.c
View File

@ -351,7 +351,7 @@ XLogDumpDisplayRecord(XLogDumpConfig *config, XLogRecPtr ReadRecPtr, XLogRecord
!!(XLR_BKP_BLOCK(3) & record->xl_info));
/* the desc routine will printf the description directly to stdout */
desc->rm_desc(NULL, record->xl_info, XLogRecGetData(record));
desc->rm_desc(NULL, record);
putchar('\n');

2
contrib/pg_xlogdump/rmgrdesc.h
View File

@ -13,7 +13,7 @@
typedef struct RmgrDescData
{
const char *rm_name;
void (*rm_desc) (StringInfo buf, uint8 xl_info, char *rec);
void (*rm_desc) (StringInfo buf, XLogRecord *record);
} RmgrDescData;
extern const RmgrDescData RmgrDescTable[];

5
src/backend/access/rmgrdesc/clogdesc.c
View File

@ -18,9 +18,10 @@
void
clog_desc(StringInfo buf, uint8 xl_info, char *rec)
clog_desc(StringInfo buf, XLogRecord *record)
{
uint8 info = xl_info & ~XLR_INFO_MASK;
char *rec = XLogRecGetData(record);
uint8 info = record->xl_info & ~XLR_INFO_MASK;
if (info == CLOG_ZEROPAGE)
{

5
src/backend/access/rmgrdesc/dbasedesc.c
View File

@ -19,9 +19,10 @@
void
dbase_desc(StringInfo buf, uint8 xl_info, char *rec)
dbase_desc(StringInfo buf, XLogRecord *record)
{
uint8 info = xl_info & ~XLR_INFO_MASK;
char *rec = XLogRecGetData(record);
uint8 info = record->xl_info & ~XLR_INFO_MASK;
if (info == XLOG_DBASE_CREATE)
{

9
src/backend/access/rmgrdesc/gindesc.c
View File

@ -77,9 +77,10 @@ desc_recompress_leaf(StringInfo buf, ginxlogRecompressDataLeaf *insertData)
}
void
gin_desc(StringInfo buf, uint8 xl_info, char *rec)
gin_desc(StringInfo buf, XLogRecord *record)
{
uint8 info = xl_info & ~XLR_INFO_MASK;
char *rec = XLogRecGetData(record);
uint8 info = record->xl_info & ~XLR_INFO_MASK;
switch (info)
{
@ -121,7 +122,7 @@ gin_desc(StringInfo buf, uint8 xl_info, char *rec)
ginxlogRecompressDataLeaf *insertData =
(ginxlogRecompressDataLeaf *) payload;
if (xl_info & XLR_BKP_BLOCK(0))
if (record->xl_info & XLR_BKP_BLOCK(0))
appendStringInfo(buf, " (full page image)");
else
desc_recompress_leaf(buf, insertData);
@ -159,7 +160,7 @@ gin_desc(StringInfo buf, uint8 xl_info, char *rec)
appendStringInfoString(buf, "Vacuum data leaf page, ");
desc_node(buf, xlrec->node, xlrec->blkno);
if (xl_info & XLR_BKP_BLOCK(0))
if (record->xl_info & XLR_BKP_BLOCK(0))
appendStringInfo(buf, " (full page image)");
else
desc_recompress_leaf(buf, &xlrec->data);

5
src/backend/access/rmgrdesc/gistdesc.c
View File

@ -42,9 +42,10 @@ out_gistxlogPageSplit(StringInfo buf, gistxlogPageSplit *xlrec)
}
void
gist_desc(StringInfo buf, uint8 xl_info, char *rec)
gist_desc(StringInfo buf, XLogRecord *record)
{
uint8 info = xl_info & ~XLR_INFO_MASK;
char *rec = XLogRecGetData(record);
uint8 info = record->xl_info & ~XLR_INFO_MASK;
switch (info)
{

2
src/backend/access/rmgrdesc/hashdesc.c
View File

@ -17,6 +17,6 @@
#include "access/hash.h"
void
hash_desc(StringInfo buf, uint8 xl_info, char *rec)
hash_desc(StringInfo buf, XLogRecord *record)
{
}

18
src/backend/access/rmgrdesc/heapdesc.c
View File

@ -41,16 +41,17 @@ out_infobits(StringInfo buf, uint8 infobits)
}
void
heap_desc(StringInfo buf, uint8 xl_info, char *rec)
heap_desc(StringInfo buf, XLogRecord *record)
{
uint8 info = xl_info & ~XLR_INFO_MASK;
char *rec = XLogRecGetData(record);
uint8 info = record->xl_info & ~XLR_INFO_MASK;
info &= XLOG_HEAP_OPMASK;
if (info == XLOG_HEAP_INSERT)
{
xl_heap_insert *xlrec = (xl_heap_insert *) rec;
if (xl_info & XLOG_HEAP_INIT_PAGE)
if (record->xl_info & XLOG_HEAP_INIT_PAGE)
appendStringInfoString(buf, "insert(init): ");
else
appendStringInfoString(buf, "insert: ");
@ -69,7 +70,7 @@ heap_desc(StringInfo buf, uint8 xl_info, char *rec)
{
xl_heap_update *xlrec = (xl_heap_update *) rec;
if (xl_info & XLOG_HEAP_INIT_PAGE)
if (record->xl_info & XLOG_HEAP_INIT_PAGE)
appendStringInfoString(buf, "update(init): ");
else
appendStringInfoString(buf, "update: ");
@ -85,7 +86,7 @@ heap_desc(StringInfo buf, uint8 xl_info, char *rec)
{
xl_heap_update *xlrec = (xl_heap_update *) rec;
if (xl_info & XLOG_HEAP_INIT_PAGE) /* can this case happen? */
if (record->xl_info & XLOG_HEAP_INIT_PAGE) /* can this case happen? */
appendStringInfoString(buf, "hot_update(init): ");
else
appendStringInfoString(buf, "hot_update: ");
@ -126,9 +127,10 @@ heap_desc(StringInfo buf, uint8 xl_info, char *rec)
appendStringInfoString(buf, "UNKNOWN");
}
void
heap2_desc(StringInfo buf, uint8 xl_info, char *rec)
heap2_desc(StringInfo buf, XLogRecord *record)
{
uint8 info = xl_info & ~XLR_INFO_MASK;
char *rec = XLogRecGetData(record);
uint8 info = record->xl_info & ~XLR_INFO_MASK;
info &= XLOG_HEAP_OPMASK;
if (info == XLOG_HEAP2_CLEAN)
@ -172,7 +174,7 @@ heap2_desc(StringInfo buf, uint8 xl_info, char *rec)
{
xl_heap_multi_insert *xlrec = (xl_heap_multi_insert *) rec;
if (xl_info & XLOG_HEAP_INIT_PAGE)
if (record->xl_info & XLOG_HEAP_INIT_PAGE)
appendStringInfoString(buf, "multi-insert (init): ");
else
appendStringInfoString(buf, "multi-insert: ");

5
src/backend/access/rmgrdesc/mxactdesc.c
View File

@ -47,9 +47,10 @@ out_member(StringInfo buf, MultiXactMember *member)
}
void
multixact_desc(StringInfo buf, uint8 xl_info, char *rec)
multixact_desc(StringInfo buf, XLogRecord *record)
{
uint8 info = xl_info & ~XLR_INFO_MASK;
char *rec = XLogRecGetData(record);
uint8 info = record->xl_info & ~XLR_INFO_MASK;
if (info == XLOG_MULTIXACT_ZERO_OFF_PAGE)
{

5
src/backend/access/rmgrdesc/nbtdesc.c
View File

@ -26,9 +26,10 @@ out_target(StringInfo buf, xl_btreetid *target)
}
void
btree_desc(StringInfo buf, uint8 xl_info, char *rec)
btree_desc(StringInfo buf, XLogRecord *record)
{
uint8 info = xl_info & ~XLR_INFO_MASK;
char *rec = XLogRecGetData(record);
uint8 info = record->xl_info & ~XLR_INFO_MASK;
switch (info)
{

5
src/backend/access/rmgrdesc/relmapdesc.c
View File

@ -17,9 +17,10 @@
#include "utils/relmapper.h"
void
relmap_desc(StringInfo buf, uint8 xl_info, char *rec)
relmap_desc(StringInfo buf, XLogRecord *record)
{
uint8 info = xl_info & ~XLR_INFO_MASK;
char *rec = XLogRecGetData(record);
uint8 info = record->xl_info & ~XLR_INFO_MASK;
if (info == XLOG_RELMAP_UPDATE)
{

5
src/backend/access/rmgrdesc/seqdesc.c
View File

@ -18,9 +18,10 @@
void
seq_desc(StringInfo buf, uint8 xl_info, char *rec)
seq_desc(StringInfo buf, XLogRecord *record)
{
uint8 info = xl_info & ~XLR_INFO_MASK;
char *rec = XLogRecGetData(record);
uint8 info = record->xl_info & ~XLR_INFO_MASK;
xl_seq_rec *xlrec = (xl_seq_rec *) rec;
if (info == XLOG_SEQ_LOG)

5
src/backend/access/rmgrdesc/smgrdesc.c
View File

@ -19,9 +19,10 @@
void
smgr_desc(StringInfo buf, uint8 xl_info, char *rec)
smgr_desc(StringInfo buf, XLogRecord *record)
{
uint8 info = xl_info & ~XLR_INFO_MASK;
char *rec = XLogRecGetData(record);
uint8 info = record->xl_info & ~XLR_INFO_MASK;
if (info == XLOG_SMGR_CREATE)
{

5
src/backend/access/rmgrdesc/spgdesc.c
View File

@ -24,9 +24,10 @@ out_target(StringInfo buf, RelFileNode node)
}
void
spg_desc(StringInfo buf, uint8 xl_info, char *rec)
spg_desc(StringInfo buf, XLogRecord *record)
{
uint8 info = xl_info & ~XLR_INFO_MASK;
char *rec = XLogRecGetData(record);
uint8 info = record->xl_info & ~XLR_INFO_MASK;
switch (info)
{

5
src/backend/access/rmgrdesc/standbydesc.c
View File

@ -37,9 +37,10 @@ standby_desc_running_xacts(StringInfo buf, xl_running_xacts *xlrec)
}
void
standby_desc(StringInfo buf, uint8 xl_info, char *rec)
standby_desc(StringInfo buf, XLogRecord *record)
{
uint8 info = xl_info & ~XLR_INFO_MASK;
char *rec = XLogRecGetData(record);
uint8 info = record->xl_info & ~XLR_INFO_MASK;
if (info == XLOG_STANDBY_LOCK)
{

5
src/backend/access/rmgrdesc/tblspcdesc.c
View File

@ -18,9 +18,10 @@
void
tblspc_desc(StringInfo buf, uint8 xl_info, char *rec)
tblspc_desc(StringInfo buf, XLogRecord *record)
{
uint8 info = xl_info & ~XLR_INFO_MASK;
char *rec = XLogRecGetData(record);
uint8 info = record->xl_info & ~XLR_INFO_MASK;
if (info == XLOG_TBLSPC_CREATE)
{

5
src/backend/access/rmgrdesc/xactdesc.c
View File

@ -137,9 +137,10 @@ xact_desc_assignment(StringInfo buf, xl_xact_assignment *xlrec)
}
void
xact_desc(StringInfo buf, uint8 xl_info, char *rec)
xact_desc(StringInfo buf, XLogRecord *record)
{
uint8 info = xl_info & ~XLR_INFO_MASK;
char *rec = XLogRecGetData(record);
uint8 info = record->xl_info & ~XLR_INFO_MASK;
if (info == XLOG_XACT_COMMIT_COMPACT)
{

5
src/backend/access/rmgrdesc/xlogdesc.c
View File

@ -32,9 +32,10 @@ const struct config_enum_entry wal_level_options[] = {
};
void
xlog_desc(StringInfo buf, uint8 xl_info, char *rec)
xlog_desc(StringInfo buf, XLogRecord *record)
{
uint8 info = xl_info & ~XLR_INFO_MASK;
char *rec = XLogRecGetData(record);
uint8 info = record->xl_info & ~XLR_INFO_MASK;
if (info == XLOG_CHECKPOINT_SHUTDOWN ||
info == XLOG_CHECKPOINT_ONLINE)

11
src/backend/access/transam/xlog.c
View File

@ -1276,11 +1276,12 @@ begin:;
rdt_lastnormal->next = NULL;
initStringInfo(&recordbuf);
appendBinaryStringInfo(&recordbuf, (char *) &rechdr, sizeof(XLogRecord));
for (; rdata != NULL; rdata = rdata->next)
appendBinaryStringInfo(&recordbuf, rdata->data, rdata->len);
appendStringInfoString(&buf, " - ");
RmgrTable[rechdr->xl_rmid].rm_desc(&buf, rechdr->xl_info, recordbuf.data);
RmgrTable[rechdr->xl_rmid].rm_desc(&buf, (XLogRecord *) recordbuf.data);
pfree(recordbuf.data);
}
elog(LOG, "%s", buf.data);
@ -6627,9 +6628,7 @@ StartupXLOG(void)
(uint32) (EndRecPtr >> 32), (uint32) EndRecPtr);
xlog_outrec(&buf, record);
appendStringInfoString(&buf, " - ");
RmgrTable[record->xl_rmid].rm_desc(&buf,
record->xl_info,
XLogRecGetData(record));
RmgrTable[record->xl_rmid].rm_desc(&buf, record);
elog(LOG, "%s", buf.data);
pfree(buf.data);
}
@ -10453,9 +10452,7 @@ rm_redo_error_callback(void *arg)
StringInfoData buf;
initStringInfo(&buf);
RmgrTable[record->xl_rmid].rm_desc(&buf,
record->xl_info,
XLogRecGetData(record));
RmgrTable[record->xl_rmid].rm_desc(&buf, record);
/* don't bother emitting empty description */
if (buf.len > 0)

2
src/include/access/clog.h
View File

@ -48,6 +48,6 @@ extern void TruncateCLOG(TransactionId oldestXact);
#define CLOG_TRUNCATE 0x10
extern void clog_redo(XLogRecPtr lsn, XLogRecord *record);
extern void clog_desc(StringInfo buf, uint8 xl_info, char *rec);
extern void clog_desc(StringInfo buf, XLogRecord *record);
#endif /* CLOG_H */

2
src/include/access/gin.h
View File

@ -73,7 +73,7 @@ extern void ginUpdateStats(Relation index, const GinStatsData *stats);
/* ginxlog.c */
extern void gin_redo(XLogRecPtr lsn, XLogRecord *record);
extern void gin_desc(StringInfo buf, uint8 xl_info, char *rec);
extern void gin_desc(StringInfo buf, XLogRecord *record);
extern void gin_xlog_startup(void);
extern void gin_xlog_cleanup(void);

2
src/include/access/gist_private.h
View File

@ -451,7 +451,7 @@ extern SplitedPageLayout *gistSplit(Relation r, Page page, IndexTuple *itup,
/* gistxlog.c */
extern void gist_redo(XLogRecPtr lsn, XLogRecord *record);
extern void gist_desc(StringInfo buf, uint8 xl_info, char *rec);
extern void gist_desc(StringInfo buf, XLogRecord *record);
extern void gist_xlog_startup(void);
extern void gist_xlog_cleanup(void);

2
src/include/access/hash.h
View File

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

8
src/include/access/heapam_xlog.h
View File

@ -367,10 +367,10 @@ typedef struct xl_heap_rewrite_mapping
extern void HeapTupleHeaderAdvanceLatestRemovedXid(HeapTupleHeader tuple,
TransactionId *latestRemovedXid);
extern void heap_redo(XLogRecPtr lsn, XLogRecord *rptr);
extern void heap_desc(StringInfo buf, uint8 xl_info, char *rec);
extern void heap2_redo(XLogRecPtr lsn, XLogRecord *rptr);
extern void heap2_desc(StringInfo buf, uint8 xl_info, char *rec);
extern void heap_redo(XLogRecPtr lsn, XLogRecord *record);
extern void heap_desc(StringInfo buf, XLogRecord *record);
extern void heap2_redo(XLogRecPtr lsn, XLogRecord *record);
extern void heap2_desc(StringInfo buf, XLogRecord *record);
extern void heap_xlog_logical_rewrite(XLogRecPtr lsn, XLogRecord *r);
extern XLogRecPtr log_heap_cleanup_info(RelFileNode rnode,

2
src/include/access/multixact.h
View File

@ -134,7 +134,7 @@ extern void multixact_twophase_postabort(TransactionId xid, uint16 info,
void *recdata, uint32 len);
extern void multixact_redo(XLogRecPtr lsn, XLogRecord *record);
extern void multixact_desc(StringInfo buf, uint8 xl_info, char *rec);
extern void multixact_desc(StringInfo buf, XLogRecord *record);
extern char *mxid_to_string(MultiXactId multi, int nmembers,
MultiXactMember *members);

2
src/include/access/nbtree.h
View File

@ -724,6 +724,6 @@ extern void _bt_leafbuild(BTSpool *btspool, BTSpool *spool2);
* prototypes for functions in nbtxlog.c
*/
extern void btree_redo(XLogRecPtr lsn, XLogRecord *record);
extern void btree_desc(StringInfo buf, uint8 xl_info, char *rec);
extern void btree_desc(StringInfo buf, XLogRecord *record);
#endif /* NBTREE_H */

2
src/include/access/spgist.h
View File

@ -197,7 +197,7 @@ extern Datum spgvacuumcleanup(PG_FUNCTION_ARGS);
/* spgxlog.c */
extern void spg_redo(XLogRecPtr lsn, XLogRecord *record);
extern void spg_desc(StringInfo buf, uint8 xl_info, char *rec);
extern void spg_desc(StringInfo buf, XLogRecord *record);
extern void spg_xlog_startup(void);
extern void spg_xlog_cleanup(void);

2
src/include/access/xact.h
View File

@ -256,6 +256,6 @@ extern void UnregisterSubXactCallback(SubXactCallback callback, void *arg);
extern int xactGetCommittedChildren(TransactionId **ptr);
extern void xact_redo(XLogRecPtr lsn, XLogRecord *record);
extern void xact_desc(StringInfo buf, uint8 xl_info, char *rec);
extern void xact_desc(StringInfo buf, XLogRecord *record);
#endif /* XACT_H */

2
src/include/access/xlog.h
View File

@ -298,7 +298,7 @@ extern Buffer RestoreBackupBlock(XLogRecPtr lsn, XLogRecord *record,
bool get_cleanup_lock, bool keep_buffer);
extern void xlog_redo(XLogRecPtr lsn, XLogRecord *record);
extern void xlog_desc(StringInfo buf, uint8 xl_info, char *rec);
extern void xlog_desc(StringInfo buf, XLogRecord *record);
extern void issue_xlog_fsync(int fd, XLogSegNo segno);

2
src/include/access/xlog_internal.h
View File

@ -245,7 +245,7 @@ typedef struct RmgrData
{
const char *rm_name;
void (*rm_redo) (XLogRecPtr lsn, struct XLogRecord *rptr);
void (*rm_desc) (StringInfo buf, uint8 xl_info, char *rec);
void (*rm_desc) (StringInfo buf, struct XLogRecord *rptr);
void (*rm_startup) (void);
void (*rm_cleanup) (void);
} RmgrData;

2
src/include/catalog/storage_xlog.h
View File

@ -44,6 +44,6 @@ typedef struct xl_smgr_truncate
extern void log_smgrcreate(RelFileNode *rnode, ForkNumber forkNum);
extern void smgr_redo(XLogRecPtr lsn, XLogRecord *record);
extern void smgr_desc(StringInfo buf, uint8 xl_info, char *rec);
extern void smgr_desc(StringInfo buf, XLogRecord *record);
#endif /* STORAGE_XLOG_H */

2
src/include/commands/dbcommands.h
View File

@ -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 lsn, XLogRecord *rptr);
extern void dbase_desc(StringInfo buf, uint8 xl_info, char *rec);
extern void dbase_desc(StringInfo buf, XLogRecord *rptr);
extern void check_encoding_locale_matches(int encoding, const char *collate, const char *ctype);

2
src/include/commands/sequence.h
View File

@ -77,6 +77,6 @@ extern void ResetSequence(Oid seq_relid);
extern void ResetSequenceCaches(void);
extern void seq_redo(XLogRecPtr lsn, XLogRecord *rptr);
extern void seq_desc(StringInfo buf, uint8 xl_info, char *rec);
extern void seq_desc(StringInfo buf, XLogRecord *rptr);
#endif /* SEQUENCE_H */

2
src/include/commands/tablespace.h
View File

@ -57,6 +57,6 @@ extern char *get_tablespace_name(Oid spc_oid);
extern bool directory_is_empty(const char *path);
extern void tblspc_redo(XLogRecPtr lsn, XLogRecord *rptr);
extern void tblspc_desc(StringInfo buf, uint8 xl_info, char *rec);
extern void tblspc_desc(StringInfo buf, XLogRecord *rptr);
#endif /* TABLESPACE_H */

2
src/include/pg_config_manual.h
View File

@ -281,7 +281,7 @@
* Enable debugging print statements for WAL-related operations; see
* also the wal_debug GUC var.
*/
/* #define WAL_DEBUG */
#define WAL_DEBUG
/*
* Enable tracing of resource consumption during sort operations;

2
src/include/storage/standby.h
View File

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

2
src/include/utils/relmapper.h
View File

@ -59,6 +59,6 @@ extern void RelationMapInitializePhase2(void);
extern void RelationMapInitializePhase3(void);
extern void relmap_redo(XLogRecPtr lsn, XLogRecord *record);
extern void relmap_desc(StringInfo buf, uint8 xl_info, char *rec);
extern void relmap_desc(StringInfo buf, XLogRecord *record);
#endif /* RELMAPPER_H */