Prevent core dump in contrib version of autovacuum when a table has been

dropped.  Per report from daveg (not his patch, though).

diff --git a/contrib/pg_autovacuum/pg_autovacuum.c b/contrib/pg_autovacuum/pg_autovacuum.c
index 0152e764b32f0e23e4fd1a604f7652c4eb4c0ee6..6e8cf55d66e5ff1df6968266a819bf0491f7b569 100644 (file)
--- a/contrib/pg_autovacuum/pg_autovacuum.c
+++ b/contrib/pg_autovacuum/pg_autovacuum.c
@@ -4,7 +4,7 @@
  * Revisions by Christopher B. Browne, Liberty RMS
  * Win32 Service code added by Dave Page
  *
- * $PostgreSQL: pgsql/contrib/pg_autovacuum/pg_autovacuum.c,v 1.27.4.4 2005/05/11 17:58:32 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/pg_autovacuum/pg_autovacuum.c,v 1.27.4.5 2005/10/20 16:14:39 tgl Exp $
  */
 
 #include "postgres_fe.h"
@@ -314,7 +314,7 @@ init_table_info(PGresult *res, int row, db_info * dbi)
 static void
 update_table_thresholds(db_info * dbi, tbl_info * tbl, int vacuum_type)
 {
-       PGresult   *res = NULL;
+       PGresult   *res;
        int                     disconnect = 0;
        char            query[128];
 
@@ -328,7 +328,7 @@ update_table_thresholds(db_info * dbi, tbl_info * tbl, int vacuum_type)
        {
                snprintf(query, sizeof(query), PAGES_QUERY, tbl->relid);
                res = send_query(query, dbi);
-               if (res != NULL)
+               if (res != NULL && PQntuples(res) > 0)
                {
                        tbl->reltuples =
                                atof(PQgetvalue(res, 0, PQfnumber(res, "reltuples")));
@@ -350,8 +350,6 @@ update_table_thresholds(db_info * dbi, tbl_info * tbl, int vacuum_type)
                                (args->analyze_base_threshold + args->analyze_scaling_factor * tbl->reltuples);
                        tbl->CountAtLastAnalyze = tbl->curr_analyze_count;
 
-                       PQclear(res);
-
                        /*
                         * If the stats collector is reporting fewer updates then we
                         * have on record then the stats were probably reset, so we
@@ -364,6 +362,8 @@ update_table_thresholds(db_info * dbi, tbl_info * tbl, int vacuum_type)
                                tbl->CountAtLastVacuum = tbl->curr_vacuum_count;
                        }
                }
+
+               PQclear(res);
        }
        if (disconnect)
                db_disconnect(dbi);