NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit1ab973a

committed

Properly check interrupts in execScan.c.

During the development ofd47cfef the CFI()s in ExecScan() weremoved back and forth, ending up in the wrong place. Thus queries thatlargely spend their time in ExecScan(), and have neither projectionnor a qual, can't be cancelled in a timely manner.Reported-By: Jeff JanesAuthor: Andres FreundDiscussion:https://postgr.es/m/CAMkU=1weDXp8eLLPt9SO1LEUsJYYK9cScaGhLKpuN+WbYo9b5g@mail.gmail.comBackpatch: 10, asd47cfef

1 parentd2e40b3 commit1ab973aCopy full SHA for 1ab973a

File tree

1 file changed

-3

lines changed

src/backend/executor
- execScan.c

1 file changed

-3

lines changed

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

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ static bool tlist_matches_tupdesc(PlanState ps, List tlist, Index varno, Tuple`
`27`	`27`
`28`	`28`
`29`	`29`	`/*`
`30`		`- * ExecScanFetch -- fetch next potential tuple`
	`30`	`+ * ExecScanFetch --check interrupts &fetch next potential tuple`
`31`	`31`	`*`
`32`	`32`	`* This routine is concerned with substituting a test tuple if we are`
`33`	`33`	`* inside an EvalPlanQual recheck. If we aren't, just execute`
`@@ -40,6 +40,8 @@ ExecScanFetch(ScanState *node,`
`40`	`40`	`{`
`41`	`41`	`EState*estate=node->ps.state;`
`42`	`42`
	`43`	`+CHECK_FOR_INTERRUPTS();`
	`44`	`+`
`43`	`45`	`if (estate->es_epqTuple!=NULL)`
`44`	`46`	`{`
`45`	`47`	`/*`
`@@ -133,6 +135,8 @@ ExecScan(ScanState *node,`
`133`	`135`	`projInfo=node->ps.ps_ProjInfo;`
`134`	`136`	`econtext=node->ps.ps_ExprContext;`
`135`	`137`
	`138`	`+/* interrupt checks are in ExecScanFetch */`
	`139`	`+`
`136`	`140`	`/*`
`137`	`141`	`* If we have neither a qual to check nor a projection to do, just skip`
`138`	`142`	`* all the overhead and return the raw scan tuple.`
`@@ -157,8 +161,6 @@ ExecScan(ScanState *node,`
`157`	`161`	`{`
`158`	`162`	`TupleTableSlot*slot;`
`159`	`163`
`160`		`-CHECK_FOR_INTERRUPTS();`
`161`		`-`
`162`	`164`	`slot=ExecScanFetch(node,accessMtd,recheckMtd);`
`163`	`165`
`164`	`166`	`/*`

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!

Commit1ab973a

File tree

1 file changed

1 file changed

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

0 commit comments