From e92a88272eb2b164e7e8c625ad3f7ad267e0224f Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Sun, 29 May 2005 04:23:07 +0000 Subject: 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. --- src/backend/executor/execGrouping.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/backend/executor') diff --git a/src/backend/executor/execGrouping.c b/src/backend/executor/execGrouping.c index 37db2bcd2f6..1bf46d815cc 100644 --- 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.14 2005/03/16 21:38:06 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/executor/execGrouping.c,v 1.15 2005/05/29 04:23:03 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -379,13 +379,9 @@ LookupTupleHashEntry(TupleHashTable hashtable, TupleTableSlot *slot, } else { - /* created new entry ... we hope */ - if (entry == NULL) - ereport(ERROR, - (errcode(ERRCODE_OUT_OF_MEMORY), - errmsg("out of memory"))); - /* + * created new entry + * * Zero any caller-requested space in the entry. (This zaps * the "key data" dynahash.c copied into the new entry, but we * don't care since we're about to overwrite it anyway.) -- cgit v1.2.3