Modify hash_create() to elog(ERROR) if an error occurs, rather than

returning a NULL pointer (some callers remembered to check the return
value, but some did not -- it is safer to just bail out).

Also, cleanup pgstat.c to use elog(ERROR) rather than elog(LOG) followed
by exit().

diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c
index 2b33043c5a29aa46000be1dee741c653f2e089b0..f6c95ef1dcdedc2eb7e871b12fffc0c87d86adfa 100644 (file)
--- a/contrib/dblink/dblink.c
+++ b/contrib/dblink/dblink.c
@@ -2043,19 +2043,11 @@ static HTAB *
 createConnHash(void)
 {
    HASHCTL     ctl;
-   HTAB       *ptr;
 
    ctl.keysize = NAMEDATALEN;
    ctl.entrysize = sizeof(remoteConnHashEnt);
 
-   ptr = hash_create("Remote Con hash", NUMCONN, &ctl, HASH_ELEM);
-
-   if (!ptr)
-       ereport(ERROR,
-               (errcode(ERRCODE_OUT_OF_MEMORY),
-                errmsg("out of memory")));
-
-   return (ptr);
+   return hash_create("Remote Con hash", NUMCONN, &ctl, HASH_ELEM);
 }
 
 static void

diff --git a/src/backend/commands/prepare.c b/src/backend/commands/prepare.c
index 2a6db32788b08661536c6596bdb994263a78bc36..b618e3ae0e7e6661454c356a0894e6afa729ca98 100644 (file)
--- a/src/backend/commands/prepare.c
+++ b/src/backend/commands/prepare.c
@@ -10,7 +10,7 @@
  * Copyright (c) 2002-2004, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *   $PostgreSQL: pgsql/src/backend/commands/prepare.c,v 1.32 2004/09/13 20:06:29 tgl Exp $
+ *   $PostgreSQL: pgsql/src/backend/commands/prepare.c,v 1.33 2004/10/25 00:46:40 neilc Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -264,9 +264,6 @@ InitQueryHashTable(void)
                                   32,
                                   &hash_ctl,
                                   HASH_ELEM);
-
-   if (!prepared_queries)
-       elog(ERROR, "could not create hash table");
 }
 
 /*

diff --git a/src/backend/executor/execGrouping.c b/src/backend/executor/execGrouping.c
index e31dc7dfcbe92e02ab0d7fc46b22129e656fcc84..6110ab8901f8319d477ef69bd15d2c918bbdf348 100644 (file)
--- a/src/backend/executor/execGrouping.c
+++ b/src/backend/executor/execGrouping.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $PostgreSQL: pgsql/src/backend/executor/execGrouping.c,v 1.11 2004/08/29 05:06:42 momjian Exp $
+ *   $PostgreSQL: pgsql/src/backend/executor/execGrouping.c,v 1.12 2004/10/25 00:46:40 neilc Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -322,10 +322,6 @@ BuildTupleHashTable(int numCols, AttrNumber *keyColIdx,
    hashtable->hashtab = hash_create("TupleHashTable", (long) nbuckets,
                                     &hash_ctl,
                HASH_ELEM | HASH_FUNCTION | HASH_COMPARE | HASH_CONTEXT);
-   if (hashtable->hashtab == NULL)
-       ereport(ERROR,
-               (errcode(ERRCODE_OUT_OF_MEMORY),
-                errmsg("out of memory")));
 
    return hashtable;
 }

diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c
index 2ff0121baff509b4d2c243acfebe5e946c33b4f5..0d7dbfbe35074befab1e0c76e83522e6f590b72a 100644 (file)
--- a/src/backend/executor/nodeIndexscan.c
+++ b/src/backend/executor/nodeIndexscan.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $PostgreSQL: pgsql/src/backend/executor/nodeIndexscan.c,v 1.97 2004/08/29 05:06:42 momjian Exp $
+ *   $PostgreSQL: pgsql/src/backend/executor/nodeIndexscan.c,v 1.98 2004/10/25 00:46:40 neilc Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1045,10 +1045,6 @@ create_duphash(IndexScanState *node)
                                    nbuckets,
                                    &hash_ctl,
                               HASH_ELEM | HASH_FUNCTION | HASH_CONTEXT);
-   if (node->iss_DupHash == NULL)
-       ereport(ERROR,
-               (errcode(ERRCODE_OUT_OF_MEMORY),
-                errmsg("out of memory")));
 }
 
 int

diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c
index 7daf7af0aa582ac75bff80a0d235ba78db64d191..035f8dced9cd65b72ff8541b35922cdcb8bcaaaa 100644 (file)
--- a/src/backend/postmaster/pgstat.c
+++ b/src/backend/postmaster/pgstat.c
@@ -13,7 +13,7 @@
  *
  * Copyright (c) 2001-2004, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.81 2004/10/14 20:23:44 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.82 2004/10/25 00:46:41 neilc Exp $
  * ----------
  */
 #include "postgres.h"
@@ -1405,12 +1405,9 @@ PgstatBufferMain(int argc, char *argv[])
     * good.
     */
    if (pgpipe(pgStatPipe) < 0)
-   {
-       ereport(LOG,
+       ereport(ERROR,
                (errcode_for_socket_access(),
             errmsg("could not create pipe for statistics buffer: %m")));
-       exit(1);
-   }
 
 #ifdef EXEC_BACKEND
    /* child becomes collector process */
@@ -1420,9 +1417,8 @@ PgstatBufferMain(int argc, char *argv[])
 #endif
    {
        case -1:
-           ereport(LOG,
+           ereport(ERROR,
                    (errmsg("could not fork statistics collector: %m")));
-           exit(1);
 
 #ifndef EXEC_BACKEND
        case 0:
@@ -1529,14 +1525,6 @@ PgstatCollectorMain(int argc, char *argv[])
    hash_ctl.hash = tag_hash;
    pgStatBeDead = hash_create("Dead Backends", PGSTAT_BE_HASH_SIZE,
                               &hash_ctl, HASH_ELEM | HASH_FUNCTION);
-   if (pgStatBeDead == NULL)
-   {
-       /* assume the problem is out-of-memory */
-       ereport(LOG,
-               (errcode(ERRCODE_OUT_OF_MEMORY),
-            errmsg("out of memory in statistics collector --- abort")));
-       exit(1);
-   }
 
    /*
     * Create the known backends table
@@ -1544,12 +1532,9 @@ PgstatCollectorMain(int argc, char *argv[])
    pgStatBeTable = (PgStat_StatBeEntry *) malloc(
                               sizeof(PgStat_StatBeEntry) * MaxBackends);
    if (pgStatBeTable == NULL)
-   {
-       ereport(LOG,
+       ereport(ERROR,
                (errcode(ERRCODE_OUT_OF_MEMORY),
             errmsg("out of memory in statistics collector --- abort")));
-       exit(1);
-   }
    memset(pgStatBeTable, 0, sizeof(PgStat_StatBeEntry) * MaxBackends);
 
    readPipe = pgStatPipe[0];
@@ -1605,10 +1590,9 @@ PgstatCollectorMain(int argc, char *argv[])
        {
            if (errno == EINTR)
                continue;
-           ereport(LOG,
+           ereport(ERROR,
                    (errcode_for_socket_access(),
                 errmsg("select() failed in statistics collector: %m")));
-           exit(1);
        }
 
        /*
@@ -1647,10 +1631,9 @@ PgstatCollectorMain(int argc, char *argv[])
                {
                    if (errno == EINTR)
                        continue;
-                   ereport(LOG,
+                   ereport(ERROR,
                            (errcode_for_socket_access(),
                             errmsg("could not read from statistics collector pipe: %m")));
-                   exit(1);
                }
                if (len == 0)   /* EOF on the pipe! */
                {
@@ -1670,9 +1653,8 @@ PgstatCollectorMain(int argc, char *argv[])
                         * sync with the buffer process somehow. Abort so
                         * that we can restart both processes.
                         */
-                       ereport(LOG,
+                       ereport(ERROR,
                          (errmsg("invalid statistics message length")));
-                       exit(1);
                    }
                }
            }
@@ -1815,24 +1797,18 @@ pgstat_recvbuffer(void)
     * the collector falls behind.
     */
    if (!set_noblock(writePipe))
-   {
-       ereport(LOG,
+       ereport(ERROR,
                (errcode_for_socket_access(),
                 errmsg("could not set statistics collector pipe to nonblocking mode: %m")));
-       exit(1);
-   }
 
    /*
     * Allocate the message buffer
     */
    msgbuffer = (char *) malloc(PGSTAT_RECVBUFFERSZ);
    if (msgbuffer == NULL)
-   {
-       ereport(LOG,
+       ereport(ERROR,
                (errcode(ERRCODE_OUT_OF_MEMORY),
             errmsg("out of memory in statistics collector --- abort")));
-       exit(1);
-   }
 
    /*
     * Loop forever
@@ -1887,10 +1863,9 @@ pgstat_recvbuffer(void)
        {
            if (errno == EINTR)
                continue;
-           ereport(LOG,
+           ereport(ERROR,
                    (errcode_for_socket_access(),
                     errmsg("select() failed in statistics buffer: %m")));
-           exit(1);
        }
 
        /*
@@ -1902,12 +1877,9 @@ pgstat_recvbuffer(void)
            len = recv(pgStatSock, (char *) &input_buffer,
                       sizeof(PgStat_Msg), 0);
            if (len < 0)
-           {
-               ereport(LOG,
+               ereport(ERROR,
                        (errcode_for_socket_access(),
                       errmsg("could not read statistics message: %m")));
-               exit(1);
-           }
 
            /*
             * We ignore messages that are smaller than our common header
@@ -1968,10 +1940,9 @@ pgstat_recvbuffer(void)
            {
                if (errno == EINTR || errno == EAGAIN)
                    continue;   /* not enough space in pipe */
-               ereport(LOG,
+               ereport(ERROR,
                        (errcode_for_socket_access(),
                         errmsg("could not write to statistics collector pipe: %m")));
-               exit(1);
            }
            /* NB: len < xfr is okay */
            msg_send += len;
@@ -2093,12 +2064,9 @@ pgstat_add_backend(PgStat_MsgHdr *msg)
                                           (void *) &(msg->m_databaseid),
                                                 HASH_ENTER, &found);
    if (dbentry == NULL)
-   {
-       ereport(LOG,
+       ereport(ERROR,
                (errcode(ERRCODE_OUT_OF_MEMORY),
             errmsg("out of memory in statistics collector --- abort")));
-       exit(1);
-   }
 
    /*
     * If not found, initialize the new one.
@@ -2123,14 +2091,6 @@ pgstat_add_backend(PgStat_MsgHdr *msg)
                                      PGSTAT_TAB_HASH_SIZE,
                                      &hash_ctl,
                                      HASH_ELEM | HASH_FUNCTION);
-       if (dbentry->tables == NULL)
-       {
-           /* assume the problem is out-of-memory */
-           ereport(LOG,
-                   (errcode(ERRCODE_OUT_OF_MEMORY),
-            errmsg("out of memory in statistics collector --- abort")));
-           exit(1);
-       }
    }
 
    /*
@@ -2179,12 +2139,10 @@ pgstat_sub_backend(int procpid)
                                                       HASH_ENTER,
                                                       &found);
            if (deadbe == NULL)
-           {
-               ereport(LOG,
+               ereport(ERROR,
                        (errcode(ERRCODE_OUT_OF_MEMORY),
                         errmsg("out of memory in statistics collector --- abort")));
-               exit(1);
-           }
+
            if (!found)
            {
                deadbe->backendid = i + 1;
@@ -2256,12 +2214,9 @@ pgstat_write_statsfile(void)
                if (hash_search(pgStatDBHash,
                                (void *) &(dbentry->databaseid),
                                HASH_REMOVE, NULL) == NULL)
-               {
-                   ereport(LOG,
+                   ereport(ERROR,
                            (errmsg("database hash table corrupted "
                                    "during cleanup --- abort")));
-                   exit(1);
-               }
            }
 
            /*
@@ -2294,12 +2249,11 @@ pgstat_write_statsfile(void)
                                    (void *) &(tabentry->tableid),
                                    HASH_REMOVE, NULL) == NULL)
                    {
-                       ereport(LOG,
+                       ereport(ERROR,
                                (errmsg("tables hash table for "
                                        "database %u corrupted during "
                                        "cleanup --- abort",
                                        dbentry->databaseid)));
-                       exit(1);
                    }
                }
                continue;
@@ -2374,10 +2328,9 @@ pgstat_write_statsfile(void)
                            (void *) &(deadbe->procpid),
                            HASH_REMOVE, NULL) == NULL)
            {
-               ereport(LOG,
+               ereport(ERROR,
                      (errmsg("dead-server-process hash table corrupted "
                              "during cleanup --- abort")));
-               exit(1);
            }
        }
    }
@@ -2436,21 +2389,6 @@ pgstat_read_statsfile(HTAB **dbhash, Oid onlydb,
    hash_ctl.hcxt = use_mcxt;
    *dbhash = hash_create("Databases hash", PGSTAT_DB_HASH_SIZE, &hash_ctl,
                          HASH_ELEM | HASH_FUNCTION | mcxt_flags);
-   if (*dbhash == NULL)
-   {
-       /* assume the problem is out-of-memory */
-       if (pgStatRunningInCollector)
-       {
-           ereport(LOG,
-                   (errcode(ERRCODE_OUT_OF_MEMORY),
-            errmsg("out of memory in statistics collector --- abort")));
-           exit(1);
-       }
-       /* in backend, can do normal error */
-       ereport(ERROR,
-               (errcode(ERRCODE_OUT_OF_MEMORY),
-                errmsg("out of memory")));
-   }
 
    /*
     * Initialize the number of known backends to zero, just in case we do
@@ -2512,20 +2450,10 @@ pgstat_read_statsfile(HTAB **dbhash, Oid onlydb,
                                                             &found);
                if (dbentry == NULL)
                {
-                   if (pgStatRunningInCollector)
-                   {
-                       ereport(LOG,
-                               (errcode(ERRCODE_OUT_OF_MEMORY),
-                                errmsg("out of memory in statistics collector --- abort")));
-                       exit(1);
-                   }
-                   else
-                   {
-                       fclose(fpin);
-                       ereport(ERROR,
-                               (errcode(ERRCODE_OUT_OF_MEMORY),
-                                errmsg("out of memory")));
-                   }
+                   fclose(fpin);
+                   ereport(ERROR,
+                           (errcode(ERRCODE_OUT_OF_MEMORY),
+                            errmsg("out of memory")));
                }
                if (found)
                {
@@ -2551,26 +2479,19 @@ pgstat_read_statsfile(HTAB **dbhash, Oid onlydb,
                hash_ctl.entrysize = sizeof(PgStat_StatTabEntry);
                hash_ctl.hash = tag_hash;
                hash_ctl.hcxt = use_mcxt;
-               dbentry->tables = hash_create("Per-database table",
-                                             PGSTAT_TAB_HASH_SIZE,
-                                             &hash_ctl,
-                                HASH_ELEM | HASH_FUNCTION | mcxt_flags);
-               if (dbentry->tables == NULL)
+               PG_TRY();
+               {
+                   dbentry->tables = hash_create("Per-database table",
+                                                 PGSTAT_TAB_HASH_SIZE,
+                                                 &hash_ctl,
+                                                 HASH_ELEM | HASH_FUNCTION | mcxt_flags);
+               }
+               PG_CATCH();
                {
-                   /* assume the problem is out-of-memory */
-                   if (pgStatRunningInCollector)
-                   {
-                       ereport(LOG,
-                               (errcode(ERRCODE_OUT_OF_MEMORY),
-                                errmsg("out of memory in statistics collector --- abort")));
-                       exit(1);
-                   }
-                   /* in backend, can do normal error */
                    fclose(fpin);
-                   ereport(ERROR,
-                           (errcode(ERRCODE_OUT_OF_MEMORY),
-                            errmsg("out of memory")));
+                   PG_RE_THROW();
                }
+               PG_END_TRY();
 
                /*
                 * Arrange that following 'T's add entries to this
@@ -2609,14 +2530,6 @@ pgstat_read_statsfile(HTAB **dbhash, Oid onlydb,
                                                     HASH_ENTER, &found);
                if (tabentry == NULL)
                {
-                   if (pgStatRunningInCollector)
-                   {
-                       ereport(LOG,
-                               (errcode(ERRCODE_OUT_OF_MEMORY),
-                                errmsg("out of memory in statistics collector --- abort")));
-                       exit(1);
-                   }
-                   /* in backend, can do normal error */
                    fclose(fpin);
                    ereport(ERROR,
                            (errcode(ERRCODE_OUT_OF_MEMORY),
@@ -2860,12 +2773,9 @@ pgstat_recv_tabstat(PgStat_MsgTabstat *msg, int len)
                                              (void *) &(tabmsg[i].t_id),
                                                     HASH_ENTER, &found);
        if (tabentry == NULL)
-       {
-           ereport(LOG,
+           ereport(ERROR,
                    (errcode(ERRCODE_OUT_OF_MEMORY),
             errmsg("out of memory in statistics collector --- abort")));
-           exit(1);
-       }
 
        if (!found)
        {
@@ -3040,12 +2950,4 @@ pgstat_recv_resetcounter(PgStat_MsgResetcounter *msg, int len)
                                  PGSTAT_TAB_HASH_SIZE,
                                  &hash_ctl,
                                  HASH_ELEM | HASH_FUNCTION);
-   if (dbentry->tables == NULL)
-   {
-       /* assume the problem is out-of-memory */
-       ereport(LOG,
-               (errcode(ERRCODE_OUT_OF_MEMORY),
-            errmsg("out of memory in statistics collector --- abort")));
-       exit(1);
-   }
 }

diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c
index e53415cc5f862e073e9d38ef4af86bad26684efe..6fcb4d434321534bcc0a5fc0bc6fead727529973 100644 (file)
--- a/src/backend/storage/lmgr/lock.c
+++ b/src/backend/storage/lmgr/lock.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $PostgreSQL: pgsql/src/backend/storage/lmgr/lock.c,v 1.142 2004/09/29 15:15:55 tgl Exp $
+ *   $PostgreSQL: pgsql/src/backend/storage/lmgr/lock.c,v 1.143 2004/10/25 00:46:41 neilc Exp $
  *
  * NOTES
  *   Outside modules can create a lock table and acquire/release
@@ -335,9 +335,6 @@ LockMethodTableInit(const char *tabName,
                                                    &info,
                                                    hash_flags);
 
-   if (!LockMethodLocalHash[lockmethodid])
-       elog(FATAL, "could not initialize lock table \"%s\"", tabName);
-
    pfree(shmemName);
 
    return lockmethodid;

diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c
index 3bb4a05d07b70d4da39f5290277031ef0cccb6e8..3847608a8271fe2b586b89f10b0dbc8997d98490 100644 (file)
--- a/src/backend/storage/smgr/md.c
+++ b/src/backend/storage/smgr/md.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $PostgreSQL: pgsql/src/backend/storage/smgr/md.c,v 1.112 2004/08/30 03:52:43 tgl Exp $
+ *   $PostgreSQL: pgsql/src/backend/storage/smgr/md.c,v 1.113 2004/10/25 00:46:42 neilc Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -132,10 +132,6 @@ mdinit(void)
                                      100L,
                                      &hash_ctl,
                               HASH_ELEM | HASH_FUNCTION | HASH_CONTEXT);
-       if (pendingOpsTable == NULL)
-           ereport(FATAL,
-                   (errcode(ERRCODE_OUT_OF_MEMORY),
-                    errmsg("out of memory")));
    }
 
    return true;

diff --git a/src/backend/utils/fmgr/fmgr.c b/src/backend/utils/fmgr/fmgr.c
index b3f6ec0f5ef002dd543124bfa3423b9240a7cdd3..b151edd6332565bbe6eeb20b4ba0c269d070c722 100644 (file)
--- a/src/backend/utils/fmgr/fmgr.c
+++ b/src/backend/utils/fmgr/fmgr.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $PostgreSQL: pgsql/src/backend/utils/fmgr/fmgr.c,v 1.85 2004/10/01 20:39:54 tgl Exp $
+ *   $PostgreSQL: pgsql/src/backend/utils/fmgr/fmgr.c,v 1.86 2004/10/25 00:46:42 neilc Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -515,10 +515,6 @@ record_C_func(HeapTuple procedureTuple,
                                100,
                                &hash_ctl,
                                HASH_ELEM | HASH_FUNCTION);
-       if (CFuncHash == NULL)
-           ereport(ERROR,
-                   (errcode(ERRCODE_OUT_OF_MEMORY),
-                    errmsg("out of memory")));
    }
 
    entry = (CFuncHashTabEntry *)

diff --git a/src/backend/utils/hash/dynahash.c b/src/backend/utils/hash/dynahash.c
index 020589ba7b1bda9a9dea45cb4e677a4a57132edb..cf4e60e3c427d312a0263c08384da9469b38d1bd 100644 (file)
--- a/src/backend/utils/hash/dynahash.c
+++ b/src/backend/utils/hash/dynahash.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *   $PostgreSQL: pgsql/src/backend/utils/hash/dynahash.c,v 1.55 2004/10/22 07:21:06 neilc Exp $
+ *   $PostgreSQL: pgsql/src/backend/utils/hash/dynahash.c,v 1.56 2004/10/25 00:46:43 neilc Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -120,8 +120,6 @@ hash_create(const char *tabname, long nelem, HASHCTL *info, int flags)
 
    /* Initialize the hash header */
    hashp = (HTAB *) MEM_ALLOC(sizeof(HTAB));
-   if (!hashp)
-       return NULL;
    MemSet(hashp, 0, sizeof(HTAB));
 
    hashp->tabname = (char *) MEM_ALLOC(strlen(tabname) + 1);
@@ -175,7 +173,9 @@ hash_create(const char *tabname, long nelem, HASHCTL *info, int flags)
    {
        hashp->hctl = (HASHHDR *) hashp->alloc(sizeof(HASHHDR));
        if (!hashp->hctl)
-           return NULL;
+           ereport(ERROR,
+                   (errcode(ERRCODE_OUT_OF_MEMORY),
+                    errmsg("out of memory")));
    }
 
    hdefault(hashp);
@@ -231,7 +231,7 @@ hash_create(const char *tabname, long nelem, HASHCTL *info, int flags)
    if (!init_htab(hashp, nelem))
    {
        hash_destroy(hashp);
-       return NULL;
+       elog(ERROR, "failed to initialize hash table");
    }
 
    /*
@@ -243,7 +243,9 @@ hash_create(const char *tabname, long nelem, HASHCTL *info, int flags)
        if (!element_alloc(hashp, (int) nelem))
        {
            hash_destroy(hashp);
-           return NULL;
+           ereport(ERROR,
+                   (errcode(ERRCODE_OUT_OF_MEMORY),
+                    errmsg("out of memory")));
        }
    }