From d0663168c7a7872725cebeb18df32f2e0c3c46bf Mon Sep 17 00:00:00 2001 From: Peter Smith Date: Tue, 29 Aug 2023 19:11:24 +1000 Subject: [PATCH v1] Remove shadows found in logical replication files --- src/backend/replication/logical/logicalfuncs.c | 4 ++-- src/backend/replication/logical/reorderbuffer.c | 6 +++--- src/backend/replication/walsender.c | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/backend/replication/logical/logicalfuncs.c b/src/backend/replication/logical/logicalfuncs.c index 55a24c0..197169d 100644 --- a/src/backend/replication/logical/logicalfuncs.c +++ b/src/backend/replication/logical/logicalfuncs.c @@ -181,10 +181,10 @@ pg_logical_slot_get_changes_guts(FunctionCallInfo fcinfo, bool confirm, bool bin for (i = 0; i < nelems; i += 2) { - char *name = TextDatumGetCString(datum_opts[i]); + char *optname = TextDatumGetCString(datum_opts[i]); char *opt = TextDatumGetCString(datum_opts[i + 1]); - options = lappend(options, makeDefElem(name, (Node *) makeString(opt), -1)); + options = lappend(options, makeDefElem(optname, (Node *) makeString(opt), -1)); } } diff --git a/src/backend/replication/logical/reorderbuffer.c b/src/backend/replication/logical/reorderbuffer.c index 87a4d2a..027c2a9 100644 --- a/src/backend/replication/logical/reorderbuffer.c +++ b/src/backend/replication/logical/reorderbuffer.c @@ -4840,16 +4840,16 @@ ReorderBufferToastReplace(ReorderBuffer *rb, ReorderBufferTXN *txn, /* stitch toast tuple back together from its parts */ dlist_foreach(it, &ent->chunks) { - bool isnull; + bool cisnull; ReorderBufferChange *cchange; ReorderBufferTupleBuf *ctup; Pointer chunk; cchange = dlist_container(ReorderBufferChange, node, it.cur); ctup = cchange->data.tp.newtuple; - chunk = DatumGetPointer(fastgetattr(&ctup->tuple, 3, toast_desc, &isnull)); + chunk = DatumGetPointer(fastgetattr(&ctup->tuple, 3, toast_desc, &cisnull)); - Assert(!isnull); + Assert(!cisnull); Assert(!VARATT_IS_EXTERNAL(chunk)); Assert(!VARATT_IS_SHORT(chunk)); diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c index 80374c55..46e4849 100644 --- a/src/backend/replication/walsender.c +++ b/src/backend/replication/walsender.c @@ -3540,7 +3540,7 @@ pg_stat_get_wal_senders(PG_FUNCTION_ARGS) for (i = 0; i < max_wal_senders; i++) { WalSnd *walsnd = &WalSndCtl->walsnds[i]; - XLogRecPtr sentPtr; + XLogRecPtr sent_ptr; XLogRecPtr write; XLogRecPtr flush; XLogRecPtr apply; @@ -3564,7 +3564,7 @@ pg_stat_get_wal_senders(PG_FUNCTION_ARGS) continue; } pid = walsnd->pid; - sentPtr = walsnd->sentPtr; + sent_ptr = walsnd->sentPtr; state = walsnd->state; write = walsnd->write; flush = walsnd->flush; @@ -3607,9 +3607,9 @@ pg_stat_get_wal_senders(PG_FUNCTION_ARGS) { values[1] = CStringGetTextDatum(WalSndGetStateString(state)); - if (XLogRecPtrIsInvalid(sentPtr)) + if (XLogRecPtrIsInvalid(sent_ptr)) nulls[2] = true; - values[2] = LSNGetDatum(sentPtr); + values[2] = LSNGetDatum(sent_ptr); if (XLogRecPtrIsInvalid(write)) nulls[3] = true; -- 1.8.3.1