aboutsummaryrefslogtreecommitdiff
path: root/src/backend/executor/nodeHash.c
diff options
context:
space:
mode:
authorMarc G. Fournier <scrappy@hub.org>1996-07-22 23:30:57 +0000
committerMarc G. Fournier <scrappy@hub.org>1996-07-22 23:30:57 +0000
commite11744e164c6fc3d10954bf1e2cf1f0b72804330 (patch)
tree97fdd7f52aea5f1d279083ecdce6ad735ad8a681 /src/backend/executor/nodeHash.c
parent5108a5b320254d108034488cb7d5e45079979667 (diff)
downloadpostgresql-e11744e164c6fc3d10954bf1e2cf1f0b72804330.tar.gz
postgresql-e11744e164c6fc3d10954bf1e2cf1f0b72804330.zip
More of Dr. George's changes...
- src/backend/catalog/* - no changes - src/backend/executor/* - change how nodeHash.c handles running out of memory - src/backend/optimizer/* - mostly cosmetic changes
Diffstat (limited to 'src/backend/executor/nodeHash.c')
-rw-r--r--src/backend/executor/nodeHash.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/src/backend/executor/nodeHash.c b/src/backend/executor/nodeHash.c
index 55a5e1f0276..3fbf230eb5b 100644
--- a/src/backend/executor/nodeHash.c
+++ b/src/backend/executor/nodeHash.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeHash.c,v 1.1.1.1 1996/07/09 06:21:26 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeHash.c,v 1.2 1996/07/22 23:30:40 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
@@ -572,6 +572,7 @@ ExecHashOverflowInsert(HashJoinTable hashtable,
newend = (RelativeAddr)LONGALIGN(hashtable->overflownext + sizeof(*otuple)
+ heapTuple->t_len);
if (newend > hashtable->bottom) {
+#if 0
elog(DEBUG, "hash table out of memory. expanding.");
/* ------------------
* XXX this is a temporary hack
@@ -586,6 +587,17 @@ ExecHashOverflowInsert(HashJoinTable hashtable,
perror("repalloc");
elog(WARN, "can't expand hashtable.");
}
+#else
+ /* ------------------
+ * XXX the temporary hack above doesn't work because things
+ * above us don't know that we've moved the hash table!
+ * - Chris Dunlop, <chris@onthe.net.au>
+ * ------------------
+ */
+ elog(WARN, "hash table out of memory. Use -B parameter to increase buffe
+rs.");
+#endif
+
}
/* ----------------