Cause ExecCountSlots() accounting to bear some relationship to reality.

Rather surprising we hadn't seen bug reports about this ...

diff --git a/src/backend/executor/nodeHash.c b/src/backend/executor/nodeHash.c
index 45b3f8bc1052bcf93b8172f3008b1a157afe2d62..b8fed0304f508d319f8ef40162f0f390a7d452cd 100644 (file)
--- a/src/backend/executor/nodeHash.c
+++ b/src/backend/executor/nodeHash.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
- * $Id: nodeHash.c,v 1.56 2001/03/22 06:16:12 momjian Exp $
+ * $Id: nodeHash.c,v 1.57 2001/05/27 20:42:18 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -140,6 +140,8 @@ ExecInitHash(Hash *node, EState *estate, Plan *parent)
     */
    ExecAssignExprContext(estate, &hashstate->cstate);
 
+#define HASH_NSLOTS 1
+
    /*
     * initialize our result slot
     */
@@ -164,7 +166,6 @@ ExecInitHash(Hash *node, EState *estate, Plan *parent)
 int
 ExecCountSlotsHash(Hash *node)
 {
-#define HASH_NSLOTS 1
    return ExecCountSlotsNode(outerPlan(node)) +
    ExecCountSlotsNode(innerPlan(node)) +
    HASH_NSLOTS;

diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c
index 1adc49d6ff0bb0fdfc677b98f62a8d30996abc7c..5b8e2d16f0f2433f22b5a6500fd3ffae6108ebce 100644 (file)
--- a/src/backend/executor/nodeIndexscan.c
+++ b/src/backend/executor/nodeIndexscan.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.59 2001/03/22 06:16:13 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.60 2001/05/27 20:42:18 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -615,7 +615,7 @@ ExecInitIndexScan(IndexScan *node, EState *estate, Plan *parent)
     */
    ExecAssignExprContext(estate, &scanstate->cstate);
 
-#define INDEXSCAN_NSLOTS 3
+#define INDEXSCAN_NSLOTS 2
 
    /*
     * tuple table initialization

diff --git a/src/backend/executor/nodeMaterial.c b/src/backend/executor/nodeMaterial.c
index b74d37ae74490376b5b1a1f82da50b0311b08953..c4ec5c9a38c09edc725b4300aafd7241f3661f24 100644 (file)
--- a/src/backend/executor/nodeMaterial.c
+++ b/src/backend/executor/nodeMaterial.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/executor/nodeMaterial.c,v 1.35 2001/03/22 06:16:13 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/executor/nodeMaterial.c,v 1.36 2001/05/27 20:42:19 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -154,7 +154,7 @@ ExecInitMaterial(Material *node, EState *estate, Plan *parent)
     * ExecQual or ExecProject.
     */
 
-#define MATERIAL_NSLOTS 1
+#define MATERIAL_NSLOTS 2
 
    /*
     * tuple table initialization

diff --git a/src/backend/executor/nodeSeqscan.c b/src/backend/executor/nodeSeqscan.c
index 4e22845a11fcb78bbfcc56ae68097dc005ee276b..5a16b77085fde226b5ddee2d9fa5f6b75c2f33d7 100644 (file)
--- a/src/backend/executor/nodeSeqscan.c
+++ b/src/backend/executor/nodeSeqscan.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/executor/nodeSeqscan.c,v 1.29 2001/03/22 06:16:13 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/executor/nodeSeqscan.c,v 1.30 2001/05/27 20:42:19 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -217,7 +217,7 @@ ExecInitSeqScan(SeqScan *node, EState *estate, Plan *parent)
     */
    ExecAssignExprContext(estate, &scanstate->cstate);
 
-#define SEQSCAN_NSLOTS 3
+#define SEQSCAN_NSLOTS 2
 
    /*
     * tuple table initialization

diff --git a/src/backend/executor/nodeSort.c b/src/backend/executor/nodeSort.c
index e0543a2810977526886fee0d639ec76cc069463f..a83a84114254f34df77aba0313d3894473344ceb 100644 (file)
--- a/src/backend/executor/nodeSort.c
+++ b/src/backend/executor/nodeSort.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/executor/nodeSort.c,v 1.33 2001/05/07 00:43:18 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/executor/nodeSort.c,v 1.34 2001/05/27 20:42:19 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -241,7 +241,7 @@ ExecInitSort(Sort *node, EState *estate, Plan *parent)
     * ExecQual or ExecProject.
     */
 
-#define SORT_NSLOTS 1
+#define SORT_NSLOTS 2
 
    /*
     * tuple table initialization

diff --git a/src/backend/executor/nodeSubqueryscan.c b/src/backend/executor/nodeSubqueryscan.c
index 43ca323e786afee2f44c07aff4af8c2d7e80facf..af2b878165b4c2ae77b4acbe56fb9fa56ba7994b 100644 (file)
--- a/src/backend/executor/nodeSubqueryscan.c
+++ b/src/backend/executor/nodeSubqueryscan.c
@@ -12,7 +12,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/executor/nodeSubqueryscan.c,v 1.8 2001/05/15 16:11:58 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/executor/nodeSubqueryscan.c,v 1.9 2001/05/27 20:42:20 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -134,7 +134,7 @@ ExecInitSubqueryScan(SubqueryScan *node, EState *estate, Plan *parent)
     */
    ExecAssignExprContext(estate, &subquerystate->csstate.cstate);
 
-#define SUBQUERYSCAN_NSLOTS 2
+#define SUBQUERYSCAN_NSLOTS 1
 
    /*
     * tuple table initialization
@@ -177,7 +177,6 @@ ExecInitSubqueryScan(SubqueryScan *node, EState *estate, Plan *parent)
 int
 ExecCountSlotsSubqueryScan(SubqueryScan *node)
 {
-
    /*
     * The subplan has its own tuple table and must not be counted here!
     */

diff --git a/src/backend/executor/nodeTidscan.c b/src/backend/executor/nodeTidscan.c
index 01a26d593063f8b59483c229c748c26d61c5dbca..0485946938ee4e057e6745d4d113ec293a8bb5a9 100644 (file)
--- a/src/backend/executor/nodeTidscan.c
+++ b/src/backend/executor/nodeTidscan.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/executor/nodeTidscan.c,v 1.16 2001/03/22 06:16:13 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/executor/nodeTidscan.c,v 1.17 2001/05/27 20:42:20 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -411,7 +411,7 @@ ExecInitTidScan(TidScan *node, EState *estate, Plan *parent)
     */
    ExecAssignExprContext(estate, &scanstate->cstate);
 
-#define TIDSCAN_NSLOTS 3
+#define TIDSCAN_NSLOTS 2
 
    /*
     * tuple table initialization