Ensure that contrib/pgstattuple functions respond to cancel interrupts

tglsfdc · tglsfdc · commit 33065ef8bc52 · 2010-04-02T16:16:51.000Z
reasonably promptly, by adding CHECK_FOR_INTERRUPTS in the per-page loops.

Tatsuhito Kasahara
diff --git a/contrib/pgstattuple/pgstattuple.c b/contrib/pgstattuple/pgstattuple.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/contrib/pgstattuple/pgstattuple.c,v 1.38 2009/06/11 14:48:52 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/pgstattuple/pgstattuple.c,v 1.39 2010/04/02 16:16:51 tgl Exp $
  *
  * Copyright (c) 2001,2002	Tatsuo Ishii
  *
@@ -276,6 +276,8 @@ pgstat_heap(Relation rel, FunctionCallInfo fcinfo)
 	/* scan the relation */
 	while ((tuple = heap_getnext(scan, ForwardScanDirection)) != NULL)
 	{
+		CHECK_FOR_INTERRUPTS();
+
 		/* must hold a buffer lock to call HeapTupleSatisfiesVisibility */
 		LockBuffer(scan->rs_cbuf, BUFFER_LOCK_SHARE);
 
@@ -302,6 +304,8 @@ pgstat_heap(Relation rel, FunctionCallInfo fcinfo)
 
 		while (block <= tupblock)
 		{
+			CHECK_FOR_INTERRUPTS();
+
 			buffer = ReadBuffer(rel, block);
 			LockBuffer(buffer, BUFFER_LOCK_SHARE);
 			stat.free_space += PageGetHeapFreeSpace((Page) BufferGetPage(buffer));
@@ -313,6 +317,8 @@ pgstat_heap(Relation rel, FunctionCallInfo fcinfo)
 
 	while (block < nblocks)
 	{
+		CHECK_FOR_INTERRUPTS();
+
 		buffer = ReadBuffer(rel, block);
 		LockBuffer(buffer, BUFFER_LOCK_SHARE);
 		stat.free_space += PageGetHeapFreeSpace((Page) BufferGetPage(buffer));
@@ -468,7 +474,11 @@ pgstat_index(Relation rel, BlockNumber start, pgstat_page pagefn,
 		}
 
 		for (; blkno < nblocks; blkno++)
+		{
+			CHECK_FOR_INTERRUPTS();
+
 			pagefn(&stat, rel, blkno);
+		}
 	}
 
 	relation_close(rel, AccessShareLock);

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * $PostgreSQL: pgsql/contrib/pgstattuple/pgstattuple.c,v 1.38 2009/06/11 14:48:52 momjian Exp $`
	`2`	`+ * $PostgreSQL: pgsql/contrib/pgstattuple/pgstattuple.c,v 1.39 2010/04/02 16:16:51 tgl Exp $`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2001,2002 Tatsuo Ishii`
`5`	`5`	`*`
`@@ -276,6 +276,8 @@ pgstat_heap(Relation rel, FunctionCallInfo fcinfo)`
`276`	`276`	`/* scan the relation */`
`277`	`277`	`while ((tuple = heap_getnext(scan, ForwardScanDirection)) != NULL)`
`278`	`278`	`{`
	`279`	`+ CHECK_FOR_INTERRUPTS();`
	`280`	`+`
`279`	`281`	`/* must hold a buffer lock to call HeapTupleSatisfiesVisibility */`
`280`	`282`	`LockBuffer(scan->rs_cbuf, BUFFER_LOCK_SHARE);`
`281`	`283`
`@@ -302,6 +304,8 @@ pgstat_heap(Relation rel, FunctionCallInfo fcinfo)`
`302`	`304`
`303`	`305`	`while (block <= tupblock)`
`304`	`306`	`{`
	`307`	`+ CHECK_FOR_INTERRUPTS();`
	`308`	`+`
`305`	`309`	`buffer = ReadBuffer(rel, block);`
`306`	`310`	`LockBuffer(buffer, BUFFER_LOCK_SHARE);`
`307`	`311`	`stat.free_space += PageGetHeapFreeSpace((Page) BufferGetPage(buffer));`
`@@ -313,6 +317,8 @@ pgstat_heap(Relation rel, FunctionCallInfo fcinfo)`
`313`	`317`
`314`	`318`	`while (block < nblocks)`
`315`	`319`	`{`
	`320`	`+ CHECK_FOR_INTERRUPTS();`
	`321`	`+`
`316`	`322`	`buffer = ReadBuffer(rel, block);`
`317`	`323`	`LockBuffer(buffer, BUFFER_LOCK_SHARE);`
`318`	`324`	`stat.free_space += PageGetHeapFreeSpace((Page) BufferGetPage(buffer));`
`@@ -468,7 +474,11 @@ pgstat_index(Relation rel, BlockNumber start, pgstat_page pagefn,`
`468`	`474`	`}`
`469`	`475`
`470`	`476`	`for (; blkno < nblocks; blkno++)`
	`477`	`+ {`
	`478`	`+ CHECK_FOR_INTERRUPTS();`
	`479`	`+`
`471`	`480`	`pagefn(&stat, rel, blkno);`
	`481`	`+ }`
`472`	`482`	`}`
`473`	`483`
`474`	`484`	`relation_close(rel, AccessShareLock);`