diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2010-04-02 16:16:57 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2010-04-02 16:16:57 +0000 |
| commit | 0926c76c8e21c7fe44856a6206e28c7d46e8e0a3 (patch) | |
| tree | c6cd5ad25eb7df5944936ce9a2625f2b2a431c18 | |
| parent | b0a3d7e47cdff59f363361798b920ba7cb73f447 (diff) | |
| download | postgresql-0926c76c8e21c7fe44856a6206e28c7d46e8e0a3.tar.gz postgresql-0926c76c8e21c7fe44856a6206e28c7d46e8e0a3.zip | |
Ensure that contrib/pgstattuple functions respond to cancel interrupts
reasonably promptly, by adding CHECK_FOR_INTERRUPTS in the per-page loops.
Tatsuhito Kasahara
| -rw-r--r-- | contrib/pgstattuple/pgstattuple.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/contrib/pgstattuple/pgstattuple.c b/contrib/pgstattuple/pgstattuple.c index 5d6168f77d6..02b8e083678 100644 --- 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.38.2.1 2010/04/02 16:16:57 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); |