mirror of
https://github.com/postgres/postgres.git
synced 2025-07-08 11:42:09 +03:00
Avoid using a cursor in plpgsql's RETURN QUERY statement.
plpgsql has always executed the query given in a RETURN QUERY command by opening it as a cursor and then fetching a few rows at a time, which it turns around and dumps into the function's result tuplestore. The point of this was to keep from blowing out memory with an oversized SPITupleTable result (note that while a tuplestore can spill tuples to disk, SPITupleTable cannot). However, it's rather inefficient, both because of extra data copying and because of executor entry/exit overhead. In recent versions, a new performance problem has emerged: use of a cursor prevents use of a parallel plan for the executed query. We can improve matters by skipping use of a cursor and having the executor push result tuples directly into the function's result tuplestore. However, a moderate amount of new infrastructure is needed to make that idea work: * We can use the existing tstoreReceiver.c DestReceiver code to funnel executor output to the tuplestore, but it has to be extended to support plpgsql's requirement for possibly applying a tuple conversion map. * SPI needs to be extended to allow use of a caller-supplied DestReceiver instead of its usual receiver that puts tuples into a SPITupleTable. Two new API calls are needed to handle both the RETURN QUERY and RETURN QUERY EXECUTE cases. I also felt that I didn't want these new API calls to use the legacy method of specifying query parameter values with "char" null flags (the old ' '/'n' convention); rather they should accept ParamListInfo objects containing the parameter type and value info. This required a bit of additional new infrastructure since we didn't yet have any parse analysis callback that would interpret $N parameter symbols according to type data supplied in a ParamListInfo. There seems to be no harm in letting makeParamList install that callback by default, rather than leaving a new ParamListInfo's parserSetup hook as NULL. (Indeed, as of HEAD, I couldn't find anyplace that was using the parserSetup field at all; plpgsql was using parserSetupArg for its own purposes, but parserSetup seemed to be write-only.) We can actually get plpgsql out of the business of using legacy null flags altogether, and using ParamListInfo instead of its ad-hoc PreparedParamsData structure; but this requires inventing one more SPI API call that can replace SPI_cursor_open_with_args. That seems worth doing, though. SPI_execute_with_args and SPI_cursor_open_with_args are now unused anywhere in the core PG distribution. Perhaps someday we could deprecate/remove them. But cleaning up the crufty bits of the SPI API is a task for a different patch. Per bug #16040 from Jeremy Smith. This is unfortunately too invasive to consider back-patching. Patch by me; thanks to Hamid Akhtar for review. Discussion: https://postgr.es/m/16040-eaacad11fecfb198@postgresql.org
This commit is contained in:
@ -8,6 +8,8 @@
|
||||
* toasted values. This is to support cursors WITH HOLD, which must retain
|
||||
* data even if the underlying table is dropped.
|
||||
*
|
||||
* Also optionally, we can apply a tuple conversion map before storing.
|
||||
*
|
||||
*
|
||||
* Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
@ -21,6 +23,7 @@
|
||||
#include "postgres.h"
|
||||
|
||||
#include "access/detoast.h"
|
||||
#include "access/tupconvert.h"
|
||||
#include "executor/tstoreReceiver.h"
|
||||
|
||||
|
||||
@ -31,14 +34,19 @@ typedef struct
|
||||
Tuplestorestate *tstore; /* where to put the data */
|
||||
MemoryContext cxt; /* context containing tstore */
|
||||
bool detoast; /* were we told to detoast? */
|
||||
TupleDesc target_tupdesc; /* target tupdesc, or NULL if none */
|
||||
const char *map_failure_msg; /* tupdesc mapping failure message */
|
||||
/* workspace: */
|
||||
Datum *outvalues; /* values array for result tuple */
|
||||
Datum *tofree; /* temp values to be pfree'd */
|
||||
TupleConversionMap *tupmap; /* conversion map, if needed */
|
||||
TupleTableSlot *mapslot; /* slot for mapped tuples */
|
||||
} TStoreState;
|
||||
|
||||
|
||||
static bool tstoreReceiveSlot_notoast(TupleTableSlot *slot, DestReceiver *self);
|
||||
static bool tstoreReceiveSlot_detoast(TupleTableSlot *slot, DestReceiver *self);
|
||||
static bool tstoreReceiveSlot_tupmap(TupleTableSlot *slot, DestReceiver *self);
|
||||
|
||||
|
||||
/*
|
||||
@ -69,27 +77,46 @@ tstoreStartupReceiver(DestReceiver *self, int operation, TupleDesc typeinfo)
|
||||
}
|
||||
}
|
||||
|
||||
/* Check if tuple conversion is needed */
|
||||
if (myState->target_tupdesc)
|
||||
myState->tupmap = convert_tuples_by_position(typeinfo,
|
||||
myState->target_tupdesc,
|
||||
myState->map_failure_msg);
|
||||
else
|
||||
myState->tupmap = NULL;
|
||||
|
||||
/* Set up appropriate callback */
|
||||
if (needtoast)
|
||||
{
|
||||
Assert(!myState->tupmap);
|
||||
myState->pub.receiveSlot = tstoreReceiveSlot_detoast;
|
||||
/* Create workspace */
|
||||
myState->outvalues = (Datum *)
|
||||
MemoryContextAlloc(myState->cxt, natts * sizeof(Datum));
|
||||
myState->tofree = (Datum *)
|
||||
MemoryContextAlloc(myState->cxt, natts * sizeof(Datum));
|
||||
myState->mapslot = NULL;
|
||||
}
|
||||
else if (myState->tupmap)
|
||||
{
|
||||
myState->pub.receiveSlot = tstoreReceiveSlot_tupmap;
|
||||
myState->outvalues = NULL;
|
||||
myState->tofree = NULL;
|
||||
myState->mapslot = MakeSingleTupleTableSlot(myState->target_tupdesc,
|
||||
&TTSOpsVirtual);
|
||||
}
|
||||
else
|
||||
{
|
||||
myState->pub.receiveSlot = tstoreReceiveSlot_notoast;
|
||||
myState->outvalues = NULL;
|
||||
myState->tofree = NULL;
|
||||
myState->mapslot = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Receive a tuple from the executor and store it in the tuplestore.
|
||||
* This is for the easy case where we don't have to detoast.
|
||||
* This is for the easy case where we don't have to detoast nor map anything.
|
||||
*/
|
||||
static bool
|
||||
tstoreReceiveSlot_notoast(TupleTableSlot *slot, DestReceiver *self)
|
||||
@ -157,6 +184,21 @@ tstoreReceiveSlot_detoast(TupleTableSlot *slot, DestReceiver *self)
|
||||
return true;
|
||||
}
|
||||
|
||||
/*
|
||||
* Receive a tuple from the executor and store it in the tuplestore.
|
||||
* This is for the case where we must apply a tuple conversion map.
|
||||
*/
|
||||
static bool
|
||||
tstoreReceiveSlot_tupmap(TupleTableSlot *slot, DestReceiver *self)
|
||||
{
|
||||
TStoreState *myState = (TStoreState *) self;
|
||||
|
||||
execute_attr_map_slot(myState->tupmap->attrMap, slot, myState->mapslot);
|
||||
tuplestore_puttupleslot(myState->tstore, myState->mapslot);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/*
|
||||
* Clean up at end of an executor run
|
||||
*/
|
||||
@ -172,6 +214,12 @@ tstoreShutdownReceiver(DestReceiver *self)
|
||||
if (myState->tofree)
|
||||
pfree(myState->tofree);
|
||||
myState->tofree = NULL;
|
||||
if (myState->tupmap)
|
||||
free_conversion_map(myState->tupmap);
|
||||
myState->tupmap = NULL;
|
||||
if (myState->mapslot)
|
||||
ExecDropSingleTupleTableSlot(myState->mapslot);
|
||||
myState->mapslot = NULL;
|
||||
}
|
||||
|
||||
/*
|
||||
@ -204,17 +252,32 @@ CreateTuplestoreDestReceiver(void)
|
||||
|
||||
/*
|
||||
* Set parameters for a TuplestoreDestReceiver
|
||||
*
|
||||
* tStore: where to store the tuples
|
||||
* tContext: memory context containing tStore
|
||||
* detoast: forcibly detoast contained data?
|
||||
* target_tupdesc: if not NULL, forcibly convert tuples to this rowtype
|
||||
* map_failure_msg: error message to use if mapping to target_tupdesc fails
|
||||
*
|
||||
* We don't currently support both detoast and target_tupdesc at the same
|
||||
* time, just because no existing caller needs that combination.
|
||||
*/
|
||||
void
|
||||
SetTuplestoreDestReceiverParams(DestReceiver *self,
|
||||
Tuplestorestate *tStore,
|
||||
MemoryContext tContext,
|
||||
bool detoast)
|
||||
bool detoast,
|
||||
TupleDesc target_tupdesc,
|
||||
const char *map_failure_msg)
|
||||
{
|
||||
TStoreState *myState = (TStoreState *) self;
|
||||
|
||||
Assert(!(detoast && target_tupdesc));
|
||||
|
||||
Assert(myState->pub.mydest == DestTuplestore);
|
||||
myState->tstore = tStore;
|
||||
myState->cxt = tContext;
|
||||
myState->detoast = detoast;
|
||||
myState->target_tupdesc = target_tupdesc;
|
||||
myState->map_failure_msg = map_failure_msg;
|
||||
}
|
||||
|
Reference in New Issue
Block a user