Commit1dfbbd5

committed

Don't try to free executor state of an InitPlan early --- this breaks

EXPLAIN ANALYZE. (Premature optimization is the root of all evil?)

1 parent061d4e2 commit1dfbbd5Copy full SHA for 1dfbbd5

File tree

-10

lines changed

-10

lines changed

Lines changed: 3 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/executor/nodeSubplan.c,v 1.39 2002/12/15 16:17:46 tgl Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeSubplan.c,v 1.40 2002/12/26 22:37:42 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -475,15 +475,6 @@ ExecSetParamPlan(SubPlanState node, ExprContext econtext)`
`475`	`475`	`}`
`476`	`476`	`}`
`477`	`477`
`478`		`-if (planstate->plan->extParam==NULL)/* un-correlated ... */`
`479`		`-{`
`480`		`-ExecEndPlan(planstate,node->sub_estate);`
`481`		`-/* mustn't free context while still in it... */`
`482`		`-MemoryContextSwitchTo(oldcontext);`
`483`		`-FreeExecutorState(node->sub_estate);`
`484`		`-node->needShutdown= false;`
`485`		`-}`
`486`		`-`
`487`	`478`	`MemoryContextSwitchTo(oldcontext);`
`488`	`479`	`}`
`489`	`480`
`@@ -502,6 +493,8 @@ ExecEndSubPlan(SubPlanState *node)`
`502`	`493`	`ExecEndPlan(node->planstate,node->sub_estate);`
`503`	`494`	`MemoryContextSwitchTo(oldcontext);`
`504`	`495`	`FreeExecutorState(node->sub_estate);`
	`496`	`+node->sub_estate=NULL;`
	`497`	`+node->planstate=NULL;`
`505`	`498`	`node->needShutdown= false;`
`506`	`499`	`}`
`507`	`500`	`if (node->curTuple)`

Comments

(0)