NotificationsYou must be signed in to change notification settings
Fork5.2k
Star19k

Commit44c2e5b

committed

Do CHECK_FOR_INTERRUPTS inside, not before, scanGetItem.

The CHECK_FOR_INTERRUPTS call in gingetbitmap turns out to beinadequate to prevent a long uninterruptible loop, becausewe now know a case where looping occurs within scanGetItem.While the next patch will fix the bug that caused that, itseems foolish to assume that no similar patterns are possible.Let's do the CFI within scanGetItem's retry loop, instead.This demonstrably allows canceling out of the loop exhibitedin bug #19031.Bug: #19031Reported-by: Tim Wood <washwithcare@gmail.com>Author: Tom Lane <tgl@sss.pgh.pa.us>Discussion:https://postgr.es/m/19031-0638148643d25548@postgresql.orgBackpatch-through: 13

1 parent8951941 commit44c2e5bCopy full SHA for 44c2e5b

File tree

1 file changed

-2

lines changed

src/backend/access/gin
- ginget.c

1 file changed

-2

lines changed

`‎src/backend/access/gin/ginget.c‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1327,6 +1327,8 @@ scanGetItem(IndexScanDesc scan, ItemPointerData advancePast,`
`1327`	`1327`	`*/`
`1328`	`1328`	`do`
`1329`	`1329`	`{`
	`1330`	`+CHECK_FOR_INTERRUPTS();`
	`1331`	`+`
`1330`	`1332`	`ItemPointerSetMin(item);`
`1331`	`1333`	`match= true;`
`1332`	`1334`	`for (i=0;i<so->nkeys&&match;i++)`
`@@ -1966,8 +1968,6 @@ gingetbitmap(IndexScanDesc scan, TIDBitmap *tbm)`
`1966`	`1968`
`1967`	`1969`	`for (;;)`
`1968`	`1970`	`{`
`1969`		`-CHECK_FOR_INTERRUPTS();`
`1970`		`-`
`1971`	`1971`	`if (!scanGetItem(scan,iptr,&iptr,&recheck))`
`1972`	`1972`	`break;`
`1973`	`1973`

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!

Commit44c2e5b

File tree

1 file changed

1 file changed

`‎src/backend/access/gin/ginget.c‎`

0 commit comments