Remove the pgstat_drop_relation() call from smgr_internal_unlink(), because

we don't know at that point which relation OID to tell pgstat to forget.
The code was passing the relfilenode, which is incorrect, and could possibly
cause some other relation's stats to be zeroed out.  While we could try to
clean this up, it seems much simpler and more reliable to let the next
invocation of pgstat_vacuum_tabstat() fix things; which indeed is how it
worked before I introduced the buggy code into 8.1.3 and later :-(.
Problem noticed by Itagaki Takahiro, fix is per subsequent discussion.

diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c
index ca48fdf566d4e32f4c184f8c3ba8232e67ce4e5a..d128381937fe213849cd57d0c5e924d9ac57fa40 100644 (file)
--- a/src/backend/postmaster/pgstat.c
+++ b/src/backend/postmaster/pgstat.c
@@ -964,8 +964,12 @@ pgstat_drop_database(Oid databaseid)
  *     Tell the collector that we just dropped a relation.
  *     (If the message gets lost, we will still clean the dead entry eventually
  *     via future invocations of pgstat_vacuum_tabstat().)
+ *
+ *     Currently not used for lack of any good place to call it; we rely
+ *     entirely on pgstat_vacuum_tabstat() to clean out stats for dead rels.
  * ----------
  */
+#ifdef NOT_USED
 void
 pgstat_drop_relation(Oid relid)
 {
@@ -984,6 +988,7 @@ pgstat_drop_relation(Oid relid)
        msg.m_databaseid = MyDatabaseId;
        pgstat_send(&msg, len);
 }
+#endif /* NOT_USED */
 
 
 /* ----------

diff --git a/src/backend/storage/smgr/smgr.c b/src/backend/storage/smgr/smgr.c
index 95e9d9c692b95453f7885f9ad64d20e05eaf868b..9ef216dfa14ddc58a928cb89809ed190380ed7ae 100644 (file)
--- a/src/backend/storage/smgr/smgr.c
+++ b/src/backend/storage/smgr/smgr.c
@@ -20,11 +20,11 @@
 #include "access/xact.h"
 #include "access/xlogutils.h"
 #include "commands/tablespace.h"
-#include "pgstat.h"
 #include "storage/bufmgr.h"
 #include "storage/freespace.h"
 #include "storage/ipc.h"
 #include "storage/smgr.h"
+#include "utils/hsearch.h"
 #include "utils/memutils.h"
 
 
@@ -452,13 +452,11 @@ smgr_internal_unlink(RelFileNode rnode, int which, bool isTemp, bool isRedo)
        FreeSpaceMapForgetRel(&rnode);
 
        /*
-        * Tell the stats collector to forget it immediately, too.      Skip this in
-        * recovery mode, since the stats collector likely isn't running (and if
-        * it is, pgstat.c will get confused because we aren't a real backend
-        * process).
+        * It'd be nice to tell the stats collector to forget it immediately, too.
+        * But we can't because we don't know the OID (and in cases involving
+        * relfilenode swaps, it's not always clear which table OID to forget,
+        * anyway).
         */
-       if (!InRecovery)
-               pgstat_drop_relation(rnode.relNode);
 
        /*
         * And delete the physical files.

diff --git a/src/include/pgstat.h b/src/include/pgstat.h
index ad7f1b0953c33cd8c57b42860128732039ba7074..0cd091e3daf8f18c609dc8c61d8ff9d591b8c6e0 100644 (file)
--- a/src/include/pgstat.h
+++ b/src/include/pgstat.h
@@ -486,7 +486,6 @@ extern void pgstat_ping(void);
 extern void pgstat_report_tabstat(bool force);
 extern void pgstat_vacuum_tabstat(void);
 extern void pgstat_drop_database(Oid databaseid);
-extern void pgstat_drop_relation(Oid relid);
 
 extern void pgstat_clear_snapshot(void);
 extern void pgstat_reset_counters(void);