database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-21 15:54:08 +03:00
Code

Fix portal management code to support non-default command completion tags for

Browse Source 
portals using PORTAL_UTIL_SELECT strategy.  This is currently significant only
for FETCH queries, which are supposed to include a count in the tag.  Seems
it's been broken since 7.4, but nobody noticed before Knut Lehre.
This commit is contained in:
Tom Lane 2007-02-18 19:49:35 +00:00
parent 0990afb8e2
commit 355451be0e
1 changed files with 33 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/backend/tcop/pquery.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/tcop/pquery.c,v 1.97.2.1 2005/11/22 18:23:20 momjian Exp $ * $PostgreSQL: pgsql/src/backend/tcop/pquery.c,v 1.97.2.2 2007/02/18 19:49:35 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -38,6 +38,7 @@ static void ProcessQuery(Query *parsetree,
ParamListInfo params, ParamListInfo params,
DestReceiver *dest, DestReceiver *dest,
char *completionTag); char *completionTag);
static void FillPortalStore(Portal portal);
static uint32 RunFromStore(Portal portal, ScanDirection direction, long count, static uint32 RunFromStore(Portal portal, ScanDirection direction, long count,
DestReceiver *dest); DestReceiver *dest);
static long PortalRunSelect(Portal portal, bool forward, long count, static long PortalRunSelect(Portal portal, bool forward, long count,
@ -629,16 +630,7 @@ PortalRun(Portal portal, long count,
* storing its results in the portal's tuplestore. * storing its results in the portal's tuplestore.
*/ */
if (!portal->portalUtilReady) if (!portal->portalUtilReady)
{ FillPortalStore(portal);
DestReceiver *treceiver;
PortalCreateHoldStore(portal);
treceiver = CreateDestReceiver(DestTuplestore, portal);
PortalRunUtility(portal, linitial(portal->parseTrees),
treceiver, NULL);
(*treceiver->rDestroy) (treceiver);
portal->portalUtilReady = true;
}
/* /*
* Now fetch desired portion of results. * Now fetch desired portion of results.
@ -867,6 +859,35 @@ PortalRunSelect(Portal portal,
return nprocessed; return nprocessed;
} }
/*
* FillPortalStore
* Run the query and load result tuples into the portal's tuple store.
*
* This is used for PORTAL_UTIL_SELECT cases only.
*/
static void
FillPortalStore(Portal portal)
{
DestReceiver *treceiver;
char completionTag[COMPLETION_TAG_BUFSIZE];
PortalCreateHoldStore(portal);
treceiver = CreateDestReceiver(DestTuplestore, portal);
completionTag[0] = '\0';
PortalRunUtility(portal, linitial(portal->parseTrees),
treceiver, completionTag);
/* Override default completion tag with actual command result */
if (completionTag[0] != '\0')
portal->commandTag = pstrdup(completionTag);
(*treceiver->rDestroy) (treceiver);
portal->portalUtilReady = true;
}
/* /*
* RunFromStore * RunFromStore
* Fetch tuples from the portal's tuple store. * Fetch tuples from the portal's tuple store.
@ -1180,16 +1201,7 @@ PortalRunFetch(Portal portal,
* storing its results in the portal's tuplestore. * storing its results in the portal's tuplestore.
*/ */
if (!portal->portalUtilReady) if (!portal->portalUtilReady)
{ FillPortalStore(portal);
DestReceiver *treceiver;
PortalCreateHoldStore(portal);
treceiver = CreateDestReceiver(DestTuplestore, portal);
PortalRunUtility(portal, linitial(portal->parseTrees),
treceiver, NULL);
(*treceiver->rDestroy) (treceiver);
portal->portalUtilReady = true;
}
/* /*
* Now fetch desired portion of results. * Now fetch desired portion of results.