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

diff --git a/src/backend/executor/nodeHash.c b/src/backend/executor/nodeHash.c
index 55a5e1f0276202995c3c58602af65da167d1b90c..3fbf230eb5b592c2927ac5685c1dd82e0006d372 100644 (file)
--- 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 ef6a8ea87c96f8c0f9a6c03d15baa4e47e0ad300..3497a77ade8899d6c39cb2685173dbaf2480caff 100644 (file)
--- 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 1ab747ee17689c09fd7b92cdb102170575dee210..81a64d63368990b72de3d4dcf4477750ad2cbaa7 100644 (file)
--- 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_);
        }