4 files changed, 19 insertions, 11 deletions

diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c
index c650ff88a1a..08a4f656ff6 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.20 2001/06/13 21:44:40 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/analyze.c,v 1.21 2001/06/22 19:16:21 wieck Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -609,7 +609,7 @@ acquire_sample_rows(Relation onerel, HeapTuple *rows, int targrows,
 				goto pageloop;
 			}
 			ItemPointerSet(&targtuple.t_self, targblock, targoffset);
-			heap_fetch(onerel, SnapshotNow, &targtuple, &targbuffer);
+			heap_fetch(onerel, SnapshotNow, &targtuple, &targbuffer, NULL);
 			if (targtuple.t_data != NULL)
 			{
 				/*
diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
index 826407c8eb6..a087012a515 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.65 2001/03/22 03:59:21 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.66 2001/06/22 19:16:21 wieck Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -264,7 +264,8 @@ rebuildheap(Oid OIDNewHeap, Oid OIDOldHeap, Oid OIDOldIndex)
 		LocalHeapTuple.t_self = ScanResult->heap_iptr;
 		LocalHeapTuple.t_datamcxt = NULL;
 		LocalHeapTuple.t_data = NULL;
-		heap_fetch(LocalOldHeap, SnapshotNow, &LocalHeapTuple, &LocalBuffer);
+		heap_fetch(LocalOldHeap, SnapshotNow, &LocalHeapTuple, &LocalBuffer,
+						ScanDesc);
 		if (LocalHeapTuple.t_data != NULL)
 		{
 
diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c
index 013221860a2..c6e15fa7af8 100644
--- a/src/backend/commands/trigger.c
+++ b/src/backend/commands/trigger.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/trigger.c,v 1.92 2001/06/01 02:41:35 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/trigger.c,v 1.93 2001/06/22 19:16:21 wieck Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -551,7 +551,7 @@ RelationBuildTriggers(Relation relation)
 				break;
 
 			tuple.t_self = indexRes->heap_iptr;
-			heap_fetch(tgrel, SnapshotNow, &tuple, &buffer);
+			heap_fetch(tgrel, SnapshotNow, &tuple, &buffer, sd);
 			pfree(indexRes);
 			if (!tuple.t_data)
 				continue;
@@ -1394,7 +1394,7 @@ DeferredTriggerExecute(DeferredTriggerEvent event, int itemno,
 	if (ItemPointerIsValid(&(event->dte_oldctid)))
 	{
 		ItemPointerCopy(&(event->dte_oldctid), &(oldtuple.t_self));
-		heap_fetch(rel, SnapshotAny, &oldtuple, &oldbuffer);
+		heap_fetch(rel, SnapshotAny, &oldtuple, &oldbuffer, NULL);
 		if (!oldtuple.t_data)
 			elog(ERROR, "DeferredTriggerExecute: failed to fetch old tuple");
 	}
@@ -1402,7 +1402,7 @@ DeferredTriggerExecute(DeferredTriggerEvent event, int itemno,
 	if (ItemPointerIsValid(&(event->dte_newctid)))
 	{
 		ItemPointerCopy(&(event->dte_newctid), &(newtuple.t_self));
-		heap_fetch(rel, SnapshotAny, &newtuple, &newbuffer);
+		heap_fetch(rel, SnapshotAny, &newtuple, &newbuffer, NULL);
 		if (!newtuple.t_data)
 			elog(ERROR, "DeferredTriggerExecute: failed to fetch new tuple");
 	}
@@ -1861,7 +1861,7 @@ DeferredTriggerSetState(ConstraintsSetStmt *stmt)
 					break;
 
 				tuple.t_self = indexRes->heap_iptr;
-				heap_fetch(tgrel, SnapshotNow, &tuple, &buffer);
+				heap_fetch(tgrel, SnapshotNow, &tuple, &buffer, sd);
 				pfree(indexRes);
 				if (!tuple.t_data)
 					continue;
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 33d5409364a..c77b2fe8b90 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.196 2001/06/13 21:44:40 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.197 2001/06/22 19:16:21 wieck Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -48,6 +48,8 @@
 #include "utils/syscache.h"
 #include "utils/temprel.h"
 
+#include "pgstat.h"
+
 extern XLogRecPtr log_heap_clean(Relation reln, Buffer buffer,
 			   char *unused, int unlen);
 extern XLogRecPtr log_heap_move(Relation reln,
@@ -185,6 +187,11 @@ vacuum(VacuumStmt *vacstmt)
 	if (IsTransactionBlock())
 		elog(ERROR, "%s cannot run inside a BEGIN/END block", stmttype);
 
+	/*
+	 * Send info about dead objects to the statistics collector
+	 */
+	pgstat_vacuum_tabstat();
+
 	if (vacstmt->verbose)
 		MESSAGE_LEVEL = NOTICE;
 	else
@@ -2350,7 +2357,7 @@ vac_update_relstats(Oid relid, long num_pages, double num_tuples,
 	/* get the buffer cache tuple */
 	rtup.t_self = ctup->t_self;
 	ReleaseSysCache(ctup);
-	heap_fetch(rd, SnapshotNow, &rtup, &buffer);
+	heap_fetch(rd, SnapshotNow, &rtup, &buffer, NULL);
 
 	/* overwrite the existing statistics in the tuple */
 	pgcform = (Form_pg_class) GETSTRUCT(&rtup);