Commitacf555b

committed

Shut down Gather's children before shutting down Gather itself.

It turns out that the original shutdown order here does not work well.Multiple people attempting to develop further parallel query patcheshave discovered that they need to do cleanup before the DSM goes away,and you can't do that if the parent node gets cleaned up first.Patch by me, reviewed by KaiGai Kohei and Dilip Kumar.Discussion:http://postgr.es/m/CA+TgmoY6bOc1YnhcAQnMfCBDbsJzROQ3sYxSAL-SYB5tMJcTKg@mail.gmail.comDiscussion:http://postgr.es/m/9A28C8860F777E439AA12E8AEA7694F8012AEB82@BPXM15GP.gisp.nec.co.jpDiscussion:http://postgr.es/m/CA+TgmoYuPOc=+xrG1v0fCsoLbKAab9F1ddOeaaiLMzKOiBar1Q@mail.gmail.com

1 parentd912dd0 commitacf555bCopy full SHA for acf555b

File tree

-2

lines changed

-2

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -815,6 +815,8 @@ ExecShutdownNode(PlanState *node)`
`815`	`815`	`if (node==NULL)`
`816`	`816`	`return false;`
`817`	`817`
	`818`	`+planstate_tree_walker(node,ExecShutdownNode,NULL);`
	`819`	`+`
`818`	`820`	`switch (nodeTag(node))`
`819`	`821`	`{`
`820`	`822`	`caseT_GatherState:`
`@@ -824,5 +826,5 @@ ExecShutdownNode(PlanState *node)`
`824`	`826`	`break;`
`825`	`827`	`}`
`826`	`828`
`827`		`-returnplanstate_tree_walker(node,ExecShutdownNode,NULL);`
	`829`	`+returnfalse;`
`828`	`830`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -229,10 +229,10 @@ ExecGather(GatherState *node)`
`229`	`229`	`void`
`230`	`230`	`ExecEndGather(GatherState*node)`
`231`	`231`	`{`
	`232`	`+ExecEndNode(outerPlanState(node));/* let children clean up first */`
`232`	`233`	`ExecShutdownGather(node);`
`233`	`234`	`ExecFreeExprContext(&node->ps);`
`234`	`235`	`ExecClearTuple(node->ps.ps_ResultTupleSlot);`
`235`		`-ExecEndNode(outerPlanState(node));`
`236`	`236`	`}`
`237`	`237`
`238`	`238`	`/*`

Comments

(0)