NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit24897e1

committed

Always call ExecShutdownNode() if appropriate.

Call ExecShutdownNode() after ExecutePlan()'s loop, rather than at eachbreak. We had forgotten to do that in one case. The omission causedintermittent "temporary file leak" warnings from multi-batch parallelhash joins with a LIMIT clause.Back-patch to 11. Though the problem exists in theory in earlierparallel query releases, nothing really depended on it.Author: Kyotaro HoriguchiReviewed-by: Thomas Munro, Amit KapilaDiscussion:https://postgr.es/m/20191111.212418.2222262873417235945.horikyota.ntt%40gmail.com

1 parentd61e7f1 commit24897e1Copy full SHA for 24897e1

File tree

1 file changed

-16

lines changed

src/backend/executor
- execMain.c

1 file changed

-16

lines changed

`‎src/backend/executor/execMain.c`

Lines changed: 7 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -1650,15 +1650,7 @@ ExecutePlan(EState *estate,`
`1650`	`1650`	`* process so we just end the loop...`
`1651`	`1651`	`*/`
`1652`	`1652`	`if (TupIsNull(slot))`
`1653`		`-{`
`1654`		`-/*`
`1655`		`- * If we know we won't need to back up, we can release resources`
`1656`		`- * at this point.`
`1657`		`- */`
`1658`		`-if (!(estate->es_top_eflags&EXEC_FLAG_BACKWARD))`
`1659`		`-(void)ExecShutdownNode(planstate);`
`1660`	`1653`	`break;`
`1661`		`-}`
`1662`	`1654`
`1663`	`1655`	`/*`
`1664`	`1656`	`* If we have a junk filter, then project a new tuple with the junk`
`@@ -1701,17 +1693,16 @@ ExecutePlan(EState *estate,`
`1701`	`1693`	`*/`
`1702`	`1694`	`current_tuple_count++;`
`1703`	`1695`	`if (numberTuples&&numberTuples==current_tuple_count)`
`1704`		`-{`
`1705`		`-/*`
`1706`		`- * If we know we won't need to back up, we can release resources`
`1707`		`- * at this point.`
`1708`		`- */`
`1709`		`-if (!(estate->es_top_eflags&EXEC_FLAG_BACKWARD))`
`1710`		`-(void)ExecShutdownNode(planstate);`
`1711`	`1696`	`break;`
`1712`		`-}`
`1713`	`1697`	`}`
`1714`	`1698`
	`1699`	`+/*`
	`1700`	`+ * If we know we won't need to back up, we can release resources at this`
	`1701`	`+ * point.`
	`1702`	`+ */`
	`1703`	`+if (!(estate->es_top_eflags&EXEC_FLAG_BACKWARD))`
	`1704`	`+(void)ExecShutdownNode(planstate);`
	`1705`	`+`
`1715`	`1706`	`if (use_parallel_mode)`
`1716`	`1707`	`ExitParallelMode();`
`1717`	`1708`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit24897e1

File tree

1 file changed

1 file changed

`‎src/backend/executor/execMain.c`

0 commit comments