diff options
| author | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2012-12-28 13:06:15 -0300 |
|---|---|---|
| committer | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2012-12-28 13:06:15 -0300 |
| commit | 5ab3af46ddd2f2c2b248f1ffdb688b394d4bb387 (patch) | |
| tree | 6150244dc25064e933170880cab2037a79682f65 /src/backend/replication/walreceiver.c | |
| parent | 24eca7977ed208de33791af8890975ffcf086598 (diff) | |
| download | postgresql-5ab3af46ddd2f2c2b248f1ffdb688b394d4bb387.tar.gz | |
Remove obsolete XLogRecPtr macros
This gets rid of XLByteLT, XLByteLE, XLByteEQ and XLByteAdvance.
These were useful for brevity when XLogRecPtrs were split in
xlogid/xrecoff; but now that they are simple uint64's, they are just
clutter. The only downside to making this change would be ease of
backporting patches, but that has been negated by other substantive
changes to the involved code anyway. The clarity of simpler expressions
makes the change worthwhile.
Most of the changes are mechanical, but in a couple of places, the patch
author chose to invert the operator sense, making the code flow more
logical (and more in line with preceding comments).
Author: Andres Freund
Eyeballed by Dimitri Fontaine and Alvaro Herrera
Diffstat (limited to 'src/backend/replication/walreceiver.c')
| -rw-r--r-- | src/backend/replication/walreceiver.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/replication/walreceiver.c b/src/backend/replication/walreceiver.c index a0960f2cea..bdb00f6cbe 100644 --- a/src/backend/replication/walreceiver.c +++ b/src/backend/replication/walreceiver.c @@ -914,7 +914,7 @@ XLogWalRcvWrite(char *buf, Size nbytes, XLogRecPtr recptr) } /* Update state for write */ - XLByteAdvance(recptr, byteswritten); + recptr += byteswritten; recvOff += byteswritten; nbytes -= byteswritten; @@ -933,7 +933,7 @@ XLogWalRcvWrite(char *buf, Size nbytes, XLogRecPtr recptr) static void XLogWalRcvFlush(bool dying) { - if (XLByteLT(LogstreamResult.Flush, LogstreamResult.Write)) + if (LogstreamResult.Flush < LogstreamResult.Write) { /* use volatile pointer to prevent code rearrangement */ volatile WalRcvData *walrcv = WalRcv; @@ -944,7 +944,7 @@ XLogWalRcvFlush(bool dying) /* Update shared-memory status */ SpinLockAcquire(&walrcv->mutex); - if (XLByteLT(walrcv->receivedUpto, LogstreamResult.Flush)) + if (walrcv->receivedUpto < LogstreamResult.Flush) { walrcv->latestChunkStart = walrcv->receivedUpto; walrcv->receivedUpto = LogstreamResult.Flush; @@ -1016,8 +1016,8 @@ XLogWalRcvSendReply(bool force, bool requestReply) * probably OK. */ if (!force - && XLByteEQ(writePtr, LogstreamResult.Write) - && XLByteEQ(flushPtr, LogstreamResult.Flush) + && writePtr == LogstreamResult.Write + && flushPtr == LogstreamResult.Flush && !TimestampDifferenceExceeds(sendTime, now, wal_receiver_status_interval * 1000)) return; @@ -1126,7 +1126,7 @@ ProcessWalSndrMessage(XLogRecPtr walEnd, TimestampTz sendTime) /* Update shared-memory status */ SpinLockAcquire(&walrcv->mutex); - if (XLByteLT(walrcv->latestWalEnd, walEnd)) + if (walrcv->latestWalEnd < walEnd) walrcv->latestWalEndTime = sendTime; walrcv->latestWalEnd = walEnd; walrcv->lastMsgSendTime = sendTime; |