mirror of
https://github.com/postgres/postgres.git
synced 2025-06-11 20:28:21 +03:00
Show isCatalogRel in several rmgr descriptions.
Commit 6af179395
added isCatalogRel field to some WAL record types,
but this field was not shown in the rmgr descriptions. This commit
changes the several rmgr descriptions to display the isCatalogRel
field.
Author: Bertrand Drouvot
Reviewed-by: Michael Paquier, Masahiko Sawada
Discussion: https://postgr.es/m/957dc8f9-2a02-4640-9c01-9dcbf97c4187%40gmail.com
This commit is contained in:
@ -26,18 +26,20 @@ out_gistxlogPageUpdate(StringInfo buf, gistxlogPageUpdate *xlrec)
|
||||
static void
|
||||
out_gistxlogPageReuse(StringInfo buf, gistxlogPageReuse *xlrec)
|
||||
{
|
||||
appendStringInfo(buf, "rel %u/%u/%u; blk %u; snapshotConflictHorizon %u:%u",
|
||||
appendStringInfo(buf, "rel %u/%u/%u; blk %u; snapshotConflictHorizon %u:%u, isCatalogRel %c",
|
||||
xlrec->locator.spcOid, xlrec->locator.dbOid,
|
||||
xlrec->locator.relNumber, xlrec->block,
|
||||
EpochFromFullTransactionId(xlrec->snapshotConflictHorizon),
|
||||
XidFromFullTransactionId(xlrec->snapshotConflictHorizon));
|
||||
XidFromFullTransactionId(xlrec->snapshotConflictHorizon),
|
||||
xlrec->isCatalogRel ? 'T' : 'F');
|
||||
}
|
||||
|
||||
static void
|
||||
out_gistxlogDelete(StringInfo buf, gistxlogDelete *xlrec)
|
||||
{
|
||||
appendStringInfo(buf, "delete: snapshotConflictHorizon %u, nitems: %u",
|
||||
xlrec->snapshotConflictHorizon, xlrec->ntodelete);
|
||||
appendStringInfo(buf, "delete: snapshotConflictHorizon %u, nitems: %u, isCatalogRel %c",
|
||||
xlrec->snapshotConflictHorizon, xlrec->ntodelete,
|
||||
xlrec->isCatalogRel ? 'T' : 'F');
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -113,9 +113,10 @@ hash_desc(StringInfo buf, XLogReaderState *record)
|
||||
{
|
||||
xl_hash_vacuum_one_page *xlrec = (xl_hash_vacuum_one_page *) rec;
|
||||
|
||||
appendStringInfo(buf, "ntuples %d, snapshotConflictHorizon %u",
|
||||
appendStringInfo(buf, "ntuples %d, snapshotConflictHorizon %u, isCatalogRel %c",
|
||||
xlrec->ntuples,
|
||||
xlrec->snapshotConflictHorizon);
|
||||
xlrec->snapshotConflictHorizon,
|
||||
xlrec->isCatalogRel ? 'T' : 'F');
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@ -179,10 +179,11 @@ heap2_desc(StringInfo buf, XLogReaderState *record)
|
||||
{
|
||||
xl_heap_prune *xlrec = (xl_heap_prune *) rec;
|
||||
|
||||
appendStringInfo(buf, "snapshotConflictHorizon: %u, nredirected: %u, ndead: %u",
|
||||
appendStringInfo(buf, "snapshotConflictHorizon: %u, nredirected: %u, ndead: %u, isCatalogRel: %c",
|
||||
xlrec->snapshotConflictHorizon,
|
||||
xlrec->nredirected,
|
||||
xlrec->ndead);
|
||||
xlrec->ndead,
|
||||
xlrec->isCatalogRel ? 'T' : 'F');
|
||||
|
||||
if (XLogRecHasBlockData(record, 0))
|
||||
{
|
||||
@ -238,8 +239,9 @@ heap2_desc(StringInfo buf, XLogReaderState *record)
|
||||
{
|
||||
xl_heap_freeze_page *xlrec = (xl_heap_freeze_page *) rec;
|
||||
|
||||
appendStringInfo(buf, "snapshotConflictHorizon: %u, nplans: %u",
|
||||
xlrec->snapshotConflictHorizon, xlrec->nplans);
|
||||
appendStringInfo(buf, "snapshotConflictHorizon: %u, nplans: %u, isCatalogRel: %c",
|
||||
xlrec->snapshotConflictHorizon, xlrec->nplans,
|
||||
xlrec->isCatalogRel ? 'T' : 'F');
|
||||
|
||||
if (XLogRecHasBlockData(record, 0))
|
||||
{
|
||||
|
@ -71,9 +71,10 @@ btree_desc(StringInfo buf, XLogReaderState *record)
|
||||
{
|
||||
xl_btree_delete *xlrec = (xl_btree_delete *) rec;
|
||||
|
||||
appendStringInfo(buf, "snapshotConflictHorizon: %u, ndeleted: %u, nupdated: %u",
|
||||
appendStringInfo(buf, "snapshotConflictHorizon: %u, ndeleted: %u, nupdated: %u, isCatalogRel: %c",
|
||||
xlrec->snapshotConflictHorizon,
|
||||
xlrec->ndeleted, xlrec->nupdated);
|
||||
xlrec->ndeleted, xlrec->nupdated,
|
||||
xlrec->isCatalogRel ? 'T' : 'F');
|
||||
|
||||
if (XLogRecHasBlockData(record, 0))
|
||||
delvacuum_desc(buf, XLogRecGetBlockData(record, 0, NULL),
|
||||
@ -113,11 +114,12 @@ btree_desc(StringInfo buf, XLogReaderState *record)
|
||||
{
|
||||
xl_btree_reuse_page *xlrec = (xl_btree_reuse_page *) rec;
|
||||
|
||||
appendStringInfo(buf, "rel: %u/%u/%u, snapshotConflictHorizon: %u:%u",
|
||||
appendStringInfo(buf, "rel: %u/%u/%u, snapshotConflictHorizon: %u:%u, isCatalogRel: %c",
|
||||
xlrec->locator.spcOid, xlrec->locator.dbOid,
|
||||
xlrec->locator.relNumber,
|
||||
EpochFromFullTransactionId(xlrec->snapshotConflictHorizon),
|
||||
XidFromFullTransactionId(xlrec->snapshotConflictHorizon));
|
||||
XidFromFullTransactionId(xlrec->snapshotConflictHorizon),
|
||||
xlrec->isCatalogRel ? 'T' : 'F');
|
||||
break;
|
||||
}
|
||||
case XLOG_BTREE_META_CLEANUP:
|
||||
|
@ -118,10 +118,11 @@ spg_desc(StringInfo buf, XLogReaderState *record)
|
||||
{
|
||||
spgxlogVacuumRedirect *xlrec = (spgxlogVacuumRedirect *) rec;
|
||||
|
||||
appendStringInfo(buf, "ntoplaceholder: %u, firstplaceholder: %u, snapshotConflictHorizon: %u",
|
||||
appendStringInfo(buf, "ntoplaceholder: %u, firstplaceholder: %u, snapshotConflictHorizon: %u, isCatalogRel: %c",
|
||||
xlrec->nToPlaceholder,
|
||||
xlrec->firstPlaceholder,
|
||||
xlrec->snapshotConflictHorizon);
|
||||
xlrec->snapshotConflictHorizon,
|
||||
xlrec->isCatalogRel ? 'T' : 'F');
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
Reference in New Issue
Block a user