From 81b59c71967e7f6e68316a67124501472b57d55a Mon Sep 17 00:00:00 2001 From: Bertrand Drouvot Date: Sat, 15 Nov 2025 17:57:51 +0000 Subject: [PATCH v1 3/8] Use OidIsValid() in various places for pointers Let's use OidIsValid() instead of: - direct pointer comparisons with InvalidOid - direct pointer comparisons with literal 0 --- src/backend/parser/parse_param.c | 2 +- src/backend/utils/sort/tuplesortvariants.c | 2 +- src/bin/pg_dump/pg_dump.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 27.2% src/backend/parser/ 36.1% src/backend/utils/sort/ 36.6% src/bin/pg_dump/ diff --git a/src/backend/parser/parse_param.c b/src/backend/parser/parse_param.c index 930921626b6..bdbb2872ce6 100644 --- a/src/backend/parser/parse_param.c +++ b/src/backend/parser/parse_param.c @@ -157,7 +157,7 @@ variable_paramref_hook(ParseState *pstate, ParamRef *pref) pptype = &(*parstate->paramTypes)[paramno - 1]; /* If not seen before, initialize to UNKNOWN type */ - if (*pptype == InvalidOid) + if (!OidIsValid(*pptype)) *pptype = UNKNOWNOID; /* diff --git a/src/backend/utils/sort/tuplesortvariants.c b/src/backend/utils/sort/tuplesortvariants.c index 41ac4afbf49..8aabae27e75 100644 --- a/src/backend/utils/sort/tuplesortvariants.c +++ b/src/backend/utils/sort/tuplesortvariants.c @@ -222,7 +222,7 @@ tuplesort_begin_heap(TupleDesc tupDesc, SortSupport sortKey = base->sortKeys + i; Assert(attNums[i] != 0); - Assert(sortOperators[i] != 0); + Assert(OidIsValid(sortOperators[i])); sortKey->ssup_cxt = CurrentMemoryContext; sortKey->ssup_collation = sortCollations[i]; diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c index 253c2369897..8be4714cd4b 100644 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@ -13669,7 +13669,7 @@ dumpFunc(Archive *fout, const FuncInfo *finfo) appendPQExpBufferStr(q, " TRANSFORM "); parseOidArray(protrftypes, typeids, FUNC_MAX_ARGS); - for (i = 0; typeids[i]; i++) + for (i = 0; OidIsValid(typeids[i]); i++) { if (i != 0) appendPQExpBufferStr(q, ", "); -- 2.34.1