-
- Downloads
Insert CHECK_FOR_INTERRUPTS() calls into btree and hash index scans at the
points where we step right or left to the next page. This should ensure reasonable response time to a query cancel request during an unsuccessful index scan, as seen in recent gripe from Marc Cousin. It's a bit trickier than it might seem at first glance, because CHECK_FOR_INTERRUPTS() is a no-op if executed while holding a buffer lock. So we have to do it just at the point where we've dropped one page lock and not yet acquired the next. Remove CHECK_FOR_INTERRUPTS calls at the top level of btgetbitmap and hashgetbitmap, since they're pointless given the added checks. I think that GIST is okay already --- at least, there's a CHECK_FOR_INTERRUPTS at a plausible-looking place in gistnext(). I don't claim to know GIN well enough to try to poke it for this, if indeed it has a problem at all. This is a pre-existing issue, but in view of the lack of prior complaints I'm not going to risk back-patching.
Showing
- src/backend/access/hash/hash.c 1 addition, 4 deletionssrc/backend/access/hash/hash.c
- src/backend/access/hash/hashsearch.c 6 additions, 1 deletionsrc/backend/access/hash/hashsearch.c
- src/backend/access/nbtree/nbtree.c 1 addition, 4 deletionssrc/backend/access/nbtree/nbtree.c
- src/backend/access/nbtree/nbtsearch.c 13 additions, 9 deletionssrc/backend/access/nbtree/nbtsearch.c
Loading
Please register or sign in to comment