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
This commit is contained in:
parent
5108a5b320
commit
e11744e164
|
@ -7,7 +7,7 @@
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* 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)
|
newend = (RelativeAddr)LONGALIGN(hashtable->overflownext + sizeof(*otuple)
|
||||||
+ heapTuple->t_len);
|
+ heapTuple->t_len);
|
||||||
if (newend > hashtable->bottom) {
|
if (newend > hashtable->bottom) {
|
||||||
|
#if 0
|
||||||
elog(DEBUG, "hash table out of memory. expanding.");
|
elog(DEBUG, "hash table out of memory. expanding.");
|
||||||
/* ------------------
|
/* ------------------
|
||||||
* XXX this is a temporary hack
|
* XXX this is a temporary hack
|
||||||
|
@ -586,6 +587,17 @@ ExecHashOverflowInsert(HashJoinTable hashtable,
|
||||||
perror("repalloc");
|
perror("repalloc");
|
||||||
elog(WARN, "can't expand hashtable.");
|
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
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ----------------
|
/* ----------------
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* 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>
|
#include <limits.h>
|
||||||
#define MAXINT INT_MAX
|
#define MAXINT INT_MAX
|
||||||
#else
|
#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>
|
# include <machine/limits.h>
|
||||||
# define MAXINT INT_MAX
|
# define MAXINT INT_MAX
|
||||||
# else
|
# else
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* 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) &&
|
if( IsA (get_leftop(clause),Var) &&
|
||||||
(relid == (get_leftop(clause))->varno)) {
|
(relid == (get_leftop(clause))->varno)) {
|
||||||
|
result1 = lappendi(result1, (int4)(get_leftop(clause))->varattno);
|
||||||
result1 = lappendi(result1, (get_leftop(clause))->varattno);
|
|
||||||
result2 = lappend(result2, "");
|
result2 = lappend(result2, "");
|
||||||
result3 = lappendi(result3, _SELEC_CONSTANT_RIGHT_);
|
result3 = lappendi(result3, _SELEC_CONSTANT_RIGHT_);
|
||||||
} else {
|
} else {
|
||||||
result1 = lappendi(result1, (get_rightop(clause))->varattno);
|
result1 = lappendi(result1, (int4)(get_rightop(clause))->varattno);
|
||||||
result2 = lappend(result2, "");
|
result2 = lappend(result2, "");
|
||||||
result3 = lappendi(result3, _SELEC_CONSTANT_LEFT_);
|
result3 = lappendi(result3, _SELEC_CONSTANT_LEFT_);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue