From ac0db34e0e5c7ee6f8b5c33c264de3e671fbd4f7 Mon Sep 17 00:00:00 2001 From: Daniel Gustafsson Date: Tue, 30 Nov 2021 14:02:14 +0100 Subject: [PATCH] Remove PF_USED_FOR_ASSERTS_ONLY from variables in general use fsstate in process_pending_requests (in postgres_fdw.c) was added in 8998e3cafa2 as an assertion-only variable, 1ec7fca8592 stated using the variable outside of assertions. rd_index in get_index_column_opclass (in lsyscache.c) was introduced in 2a6368343ff, and then promptly used in the fix commit 7e041603904 shortly thereafter. This removes the PG_USED_FOR_ASSERTS_ONLY variable decoration from the above mentioned variables. Reviewed-by: Greg Nancarrow Discussion: https://postgr.es/m/F959106C-0F21-43A5-B2AE-D007D51ACBEE@yesql.se --- contrib/postgres_fdw/postgres_fdw.c | 2 +- src/backend/utils/cache/lsyscache.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/postgres_fdw/postgres_fdw.c b/contrib/postgres_fdw/postgres_fdw.c index f767fdcc6a1..fa9a099f134 100644 --- a/contrib/postgres_fdw/postgres_fdw.c +++ b/contrib/postgres_fdw/postgres_fdw.c @@ -7058,7 +7058,7 @@ void process_pending_request(AsyncRequest *areq) { ForeignScanState *node = (ForeignScanState *) areq->requestee; - PgFdwScanState *fsstate PG_USED_FOR_ASSERTS_ONLY = (PgFdwScanState *) node->fdw_state; + PgFdwScanState *fsstate = (PgFdwScanState *) node->fdw_state; /* The request would have been pending for a callback */ Assert(areq->callback_pending); diff --git a/src/backend/utils/cache/lsyscache.c b/src/backend/utils/cache/lsyscache.c index 4ebaa552a27..9176514a962 100644 --- a/src/backend/utils/cache/lsyscache.c +++ b/src/backend/utils/cache/lsyscache.c @@ -3462,7 +3462,7 @@ Oid get_index_column_opclass(Oid index_oid, int attno) { HeapTuple tuple; - Form_pg_index rd_index PG_USED_FOR_ASSERTS_ONLY; + Form_pg_index rd_index; Datum datum; bool isnull; oidvector *indclass;