Add flag values in WAL description to all heap records

michaelpq · michaelpq · commit 3be97b97ed37 · 2018-11-14T10:33:10.000+09:00
Hexadecimal is consistently used as format to not bloat too much the output but keep it readable. This information is useful mainly for debugging purposes with for example pg_waldump. Author: Michael Paquier Reviewed-by: Nathan Bossart, Dmitry Dolgov, Andres Freund, Álvaro Herrera Discussion: https://postgr.es/m/20180413034734.GE1552@paquier.xyz
diff --git a/src/backend/access/rmgrdesc/heapdesc.c b/src/backend/access/rmgrdesc/heapdesc.c
@@ -42,22 +42,26 @@ heap_desc(StringInfo buf, XLogReaderState *record)
 	{
 		xl_heap_insert *xlrec = (xl_heap_insert *) rec;
 
-		appendStringInfo(buf, "off %u", xlrec->offnum);
+		appendStringInfo(buf, "off %u flags 0x%02X", xlrec->offnum,
+						 xlrec->flags);
 	}
 	else if (info == XLOG_HEAP_DELETE)
 	{
 		xl_heap_delete *xlrec = (xl_heap_delete *) rec;
 
-		appendStringInfo(buf, "off %u ", xlrec->offnum);
+		appendStringInfo(buf, "off %u flags 0x%02X ",
+						 xlrec->offnum,
+						 xlrec->flags);
 		out_infobits(buf, xlrec->infobits_set);
 	}
 	else if (info == XLOG_HEAP_UPDATE)
 	{
 		xl_heap_update *xlrec = (xl_heap_update *) rec;
 
-		appendStringInfo(buf, "off %u xmax %u ",
+		appendStringInfo(buf, "off %u xmax %u flags 0x%02X ",
 						 xlrec->old_offnum,
-						 xlrec->old_xmax);
+						 xlrec->old_xmax,
+						 xlrec->flags);
 		out_infobits(buf, xlrec->old_infobits_set);
 		appendStringInfo(buf, "; new off %u xmax %u",
 						 xlrec->new_offnum,
@@ -67,9 +71,10 @@ heap_desc(StringInfo buf, XLogReaderState *record)
 	{
 		xl_heap_update *xlrec = (xl_heap_update *) rec;
 
-		appendStringInfo(buf, "off %u xmax %u ",
+		appendStringInfo(buf, "off %u xmax %u flags 0x%02X ",
 						 xlrec->old_offnum,
-						 xlrec->old_xmax);
+						 xlrec->old_xmax,
+						 xlrec->flags);
 		out_infobits(buf, xlrec->old_infobits_set);
 		appendStringInfo(buf, "; new off %u xmax %u",
 						 xlrec->new_offnum,
@@ -98,7 +103,7 @@ heap_desc(StringInfo buf, XLogReaderState *record)
 	{
 		xl_heap_lock *xlrec = (xl_heap_lock *) rec;
 
-		appendStringInfo(buf, "off %u: xid %u: flags %u ",
+		appendStringInfo(buf, "off %u: xid %u: flags 0x%02X ",
 						 xlrec->offnum, xlrec->locking_xid, xlrec->flags);
 		out_infobits(buf, xlrec->infobits_set);
 	}
@@ -139,20 +144,21 @@ heap2_desc(StringInfo buf, XLogReaderState *record)
 	{
 		xl_heap_visible *xlrec = (xl_heap_visible *) rec;
 
-		appendStringInfo(buf, "cutoff xid %u flags %d",
+		appendStringInfo(buf, "cutoff xid %u flags 0x%02X",
 						 xlrec->cutoff_xid, xlrec->flags);
 	}
 	else if (info == XLOG_HEAP2_MULTI_INSERT)
 	{
 		xl_heap_multi_insert *xlrec = (xl_heap_multi_insert *) rec;
 
-		appendStringInfo(buf, "%d tuples", xlrec->ntuples);
+		appendStringInfo(buf, "%d tuples flags 0x%02X", xlrec->ntuples,
+						 xlrec->flags);
 	}
 	else if (info == XLOG_HEAP2_LOCK_UPDATED)
 	{
 		xl_heap_lock_updated *xlrec = (xl_heap_lock_updated *) rec;
 
-		appendStringInfo(buf, "off %u: xmax %u: flags %u ",
+		appendStringInfo(buf, "off %u: xmax %u: flags 0x%02X ",
 						 xlrec->offnum, xlrec->xmax, xlrec->flags);
 		out_infobits(buf, xlrec->infobits_set);
 	}

Original file line number	Diff line number	Diff line change
`@@ -42,22 +42,26 @@ heap_desc(StringInfo buf, XLogReaderState *record)`
`42`	`42`	`{`
`43`	`43`	`xl_heap_insert xlrec = (xl_heap_insert ) rec;`
`44`	`44`
`45`		`- appendStringInfo(buf, "off %u", xlrec->offnum);`
	`45`	`+ appendStringInfo(buf, "off %u flags 0x%02X", xlrec->offnum,`
	`46`	`+ xlrec->flags);`
`46`	`47`	`}`
`47`	`48`	`else if (info == XLOG_HEAP_DELETE)`
`48`	`49`	`{`
`49`	`50`	`xl_heap_delete xlrec = (xl_heap_delete ) rec;`
`50`	`51`
`51`		`- appendStringInfo(buf, "off %u ", xlrec->offnum);`
	`52`	`+ appendStringInfo(buf, "off %u flags 0x%02X ",`
	`53`	`+ xlrec->offnum,`
	`54`	`+ xlrec->flags);`
`52`	`55`	`out_infobits(buf, xlrec->infobits_set);`
`53`	`56`	`}`
`54`	`57`	`else if (info == XLOG_HEAP_UPDATE)`
`55`	`58`	`{`
`56`	`59`	`xl_heap_update xlrec = (xl_heap_update ) rec;`
`57`	`60`
`58`		`- appendStringInfo(buf, "off %u xmax %u ",`
	`61`	`+ appendStringInfo(buf, "off %u xmax %u flags 0x%02X ",`
`59`	`62`	`xlrec->old_offnum,`
`60`		`- xlrec->old_xmax);`
	`63`	`+ xlrec->old_xmax,`
	`64`	`+ xlrec->flags);`
`61`	`65`	`out_infobits(buf, xlrec->old_infobits_set);`
`62`	`66`	`appendStringInfo(buf, "; new off %u xmax %u",`
`63`	`67`	`xlrec->new_offnum,`
`@@ -67,9 +71,10 @@ heap_desc(StringInfo buf, XLogReaderState *record)`
`67`	`71`	`{`
`68`	`72`	`xl_heap_update xlrec = (xl_heap_update ) rec;`
`69`	`73`
`70`		`- appendStringInfo(buf, "off %u xmax %u ",`
	`74`	`+ appendStringInfo(buf, "off %u xmax %u flags 0x%02X ",`
`71`	`75`	`xlrec->old_offnum,`
`72`		`- xlrec->old_xmax);`
	`76`	`+ xlrec->old_xmax,`
	`77`	`+ xlrec->flags);`
`73`	`78`	`out_infobits(buf, xlrec->old_infobits_set);`
`74`	`79`	`appendStringInfo(buf, "; new off %u xmax %u",`
`75`	`80`	`xlrec->new_offnum,`
`@@ -98,7 +103,7 @@ heap_desc(StringInfo buf, XLogReaderState *record)`
`98`	`103`	`{`
`99`	`104`	`xl_heap_lock xlrec = (xl_heap_lock ) rec;`
`100`	`105`
`101`		`- appendStringInfo(buf, "off %u: xid %u: flags %u ",`
	`106`	`+ appendStringInfo(buf, "off %u: xid %u: flags 0x%02X ",`
`102`	`107`	`xlrec->offnum, xlrec->locking_xid, xlrec->flags);`
`103`	`108`	`out_infobits(buf, xlrec->infobits_set);`
`104`	`109`	`}`
`@@ -139,20 +144,21 @@ heap2_desc(StringInfo buf, XLogReaderState *record)`
`139`	`144`	`{`
`140`	`145`	`xl_heap_visible xlrec = (xl_heap_visible ) rec;`
`141`	`146`
`142`		`- appendStringInfo(buf, "cutoff xid %u flags %d",`
	`147`	`+ appendStringInfo(buf, "cutoff xid %u flags 0x%02X",`
`143`	`148`	`xlrec->cutoff_xid, xlrec->flags);`
`144`	`149`	`}`
`145`	`150`	`else if (info == XLOG_HEAP2_MULTI_INSERT)`
`146`	`151`	`{`
`147`	`152`	`xl_heap_multi_insert xlrec = (xl_heap_multi_insert ) rec;`
`148`	`153`
`149`		`- appendStringInfo(buf, "%d tuples", xlrec->ntuples);`
	`154`	`+ appendStringInfo(buf, "%d tuples flags 0x%02X", xlrec->ntuples,`
	`155`	`+ xlrec->flags);`
`150`	`156`	`}`
`151`	`157`	`else if (info == XLOG_HEAP2_LOCK_UPDATED)`
`152`	`158`	`{`
`153`	`159`	`xl_heap_lock_updated xlrec = (xl_heap_lock_updated ) rec;`
`154`	`160`
`155`		`- appendStringInfo(buf, "off %u: xmax %u: flags %u ",`
	`161`	`+ appendStringInfo(buf, "off %u: xmax %u: flags 0x%02X ",`
`156`	`162`	`xlrec->offnum, xlrec->xmax, xlrec->flags);`
`157`	`163`	`out_infobits(buf, xlrec->infobits_set);`
`158`	`164`	`}`