NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitbb4aed4

committed

Shut down EvalPlanQual machinery when LockRows node reaches the end.

Previously, we left the EPQ sub-executor alone until ExecEndLockRows.This caused any buffer pins or other resources that it might hold toremain held until ExecutorEnd, which in some code paths means thatthey are held till the Portal is closed. That can cause user-visibleproblems, such as blocking VACUUM; and it's unlike the behavior ofordinary table-scanning nodes, which will have released all bufferpins by the time they return an EOF indication.We can make LockRows work more like other plan nodes by callingEvalPlanQualEnd just before returning NULL. We still need to call itin ExecEndLockRows in case the node was not run to completion, but inthe normal case the second call does nothing and costs little.Per report from Yura Sokolov. In principle this is a longstandingbug, but in view of the lack of other complaints and the low severityof the consequences, I chose not to back-patch.Discussion:https://postgr.es/m/4aa370cb91ecf2f9885d98b80ad1109c@postgrespro.ru

1 parent9bb5eec commitbb4aed4Copy full SHA for bb4aed4

File tree

1 file changed

-0

lines changed

src/backend/executor
- nodeLockRows.c

1 file changed

-0

lines changed

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

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,11 @@ ExecLockRows(PlanState *pstate)`
`59`	`59`	`slot=ExecProcNode(outerPlan);`
`60`	`60`
`61`	`61`	`if (TupIsNull(slot))`
	`62`	`+{`
	`63`	`+/* Release any resources held by EPQ mechanism before exiting */`
	`64`	`+EvalPlanQualEnd(&node->lr_epqstate);`
`62`	`65`	`returnNULL;`
	`66`	`+}`
`63`	`67`
`64`	`68`	`/* We don't need EvalPlanQual unless we get updated tuple version(s) */`
`65`	`69`	`epq_needed= false;`
`@@ -381,6 +385,7 @@ ExecInitLockRows(LockRows node, EState estate, int eflags)`
`381`	`385`	`void`
`382`	`386`	`ExecEndLockRows(LockRowsState*node)`
`383`	`387`	`{`
	`388`	`+/* We may have shut down EPQ already, but no harm in another call */`
`384`	`389`	`EvalPlanQualEnd(&node->lr_epqstate);`
`385`	`390`	`ExecEndNode(outerPlanState(node));`
`386`	`391`	`}`

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!

Commitbb4aed4

File tree

1 file changed

1 file changed

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

0 commit comments