rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add interrupt checks to contrib/pg_prewarm. 

Currently the extension's pg_prewarm() function didn't check
interrupts once it started "warming" data. Since individual calls can
take a long while it's important for them to be interruptible.

Backpatch to 9.4 where pg_prewarm was introduced.
This commit is contained in:
Andres Freund 2014-11-12 18:52:49 +01:00
parent 28245b8424
commit bd4ae0f396
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/pg_prewarm/pg_prewarm.c
View File

@ -159,6 +159,7 @@ pg_prewarm(PG_FUNCTION_ARGS)
*/ */
for (block = first_block; block <= last_block; ++block) for (block = first_block; block <= last_block; ++block)
{ {
CHECK_FOR_INTERRUPTS();
PrefetchBuffer(rel, forkNumber, block); PrefetchBuffer(rel, forkNumber, block);
++blocks_done; ++blocks_done;
} }
@ -177,6 +178,7 @@ pg_prewarm(PG_FUNCTION_ARGS)
*/ */
for (block = first_block; block <= last_block; ++block) for (block = first_block; block <= last_block; ++block)
{ {
CHECK_FOR_INTERRUPTS();
smgrread(rel->rd_smgr, forkNumber, block, blockbuffer); smgrread(rel->rd_smgr, forkNumber, block, blockbuffer);
++blocks_done; ++blocks_done;
} }
@ -190,6 +192,7 @@ pg_prewarm(PG_FUNCTION_ARGS)
{ {
Buffer buf; Buffer buf;
CHECK_FOR_INTERRUPTS();
buf = ReadBufferExtended(rel, forkNumber, block, RBM_NORMAL, NULL); buf = ReadBufferExtended(rel, forkNumber, block, RBM_NORMAL, NULL);
ReleaseBuffer(buf); ReleaseBuffer(buf);
++blocks_done; ++blocks_done;