From 577993ffe3636007b54f5072dc58e82dd160947a Mon Sep 17 00:00:00 2001 From: "Chao Li (Evan)" Date: Tue, 2 Dec 2025 11:51:01 +0800 Subject: [PATCH v3 03/13] cleanup: rename outer variables to avoid shadowing inner locals This commit resolves several cases where an outer-scope variable shared a name with a more frequently used inner variable. The fixes rename the outer variables so each identifier remains distinct within its scope. Author: Chao Li Discussion: https://postgr.es/m/CAEoWx2kQ2x5gMaj8tHLJ3=jfC+p5YXHkJyHrDTiQw2nn2FJTmQ@mail.gmail.com --- src/backend/catalog/objectaddress.c | 10 +++++----- src/backend/catalog/pg_constraint.c | 4 ++-- src/backend/optimizer/path/equivclass.c | 6 +++--- src/backend/partitioning/partdesc.c | 6 +++--- src/backend/storage/aio/read_stream.c | 6 +++--- src/bin/pg_basebackup/pg_receivewal.c | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index c75b7131ed7..296de7647bc 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -2119,7 +2119,7 @@ pg_get_object_address(PG_FUNCTION_ARGS) ObjectAddress addr; TupleDesc tupdesc; Datum values[3]; - bool nulls[3]; + bool isnulls[3]; HeapTuple htup; Relation relation; @@ -2374,11 +2374,11 @@ pg_get_object_address(PG_FUNCTION_ARGS) values[0] = ObjectIdGetDatum(addr.classId); values[1] = ObjectIdGetDatum(addr.objectId); values[2] = Int32GetDatum(addr.objectSubId); - nulls[0] = false; - nulls[1] = false; - nulls[2] = false; + isnulls[0] = false; + isnulls[1] = false; + isnulls[2] = false; - htup = heap_form_tuple(tupdesc, values, nulls); + htup = heap_form_tuple(tupdesc, values, isnulls); PG_RETURN_DATUM(HeapTupleGetDatum(htup)); } diff --git a/src/backend/catalog/pg_constraint.c b/src/backend/catalog/pg_constraint.c index 9944e4bd2d1..b86f93aeb4f 100644 --- a/src/backend/catalog/pg_constraint.c +++ b/src/backend/catalog/pg_constraint.c @@ -814,7 +814,7 @@ AdjustNotNullInheritance(Oid relid, AttrNumber attnum, * 'include_noinh' determines whether to include NO INHERIT constraints or not. */ List * -RelationGetNotNullConstraints(Oid relid, bool cooked, bool include_noinh) +RelationGetNotNullConstraints(Oid relid, bool want_cooked, bool include_noinh) { List *notnulls = NIL; Relation constrRel; @@ -842,7 +842,7 @@ RelationGetNotNullConstraints(Oid relid, bool cooked, bool include_noinh) colnum = extractNotNullColumn(htup); - if (cooked) + if (want_cooked) { CookedConstraint *cooked; diff --git a/src/backend/optimizer/path/equivclass.c b/src/backend/optimizer/path/equivclass.c index 441f12f6c50..d350aa8a3b0 100644 --- a/src/backend/optimizer/path/equivclass.c +++ b/src/backend/optimizer/path/equivclass.c @@ -739,7 +739,7 @@ get_eclass_for_sort_expr(PlannerInfo *root, Oid opcintype, Oid collation, Index sortref, - Relids rel, + Relids relids, bool create_it) { JoinDomain *jdomain; @@ -782,14 +782,14 @@ get_eclass_for_sort_expr(PlannerInfo *root, if (!equal(opfamilies, cur_ec->ec_opfamilies)) continue; - setup_eclass_member_iterator(&it, cur_ec, rel); + setup_eclass_member_iterator(&it, cur_ec, relids); while ((cur_em = eclass_member_iterator_next(&it)) != NULL) { /* * Ignore child members unless they match the request. */ if (cur_em->em_is_child && - !bms_equal(cur_em->em_relids, rel)) + !bms_equal(cur_em->em_relids, relids)) continue; /* diff --git a/src/backend/partitioning/partdesc.c b/src/backend/partitioning/partdesc.c index 328b4d450e4..6fd46cf2c91 100644 --- a/src/backend/partitioning/partdesc.c +++ b/src/backend/partitioning/partdesc.c @@ -146,7 +146,7 @@ RelationBuildPartitionDesc(Relation rel, bool omit_detached) int i, nparts; bool retried = false; - PartitionKey key = RelationGetPartitionKey(rel); + PartitionKey partkey = RelationGetPartitionKey(rel); MemoryContext new_pdcxt; MemoryContext oldcxt; int *mapping; @@ -308,7 +308,7 @@ retry: * This could fail, but we haven't done any damage if so. */ if (nparts > 0) - boundinfo = partition_bounds_create(boundspecs, nparts, key, &mapping); + boundinfo = partition_bounds_create(boundspecs, nparts, partkey, &mapping); /* * Now build the actual relcache partition descriptor, copying all the @@ -329,7 +329,7 @@ retry: if (nparts > 0) { oldcxt = MemoryContextSwitchTo(new_pdcxt); - partdesc->boundinfo = partition_bounds_copy(boundinfo, key); + partdesc->boundinfo = partition_bounds_copy(boundinfo, partkey); /* Initialize caching fields for speeding up ExecFindPartition */ partdesc->last_found_datum_index = -1; diff --git a/src/backend/storage/aio/read_stream.c b/src/backend/storage/aio/read_stream.c index 031fde9f4cb..edc2279ead4 100644 --- a/src/backend/storage/aio/read_stream.c +++ b/src/backend/storage/aio/read_stream.c @@ -788,7 +788,7 @@ read_stream_begin_smgr_relation(int flags, * the stream early at any time by calling read_stream_end(). */ Buffer -read_stream_next_buffer(ReadStream *stream, void **per_buffer_data) +read_stream_next_buffer(ReadStream *stream, void **pper_buffer_data) { Buffer buffer; int16 oldest_buffer_index; @@ -903,8 +903,8 @@ read_stream_next_buffer(ReadStream *stream, void **per_buffer_data) Assert(oldest_buffer_index >= 0 && oldest_buffer_index < stream->queue_size); buffer = stream->buffers[oldest_buffer_index]; - if (per_buffer_data) - *per_buffer_data = get_per_buffer_data(stream, oldest_buffer_index); + if (pper_buffer_data) + *pper_buffer_data = get_per_buffer_data(stream, oldest_buffer_index); Assert(BufferIsValid(buffer)); diff --git a/src/bin/pg_basebackup/pg_receivewal.c b/src/bin/pg_basebackup/pg_receivewal.c index 46e553dce4b..785bf7b11dc 100644 --- a/src/bin/pg_basebackup/pg_receivewal.c +++ b/src/bin/pg_basebackup/pg_receivewal.c @@ -265,7 +265,7 @@ close_destination_dir(DIR *dest_dir, char *dest_folder) * If there are no WAL files in the directory, returns InvalidXLogRecPtr. */ static XLogRecPtr -FindStreamingStart(uint32 *tli) +FindStreamingStart(uint32 *ptli) { DIR *dir; struct dirent *dirent; @@ -486,7 +486,7 @@ FindStreamingStart(uint32 *tli) XLogSegNoOffsetToRecPtr(high_segno, 0, WalSegSz, high_ptr); - *tli = high_tli; + *ptli = high_tli; return high_ptr; } else -- 2.39.5 (Apple Git-154)