diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2010-04-02 16:17:24 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2010-04-02 16:17:24 +0000 |
| commit | 9d76c535371ce18e559a6fd8c8fde73b4b1f9c0f (patch) | |
| tree | 331dcac062d36e4db8fe34b5a0a03be5442f1568 | |
| parent | d07f5947058eae0433c0a08e84711b3d32a84f4d (diff) | |
| download | postgresql-9d76c535371ce18e559a6fd8c8fde73b4b1f9c0f.tar.gz postgresql-9d76c535371ce18e559a6fd8c8fde73b4b1f9c0f.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 | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/contrib/pgstattuple/pgstattuple.c b/contrib/pgstattuple/pgstattuple.c index 40fe4f1961c..e68a896f525 100644 --- a/contrib/pgstattuple/pgstattuple.c +++ b/contrib/pgstattuple/pgstattuple.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/pgstattuple/pgstattuple.c,v 1.17.4.1 2009/03/31 22:56:18 tgl Exp $ + * $PostgreSQL: pgsql/contrib/pgstattuple/pgstattuple.c,v 1.17.4.2 2010/04/02 16:17:24 tgl Exp $ * * Copyright (c) 2001,2002 Tatsuo Ishii * @@ -29,6 +29,7 @@ #include "access/heapam.h" #include "access/transam.h" #include "catalog/namespace.h" +#include "miscadmin.h" #include "utils/builtins.h" @@ -144,6 +145,8 @@ pgstattuple_real(Relation rel) /* scan the relation */ while ((tuple = heap_getnext(scan, ForwardScanDirection)) != NULL) { + CHECK_FOR_INTERRUPTS(); + /* must hold a buffer lock to call HeapTupleSatisfiesNow */ LockBuffer(scan->rs_cbuf, BUFFER_LOCK_SHARE); @@ -170,6 +173,8 @@ pgstattuple_real(Relation rel) while (block <= tupblock) { + CHECK_FOR_INTERRUPTS(); + buffer = ReadBuffer(rel, block); LockBuffer(buffer, BUFFER_LOCK_SHARE); free_space += PageGetFreeSpace((Page) BufferGetPage(buffer)); @@ -182,6 +187,8 @@ pgstattuple_real(Relation rel) while (block < nblocks) { + CHECK_FOR_INTERRUPTS(); + buffer = ReadBuffer(rel, block); free_space += PageGetFreeSpace((Page) BufferGetPage(buffer)); ReleaseBuffer(buffer); |