From a45ff8e15bf246ffc381648877651c21fef015a4 Mon Sep 17 00:00:00 2001 From: Bertrand Drouvot Date: Mon, 17 Nov 2025 09:21:20 +0000 Subject: [PATCH v1 7/8] Replace ternary operators with !OidIsValid() And negated OidIsValid equality to use positive logic. --- src/backend/commands/tablecmds.c | 4 ++-- src/backend/nodes/nodeFuncs.c | 4 ++-- src/backend/utils/cache/plancache.c | 12 ++++++------ src/backend/utils/misc/queryenvironment.c | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) 19.1% src/backend/commands/ 11.2% src/backend/nodes/ 57.8% src/backend/utils/cache/ 11.6% src/backend/utils/misc/ diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index f4e9490cd71..60d9462038b 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -17112,8 +17112,8 @@ AlterTableMoveAll(AlterTableMoveAllStmt *stmt) ereport(NOTICE, (errcode(ERRCODE_NO_DATA_FOUND), errmsg("no matching relations in tablespace \"%s\" found", - !OidIsValid(orig_tablespaceoid) ? "(database default)" : - get_tablespace_name(orig_tablespaceoid)))); + OidIsValid(orig_tablespaceoid) ? get_tablespace_name(orig_tablespaceoid) : + "(database default)"))); /* Everything is locked, loop through and move all of the relations. */ foreach(l, relations) diff --git a/src/backend/nodes/nodeFuncs.c b/src/backend/nodes/nodeFuncs.c index 5b11184bd0b..4a390e8821d 100644 --- a/src/backend/nodes/nodeFuncs.c +++ b/src/backend/nodes/nodeFuncs.c @@ -1241,12 +1241,12 @@ exprSetCollation(Node *expr, Oid collation) case T_SQLValueFunction: Assert((((SQLValueFunction *) expr)->type == NAMEOID) ? (collation == C_COLLATION_OID) : - (!OidIsValid(collation))); + !OidIsValid(collation)); break; case T_XmlExpr: Assert((((XmlExpr *) expr)->op == IS_XMLSERIALIZE) ? (collation == DEFAULT_COLLATION_OID) : - (!OidIsValid(collation))); + !OidIsValid(collation)); break; case T_JsonValueExpr: exprSetCollation((Node *) ((JsonValueExpr *) expr)->formatted_expr, diff --git a/src/backend/utils/cache/plancache.c b/src/backend/utils/cache/plancache.c index 54772e6c260..6d2ac455b74 100644 --- a/src/backend/utils/cache/plancache.c +++ b/src/backend/utils/cache/plancache.c @@ -2140,8 +2140,8 @@ PlanCacheRelCallback(Datum arg, Oid relid) /* * Check the dependency list for the rewritten querytree. */ - if ((!OidIsValid(relid)) ? plansource->relationOids != NIL : - list_member_oid(plansource->relationOids, relid)) + if (OidIsValid(relid) ? list_member_oid(plansource->relationOids, relid) : + plansource->relationOids != NIL) { /* Invalidate the querytree and generic plan */ plansource->is_valid = false; @@ -2163,8 +2163,8 @@ PlanCacheRelCallback(Datum arg, Oid relid) if (plannedstmt->commandType == CMD_UTILITY) continue; /* Ignore utility statements */ - if ((!OidIsValid(relid)) ? plannedstmt->relationOids != NIL : - list_member_oid(plannedstmt->relationOids, relid)) + if (OidIsValid(relid) ? list_member_oid(plannedstmt->relationOids, relid) : + plannedstmt->relationOids != NIL) { /* Invalidate the generic plan only */ plansource->gplan->is_valid = false; @@ -2186,8 +2186,8 @@ PlanCacheRelCallback(Datum arg, Oid relid) if (!cexpr->is_valid) continue; - if ((!OidIsValid(relid)) ? cexpr->relationOids != NIL : - list_member_oid(cexpr->relationOids, relid)) + if (OidIsValid(relid) ? list_member_oid(cexpr->relationOids, relid) : + cexpr->relationOids != NIL) { cexpr->is_valid = false; } diff --git a/src/backend/utils/misc/queryenvironment.c b/src/backend/utils/misc/queryenvironment.c index 8ae1783bc0e..001a6032645 100644 --- a/src/backend/utils/misc/queryenvironment.c +++ b/src/backend/utils/misc/queryenvironment.c @@ -127,7 +127,7 @@ ENRMetadataGetTupDesc(EphemeralNamedRelationMetadata enrmd) TupleDesc tupdesc; /* One, and only one, of these fields must be filled. */ - Assert((!OidIsValid(enrmd->reliddesc)) != (enrmd->tupdesc == NULL)); + Assert(OidIsValid(enrmd->reliddesc) == (enrmd->tupdesc == NULL)); if (enrmd->tupdesc != NULL) tupdesc = enrmd->tupdesc; -- 2.34.1