Revise pgstats stuff to fix the problems with not counting accesses

generated by bitmap index scans.  Along the way, simplify and speed up
the code for counting sequential and index scans; it was both confusing
and inefficient to be taking care of that in the per-tuple loops, IMHO.
initdb forced because of internal changes in pg_stat view definitions.

src/backend/access/gist/gistget.c

@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/gist/gistget.c,v 1.51 2005/09/22 20:44:36 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/gist/gistget.c,v 1.52 2005/10/06 02:29:07 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,8 +17,10 @@
 #include "access/itup.h"
 #include "access/gist_private.h"
 #include "executor/execdebug.h"
+#include "pgstat.h"
 #include "utils/memutils.h"
 
+
 static OffsetNumber gistfindnext(IndexScanDesc scan, OffsetNumber n,
 			 ScanDirection dir);
 static int	gistnext(IndexScanDesc scan, ScanDirection dir, ItemPointer tids, int maxtids, bool ignore_killed_tuples);
@@ -161,6 +163,8 @@ gistnext(IndexScanDesc scan, ScanDirection dir, ItemPointer tids, int maxtids, b
 
 		stk->next = NULL;
 		stk->block = GIST_ROOT_BLKNO;
+
+		pgstat_count_index_scan(&scan->xs_pgstat_info);
 	}
 	else if (so->curbuf == InvalidBuffer)
 	{

src/backend/access/hash/hashsearch.c

@@ -8,13 +8,14 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/hash/hashsearch.c,v 1.38 2004/12/31 21:59:13 pgsql Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/hash/hashsearch.c,v 1.39 2005/10/06 02:29:08 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
 #include "access/hash.h"
+#include "pgstat.h"
 #include "storage/lmgr.h"
 
 
@@ -130,6 +131,8 @@ _hash_first(IndexScanDesc scan, ScanDirection dir)
 	ItemPointer current;
 	OffsetNumber offnum;
 
+	pgstat_count_index_scan(&scan->xs_pgstat_info);
+
 	current = &(scan->currentItemData);
 	ItemPointerSetInvalid(current);
 

src/backend/access/heap/heapam.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/heap/heapam.c,v 1.198 2005/08/20 00:39:51 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/heap/heapam.c,v 1.199 2005/10/06 02:29:10 tgl Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -47,10 +47,10 @@
 #include "catalog/catalog.h"
 #include "catalog/namespace.h"
 #include "miscadmin.h"
+#include "pgstat.h"
 #include "storage/procarray.h"
 #include "utils/inval.h"
 #include "utils/relcache.h"
-#include "pgstat.h"
 
 
 static XLogRecPtr log_heap_update(Relation reln, Buffer oldbuf,
@@ -90,6 +90,8 @@ initscan(HeapScanDesc scan, ScanKey key)
 	 */
 	if (key != NULL)
 		memcpy(scan->rs_key, key, scan->rs_nkeys * sizeof(ScanKeyData));
+
+	pgstat_count_heap_scan(&scan->rs_pgstat_info);
 }
 
 /* ----------------
@@ -680,8 +682,6 @@ heap_rescan(HeapScanDesc scan,
 	 * reinitialize scan descriptor
 	 */
 	initscan(scan, key);
-
-	pgstat_reset_heap_scan(&scan->rs_pgstat_info);
 }
 
 /* ----------------
@@ -762,8 +762,6 @@ heap_getnext(HeapScanDesc scan, ScanDirection direction)
 		return NULL;
 	}
 
-	pgstat_count_heap_scan(&scan->rs_pgstat_info);
-
 	/*
 	 * if we get here it means we have a new current scan tuple, so point
 	 * to the proper return buffer and return the tuple.
@@ -927,14 +925,9 @@ heap_release_fetch(Relation relation,
 		 */
 		*userbuf = buffer;
 
-		/*
-		 * Count the successful fetch in *pgstat_info if given, otherwise
-		 * in the relation's default statistics area.
-		 */
+		/* Count the successful fetch in *pgstat_info, if given. */
 		if (pgstat_info != NULL)
 			pgstat_count_heap_fetch(pgstat_info);
-		else
-			pgstat_count_heap_fetch(&relation->pgstat_info);
 
 		return true;
 	}
@@ -1152,8 +1145,6 @@ heap_insert(Relation relation, HeapTuple tup, CommandId cid,
 
 	RelationPutHeapTuple(relation, buffer, tup);
 
-	pgstat_count_heap_insert(&relation->pgstat_info);
-
 	/* XLOG stuff */
 	if (relation->rd_istemp)
 	{
@@ -1229,6 +1220,8 @@ heap_insert(Relation relation, HeapTuple tup, CommandId cid,
 	 */
 	CacheInvalidateHeapTuple(relation, tup);
 
+	pgstat_count_heap_insert(&relation->pgstat_info);
+
 	return HeapTupleGetOid(tup);
 }
 
@@ -1481,8 +1474,6 @@ l1:
 	if (HeapTupleHasExternal(&tp))
 		heap_tuple_toast_attrs(relation, NULL, &tp);
 
-	pgstat_count_heap_delete(&relation->pgstat_info);
-
 	/*
 	 * Mark tuple for invalidation from system caches at next command
 	 * boundary. We have to do this before WriteBuffer because we need to
@@ -1499,6 +1490,8 @@ l1:
 	if (have_tuple_lock)
 		UnlockTuple(relation, &(tp.t_self), ExclusiveLock);
 
+	pgstat_count_heap_delete(&relation->pgstat_info);
+
 	return HeapTupleMayBeUpdated;
 }
 
@@ -1851,8 +1844,6 @@ l2:
 		newbuf = buffer;
 	}
 
-	pgstat_count_heap_update(&relation->pgstat_info);
-
 	/*
 	 * At this point newbuf and buffer are both pinned and locked, and
 	 * newbuf has enough space for the new tuple.  If they are the same
@@ -1929,6 +1920,8 @@ l2:
 	if (have_tuple_lock)
 		UnlockTuple(relation, &(oldtup.t_self), ExclusiveLock);
 
+	pgstat_count_heap_update(&relation->pgstat_info);
+
 	return HeapTupleMayBeUpdated;
 }
 

src/backend/access/index/indexam.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/index/indexam.c,v 1.84 2005/06/27 12:45:22 teodor Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/index/indexam.c,v 1.85 2005/10/06 02:29:11 tgl Exp $
  *
  * INTERFACE ROUTINES
  *		index_open		- open an index relation by relation OID
@@ -65,9 +65,9 @@
 
 #include "access/genam.h"
 #include "access/heapam.h"
+#include "pgstat.h"
 #include "utils/relcache.h"
 
-#include "pgstat.h"
 
 /* ----------------------------------------------------------------
  *					macros used in index_ routines
@@ -354,8 +354,6 @@ index_rescan(IndexScanDesc scan, ScanKey key)
 	FunctionCall2(procedure,
 				  PointerGetDatum(scan),
 				  PointerGetDatum(key));
-
-	pgstat_reset_index_scan(&scan->xs_pgstat_info);
 }
 
 /* ----------------
@@ -521,8 +519,6 @@ index_getnext(IndexScanDesc scan, ScanDirection direction)
 	{
 		bool		found;
 
-		pgstat_count_index_scan(&scan->xs_pgstat_info);
-
 		/*
 		 * The AM's gettuple proc finds the next tuple matching the scan
 		 * keys.
@@ -545,6 +541,8 @@ index_getnext(IndexScanDesc scan, ScanDirection direction)
 			return NULL;		/* failure exit */
 		}
 
+		pgstat_count_index_tuples(&scan->xs_pgstat_info, 1);
+
 		/*
 		 * Fetch the heap tuple and see if it matches the snapshot.
 		 */
@@ -583,8 +581,6 @@ index_getnext(IndexScanDesc scan, ScanDirection direction)
 	 * initialized to 0, which is the correct state ("on row").
 	 */
 
-	pgstat_count_index_getnext(&scan->xs_pgstat_info);
-
 	return heapTuple;
 }
 
@@ -621,6 +617,9 @@ index_getnext_indexitem(IndexScanDesc scan,
 									   PointerGetDatum(scan),
 									   Int32GetDatum(direction)));
 
+	if (found)
+		pgstat_count_index_tuples(&scan->xs_pgstat_info, 1);
+
 	return found;
 }
 
@@ -660,6 +659,8 @@ index_getmulti(IndexScanDesc scan,
 									   Int32GetDatum(max_tids),
 									   PointerGetDatum(returned_tids)));
 
+	pgstat_count_index_tuples(&scan->xs_pgstat_info, *returned_tids);
+
 	return found;
 }
 

src/backend/access/nbtree/nbtsearch.c

@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.93 2005/06/19 22:41:00 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.94 2005/10/06 02:29:12 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,6 +17,7 @@
 
 #include "access/genam.h"
 #include "access/nbtree.h"
+#include "pgstat.h"
 #include "utils/lsyscache.h"
 
 
@@ -501,6 +502,8 @@ _bt_first(IndexScanDesc scan, ScanDirection dir)
 	int			i;
 	StrategyNumber strat_total;
 
+	pgstat_count_index_scan(&scan->xs_pgstat_info);
+
 	/*
 	 * Examine the scan keys and eliminate any redundant keys; also
 	 * discover how many keys must be matched to continue the scan.

src/backend/access/rtree/rtget.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/rtree/rtget.c,v 1.35 2005/03/27 23:53:02 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/rtree/rtget.c,v 1.36 2005/10/06 02:29:14 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,6 +18,8 @@
 #include "access/iqual.h"
 #include "access/relscan.h"
 #include "access/rtree.h"
+#include "pgstat.h"
+
 
 static OffsetNumber findnext(IndexScanDesc s, OffsetNumber n,
 		 ScanDirection dir);
@@ -118,6 +120,7 @@ rtnext(IndexScanDesc s, ScanDirection dir)
 		/* first call: start at the root */
 		Assert(BufferIsValid(so->curbuf) == false);
 		so->curbuf = ReadBuffer(s->indexRelation, P_ROOT);
+		pgstat_count_index_scan(&s->xs_pgstat_info);
 	}
 
 	p = BufferGetPage(so->curbuf);

src/backend/catalog/system_views.sql

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 1996-2005, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/backend/catalog/system_views.sql,v 1.21 2005/08/15 23:00:13 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/catalog/system_views.sql,v 1.22 2005/10/06 02:29:15 tgl Exp $
  */
 
 CREATE VIEW pg_roles AS 
@@ -182,8 +182,9 @@ CREATE VIEW pg_stat_all_tables AS
             C.relname AS relname, 
             pg_stat_get_numscans(C.oid) AS seq_scan, 
             pg_stat_get_tuples_returned(C.oid) AS seq_tup_read, 
-            sum(pg_stat_get_numscans(I.indexrelid)) AS idx_scan, 
-            sum(pg_stat_get_tuples_fetched(I.indexrelid)) AS idx_tup_fetch, 
+            sum(pg_stat_get_numscans(I.indexrelid))::bigint AS idx_scan, 
+            sum(pg_stat_get_tuples_fetched(I.indexrelid))::bigint +
+                    pg_stat_get_tuples_fetched(C.oid) AS idx_tup_fetch, 
             pg_stat_get_tuples_inserted(C.oid) AS n_tup_ins, 
             pg_stat_get_tuples_updated(C.oid) AS n_tup_upd, 
             pg_stat_get_tuples_deleted(C.oid) AS n_tup_del 
@@ -210,8 +211,8 @@ CREATE VIEW pg_statio_all_tables AS
                     pg_stat_get_blocks_hit(C.oid) AS heap_blks_read, 
             pg_stat_get_blocks_hit(C.oid) AS heap_blks_hit, 
             sum(pg_stat_get_blocks_fetched(I.indexrelid) - 
-                    pg_stat_get_blocks_hit(I.indexrelid)) AS idx_blks_read, 
-            sum(pg_stat_get_blocks_hit(I.indexrelid)) AS idx_blks_hit, 
+                    pg_stat_get_blocks_hit(I.indexrelid))::bigint AS idx_blks_read, 
+            sum(pg_stat_get_blocks_hit(I.indexrelid))::bigint AS idx_blks_hit, 
             pg_stat_get_blocks_fetched(T.oid) - 
                     pg_stat_get_blocks_hit(T.oid) AS toast_blks_read, 
             pg_stat_get_blocks_hit(T.oid) AS toast_blks_hit, 
@@ -350,5 +351,5 @@ UPDATE pg_proc SET
                          'bool'],
   proargmodes = ARRAY['i'::"char", 'o', 'o', 'o', 'o', 'o', 'o'],
   proargnames = ARRAY['filename'::text, 'size', 'access', 'modification',
-		      'change', 'creation', 'isdir']
+                      'change', 'creation', 'isdir']
 WHERE oid = 'pg_stat_file(text)'::regprocedure;

src/backend/executor/nodeBitmapHeapscan.c

@@ -21,7 +21,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/executor/nodeBitmapHeapscan.c,v 1.2 2005/05/06 17:24:54 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/nodeBitmapHeapscan.c,v 1.3 2005/10/06 02:29:16 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -39,6 +39,7 @@
 #include "executor/execdebug.h"
 #include "executor/nodeBitmapHeapscan.h"
 #include "parser/parsetree.h"
+#include "pgstat.h"
 #include "utils/memutils.h"
 
 
@@ -328,6 +329,9 @@ ExecBitmapHeapReScan(BitmapHeapScanState *node, ExprContext *exprCtxt)
 	/* rescan to release any page pin */
 	heap_rescan(node->ss.ss_currentScanDesc, NULL);
 
+	/* undo bogus "seq scan" count (see notes in ExecInitBitmapHeapScan) */
+	pgstat_discount_heap_scan(&node->ss.ss_currentScanDesc->rs_pgstat_info);
+
 	if (node->tbm)
 		tbm_free(node->tbm);
 	node->tbm = NULL;
@@ -475,6 +479,13 @@ ExecInitBitmapHeapScan(BitmapHeapScan *node, EState *estate)
 													  0,
 													  NULL);
 
+	/*
+	 * One problem is that heap_beginscan counts a "sequential scan" start,
+	 * when we actually aren't doing any such thing.  Reverse out the added
+	 * scan count.  (Eventually we may want to count bitmap scans separately.)
+	 */
+	pgstat_discount_heap_scan(&scanstate->ss.ss_currentScanDesc->rs_pgstat_info);
+
 	/*
 	 * get the scan type from the relation descriptor.
 	 */

src/backend/postmaster/pgstat.c

@@ -13,7 +13,7 @@
  *
  *	Copyright (c) 2001-2005, PostgreSQL Global Development Group
  *
- *	$PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.108 2005/09/24 17:53:14 tgl Exp $
+ *	$PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.109 2005/10/06 02:29:17 tgl Exp $
  * ----------
  */
 #include "postgres.h"
@@ -1159,17 +1159,11 @@ pgstat_initstats(PgStat_Info *stats, Relation rel)
 	 * Initialize data not to count at all.
 	 */
 	stats->tabentry = NULL;
-	stats->no_stats = FALSE;
-	stats->heap_scan_counted = FALSE;
-	stats->index_scan_counted = FALSE;
 
 	if (pgStatSock < 0 ||
 		!(pgstat_collect_tuplelevel ||
 		  pgstat_collect_blocklevel))
-	{
-		stats->no_stats = TRUE;
 		return;
-	}
 
 	tsarr = rel->rd_rel->relisshared ? &SharedTabStat : &RegularTabStat;
 

src/include/catalog/catversion.h

@@ -37,7 +37,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.303 2005/10/02 23:50:11 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.304 2005/10/06 02:29:18 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -53,6 +53,6 @@
  */
 
 /*							yyyymmddN */
-#define CATALOG_VERSION_NO	200510011
+#define CATALOG_VERSION_NO	200510051
 
 #endif

src/include/pgstat.h

@@ -5,7 +5,7 @@
  *
  *	Copyright (c) 2001-2005, PostgreSQL Global Development Group
  *
- *	$PostgreSQL: pgsql/src/include/pgstat.h,v 1.36 2005/08/15 16:25:18 tgl Exp $
+ *	$PostgreSQL: pgsql/src/include/pgstat.h,v 1.37 2005/10/06 02:29:19 tgl Exp $
  * ----------
  */
 #ifndef PGSTAT_H
@@ -70,6 +70,13 @@ typedef struct PgStat_MsgHdr
 
 /* ----------
  * PgStat_TableEntry			Per-table info in a MsgTabstat
+ *
+ * Note: for a table, tuples_returned is the number of tuples successfully
+ * fetched by heap_getnext, while tuples_fetched is the number of tuples
+ * successfully fetched by heap_fetch under the control of bitmap indexscans.
+ * For an index, tuples_returned is the number of index entries returned by
+ * the index AM, while tuples_fetched is the number of tuples successfully
+ * fetched by heap_fetch under the control of simple indexscans for this index.
  * ----------
  */
 typedef struct PgStat_TableEntry
@@ -80,6 +87,7 @@ typedef struct PgStat_TableEntry
 
 	PgStat_Counter t_tuples_returned;
 	PgStat_Counter t_tuples_fetched;
+
 	PgStat_Counter t_tuples_inserted;
 	PgStat_Counter t_tuples_updated;
 	PgStat_Counter t_tuples_deleted;
@@ -179,8 +187,9 @@ typedef struct PgStat_MsgActivity
  *								and buffer access statistics.
  * ----------
  */
-#define PGSTAT_NUM_TABENTRIES	((PGSTAT_MSG_PAYLOAD - 3 * sizeof(int))		\
-								/ sizeof(PgStat_TableEntry))
+#define PGSTAT_NUM_TABENTRIES  \
+	((PGSTAT_MSG_PAYLOAD - sizeof(Oid) - 3 * sizeof(int))  \
+	 / sizeof(PgStat_TableEntry))
 
 typedef struct PgStat_MsgTabstat
 {
@@ -197,8 +206,9 @@ typedef struct PgStat_MsgTabstat
  *								about dead tables.
  * ----------
  */
-#define PGSTAT_NUM_TABPURGE		((PGSTAT_MSG_PAYLOAD - sizeof(int))		\
-								/ sizeof(Oid))
+#define PGSTAT_NUM_TABPURGE  \
+	((PGSTAT_MSG_PAYLOAD - sizeof(Oid) - sizeof(int))  \
+	 / sizeof(Oid))
 
 typedef struct PgStat_MsgTabpurge
 {
@@ -211,7 +221,7 @@ typedef struct PgStat_MsgTabpurge
 
 /* ----------
  * PgStat_MsgDropdb				Sent by the backend to tell the collector
- *								about dropped database
+ *								about a dropped database
  * ----------
  */
 typedef struct PgStat_MsgDropdb
@@ -264,7 +274,7 @@ typedef union PgStat_Msg
 #define PGSTAT_FILE_FORMAT_ID	0x01A5BC93
 
 /* ----------
- * PgStat_StatDBEntry			The collectors data per database
+ * PgStat_StatDBEntry			The collector's data per database
  * ----------
  */
 typedef struct PgStat_StatDBEntry
@@ -282,7 +292,7 @@ typedef struct PgStat_StatDBEntry
 
 
 /* ----------
- * PgStat_StatBeEntry			The collectors data per backend
+ * PgStat_StatBeEntry			The collector's data per backend
  * ----------
  */
 typedef struct PgStat_StatBeEntry
@@ -323,7 +333,7 @@ typedef struct PgStat_StatBeDead
 
 
 /* ----------
- * PgStat_StatTabEntry			The collectors data table data
+ * PgStat_StatTabEntry			The collector's data per table (or index)
  * ----------
  */
 typedef struct PgStat_StatTabEntry
@@ -334,6 +344,7 @@ typedef struct PgStat_StatTabEntry
 
 	PgStat_Counter tuples_returned;
 	PgStat_Counter tuples_fetched;
+
 	PgStat_Counter tuples_inserted;
 	PgStat_Counter tuples_updated;
 	PgStat_Counter tuples_deleted;
@@ -397,18 +408,16 @@ extern void pgstat_reset_counters(void);
 extern void pgstat_initstats(PgStat_Info *stats, Relation rel);
 
 
-#define pgstat_reset_heap_scan(s)										\
+#define pgstat_count_heap_scan(s)										\
 	do {																\
 		if (pgstat_collect_tuplelevel && (s)->tabentry != NULL)			\
-			(s)->heap_scan_counted = FALSE;								\
+			((PgStat_TableEntry *)((s)->tabentry))->t_numscans++;		\
 	} while (0)
-#define pgstat_count_heap_scan(s)										\
+/* kluge for bitmap scans: */
+#define pgstat_discount_heap_scan(s)									\
 	do {																\
-		if (pgstat_collect_tuplelevel && (s)->tabentry != NULL &&		\
-				!(s)->heap_scan_counted) {								\
-			((PgStat_TableEntry *)((s)->tabentry))->t_numscans++;		\
-			(s)->heap_scan_counted = TRUE;								\
-		}																\
+		if (pgstat_collect_tuplelevel && (s)->tabentry != NULL)			\
+			((PgStat_TableEntry *)((s)->tabentry))->t_numscans--;		\
 	} while (0)
 #define pgstat_count_heap_getnext(s)									\
 	do {																\
@@ -435,30 +444,22 @@ extern void pgstat_initstats(PgStat_Info *stats, Relation rel);
 		if (pgstat_collect_tuplelevel && (s)->tabentry != NULL)			\
 			((PgStat_TableEntry *)((s)->tabentry))->t_tuples_deleted++; \
 	} while (0)
-#define pgstat_reset_index_scan(s)										\
-	do {																\
-		if (pgstat_collect_tuplelevel && (s)->tabentry != NULL)			\
-			(s)->index_scan_counted = FALSE;							\
-	} while (0)
 #define pgstat_count_index_scan(s)										\
 	do {																\
-		if (pgstat_collect_tuplelevel && (s)->tabentry != NULL &&		\
-				!(s)->index_scan_counted) {								\
+		if (pgstat_collect_tuplelevel && (s)->tabentry != NULL)			\
 			((PgStat_TableEntry *)((s)->tabentry))->t_numscans++;		\
-			(s)->index_scan_counted = TRUE;								\
-		}																\
 	} while (0)
-#define pgstat_count_index_getnext(s)									\
+#define pgstat_count_index_tuples(s, n)									\
 	do {																\
 		if (pgstat_collect_tuplelevel && (s)->tabentry != NULL)			\
-			((PgStat_TableEntry *)((s)->tabentry))->t_tuples_returned++; \
+			((PgStat_TableEntry *)((s)->tabentry))->t_tuples_returned += (n); \
 	} while (0)
 #define pgstat_count_buffer_read(s,r)									\
 	do {																\
-		if (pgstat_collect_blocklevel && (s)->tabentry != NULL)			\
-			((PgStat_TableEntry *)((s)->tabentry))->t_blocks_fetched++; \
-		else {															\
-			if (pgstat_collect_blocklevel && !(s)->no_stats) {			\
+		if (pgstat_collect_blocklevel) {								\
+			if ((s)->tabentry != NULL)									\
+				((PgStat_TableEntry *)((s)->tabentry))->t_blocks_fetched++; \
+			else {														\
 				pgstat_initstats((s), (r));								\
 				if ((s)->tabentry != NULL)								\
 					((PgStat_TableEntry *)((s)->tabentry))->t_blocks_fetched++; \
@@ -467,10 +468,10 @@ extern void pgstat_initstats(PgStat_Info *stats, Relation rel);
 	} while (0)
 #define pgstat_count_buffer_hit(s,r)									\
 	do {																\
-		if (pgstat_collect_blocklevel && (s)->tabentry != NULL)			\
-			((PgStat_TableEntry *)((s)->tabentry))->t_blocks_hit++;		\
-		else {															\
-			if (pgstat_collect_blocklevel && !(s)->no_stats) {			\
+		if (pgstat_collect_blocklevel) {								\
+			if ((s)->tabentry != NULL)									\
+				((PgStat_TableEntry *)((s)->tabentry))->t_blocks_hit++; \
+			else {														\
 				pgstat_initstats((s), (r));								\
 				if ((s)->tabentry != NULL)								\
 					((PgStat_TableEntry *)((s)->tabentry))->t_blocks_hit++; \

src/include/utils/rel.h

@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/utils/rel.h,v 1.85 2005/08/12 01:36:05 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/utils/rel.h,v 1.86 2005/10/06 02:29:21 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -94,9 +94,6 @@ typedef struct TriggerDesc
 typedef struct PgStat_Info
 {
 	void	   *tabentry;
-	bool		no_stats;
-	bool		heap_scan_counted;
-	bool		index_scan_counted;
 } PgStat_Info;
 
 

src/test/regress/expected/rules.out

@@ -1287,7 +1287,7 @@ SELECT viewname, definition FROM pg_views WHERE schemaname <> 'information_schem
  pg_shadow                | SELECT pg_authid.rolname AS usename, pg_authid.oid AS usesysid, pg_authid.rolcreatedb AS usecreatedb, pg_authid.rolsuper AS usesuper, pg_authid.rolcatupdate AS usecatupd, pg_authid.rolpassword AS passwd, (pg_authid.rolvaliduntil)::abstime AS valuntil, pg_authid.rolconfig AS useconfig FROM pg_authid WHERE pg_authid.rolcanlogin;
  pg_stat_activity         | SELECT d.oid AS datid, d.datname, pg_stat_get_backend_pid(s.backendid) AS procpid, pg_stat_get_backend_userid(s.backendid) AS usesysid, u.rolname AS usename, pg_stat_get_backend_activity(s.backendid) AS current_query, pg_stat_get_backend_activity_start(s.backendid) AS query_start, pg_stat_get_backend_start(s.backendid) AS backend_start, pg_stat_get_backend_client_addr(s.backendid) AS client_addr, pg_stat_get_backend_client_port(s.backendid) AS client_port FROM pg_database d, (SELECT pg_stat_get_backend_idset() AS backendid) s, pg_authid u WHERE ((pg_stat_get_backend_dbid(s.backendid) = d.oid) AND (pg_stat_get_backend_userid(s.backendid) = u.oid));
  pg_stat_all_indexes      | SELECT c.oid AS relid, i.oid AS indexrelid, n.nspname AS schemaname, c.relname, i.relname AS indexrelname, pg_stat_get_numscans(i.oid) AS idx_scan, pg_stat_get_tuples_returned(i.oid) AS idx_tup_read, pg_stat_get_tuples_fetched(i.oid) AS idx_tup_fetch FROM (((pg_class c JOIN pg_index x ON ((c.oid = x.indrelid))) JOIN pg_class i ON ((i.oid = x.indexrelid))) LEFT JOIN pg_namespace n ON ((n.oid = c.relnamespace))) WHERE ((c.relkind = 'r'::"char") OR (c.relkind = 't'::"char"));
- pg_stat_all_tables       | SELECT c.oid AS relid, n.nspname AS schemaname, c.relname, pg_stat_get_numscans(c.oid) AS seq_scan, pg_stat_get_tuples_returned(c.oid) AS seq_tup_read, sum(pg_stat_get_numscans(i.indexrelid)) AS idx_scan, sum(pg_stat_get_tuples_fetched(i.indexrelid)) AS idx_tup_fetch, pg_stat_get_tuples_inserted(c.oid) AS n_tup_ins, pg_stat_get_tuples_updated(c.oid) AS n_tup_upd, pg_stat_get_tuples_deleted(c.oid) AS n_tup_del FROM ((pg_class c LEFT JOIN pg_index i ON ((c.oid = i.indrelid))) LEFT JOIN pg_namespace n ON ((n.oid = c.relnamespace))) WHERE ((c.relkind = 'r'::"char") OR (c.relkind = 't'::"char")) GROUP BY c.oid, n.nspname, c.relname;
+ pg_stat_all_tables       | SELECT c.oid AS relid, n.nspname AS schemaname, c.relname, pg_stat_get_numscans(c.oid) AS seq_scan, pg_stat_get_tuples_returned(c.oid) AS seq_tup_read, (sum(pg_stat_get_numscans(i.indexrelid)))::bigint AS idx_scan, ((sum(pg_stat_get_tuples_fetched(i.indexrelid)))::bigint + pg_stat_get_tuples_fetched(c.oid)) AS idx_tup_fetch, pg_stat_get_tuples_inserted(c.oid) AS n_tup_ins, pg_stat_get_tuples_updated(c.oid) AS n_tup_upd, pg_stat_get_tuples_deleted(c.oid) AS n_tup_del FROM ((pg_class c LEFT JOIN pg_index i ON ((c.oid = i.indrelid))) LEFT JOIN pg_namespace n ON ((n.oid = c.relnamespace))) WHERE ((c.relkind = 'r'::"char") OR (c.relkind = 't'::"char")) GROUP BY c.oid, n.nspname, c.relname;
  pg_stat_database         | SELECT d.oid AS datid, d.datname, pg_stat_get_db_numbackends(d.oid) AS numbackends, pg_stat_get_db_xact_commit(d.oid) AS xact_commit, pg_stat_get_db_xact_rollback(d.oid) AS xact_rollback, (pg_stat_get_db_blocks_fetched(d.oid) - pg_stat_get_db_blocks_hit(d.oid)) AS blks_read, pg_stat_get_db_blocks_hit(d.oid) AS blks_hit FROM pg_database d;
  pg_stat_sys_indexes      | SELECT pg_stat_all_indexes.relid, pg_stat_all_indexes.indexrelid, pg_stat_all_indexes.schemaname, pg_stat_all_indexes.relname, pg_stat_all_indexes.indexrelname, pg_stat_all_indexes.idx_scan, pg_stat_all_indexes.idx_tup_read, pg_stat_all_indexes.idx_tup_fetch FROM pg_stat_all_indexes WHERE (((pg_stat_all_indexes.schemaname = 'pg_catalog'::name) OR (pg_stat_all_indexes.schemaname = 'pg_toast'::name)) OR (pg_stat_all_indexes.schemaname = 'information_schema'::name));
  pg_stat_sys_tables       | SELECT pg_stat_all_tables.relid, pg_stat_all_tables.schemaname, pg_stat_all_tables.relname, pg_stat_all_tables.seq_scan, pg_stat_all_tables.seq_tup_read, pg_stat_all_tables.idx_scan, pg_stat_all_tables.idx_tup_fetch, pg_stat_all_tables.n_tup_ins, pg_stat_all_tables.n_tup_upd, pg_stat_all_tables.n_tup_del FROM pg_stat_all_tables WHERE (((pg_stat_all_tables.schemaname = 'pg_catalog'::name) OR (pg_stat_all_tables.schemaname = 'pg_toast'::name)) OR (pg_stat_all_tables.schemaname = 'information_schema'::name));
@@ -1295,7 +1295,7 @@ SELECT viewname, definition FROM pg_views WHERE schemaname <> 'information_schem
  pg_stat_user_tables      | SELECT pg_stat_all_tables.relid, pg_stat_all_tables.schemaname, pg_stat_all_tables.relname, pg_stat_all_tables.seq_scan, pg_stat_all_tables.seq_tup_read, pg_stat_all_tables.idx_scan, pg_stat_all_tables.idx_tup_fetch, pg_stat_all_tables.n_tup_ins, pg_stat_all_tables.n_tup_upd, pg_stat_all_tables.n_tup_del FROM pg_stat_all_tables WHERE (((pg_stat_all_tables.schemaname <> 'pg_catalog'::name) AND (pg_stat_all_tables.schemaname <> 'pg_toast'::name)) AND (pg_stat_all_tables.schemaname <> 'information_schema'::name));
  pg_statio_all_indexes    | SELECT c.oid AS relid, i.oid AS indexrelid, n.nspname AS schemaname, c.relname, i.relname AS indexrelname, (pg_stat_get_blocks_fetched(i.oid) - pg_stat_get_blocks_hit(i.oid)) AS idx_blks_read, pg_stat_get_blocks_hit(i.oid) AS idx_blks_hit FROM (((pg_class c JOIN pg_index x ON ((c.oid = x.indrelid))) JOIN pg_class i ON ((i.oid = x.indexrelid))) LEFT JOIN pg_namespace n ON ((n.oid = c.relnamespace))) WHERE ((c.relkind = 'r'::"char") OR (c.relkind = 't'::"char"));
  pg_statio_all_sequences  | SELECT c.oid AS relid, n.nspname AS schemaname, c.relname, (pg_stat_get_blocks_fetched(c.oid) - pg_stat_get_blocks_hit(c.oid)) AS blks_read, pg_stat_get_blocks_hit(c.oid) AS blks_hit FROM (pg_class c LEFT JOIN pg_namespace n ON ((n.oid = c.relnamespace))) WHERE (c.relkind = 'S'::"char");
- pg_statio_all_tables     | SELECT c.oid AS relid, n.nspname AS schemaname, c.relname, (pg_stat_get_blocks_fetched(c.oid) - pg_stat_get_blocks_hit(c.oid)) AS heap_blks_read, pg_stat_get_blocks_hit(c.oid) AS heap_blks_hit, sum((pg_stat_get_blocks_fetched(i.indexrelid) - pg_stat_get_blocks_hit(i.indexrelid))) AS idx_blks_read, sum(pg_stat_get_blocks_hit(i.indexrelid)) AS idx_blks_hit, (pg_stat_get_blocks_fetched(t.oid) - pg_stat_get_blocks_hit(t.oid)) AS toast_blks_read, pg_stat_get_blocks_hit(t.oid) AS toast_blks_hit, (pg_stat_get_blocks_fetched(x.oid) - pg_stat_get_blocks_hit(x.oid)) AS tidx_blks_read, pg_stat_get_blocks_hit(x.oid) AS tidx_blks_hit FROM ((((pg_class c LEFT JOIN pg_index i ON ((c.oid = i.indrelid))) LEFT JOIN pg_class t ON ((c.reltoastrelid = t.oid))) LEFT JOIN pg_class x ON ((t.reltoastidxid = x.oid))) LEFT JOIN pg_namespace n ON ((n.oid = c.relnamespace))) WHERE ((c.relkind = 'r'::"char") OR (c.relkind = 't'::"char")) GROUP BY c.oid, n.nspname, c.relname, t.oid, x.oid;
+ pg_statio_all_tables     | SELECT c.oid AS relid, n.nspname AS schemaname, c.relname, (pg_stat_get_blocks_fetched(c.oid) - pg_stat_get_blocks_hit(c.oid)) AS heap_blks_read, pg_stat_get_blocks_hit(c.oid) AS heap_blks_hit, (sum((pg_stat_get_blocks_fetched(i.indexrelid) - pg_stat_get_blocks_hit(i.indexrelid))))::bigint AS idx_blks_read, (sum(pg_stat_get_blocks_hit(i.indexrelid)))::bigint AS idx_blks_hit, (pg_stat_get_blocks_fetched(t.oid) - pg_stat_get_blocks_hit(t.oid)) AS toast_blks_read, pg_stat_get_blocks_hit(t.oid) AS toast_blks_hit, (pg_stat_get_blocks_fetched(x.oid) - pg_stat_get_blocks_hit(x.oid)) AS tidx_blks_read, pg_stat_get_blocks_hit(x.oid) AS tidx_blks_hit FROM ((((pg_class c LEFT JOIN pg_index i ON ((c.oid = i.indrelid))) LEFT JOIN pg_class t ON ((c.reltoastrelid = t.oid))) LEFT JOIN pg_class x ON ((t.reltoastidxid = x.oid))) LEFT JOIN pg_namespace n ON ((n.oid = c.relnamespace))) WHERE ((c.relkind = 'r'::"char") OR (c.relkind = 't'::"char")) GROUP BY c.oid, n.nspname, c.relname, t.oid, x.oid;
  pg_statio_sys_indexes    | SELECT pg_statio_all_indexes.relid, pg_statio_all_indexes.indexrelid, pg_statio_all_indexes.schemaname, pg_statio_all_indexes.relname, pg_statio_all_indexes.indexrelname, pg_statio_all_indexes.idx_blks_read, pg_statio_all_indexes.idx_blks_hit FROM pg_statio_all_indexes WHERE (((pg_statio_all_indexes.schemaname = 'pg_catalog'::name) OR (pg_statio_all_indexes.schemaname = 'pg_toast'::name)) OR (pg_statio_all_indexes.schemaname = 'information_schema'::name));
  pg_statio_sys_sequences  | SELECT pg_statio_all_sequences.relid, pg_statio_all_sequences.schemaname, pg_statio_all_sequences.relname, pg_statio_all_sequences.blks_read, pg_statio_all_sequences.blks_hit FROM pg_statio_all_sequences WHERE (((pg_statio_all_sequences.schemaname = 'pg_catalog'::name) OR (pg_statio_all_sequences.schemaname = 'pg_toast'::name)) OR (pg_statio_all_sequences.schemaname = 'information_schema'::name));
  pg_statio_sys_tables     | SELECT pg_statio_all_tables.relid, pg_statio_all_tables.schemaname, pg_statio_all_tables.relname, pg_statio_all_tables.heap_blks_read, pg_statio_all_tables.heap_blks_hit, pg_statio_all_tables.idx_blks_read, pg_statio_all_tables.idx_blks_hit, pg_statio_all_tables.toast_blks_read, pg_statio_all_tables.toast_blks_hit, pg_statio_all_tables.tidx_blks_read, pg_statio_all_tables.tidx_blks_hit FROM pg_statio_all_tables WHERE (((pg_statio_all_tables.schemaname = 'pg_catalog'::name) OR (pg_statio_all_tables.schemaname = 'pg_toast'::name)) OR (pg_statio_all_tables.schemaname = 'information_schema'::name));

src/test/regress/expected/stats.out

@@ -11,8 +11,6 @@ SHOW stats_start_collector;  -- must be on
  on
 (1 row)
 
--- XXX stopgap until we figure out how bitmap scans should be counted
-SET enable_bitmapscan = off;
 -- save counters
 CREATE TEMP TABLE prevstats AS
 SELECT t.seq_scan, t.seq_tup_read, t.idx_scan, t.idx_tup_fetch,

src/test/regress/sql/stats.sql

@@ -8,9 +8,6 @@
 -- conditio sine qua non
 SHOW stats_start_collector;  -- must be on
 
--- XXX stopgap until we figure out how bitmap scans should be counted
-SET enable_bitmapscan = off;
-
 -- save counters
 CREATE TEMP TABLE prevstats AS
 SELECT t.seq_scan, t.seq_tup_read, t.idx_scan, t.idx_tup_fetch,