diff options
| author | Tom Lane | 2005-05-29 04:23:07 +0000 |
|---|---|---|
| committer | Tom Lane | 2005-05-29 04:23:07 +0000 |
| commit | e92a88272eb2b164e7e8c625ad3f7ad267e0224f (patch) | |
| tree | 3ca62f2a6cdd52f78911a50b628f16e77e70be78 /contrib | |
| parent | ecd70d75267ccf845e8f3976048d944e4ee35cf7 (diff) | |
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 'contrib')
| -rw-r--r-- | contrib/dblink/dblink.c | 5 | ||||
| -rw-r--r-- | contrib/tablefunc/tablefunc.c | 4 |
2 files changed, 0 insertions, 9 deletions
diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c index f23151ac146..b216dbeea98 100644 --- a/contrib/dblink/dblink.c +++ b/contrib/dblink/dblink.c @@ -2061,11 +2061,6 @@ createNewConnection(const char *name, remoteConn * con) hentry = (remoteConnHashEnt *) hash_search(remoteConnHash, key, HASH_ENTER, &found); - if (!hentry) - ereport(ERROR, - (errcode(ERRCODE_OUT_OF_MEMORY), - errmsg("out of memory"))); - if (found) ereport(ERROR, (errcode(ERRCODE_DUPLICATE_OBJECT), diff --git a/contrib/tablefunc/tablefunc.c b/contrib/tablefunc/tablefunc.c index c364fc65954..0aa52b52814 100644 --- a/contrib/tablefunc/tablefunc.c +++ b/contrib/tablefunc/tablefunc.c @@ -144,10 +144,6 @@ do { \ snprintf(key, MAX_CATNAME_LEN - 1, "%s", CATDESC->catname); \ hentry = (crosstab_HashEnt*) hash_search(crosstab_HashTable, \ key, HASH_ENTER, &found); \ - if (hentry == NULL) \ - ereport(ERROR, \ - (errcode(ERRCODE_OUT_OF_MEMORY), \ - errmsg("out of memory"))); \ if (found) \ ereport(ERROR, \ (errcode(ERRCODE_DUPLICATE_OBJECT), \ |