From 604f7956b9460192222dd37bd3baea24cb669a47 Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Mon, 22 Sep 2014 16:48:14 +0200 Subject: Improve code around the recently added rm_identify rmgr callback. There are four weaknesses in728f152e07f998d2cb4fe5f24ec8da2c3bda98f2: * append_init() in heapdesc.c was ugly and required that rm_identify return values are only valid till the next call. Instead just add a couple more switch() cases for the INIT_PAGE cases. Now the returned value will always be valid. * a couple rm_identify() callbacks missed masking xl_info with ~XLR_INFO_MASK. * pg_xlogdump didn't map a NULL rm_identify to UNKNOWN or a similar string. * append_init() was called when id=NULL - which should never actually happen. But it's better to be careful. --- src/backend/access/transam/xlog.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/backend/access/transam/xlog.c') diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 21f0052f68e..544d76e8524 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -9642,7 +9642,8 @@ xlog_outdesc(StringInfo buf, RmgrId rmid, XLogRecord *record) id = RmgrTable[rmid].rm_identify(record->xl_info); if (id == NULL) - appendStringInfo(buf, "UNKNOWN (%X): ", record->xl_info); + appendStringInfo(buf, "UNKNOWN (%X): ", + record->xl_info & ~XLR_INFO_MASK); else appendStringInfo(buf, "%s: ", id); -- cgit v1.2.3