Add interrupt checks to contrib/pg_prewarm.

anarazel · anarazel · commit bd4ae0f396b3 · 2014-11-12T18:52:49.000+01:00
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.
diff --git a/contrib/pg_prewarm/pg_prewarm.c b/contrib/pg_prewarm/pg_prewarm.c
@@ -159,6 +159,7 @@ pg_prewarm(PG_FUNCTION_ARGS)
 		 */
 		for (block = first_block; block <= last_block; ++block)
 		{
+			CHECK_FOR_INTERRUPTS();
 			PrefetchBuffer(rel, forkNumber, block);
 			++blocks_done;
 		}
@@ -177,6 +178,7 @@ pg_prewarm(PG_FUNCTION_ARGS)
 		 */
 		for (block = first_block; block <= last_block; ++block)
 		{
+			CHECK_FOR_INTERRUPTS();
 			smgrread(rel->rd_smgr, forkNumber, block, blockbuffer);
 			++blocks_done;
 		}
@@ -190,6 +192,7 @@ pg_prewarm(PG_FUNCTION_ARGS)
 		{
 			Buffer		buf;
 
+			CHECK_FOR_INTERRUPTS();
 			buf = ReadBufferExtended(rel, forkNumber, block, RBM_NORMAL, NULL);
 			ReleaseBuffer(buf);
 			++blocks_done;

Original file line number	Diff line number	Diff line change
`@@ -159,6 +159,7 @@ pg_prewarm(PG_FUNCTION_ARGS)`
`159`	`159`	`*/`
`160`	`160`	`for (block = first_block; block <= last_block; ++block)`
`161`	`161`	`{`
	`162`	`+ CHECK_FOR_INTERRUPTS();`
`162`	`163`	`PrefetchBuffer(rel, forkNumber, block);`
`163`	`164`	`++blocks_done;`
`164`	`165`	`}`
`@@ -177,6 +178,7 @@ pg_prewarm(PG_FUNCTION_ARGS)`
`177`	`178`	`*/`
`178`	`179`	`for (block = first_block; block <= last_block; ++block)`
`179`	`180`	`{`
	`181`	`+ CHECK_FOR_INTERRUPTS();`
`180`	`182`	`smgrread(rel->rd_smgr, forkNumber, block, blockbuffer);`
`181`	`183`	`++blocks_done;`
`182`	`184`	`}`
`@@ -190,6 +192,7 @@ pg_prewarm(PG_FUNCTION_ARGS)`
`190`	`192`	`{`
`191`	`193`	`Buffer buf;`
`192`	`194`
	`195`	`+ CHECK_FOR_INTERRUPTS();`
`193`	`196`	`buf = ReadBufferExtended(rel, forkNumber, block, RBM_NORMAL, NULL);`
`194`	`197`	`ReleaseBuffer(buf);`
`195`	`198`	`++blocks_done;`