diff options
| author | Peter Eisentraut | 2021-02-23 09:14:38 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2021-02-23 09:27:02 +0000 |
| commit | 6f6f284c7ee44264eb3e128e2bf54d9276711d11 (patch) | |
| tree | c861d32584f751b28a065b98c03e1dd1370daa10 /src/backend/access/rmgrdesc | |
| parent | ade89ba5f408e6034db7cc8a2c9b7858f5a214c4 (diff) | |
Simplify printing of LSNs
Add a macro LSN_FORMAT_ARGS for use in printf-style printing of LSNs.
Convert all applicable code to use it.
Reviewed-by: Ashutosh Bapat <[email protected]>
Reviewed-by: Kyotaro Horiguchi <[email protected]>
Reviewed-by: Michael Paquier <[email protected]>
Discussion: https://www.postgresql.org/message-id/flat/CAExHW5ub5NaTELZ3hJUCE6amuvqAtsSxc7O+uK7y4t9Rrk23cw@mail.gmail.com
Diffstat (limited to 'src/backend/access/rmgrdesc')
| -rw-r--r-- | src/backend/access/rmgrdesc/replorigindesc.c | 3 | ||||
| -rw-r--r-- | src/backend/access/rmgrdesc/xactdesc.c | 3 | ||||
| -rw-r--r-- | src/backend/access/rmgrdesc/xlogdesc.c | 5 |
3 files changed, 4 insertions, 7 deletions
diff --git a/src/backend/access/rmgrdesc/replorigindesc.c b/src/backend/access/rmgrdesc/replorigindesc.c index 2e29ecc6d57..1f314c4771a 100644 --- a/src/backend/access/rmgrdesc/replorigindesc.c +++ b/src/backend/access/rmgrdesc/replorigindesc.c @@ -31,8 +31,7 @@ replorigin_desc(StringInfo buf, XLogReaderState *record) appendStringInfo(buf, "set %u; lsn %X/%X; force: %d", xlrec->node_id, - (uint32) (xlrec->remote_lsn >> 32), - (uint32) xlrec->remote_lsn, + LSN_FORMAT_ARGS(xlrec->remote_lsn), xlrec->force); break; } diff --git a/src/backend/access/rmgrdesc/xactdesc.c b/src/backend/access/rmgrdesc/xactdesc.c index c6fb1ec5727..4b0d10f0735 100644 --- a/src/backend/access/rmgrdesc/xactdesc.c +++ b/src/backend/access/rmgrdesc/xactdesc.c @@ -306,8 +306,7 @@ xact_desc_commit(StringInfo buf, uint8 info, xl_xact_commit *xlrec, RepOriginId { appendStringInfo(buf, "; origin: node %u, lsn %X/%X, at %s", origin_id, - (uint32) (parsed.origin_lsn >> 32), - (uint32) parsed.origin_lsn, + LSN_FORMAT_ARGS(parsed.origin_lsn), timestamptz_to_str(parsed.origin_timestamp)); } } diff --git a/src/backend/access/rmgrdesc/xlogdesc.c b/src/backend/access/rmgrdesc/xlogdesc.c index 92cc7ea0735..e6090a9dadb 100644 --- a/src/backend/access/rmgrdesc/xlogdesc.c +++ b/src/backend/access/rmgrdesc/xlogdesc.c @@ -49,7 +49,7 @@ xlog_desc(StringInfo buf, XLogReaderState *record) "oldest xid %u in DB %u; oldest multi %u in DB %u; " "oldest/newest commit timestamp xid: %u/%u; " "oldest running xid %u; %s", - (uint32) (checkpoint->redo >> 32), (uint32) checkpoint->redo, + LSN_FORMAT_ARGS(checkpoint->redo), checkpoint->ThisTimeLineID, checkpoint->PrevTimeLineID, checkpoint->fullPageWrites ? "true" : "false", @@ -89,8 +89,7 @@ xlog_desc(StringInfo buf, XLogReaderState *record) XLogRecPtr startpoint; memcpy(&startpoint, rec, sizeof(XLogRecPtr)); - appendStringInfo(buf, "%X/%X", - (uint32) (startpoint >> 32), (uint32) startpoint); + appendStringInfo(buf, "%X/%X", LSN_FORMAT_ARGS(startpoint)); } else if (info == XLOG_PARAMETER_CHANGE) { |