mirror of
https://github.com/postgres/postgres.git
synced 2025-07-03 20:02:46 +03:00
Avoid leaking memory while evaluating arguments for a table function.
ExecMakeTableFunctionResult evaluated the arguments for a function-in-FROM in the query-lifespan memory context. This is insignificant in simple cases where the function relation is scanned only once; but if the function is in a sub-SELECT or is on the inside of a nested loop, any memory consumed during argument evaluation can add up quickly. (The potential for trouble here had been foreseen long ago, per existing comments; but we'd not previously seen a complaint from the field about it.) To fix, create an additional temporary context just for this purpose. Per an example from MauMau. Back-patch to all active branches.
This commit is contained in:
@ -28,6 +28,7 @@
|
||||
#include "nodes/nodeFuncs.h"
|
||||
#include "parser/parsetree.h"
|
||||
#include "utils/builtins.h"
|
||||
#include "utils/memutils.h"
|
||||
|
||||
|
||||
/*
|
||||
@ -94,6 +95,7 @@ FunctionNext(FunctionScanState *node)
|
||||
node->funcstates[0].tstore = tstore =
|
||||
ExecMakeTableFunctionResult(node->funcstates[0].funcexpr,
|
||||
node->ss.ps.ps_ExprContext,
|
||||
node->argcontext,
|
||||
node->funcstates[0].tupdesc,
|
||||
node->eflags & EXEC_FLAG_BACKWARD);
|
||||
|
||||
@ -152,6 +154,7 @@ FunctionNext(FunctionScanState *node)
|
||||
fs->tstore =
|
||||
ExecMakeTableFunctionResult(fs->funcexpr,
|
||||
node->ss.ps.ps_ExprContext,
|
||||
node->argcontext,
|
||||
fs->tupdesc,
|
||||
node->eflags & EXEC_FLAG_BACKWARD);
|
||||
|
||||
@ -515,6 +518,19 @@ ExecInitFunctionScan(FunctionScan *node, EState *estate, int eflags)
|
||||
ExecAssignResultTypeFromTL(&scanstate->ss.ps);
|
||||
ExecAssignScanProjectionInfo(&scanstate->ss);
|
||||
|
||||
/*
|
||||
* Create a memory context that ExecMakeTableFunctionResult can use to
|
||||
* evaluate function arguments in. We can't use the per-tuple context for
|
||||
* this because it gets reset too often; but we don't want to leak
|
||||
* evaluation results into the query-lifespan context either. We just
|
||||
* need one context, because we evaluate each function separately.
|
||||
*/
|
||||
scanstate->argcontext = AllocSetContextCreate(CurrentMemoryContext,
|
||||
"Table function arguments",
|
||||
ALLOCSET_DEFAULT_MINSIZE,
|
||||
ALLOCSET_DEFAULT_INITSIZE,
|
||||
ALLOCSET_DEFAULT_MAXSIZE);
|
||||
|
||||
return scanstate;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user