From 3b464bf0ccb22e36ab627a5e19981eaf3734d4dd Mon Sep 17 00:00:00 2001 From: Nathan Bossart Date: Tue, 24 Jan 2023 20:52:21 -0800 Subject: [PATCH v3 1/2] code review for 05a7be9 --- src/backend/replication/walreceiver.c | 31 ++++++++++++++------------- src/include/utils/timestamp.h | 1 + 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/backend/replication/walreceiver.c b/src/backend/replication/walreceiver.c index 3876c0188d..0563bad0f6 100644 --- a/src/backend/replication/walreceiver.c +++ b/src/backend/replication/walreceiver.c @@ -122,8 +122,8 @@ typedef enum WalRcvWakeupReason WALRCV_WAKEUP_TERMINATE, WALRCV_WAKEUP_PING, WALRCV_WAKEUP_REPLY, - WALRCV_WAKEUP_HSFEEDBACK, - NUM_WALRCV_WAKEUPS + WALRCV_WAKEUP_HSFEEDBACK +#define NUM_WALRCV_WAKEUPS (WALRCV_WAKEUP_HSFEEDBACK + 1) } WalRcvWakeupReason; /* @@ -525,7 +525,7 @@ WalReceiverMain(void) break; /* Find the soonest wakeup time, to limit our nap. */ - nextWakeup = PG_INT64_MAX; + nextWakeup = DT_NOEND; for (int i = 0; i < NUM_WALRCV_WAKEUPS; ++i) nextWakeup = Min(wakeup[i], nextWakeup); @@ -604,7 +604,7 @@ WalReceiverMain(void) if (now >= wakeup[WALRCV_WAKEUP_PING]) { requestReply = true; - wakeup[WALRCV_WAKEUP_PING] = PG_INT64_MAX; + wakeup[WALRCV_WAKEUP_PING] = DT_NOEND; } XLogWalRcvSendReply(requestReply, requestReply); @@ -1310,7 +1310,10 @@ ProcessWalSndrMessage(XLogRecPtr walEnd, TimestampTz sendTime) /* * Compute the next wakeup time for a given wakeup reason. Can be called to * initialize a wakeup time, to adjust it for the next wakeup, or to - * reinitialize it when GUCs have changed. + * reinitialize it when GUCs have changed. We ask the caller to pass in the + * value of "now" because this frequently avoids multiple calls of + * GetCurrentTimestamp(). It had better be a reasonably up-to-date value + * though. */ static void WalRcvComputeNextWakeup(WalRcvWakeupReason reason, TimestampTz now) @@ -1319,29 +1322,27 @@ WalRcvComputeNextWakeup(WalRcvWakeupReason reason, TimestampTz now) { case WALRCV_WAKEUP_TERMINATE: if (wal_receiver_timeout <= 0) - wakeup[reason] = PG_INT64_MAX; + wakeup[reason] = DT_NOEND; else - wakeup[reason] = now + wal_receiver_timeout * INT64CONST(1000); + wakeup[reason] = TimestampTzPlusMilliseconds(now, wal_receiver_timeout); break; case WALRCV_WAKEUP_PING: if (wal_receiver_timeout <= 0) - wakeup[reason] = PG_INT64_MAX; + wakeup[reason] = DT_NOEND; else - wakeup[reason] = now + (wal_receiver_timeout / 2) * INT64CONST(1000); + wakeup[reason] = TimestampTzPlusMilliseconds(now, wal_receiver_timeout / 2); break; case WALRCV_WAKEUP_HSFEEDBACK: if (!hot_standby_feedback || wal_receiver_status_interval <= 0) - wakeup[reason] = PG_INT64_MAX; + wakeup[reason] = DT_NOEND; else - wakeup[reason] = now + wal_receiver_status_interval * INT64CONST(1000000); + wakeup[reason] = TimestampTzPlusSeconds(now, wal_receiver_status_interval); break; case WALRCV_WAKEUP_REPLY: if (wal_receiver_status_interval <= 0) - wakeup[reason] = PG_INT64_MAX; + wakeup[reason] = DT_NOEND; else - wakeup[reason] = now + wal_receiver_status_interval * INT64CONST(1000000); - break; - default: + wakeup[reason] = TimestampTzPlusSeconds(now, wal_receiver_status_interval); break; } } diff --git a/src/include/utils/timestamp.h b/src/include/utils/timestamp.h index 42f802bb9d..1a63bc7c2d 100644 --- a/src/include/utils/timestamp.h +++ b/src/include/utils/timestamp.h @@ -82,6 +82,7 @@ IntervalPGetDatum(const Interval *X) #define INTERVAL_RANGE(t) (((t) >> 16) & INTERVAL_RANGE_MASK) #define TimestampTzPlusMilliseconds(tz,ms) ((tz) + ((ms) * (int64) 1000)) +#define TimestampTzPlusSeconds(tz,s) ((tz) + ((s) * (int64) 1000000)) /* Set at postmaster start */ -- 2.25.1