diff options
Diffstat (limited to 'src/backend/replication')
| -rw-r--r-- | src/backend/replication/logical/reorderbuffer.c | 10 | ||||
| -rw-r--r-- | src/backend/replication/walreceiver.c | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/backend/replication/logical/reorderbuffer.c b/src/backend/replication/logical/reorderbuffer.c index 03d9c9c86a2..6dff9915a50 100644 --- a/src/backend/replication/logical/reorderbuffer.c +++ b/src/backend/replication/logical/reorderbuffer.c @@ -2320,17 +2320,17 @@ ReorderBufferProcessTXN(ReorderBuffer *rb, ReorderBufferTXN *txn, for (i = 0; i < nrelids; i++) { Oid relid = change->data.truncate.relids[i]; - Relation relation; + Relation rel; - relation = RelationIdGetRelation(relid); + rel = RelationIdGetRelation(relid); - if (!RelationIsValid(relation)) + if (!RelationIsValid(rel)) elog(ERROR, "could not open relation with OID %u", relid); - if (!RelationIsLogicallyLogged(relation)) + if (!RelationIsLogicallyLogged(rel)) continue; - relations[nrelations++] = relation; + relations[nrelations++] = rel; } /* Apply the truncate. */ diff --git a/src/backend/replication/walreceiver.c b/src/backend/replication/walreceiver.c index 3767466ef31..6cbb67c92a3 100644 --- a/src/backend/replication/walreceiver.c +++ b/src/backend/replication/walreceiver.c @@ -180,7 +180,7 @@ WalReceiverMain(void) bool first_stream; WalRcvData *walrcv = WalRcv; TimestampTz last_recv_timestamp; - TimestampTz now; + TimestampTz starttime; bool ping_sent; char *err; char *sender_host = NULL; @@ -192,7 +192,7 @@ WalReceiverMain(void) */ Assert(walrcv != NULL); - now = GetCurrentTimestamp(); + starttime = GetCurrentTimestamp(); /* * Mark walreceiver as running in shared memory. @@ -248,7 +248,7 @@ WalReceiverMain(void) /* Initialise to a sanish value */ walrcv->lastMsgSendTime = - walrcv->lastMsgReceiptTime = walrcv->latestWalEndTime = now; + walrcv->lastMsgReceiptTime = walrcv->latestWalEndTime = starttime; /* Report the latch to use to awaken this process */ walrcv->latch = &MyProc->procLatch; |