aboutsummaryrefslogtreecommitdiff
path: root/src/backend/executor/nodeFunctionscan.c
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2014-06-19 22:13:41 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2014-06-19 22:14:26 -0400
commit45b0f357235236dd3198f8abcca277adc0d7459a (patch)
treef8a91f92510a5a8a0e62ef4698a2c878bf85e7f5 /src/backend/executor/nodeFunctionscan.c
parent686f362bee126e50280bcd3b35807b02f18a8966 (diff)
downloadpostgresql-45b0f357235236dd3198f8abcca277adc0d7459a.tar.gz
postgresql-45b0f357235236dd3198f8abcca277adc0d7459a.zip
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/backend/executor/nodeFunctionscan.c')
-rw-r--r--src/backend/executor/nodeFunctionscan.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/src/backend/executor/nodeFunctionscan.c b/src/backend/executor/nodeFunctionscan.c
index da5d8c114db..945a414e96f 100644
--- a/src/backend/executor/nodeFunctionscan.c
+++ b/src/backend/executor/nodeFunctionscan.c
@@ -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;
}