From 59f40566cab95181ec132b3f0208f34e4c67f2b0 Mon Sep 17 00:00:00 2001 From: Robert Haas Date: Tue, 16 May 2017 12:46:32 -0400 Subject: Fix relcache leak when row triggers on partitions are fired by COPY. Thomas Munro, reviewed by Amit Langote Discussion: http://postgr.es/m/CAEepm=15Jss-yhFApuKzxcoCuFnb8TR8iQiWMjG=CLYPx48QLw@mail.gmail.com --- src/backend/executor/execMain.c | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) (limited to 'src/backend/executor/execMain.c') diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c index 2535d2ee695..fb2ba3302c0 100644 --- a/src/backend/executor/execMain.c +++ b/src/backend/executor/execMain.c @@ -1446,6 +1446,24 @@ ExecGetTriggerResultRel(EState *estate, Oid relid) return rInfo; } +/* + * Close any relations that have been opened by ExecGetTriggerResultRel(). + */ +void +ExecCleanUpTriggerState(EState *estate) +{ + ListCell *l; + + foreach(l, estate->es_trig_target_relations) + { + ResultRelInfo *resultRelInfo = (ResultRelInfo *) lfirst(l); + + /* Close indices and then the relation itself */ + ExecCloseIndices(resultRelInfo); + heap_close(resultRelInfo->ri_RelationDesc, NoLock); + } +} + /* * ExecContextForcesOids * @@ -1610,16 +1628,8 @@ ExecEndPlan(PlanState *planstate, EState *estate) resultRelInfo++; } - /* - * likewise close any trigger target relations - */ - foreach(l, estate->es_trig_target_relations) - { - resultRelInfo = (ResultRelInfo *) lfirst(l); - /* Close indices and then the relation itself */ - ExecCloseIndices(resultRelInfo); - heap_close(resultRelInfo->ri_RelationDesc, NoLock); - } + /* likewise close any trigger target relations */ + ExecCleanUpTriggerState(estate); /* * close any relations selected FOR [KEY] UPDATE/SHARE, again keeping @@ -3173,14 +3183,7 @@ EvalPlanQualEnd(EPQState *epqstate) ExecResetTupleTable(estate->es_tupleTable, false); /* close any trigger target relations attached to this EState */ - foreach(l, estate->es_trig_target_relations) - { - ResultRelInfo *resultRelInfo = (ResultRelInfo *) lfirst(l); - - /* Close indices and then the relation itself */ - ExecCloseIndices(resultRelInfo); - heap_close(resultRelInfo->ri_RelationDesc, NoLock); - } + ExecCleanUpTriggerState(estate); MemoryContextSwitchTo(oldcontext); -- cgit v1.2.3