diff options
| author | Jeff Davis <jdavis@postgresql.org> | 2015-02-21 17:24:48 -0800 |
|---|---|---|
| committer | Jeff Davis <jdavis@postgresql.org> | 2015-02-21 17:24:48 -0800 |
| commit | b419865a814abbca12bdd6eef6a3d5ed67f432e1 (patch) | |
| tree | e1cce5a0394a5d83f8f42e1b33e265bd12b69613 /src/backend/executor/nodeSubplan.c | |
| parent | e9fd5545de3bb4efe163af4a9c957badac86ccd7 (diff) | |
| download | postgresql-b419865a814abbca12bdd6eef6a3d5ed67f432e1.tar.gz postgresql-b419865a814abbca12bdd6eef6a3d5ed67f432e1.zip | |
In array_agg(), don't create a new context for every group.
Previously, each new array created a new memory context that started
out at 8kB. This is incredibly wasteful when there are lots of small
groups of just a few elements each.
Change initArrayResult() and friends to accept a "subcontext" argument
to indicate whether the caller wants the ArrayBuildState allocated in
a new subcontext or not. If not, it can no longer be released
separately from the rest of the memory context.
Fixes bug report by Frank van Vugt on 2013-10-19.
Tomas Vondra. Reviewed by Ali Akbar, Tom Lane, and me.
Diffstat (limited to 'src/backend/executor/nodeSubplan.c')
| -rw-r--r-- | src/backend/executor/nodeSubplan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/executor/nodeSubplan.c b/src/backend/executor/nodeSubplan.c index f3ce1d714bd..9eb4d63e1ac 100644 --- a/src/backend/executor/nodeSubplan.c +++ b/src/backend/executor/nodeSubplan.c @@ -262,7 +262,7 @@ ExecScanSubPlan(SubPlanState *node, /* Initialize ArrayBuildStateAny in caller's context, if needed */ if (subLinkType == ARRAY_SUBLINK) astate = initArrayResultAny(subplan->firstColType, - CurrentMemoryContext); + CurrentMemoryContext, true); /* * We are probably in a short-lived expression-evaluation context. Switch @@ -964,7 +964,7 @@ ExecSetParamPlan(SubPlanState *node, ExprContext *econtext) /* Initialize ArrayBuildStateAny in caller's context, if needed */ if (subLinkType == ARRAY_SUBLINK) astate = initArrayResultAny(subplan->firstColType, - CurrentMemoryContext); + CurrentMemoryContext, true); /* * Must switch to per-query memory context. |