From 8ec05b28b712fa4b2de5cc088ee978e05cd7e69a Mon Sep 17 00:00:00 2001
From: Neil Conway <neilc@samurai.com>
Date: Mon, 25 Oct 2004 00:46:43 +0000
Subject: 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().
---
 src/backend/executor/execGrouping.c  | 6 +-----
 src/backend/executor/nodeIndexscan.c | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

(limited to 'src/backend/executor')

diff --git a/src/backend/executor/execGrouping.c b/src/backend/executor/execGrouping.c
index e31dc7dfcbe..6110ab8901f 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.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 2ff0121baff..0d7dbfbe350 100644
--- 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
-- 
cgit v1.2.3