diff options
| author | Marc G. Fournier <scrappy@hub.org> | 1996-07-22 23:30:57 +0000 |
|---|---|---|
| committer | Marc G. Fournier <scrappy@hub.org> | 1996-07-22 23:30:57 +0000 |
| commit | e11744e164c6fc3d10954bf1e2cf1f0b72804330 (patch) | |
| tree | 97fdd7f52aea5f1d279083ecdce6ad735ad8a681 | |
| parent | 5108a5b320254d108034488cb7d5e45079979667 (diff) | |
| download | postgresql-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
| -rw-r--r-- | src/backend/executor/nodeHash.c | 14 | ||||
| -rw-r--r-- | src/backend/optimizer/path/costsize.c | 6 | ||||
| -rw-r--r-- | src/backend/optimizer/util/clauseinfo.c | 7 |
3 files changed, 20 insertions, 7 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 + } /* ---------------- diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c index ef6a8ea87c9..3497a77ade8 100644 --- a/src/backend/optimizer/path/costsize.c +++ b/src/backend/optimizer/path/costsize.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/costsize.c,v 1.2 1996/07/16 07:12:39 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/costsize.c,v 1.3 1996/07/22 23:30:50 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -17,7 +17,9 @@ #include <limits.h> #define MAXINT INT_MAX #else -# if defined(PORTNAME_BSD44_derived) || defined(PORTNAME_bsdi) || defined(PORTNAME_bsdi_2_1) +# if defined(PORTNAME_BSD44_derived) || \ + defined(PORTNAME_bsdi) || \ + defined(PORTNAME_bsdi_2_1) # include <machine/limits.h> # define MAXINT INT_MAX # else diff --git a/src/backend/optimizer/util/clauseinfo.c b/src/backend/optimizer/util/clauseinfo.c index 1ab747ee176..81a64d63368 100644 --- a/src/backend/optimizer/util/clauseinfo.c +++ b/src/backend/optimizer/util/clauseinfo.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/clauseinfo.c,v 1.1.1.1 1996/07/09 06:21:38 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/clauseinfo.c,v 1.2 1996/07/22 23:30:57 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -146,12 +146,11 @@ get_joinvars(Oid relid, if( IsA (get_leftop(clause),Var) && (relid == (get_leftop(clause))->varno)) { - - result1 = lappendi(result1, (get_leftop(clause))->varattno); + result1 = lappendi(result1, (int4)(get_leftop(clause))->varattno); result2 = lappend(result2, ""); result3 = lappendi(result3, _SELEC_CONSTANT_RIGHT_); } else { - result1 = lappendi(result1, (get_rightop(clause))->varattno); + result1 = lappendi(result1, (int4)(get_rightop(clause))->varattno); result2 = lappend(result2, ""); result3 = lappendi(result3, _SELEC_CONSTANT_LEFT_); } |