Index: pgstat.c
===================================================================
RCS file: /cvsroot/pgsql/src/backend/postmaster/pgstat.c,v
retrieving revision 1.140
diff -c -r1.140 pgstat.c
*** pgstat.c	21 Nov 2006 20:59:52 -0000	1.140
--- pgstat.c	11 Jan 2007 22:32:30 -0000
***************
*** 159,164 ****
--- 159,165 ----
  static void pgstat_read_statsfile(HTAB **dbhash, Oid onlydb);
  static void backend_read_statsfile(void);
  static void pgstat_read_current_status(void);
+ static HTAB *pgstat_collect_oids(Oid catalogid);
  
  static void pgstat_setheader(PgStat_MsgHdr *hdr, StatMsgType mtype);
  static void pgstat_send(void *msg, int len);
***************
*** 657,666 ****
  void
  pgstat_vacuum_tabstat(void)
  {
! 	List	   *oidlist;
! 	Relation	rel;
! 	HeapScanDesc scan;
! 	HeapTuple	tup;
  	PgStat_MsgTabpurge msg;
  	HASH_SEQ_STATUS hstat;
  	PgStat_StatDBEntry *dbentry;
--- 658,664 ----
  void
  pgstat_vacuum_tabstat(void)
  {
! 	HTAB	   *htab;
  	PgStat_MsgTabpurge msg;
  	HASH_SEQ_STATUS hstat;
  	PgStat_StatDBEntry *dbentry;
***************
*** 679,693 ****
  	/*
  	 * Read pg_database and make a list of OIDs of all existing databases
  	 */
! 	oidlist = NIL;
! 	rel = heap_open(DatabaseRelationId, AccessShareLock);
! 	scan = heap_beginscan(rel, SnapshotNow, 0, NULL);
! 	while ((tup = heap_getnext(scan, ForwardScanDirection)) != NULL)
! 	{
! 		oidlist = lappend_oid(oidlist, HeapTupleGetOid(tup));
! 	}
! 	heap_endscan(scan);
! 	heap_close(rel, AccessShareLock);
  
  	/*
  	 * Search the database hash table for dead databases and tell the
--- 677,683 ----
  	/*
  	 * Read pg_database and make a list of OIDs of all existing databases
  	 */
! 	htab = pgstat_collect_oids(DatabaseRelationId);
  
  	/*
  	 * Search the database hash table for dead databases and tell the
***************
*** 698,709 ****
  	{
  		Oid			dbid = dbentry->databaseid;
  
! 		if (!list_member_oid(oidlist, dbid))
  			pgstat_drop_database(dbid);
  	}
  
  	/* Clean up */
! 	list_free(oidlist);
  
  	/*
  	 * Lookup our own database entry; if not found, nothing more to do.
--- 688,701 ----
  	{
  		Oid			dbid = dbentry->databaseid;
  
! 		CHECK_FOR_INTERRUPTS();
! 
! 		if (hash_search(htab, (void *) &dbid, HASH_FIND, NULL) == NULL)
  			pgstat_drop_database(dbid);
  	}
  
  	/* Clean up */
! 	hash_destroy(htab);
  
  	/*
  	 * Lookup our own database entry; if not found, nothing more to do.
***************
*** 717,731 ****
  	/*
  	 * Similarly to above, make a list of all known relations in this DB.
  	 */
! 	oidlist = NIL;
! 	rel = heap_open(RelationRelationId, AccessShareLock);
! 	scan = heap_beginscan(rel, SnapshotNow, 0, NULL);
! 	while ((tup = heap_getnext(scan, ForwardScanDirection)) != NULL)
! 	{
! 		oidlist = lappend_oid(oidlist, HeapTupleGetOid(tup));
! 	}
! 	heap_endscan(scan);
! 	heap_close(rel, AccessShareLock);
  
  	/*
  	 * Initialize our messages table counter to zero
--- 709,715 ----
  	/*
  	 * Similarly to above, make a list of all known relations in this DB.
  	 */
! 	htab = pgstat_collect_oids(RelationRelationId);
  
  	/*
  	 * Initialize our messages table counter to zero
***************
*** 738,750 ****
  	hash_seq_init(&hstat, dbentry->tables);
  	while ((tabentry = (PgStat_StatTabEntry *) hash_seq_search(&hstat)) != NULL)
  	{
! 		if (list_member_oid(oidlist, tabentry->tableid))
  			continue;
  
  		/*
  		 * Not there, so add this table's Oid to the message
  		 */
! 		msg.m_tableid[msg.m_nentries++] = tabentry->tableid;
  
  		/*
  		 * If the message is full, send it out and reinitialize to empty
--- 722,738 ----
  	hash_seq_init(&hstat, dbentry->tables);
  	while ((tabentry = (PgStat_StatTabEntry *) hash_seq_search(&hstat)) != NULL)
  	{
! 		Oid			tabid = tabentry->tableid;
! 
! 		CHECK_FOR_INTERRUPTS();
! 
! 		if (hash_search(htab, (void *) &tabid, HASH_FIND, NULL) != NULL)
  			continue;
  
  		/*
  		 * Not there, so add this table's Oid to the message
  		 */
! 		msg.m_tableid[msg.m_nentries++] = tabid;
  
  		/*
  		 * If the message is full, send it out and reinitialize to empty
***************
*** 776,782 ****
  	}
  
  	/* Clean up */
! 	list_free(oidlist);
  }
  
  
--- 764,813 ----
  	}
  
  	/* Clean up */
! 	hash_destroy(htab);
! }
! 
! 
! /* ----------
!  * pgstat_collect_oids() -
!  *
!  *	Collect the OIDs of either all databases or all tables, according to
!  *	the parameter, into a temporary hash table.  Caller should hash_destroy
!  *	the result when done with it.
!  * ----------
!  */
! static HTAB *
! pgstat_collect_oids(Oid catalogid)
! {
! 	HTAB	   *htab;
! 	HASHCTL		hash_ctl;
! 	Relation	rel;
! 	HeapScanDesc scan;
! 	HeapTuple	tup;
! 
! 	memset(&hash_ctl, 0, sizeof(hash_ctl));
! 	hash_ctl.keysize = sizeof(Oid);
! 	hash_ctl.entrysize = sizeof(Oid);
! 	hash_ctl.hash = oid_hash;
! 	htab = hash_create("Temporary table of OIDs",
! 					   PGSTAT_TAB_HASH_SIZE,
! 					   &hash_ctl,
! 					   HASH_ELEM | HASH_FUNCTION);
! 
! 	rel = heap_open(catalogid, AccessShareLock);
! 	scan = heap_beginscan(rel, SnapshotNow, 0, NULL);
! 	while ((tup = heap_getnext(scan, ForwardScanDirection)) != NULL)
! 	{
! 		Oid		thisoid = HeapTupleGetOid(tup);
! 
! 		CHECK_FOR_INTERRUPTS();
! 
! 		(void) hash_search(htab, (void *) &thisoid, HASH_ENTER, NULL);
! 	}
! 	heap_endscan(scan);
! 	heap_close(rel, AccessShareLock);
! 
! 	return htab;
  }