Add CHECK_FOR_INTERRUPTS() in various strategic spots, per comments

tglsfdc · tglsfdc · commit 3b6cbce458d8 · 2002-01-06T00:37:44.000Z
from Hiroshi.
diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c
@@ -12,7 +12,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.86 2001/11/23 23:41:54 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.87 2002/01/06 00:37:43 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -596,6 +596,8 @@ btbulkdelete(PG_FUNCTION_ARGS)
 			IndexTuple	itup;
 			ItemPointer htup;
 
+			CHECK_FOR_INTERRUPTS();
+
 			/* current is the next index tuple */
 			blkno = ItemPointerGetBlockNumber(current);
 			offnum = ItemPointerGetOffsetNumber(current);
diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.170 2001/11/20 02:46:13 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.171 2002/01/06 00:37:44 tgl Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -1679,6 +1679,8 @@ IndexBuildHeapScan(Relation heapRelation,
 	{
 		bool		tupleIsAlive;
 
+		CHECK_FOR_INTERRUPTS();
+
 		if (snapshot == SnapshotAny)
 		{
 			/* do our own time qual check */
diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/analyze.c,v 1.24 2001/10/25 20:37:30 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/analyze.c,v 1.25 2002/01/06 00:37:44 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -516,6 +516,7 @@ acquire_sample_rows(Relation onerel, HeapTuple *rows, int targrows,
 		rows[numrows++] = heap_copytuple(tuple);
 		if (numrows >= targrows)
 			break;
+		CHECK_FOR_INTERRUPTS();
 	}
 	heap_endscan(scan);
 
@@ -584,6 +585,8 @@ acquire_sample_rows(Relation onerel, HeapTuple *rows, int targrows,
 		OffsetNumber targoffset,
 					maxoffset;
 
+		CHECK_FOR_INTERRUPTS();
+
 		t = select_next_random_record(t, targrows, &rstate);
 		/* Try to read the t'th record in the table */
 		targpos = t / tuplesperpage;
@@ -881,6 +884,8 @@ compute_minimal_stats(VacAttrStats *stats,
 		int			firstcount1,
 					j;
 
+		CHECK_FOR_INTERRUPTS();
+
 		value = heap_getattr(tuple, stats->attnum, tupDesc, &isnull);
 
 		/* Check for null/nonnull */
@@ -1158,6 +1163,8 @@ compute_scalar_stats(VacAttrStats *stats,
 		Datum		value;
 		bool		isnull;
 
+		CHECK_FOR_INTERRUPTS();
+
 		value = heap_getattr(tuple, stats->attnum, tupDesc, &isnull);
 
 		/* Check for null/nonnull */
diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
@@ -15,7 +15,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.70 2001/10/25 05:49:24 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.71 2002/01/06 00:37:44 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -263,6 +263,8 @@ rebuildheap(Oid OIDNewHeap, Oid OIDOldHeap, Oid OIDOldIndex)
 		HeapTupleData LocalHeapTuple;
 		Buffer		LocalBuffer;
 
+		CHECK_FOR_INTERRUPTS();
+
 		LocalHeapTuple.t_self = ScanResult->heap_iptr;
 		LocalHeapTuple.t_datamcxt = NULL;
 		LocalHeapTuple.t_data = NULL;
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
@@ -13,7 +13,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.212 2001/11/05 17:46:25 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.213 2002/01/06 00:37:44 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -992,6 +992,8 @@ scan_heap(VRelStats *vacrelstats, Relation onerel,
 		bool		do_reap,
 					do_frag;
 
+		CHECK_FOR_INTERRUPTS();
+
 		buf = ReadBuffer(onerel, blkno);
 		page = BufferGetPage(buf);
 
@@ -1415,6 +1417,8 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
 		 blkno > last_move_dest_block;
 		 blkno--)
 	{
+		CHECK_FOR_INTERRUPTS();
+
 		/*
 		 * Forget fraged_pages pages at or after this one; they're no
 		 * longer useful as move targets, since we only want to move down.
@@ -2127,6 +2131,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
 		 i < vacuumed_pages;
 		 i++, curpage++)
 	{
+		CHECK_FOR_INTERRUPTS();
 		Assert((*curpage)->blkno < blkno);
 		if ((*curpage)->offsets_used == 0)
 		{
@@ -2157,6 +2162,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
 		 i < num_fraged_pages;
 		 i++, curpage++)
 	{
+		CHECK_FOR_INTERRUPTS();
 		Assert((*curpage)->blkno < blkno);
 		if ((*curpage)->blkno > last_move_dest_block)
 			break;				/* no need to scan any further */
@@ -2342,6 +2348,7 @@ vacuum_heap(VRelStats *vacrelstats, Relation onerel, VacPageList vacuum_pages)
 
 	for (i = 0, vacpage = vacuum_pages->pagedesc; i < nblocks; i++, vacpage++)
 	{
+		CHECK_FOR_INTERRUPTS();
 		if ((*vacpage)->offsets_free > 0)
 		{
 			buf = ReadBuffer(onerel, (*vacpage)->blkno);
diff --git a/src/backend/commands/vacuumlazy.c b/src/backend/commands/vacuumlazy.c
@@ -31,7 +31,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuumlazy.c,v 1.10 2001/10/28 06:25:43 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuumlazy.c,v 1.11 2002/01/06 00:37:44 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -230,6 +230,8 @@ lazy_scan_heap(Relation onerel, LVRelStats *vacrelstats,
 					hastup;
 		int			prev_dead_count;
 
+		CHECK_FOR_INTERRUPTS();
+
 		/*
 		 * If we are close to overrunning the available space for
 		 * dead-tuple TIDs, pause and do a cycle of vacuuming before we
@@ -464,6 +466,8 @@ lazy_vacuum_heap(Relation onerel, LVRelStats *vacrelstats)
 		Buffer		buf;
 		Page		page;
 
+		CHECK_FOR_INTERRUPTS();
+
 		tblk = ItemPointerGetBlockNumber(&vacrelstats->dead_tuples[tupindex]);
 		buf = ReadBuffer(onerel, tblk);
 		LockBufferForCleanup(buf);
@@ -770,6 +774,8 @@ count_nondeletable_pages(Relation onerel, LVRelStats *vacrelstats)
 					tupgone,
 					hastup;
 
+		CHECK_FOR_INTERRUPTS();
+
 		blkno--;
 
 		buf = ReadBuffer(onerel, blkno);
diff --git a/src/backend/executor/execScan.c b/src/backend/executor/execScan.c
@@ -12,17 +12,17 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execScan.c,v 1.18 2001/10/25 05:49:27 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execScan.c,v 1.19 2002/01/06 00:37:44 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
+#include "postgres.h"
 
 #include <sys/types.h>
 #include <sys/file.h>
 
-#include "postgres.h"
-
 #include "executor/executor.h"
+#include "miscadmin.h"
 #include "utils/memutils.h"
 
 
@@ -92,6 +92,8 @@ ExecScan(Scan *node,
 	{
 		TupleTableSlot *slot;
 
+		CHECK_FOR_INTERRUPTS();
+
 		slot = (*accessMtd) (node);
 
 		/*
diff --git a/src/backend/utils/sort/tuplesort.c b/src/backend/utils/sort/tuplesort.c
@@ -78,7 +78,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/sort/tuplesort.c,v 1.21 2001/11/11 22:00:25 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/sort/tuplesort.c,v 1.22 2002/01/06 00:37:44 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1233,6 +1233,7 @@ mergeonerun(Tuplesortstate *state)
 	 */
 	while (state->memtupcount > 0)
 	{
+		CHECK_FOR_INTERRUPTS();
 		/* write the tuple to destTape */
 		priorAvail = state->availMem;
 		srcTape = state->memtupindex[0];

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.170 2001/11/20 02:46:13 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.171 2002/01/06 00:37:44 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*`
`14`	`14`	`* INTERFACE ROUTINES`
`@@ -1679,6 +1679,8 @@ IndexBuildHeapScan(Relation heapRelation,`
`1679`	`1679`	`{`
`1680`	`1680`	`bool tupleIsAlive;`
`1681`	`1681`
	`1682`	`+ CHECK_FOR_INTERRUPTS();`
	`1683`	`+`
`1682`	`1684`	`if (snapshot == SnapshotAny)`
`1683`	`1685`	`{`
`1684`	`1686`	`/* do our own time qual check */`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`*`
`16`	`16`	`*`
`17`	`17`	`* IDENTIFICATION`
`18`		`- * $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.70 2001/10/25 05:49:24 momjian Exp $`
	`18`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.71 2002/01/06 00:37:44 tgl Exp $`
`19`	`19`	`*`
`20`	`20`	`*-------------------------------------------------------------------------`
`21`	`21`	`*/`
`@@ -263,6 +263,8 @@ rebuildheap(Oid OIDNewHeap, Oid OIDOldHeap, Oid OIDOldIndex)`
`263`	`263`	`HeapTupleData LocalHeapTuple;`
`264`	`264`	`Buffer LocalBuffer;`
`265`	`265`
	`266`	`+ CHECK_FOR_INTERRUPTS();`
	`267`	`+`
`266`	`268`	`LocalHeapTuple.t_self = ScanResult->heap_iptr;`
`267`	`269`	`LocalHeapTuple.t_datamcxt = NULL;`
`268`	`270`	`LocalHeapTuple.t_data = NULL;`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`*`
`14`	`14`	`*`
`15`	`15`	`* IDENTIFICATION`
`16`		`- * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.212 2001/11/05 17:46:25 momjian Exp $`
	`16`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.213 2002/01/06 00:37:44 tgl Exp $`
`17`	`17`	`*`
`18`	`18`	`*-------------------------------------------------------------------------`
`19`	`19`	`*/`
`@@ -992,6 +992,8 @@ scan_heap(VRelStats *vacrelstats, Relation onerel,`
`992`	`992`	`bool do_reap,`
`993`	`993`	`do_frag;`
`994`	`994`
	`995`	`+ CHECK_FOR_INTERRUPTS();`
	`996`	`+`
`995`	`997`	`buf = ReadBuffer(onerel, blkno);`
`996`	`998`	`page = BufferGetPage(buf);`
`997`	`999`
`@@ -1415,6 +1417,8 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,`
`1415`	`1417`	`blkno > last_move_dest_block;`
`1416`	`1418`	`blkno--)`
`1417`	`1419`	`{`
	`1420`	`+ CHECK_FOR_INTERRUPTS();`
	`1421`	`+`
`1418`	`1422`	`/*`
`1419`	`1423`	`* Forget fraged_pages pages at or after this one; they're no`
`1420`	`1424`	`* longer useful as move targets, since we only want to move down.`
`@@ -2127,6 +2131,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,`
`2127`	`2131`	`i < vacuumed_pages;`
`2128`	`2132`	`i++, curpage++)`
`2129`	`2133`	`{`
	`2134`	`+ CHECK_FOR_INTERRUPTS();`
`2130`	`2135`	`Assert((*curpage)->blkno < blkno);`
`2131`	`2136`	`if ((*curpage)->offsets_used == 0)`
`2132`	`2137`	`{`
`@@ -2157,6 +2162,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,`
`2157`	`2162`	`i < num_fraged_pages;`
`2158`	`2163`	`i++, curpage++)`
`2159`	`2164`	`{`
	`2165`	`+ CHECK_FOR_INTERRUPTS();`
`2160`	`2166`	`Assert((*curpage)->blkno < blkno);`
`2161`	`2167`	`if ((*curpage)->blkno > last_move_dest_block)`
`2162`	`2168`	`break; /* no need to scan any further */`
`@@ -2342,6 +2348,7 @@ vacuum_heap(VRelStats *vacrelstats, Relation onerel, VacPageList vacuum_pages)`
`2342`	`2348`
`2343`	`2349`	`for (i = 0, vacpage = vacuum_pages->pagedesc; i < nblocks; i++, vacpage++)`
`2344`	`2350`	`{`
	`2351`	`+ CHECK_FOR_INTERRUPTS();`
`2345`	`2352`	`if ((*vacpage)->offsets_free > 0)`
`2346`	`2353`	`{`
`2347`	`2354`	`buf = ReadBuffer(onerel, (*vacpage)->blkno);`
Original file line number	Diff line number	Diff line change
`@@ -12,17 +12,17 @@`
`12`	`12`	`*`
`13`	`13`	`*`
`14`	`14`	`* IDENTIFICATION`
`15`		`- * $Header: /cvsroot/pgsql/src/backend/executor/execScan.c,v 1.18 2001/10/25 05:49:27 momjian Exp $`
	`15`	`+ * $Header: /cvsroot/pgsql/src/backend/executor/execScan.c,v 1.19 2002/01/06 00:37:44 tgl Exp $`
`16`	`16`	`*`
`17`	`17`	`*-------------------------------------------------------------------------`
`18`	`18`	`*/`
	`19`	`+#include "postgres.h"`
`19`	`20`
`20`	`21`	`#include <sys/types.h>`
`21`	`22`	`#include <sys/file.h>`
`22`	`23`
`23`		`-#include "postgres.h"`
`24`		`-`
`25`	`24`	`#include "executor/executor.h"`
	`25`	`+#include "miscadmin.h"`
`26`	`26`	`#include "utils/memutils.h"`
`27`	`27`
`28`	`28`
`@@ -92,6 +92,8 @@ ExecScan(Scan *node,`
`92`	`92`	`{`
`93`	`93`	`TupleTableSlot *slot;`
`94`	`94`
	`95`	`+ CHECK_FOR_INTERRUPTS();`
	`96`	`+`
`95`	`97`	`slot = (*accessMtd) (node);`
`96`	`98`
`97`	`99`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@`
`78`	`78`	`* Portions Copyright (c) 1994, Regents of the University of California`
`79`	`79`	`*`
`80`	`80`	`* IDENTIFICATION`
`81`		`- * $Header: /cvsroot/pgsql/src/backend/utils/sort/tuplesort.c,v 1.21 2001/11/11 22:00:25 tgl Exp $`
	`81`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/sort/tuplesort.c,v 1.22 2002/01/06 00:37:44 tgl Exp $`
`82`	`82`	`*`
`83`	`83`	`*-------------------------------------------------------------------------`
`84`	`84`	`*/`
`@@ -1233,6 +1233,7 @@ mergeonerun(Tuplesortstate *state)`
`1233`	`1233`	`*/`
`1234`	`1234`	`while (state->memtupcount > 0)`
`1235`	`1235`	`{`
	`1236`	`+ CHECK_FOR_INTERRUPTS();`
`1236`	`1237`	`/* write the tuple to destTape */`
`1237`	`1238`	`priorAvail = state->availMem;`
`1238`	`1239`	`srcTape = state->memtupindex[0];`