diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2005-05-29 04:23:07 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2005-05-29 04:23:07 +0000 |
| commit | e92a88272eb2b164e7e8c625ad3f7ad267e0224f (patch) | |
| tree | 3ca62f2a6cdd52f78911a50b628f16e77e70be78 /src/backend/postmaster/pgstat.c | |
| parent | ecd70d75267ccf845e8f3976048d944e4ee35cf7 (diff) | |
| download | postgresql-e92a88272eb2b164e7e8c625ad3f7ad267e0224f.tar.gz postgresql-e92a88272eb2b164e7e8c625ad3f7ad267e0224f.zip | |
Modify hash_search() API to prevent future occurrences of the error
spotted by Qingqing Zhou. The HASH_ENTER action now automatically
fails with elog(ERROR) on out-of-memory --- which incidentally lets
us eliminate duplicate error checks in quite a bunch of places. If
you really need the old return-NULL-on-out-of-memory behavior, you
can ask for HASH_ENTER_NULL. But there is now an Assert in that path
checking that you aren't hoping to get that behavior in a palloc-based
hash table.
Along the way, remove the old HASH_FIND_SAVE/HASH_REMOVE_SAVED actions,
which were not being used anywhere anymore, and were surely too ugly
and unsafe to want to see revived again.
Diffstat (limited to 'src/backend/postmaster/pgstat.c')
| -rw-r--r-- | src/backend/postmaster/pgstat.c | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c index 3d2244b0d81..b7f15ea38eb 100644 --- a/src/backend/postmaster/pgstat.c +++ b/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.94 2005/05/11 01:41:40 neilc Exp $ + * $PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.95 2005/05/29 04:23:03 tgl Exp $ * ---------- */ #include "postgres.h" @@ -2061,10 +2061,6 @@ pgstat_get_db_entry(int databaseid) result = (PgStat_StatDBEntry *) hash_search(pgStatDBHash, &databaseid, HASH_ENTER, &found); - if (result == NULL) - ereport(ERROR, - (errcode(ERRCODE_OUT_OF_MEMORY), - errmsg("out of memory in statistics collector --- abort"))); /* If not found, initialize the new one. */ if (!found) @@ -2126,10 +2122,6 @@ pgstat_sub_backend(int procpid) (void *) &procpid, HASH_ENTER, &found); - if (deadbe == NULL) - ereport(ERROR, - (errcode(ERRCODE_OUT_OF_MEMORY), - errmsg("out of memory in statistics collector --- abort"))); if (!found) { @@ -2435,12 +2427,6 @@ pgstat_read_statsfile(HTAB **dbhash, Oid onlydb, (void *) &dbbuf.databaseid, HASH_ENTER, &found); - if (dbentry == NULL) - { - ereport(ERROR, - (errcode(ERRCODE_OUT_OF_MEMORY), - errmsg("out of memory"))); - } if (found) { ereport(pgStatRunningInCollector ? LOG : WARNING, @@ -2503,10 +2489,6 @@ pgstat_read_statsfile(HTAB **dbhash, Oid onlydb, tabentry = (PgStat_StatTabEntry *) hash_search(tabhash, (void *) &tabbuf.tableid, HASH_ENTER, &found); - if (tabentry == NULL) - ereport(ERROR, - (errcode(ERRCODE_OUT_OF_MEMORY), - errmsg("out of memory"))); if (found) { @@ -2730,10 +2712,6 @@ pgstat_recv_tabstat(PgStat_MsgTabstat *msg, int len) tabentry = (PgStat_StatTabEntry *) hash_search(dbentry->tables, (void *) &(tabmsg[i].t_id), HASH_ENTER, &found); - if (tabentry == NULL) - ereport(ERROR, - (errcode(ERRCODE_OUT_OF_MEMORY), - errmsg("out of memory in statistics collector --- abort"))); if (!found) { |