On Fri, Sep 12, 2014 at 9:08 AM, Michael Paquier <michael.paqu...@gmail.com> wrote: > In walsender.c, sentPtr is initialized as follows: > static XLogRecPtr sentPtr = 0; > Isn't that incorrect and shouldn't we use InvalidXLogRecPtr instead? Actually by looking more around I found a couple of extra places where the same inconsistencies are present, mainly in xlog.c and walreceiver.c. Updated patch attached for all those things. Regards, -- Michael
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 34f2fc0..a6575f3 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -163,7 +163,7 @@ HotStandbyState standbyState = STANDBY_DISABLED; static XLogRecPtr LastRec; /* Local copy of WalRcv->receivedUpto */ -static XLogRecPtr receivedUpto = 0; +static XLogRecPtr receivedUpto = InvalidXLogRecPtr; static TimeLineID receiveTLI = 0; /* @@ -11003,7 +11003,7 @@ WaitForWALToBecomeAvailable(XLogRecPtr RecPtr, bool randAccess, curFileTLI = tli; RequestXLogStreaming(tli, ptr, PrimaryConnInfo, PrimarySlotName); - receivedUpto = 0; + receivedUpto = InvalidXLogRecPtr; } /* @@ -11266,7 +11266,7 @@ WaitForWALToBecomeAvailable(XLogRecPtr RecPtr, bool randAccess, static int emode_for_corrupt_record(int emode, XLogRecPtr RecPtr) { - static XLogRecPtr lastComplaint = 0; + static XLogRecPtr lastComplaint = InvalidXLogRecPtr; if (readSource == XLOG_FROM_PG_XLOG && emode == LOG) { diff --git a/src/backend/replication/walreceiver.c b/src/backend/replication/walreceiver.c index c2d4ed3..c5103f7 100644 --- a/src/backend/replication/walreceiver.c +++ b/src/backend/replication/walreceiver.c @@ -1037,8 +1037,8 @@ XLogWalRcvFlush(bool dying) static void XLogWalRcvSendReply(bool force, bool requestReply) { - static XLogRecPtr writePtr = 0; - static XLogRecPtr flushPtr = 0; + static XLogRecPtr writePtr = InvalidXLogRecPtr; + static XLogRecPtr flushPtr = InvalidXLogRecPtr; XLogRecPtr applyPtr; static TimestampTz sendTime = 0; TimestampTz now; diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c index 844a5de..1568a6c 100644 --- a/src/backend/replication/walsender.c +++ b/src/backend/replication/walsender.c @@ -140,7 +140,7 @@ static XLogRecPtr sendTimeLineValidUpto = InvalidXLogRecPtr; * How far have we sent WAL already? This is also advertised in * MyWalSnd->sentPtr. (Actually, this is the next WAL location to send.) */ -static XLogRecPtr sentPtr = 0; +static XLogRecPtr sentPtr = InvalidXLogRecPtr; /* Buffers for constructing outgoing messages and processing reply messages. */ static StringInfoData output_message;
-- Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers