Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commite11744e

Browse files
committed
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
1 parent5108a5b commite11744e

File tree

3 files changed

+20
-7
lines changed

3 files changed

+20
-7
lines changed

‎src/backend/executor/nodeHash.c‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/executor/nodeHash.c,v 1.1.1.1 1996/07/09 06:21:26 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/executor/nodeHash.c,v 1.2 1996/07/22 23:30:40 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -572,6 +572,7 @@ ExecHashOverflowInsert(HashJoinTable hashtable,
572572
newend= (RelativeAddr)LONGALIGN(hashtable->overflownext+sizeof(*otuple)
573573
+heapTuple->t_len);
574574
if (newend>hashtable->bottom) {
575+
#if0
575576
elog(DEBUG,"hash table out of memory. expanding.");
576577
/* ------------------
577578
* XXX this is a temporary hack
@@ -586,6 +587,17 @@ ExecHashOverflowInsert(HashJoinTable hashtable,
586587
perror("repalloc");
587588
elog(WARN,"can't expand hashtable.");
588589
}
590+
#else
591+
/* ------------------
592+
* XXX the temporary hack above doesn't work because things
593+
* above us don't know that we've moved the hash table!
594+
* - Chris Dunlop, <chris@onthe.net.au>
595+
* ------------------
596+
*/
597+
elog(WARN,"hash table out of memory. Use -B parameter to increase buffe
598+
rs.");
599+
#endif
600+
589601
}
590602

591603
/* ----------------

‎src/backend/optimizer/path/costsize.c‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/costsize.c,v 1.2 1996/07/16 07:12:39 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/costsize.c,v 1.3 1996/07/22 23:30:50 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -17,7 +17,9 @@
1717
#include<limits.h>
1818
#defineMAXINT INT_MAX
1919
#else
20-
# if defined(PORTNAME_BSD44_derived)|| defined(PORTNAME_bsdi)|| defined(PORTNAME_bsdi_2_1)
20+
# if defined(PORTNAME_BSD44_derived)|| \
21+
defined(PORTNAME_bsdi)|| \
22+
defined(PORTNAME_bsdi_2_1)
2123
# include<machine/limits.h>
2224
# defineMAXINTINT_MAX
2325
# else

‎src/backend/optimizer/util/clauseinfo.c‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/clauseinfo.c,v 1.1.1.1 1996/07/09 06:21:38 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/clauseinfo.c,v 1.2 1996/07/22 23:30:57 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -146,12 +146,11 @@ get_joinvars(Oid relid,
146146

147147
if(IsA (get_leftop(clause),Var)&&
148148
(relid== (get_leftop(clause))->varno)) {
149-
150-
result1=lappendi(result1, (get_leftop(clause))->varattno);
149+
result1=lappendi(result1, (int4)(get_leftop(clause))->varattno);
151150
result2=lappend(result2,"");
152151
result3=lappendi(result3,_SELEC_CONSTANT_RIGHT_);
153152
}else {
154-
result1=lappendi(result1, (get_rightop(clause))->varattno);
153+
result1=lappendi(result1, (int4)(get_rightop(clause))->varattno);
155154
result2=lappend(result2,"");
156155
result3=lappendi(result3,_SELEC_CONSTANT_LEFT_);
157156
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp