From a09c3f393bd00dcb9e4db6abdb426c1ea633f0a1 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Sat, 16 Dec 2017 17:43:41 -0500 Subject: [PATCH 2/2] Remove PortalGetQueryDesc() After having gotten rid of PortalGetHeapMemory(), there seems little reason to keep one Portal access macro around that offers no actual abstraction and isn't consistently used anyway. --- src/backend/commands/portalcmds.c | 4 ++-- src/backend/executor/execCurrent.c | 2 +- src/backend/tcop/pquery.c | 4 ++-- src/include/utils/portal.h | 5 ----- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/backend/commands/portalcmds.c b/src/backend/commands/portalcmds.c index e19b2d82a7..b1aa2cf58c 100644 --- a/src/backend/commands/portalcmds.c +++ b/src/backend/commands/portalcmds.c @@ -277,7 +277,7 @@ PortalCleanup(Portal portal) * since other mechanisms will take care of releasing executor resources, * and we can't be sure that ExecutorEnd itself wouldn't fail. */ - queryDesc = PortalGetQueryDesc(portal); + queryDesc = portal->queryDesc; if (queryDesc) { /* @@ -317,7 +317,7 @@ PortalCleanup(Portal portal) void PersistHoldablePortal(Portal portal) { - QueryDesc *queryDesc = PortalGetQueryDesc(portal); + QueryDesc *queryDesc = portal->queryDesc; Portal saveActivePortal; ResourceOwner saveResourceOwner; MemoryContext savePortalContext; diff --git a/src/backend/executor/execCurrent.c b/src/backend/executor/execCurrent.c index a3e962ee67..d7288e106b 100644 --- a/src/backend/executor/execCurrent.c +++ b/src/backend/executor/execCurrent.c @@ -75,7 +75,7 @@ execCurrentOf(CurrentOfExpr *cexpr, (errcode(ERRCODE_INVALID_CURSOR_STATE), errmsg("cursor \"%s\" is not a SELECT query", cursor_name))); - queryDesc = PortalGetQueryDesc(portal); + queryDesc = portal->queryDesc; if (queryDesc == NULL || queryDesc->estate == NULL) ereport(ERROR, (errcode(ERRCODE_INVALID_CURSOR_STATE), diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c index 3d59291f5d..f27c298353 100644 --- a/src/backend/tcop/pquery.c +++ b/src/backend/tcop/pquery.c @@ -885,7 +885,7 @@ PortalRunSelect(Portal portal, * NB: queryDesc will be NULL if we are fetching from a held cursor or a * completed utility query; can't use it in that path. */ - queryDesc = PortalGetQueryDesc(portal); + queryDesc = portal->queryDesc; /* Caller messed up if we have neither a ready query nor held data. */ Assert(queryDesc || portal->holdStore); @@ -1694,7 +1694,7 @@ DoPortalRewind(Portal portal) } /* Rewind executor, if active */ - queryDesc = PortalGetQueryDesc(portal); + queryDesc = portal->queryDesc; if (queryDesc) { PushActiveSnapshot(queryDesc->snapshot); diff --git a/src/include/utils/portal.h b/src/include/utils/portal.h index 31f506cf97..cac2a1b4b8 100644 --- a/src/include/utils/portal.h +++ b/src/include/utils/portal.h @@ -198,11 +198,6 @@ typedef struct PortalData */ #define PortalIsValid(p) PointerIsValid(p) -/* - * Access macros for Portal ... use these in preference to field access. - */ -#define PortalGetQueryDesc(portal) ((portal)->queryDesc) - /* Prototypes for functions in utils/mmgr/portalmem.c */ extern void EnablePortalManager(void); -- 2.15.1