diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2014-06-19 22:13:44 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2014-06-19 22:13:44 -0400 |
| commit | 1044e79a0b7b21ddedd9e093394a34e8cc2d42bc (patch) | |
| tree | 5efcc91217468969bcb1871b139d4a5bfd41b96b /src/include/nodes/execnodes.h | |
| parent | b488daf0d59614e801059e3558f73b65b0cf7e06 (diff) | |
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.
Diffstat (limited to 'src/include/nodes/execnodes.h')
| -rw-r--r-- | src/include/nodes/execnodes.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h index 0ab2a136976..fae281143fa 100644 --- a/src/include/nodes/execnodes.h +++ b/src/include/nodes/execnodes.h @@ -1406,6 +1406,7 @@ typedef struct SubqueryScanState * nfuncs number of functions being executed * funcstates per-function execution states (private in * nodeFunctionscan.c) + * argcontext memory context to evaluate function arguments in * ---------------- */ struct FunctionScanPerFuncState; @@ -1420,6 +1421,7 @@ typedef struct FunctionScanState int nfuncs; struct FunctionScanPerFuncState *funcstates; /* array of length * nfuncs */ + MemoryContext argcontext; } FunctionScanState; /* ---------------- |