diff options
| author | Peter Eisentraut <peter@eisentraut.org> | 2021-02-23 10:14:38 +0100 |
|---|---|---|
| committer | Peter Eisentraut <peter@eisentraut.org> | 2021-02-23 10:27:02 +0100 |
| commit | 6f6f284c7ee44264eb3e128e2bf54d9276711d11 (patch) | |
| tree | c861d32584f751b28a065b98c03e1dd1370daa10 /src/backend/replication/walreceiver.c | |
| parent | ade89ba5f408e6034db7cc8a2c9b7858f5a214c4 (diff) | |
| download | postgresql-6f6f284c7ee44264eb3e128e2bf54d9276711d11.tar.gz postgresql-6f6f284c7ee44264eb3e128e2bf54d9276711d11.zip | |
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 <ashutosh.bapat@enterprisedb.com>
Reviewed-by: Kyotaro Horiguchi <horikyota.ntt@gmail.com>
Reviewed-by: Michael Paquier <michael@paquier.xyz>
Discussion: https://www.postgresql.org/message-id/flat/CAExHW5ub5NaTELZ3hJUCE6amuvqAtsSxc7O+uK7y4t9Rrk23cw@mail.gmail.com
Diffstat (limited to 'src/backend/replication/walreceiver.c')
| -rw-r--r-- | src/backend/replication/walreceiver.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/backend/replication/walreceiver.c b/src/backend/replication/walreceiver.c index 9ec71238c48..e5f8a06fea0 100644 --- a/src/backend/replication/walreceiver.c +++ b/src/backend/replication/walreceiver.c @@ -392,13 +392,11 @@ WalReceiverMain(void) if (first_stream) ereport(LOG, (errmsg("started streaming WAL from primary at %X/%X on timeline %u", - (uint32) (startpoint >> 32), (uint32) startpoint, - startpointTLI))); + LSN_FORMAT_ARGS(startpoint), startpointTLI))); else ereport(LOG, (errmsg("restarted WAL streaming at %X/%X on timeline %u", - (uint32) (startpoint >> 32), (uint32) startpoint, - startpointTLI))); + LSN_FORMAT_ARGS(startpoint), startpointTLI))); first_stream = false; /* Initialize LogstreamResult and buffers for processing messages */ @@ -465,7 +463,7 @@ WalReceiverMain(void) (errmsg("replication terminated by primary server"), errdetail("End of WAL reached on timeline %u at %X/%X.", startpointTLI, - (uint32) (LogstreamResult.Write >> 32), (uint32) LogstreamResult.Write))); + LSN_FORMAT_ARGS(LogstreamResult.Write)))); endofwal = true; break; } @@ -699,8 +697,7 @@ WalRcvWaitForStartPosition(XLogRecPtr *startpoint, TimeLineID *startpointTLI) char activitymsg[50]; snprintf(activitymsg, sizeof(activitymsg), "restarting at %X/%X", - (uint32) (*startpoint >> 32), - (uint32) *startpoint); + LSN_FORMAT_ARGS(*startpoint)); set_ps_display(activitymsg); } } @@ -1002,8 +999,7 @@ XLogWalRcvFlush(bool dying) char activitymsg[50]; snprintf(activitymsg, sizeof(activitymsg), "streaming %X/%X", - (uint32) (LogstreamResult.Write >> 32), - (uint32) LogstreamResult.Write); + LSN_FORMAT_ARGS(LogstreamResult.Write)); set_ps_display(activitymsg); } @@ -1080,9 +1076,9 @@ XLogWalRcvSendReply(bool force, bool requestReply) /* Send it */ elog(DEBUG2, "sending write %X/%X flush %X/%X apply %X/%X%s", - (uint32) (writePtr >> 32), (uint32) writePtr, - (uint32) (flushPtr >> 32), (uint32) flushPtr, - (uint32) (applyPtr >> 32), (uint32) applyPtr, + LSN_FORMAT_ARGS(writePtr), + LSN_FORMAT_ARGS(flushPtr), + LSN_FORMAT_ARGS(applyPtr), requestReply ? " (reply requested)" : ""); walrcv_send(wrconn, reply_message.data, reply_message.len); |