From 3b6cbce458d80176250af38b225541f53d5cad8e Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Sun, 6 Jan 2002 00:37:44 +0000 Subject: [PATCH] Add CHECK_FOR_INTERRUPTS() in various strategic spots, per comments from Hiroshi. --- src/backend/access/nbtree/nbtree.c | 4 +++- src/backend/catalog/index.c | 4 +++- src/backend/commands/analyze.c | 9 ++++++++- src/backend/commands/cluster.c | 4 +++- src/backend/commands/vacuum.c | 9 ++++++++- src/backend/commands/vacuumlazy.c | 8 +++++++- src/backend/executor/execScan.c | 8 +++++--- src/backend/utils/sort/tuplesort.c | 3 ++- 8 files changed, 39 insertions(+), 10 deletions(-) diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c index 6c7c4350aa..da54ed5adc 100644 --- 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 index 42200369a1..ed57db6870 100644 --- 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 index 085032cd7a..e6d9a574e2 100644 --- 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 index 469b4cd1ce..663a2b2200 100644 --- 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 index 9b4dc95923..894a7e3285 100644 --- 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 index dd8ef4d18d..088ad9c8ae 100644 --- 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 index 63aaa63858..483e6554ca 100644 --- 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 #include -#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 index ad937c95aa..ad169856a1 100644 --- 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];