Fix wrong/misleading comments, be more consistent about where to call

ExecAssignResultTypeFromTL().

diff --git a/src/backend/executor/nodeFunctionscan.c b/src/backend/executor/nodeFunctionscan.c
index 78f6652..cb30717 100644 (file)
--- a/src/backend/executor/nodeFunctionscan.c
+++ b/src/backend/executor/nodeFunctionscan.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/executor/nodeFunctionscan.c,v 1.16 2002/12/15 16:17:46 tgl Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/executor/nodeFunctionscan.c,v 1.17 2003/01/12 22:01:38 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -247,7 +247,7 @@ ExecInitFunctionScan(FunctionScan *node, EState *estate)
        scanstate->ss.ps.ps_TupFromTlist = false;
 
        /*
-        * initialize tuple type
+        * Initialize result tuple type and projection info.
         */
        ExecAssignResultTypeFromTL(&scanstate->ss.ps);
        ExecAssignProjectionInfo(&scanstate->ss.ps);

diff --git a/src/backend/executor/nodeGroup.c b/src/backend/executor/nodeGroup.c
index b480e38..6ec0eb7 100644 (file)
--- a/src/backend/executor/nodeGroup.c
+++ b/src/backend/executor/nodeGroup.c
@@ -15,7 +15,7 @@
  *       locate group boundaries.
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/executor/nodeGroup.c,v 1.54 2003/01/10 23:54:24 tgl Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/executor/nodeGroup.c,v 1.55 2003/01/12 22:01:38 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -180,8 +180,7 @@ ExecInitGroup(Group *node, EState *estate)
        ExecAssignScanTypeFromOuterPlan(&grpstate->ss);
 
        /*
-        * Initialize tuple type for both result and scan. This node does no
-        * projection
+        * Initialize result tuple type and projection info.
         */
        ExecAssignResultTypeFromTL(&grpstate->ss.ps);
        ExecAssignProjectionInfo(&grpstate->ss.ps);

diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c
index a7cfce1..ad8680d 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.76 2002/12/18 00:14:24 tgl Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.77 2003/01/12 22:01:38 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -583,9 +583,9 @@ ExecInitIndexScan(IndexScan *node, EState *estate)
        ExecInitScanTupleSlot(estate, &indexstate->ss);
 
        /*
-        * initialize projection info.  result type comes from scan desc
-        * below..
+        * Initialize result tuple type and projection info.
         */
+       ExecAssignResultTypeFromTL(&indexstate->ss.ps);
        ExecAssignProjectionInfo(&indexstate->ss.ps);
 
        /*
@@ -893,7 +893,6 @@ ExecInitIndexScan(IndexScan *node, EState *estate)
         * get the scan type from the relation descriptor.
         */
        ExecAssignScanType(&indexstate->ss, RelationGetDescr(currentRelation), false);
-       ExecAssignResultTypeFromTL(&indexstate->ss.ps);
 
        /*
         * open the index relations and initialize relation and scan

diff --git a/src/backend/executor/nodeSeqscan.c b/src/backend/executor/nodeSeqscan.c
index 6628a9e..713dd76 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.41 2002/12/15 16:17:46 tgl Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/executor/nodeSeqscan.c,v 1.42 2003/01/12 22:01:38 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -229,7 +229,7 @@ ExecInitSeqScan(SeqScan *node, EState *estate)
        scanstate->ps.ps_TupFromTlist = false;
 
        /*
-        * initialize tuple type
+        * Initialize result tuple type and projection info.
         */
        ExecAssignResultTypeFromTL(&scanstate->ps);
        ExecAssignProjectionInfo(&scanstate->ps);

diff --git a/src/backend/executor/nodeSubqueryscan.c b/src/backend/executor/nodeSubqueryscan.c
index 4466ef3..c5ad1e9 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.16 2002/12/15 16:17:46 tgl Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/executor/nodeSubqueryscan.c,v 1.17 2003/01/12 22:01:38 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -189,7 +189,7 @@ ExecInitSubqueryScan(SubqueryScan *node, EState *estate)
        subquerystate->ss.ps.ps_TupFromTlist = false;
 
        /*
-        * initialize tuple type
+        * Initialize result tuple type and projection info.
         */
        ExecAssignResultTypeFromTL(&subquerystate->ss.ps);
        ExecAssignProjectionInfo(&subquerystate->ss.ps);

diff --git a/src/backend/executor/nodeTidscan.c b/src/backend/executor/nodeTidscan.c
index 7e35bc0..3a51057 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.30 2002/12/15 16:17:46 tgl Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/executor/nodeTidscan.c,v 1.31 2003/01/12 22:01:38 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -384,9 +384,9 @@ ExecInitTidScan(TidScan *node, EState *estate)
        ExecInitScanTupleSlot(estate, &tidstate->ss);
 
        /*
-        * initialize projection info.  result type comes from scan desc
-        * below..
+        * Initialize result tuple type and projection info.
         */
+       ExecAssignResultTypeFromTL(&tidstate->ss.ps);
        ExecAssignProjectionInfo(&tidstate->ss.ps);
 
        /*
@@ -431,7 +431,6 @@ ExecInitTidScan(TidScan *node, EState *estate)
         * get the scan type from the relation descriptor.
         */
        ExecAssignScanType(&tidstate->ss, RelationGetDescr(currentRelation), false);
-       ExecAssignResultTypeFromTL(&tidstate->ss.ps);
 
        /*
         * if there are some PARAM_EXEC in skankeys then force tid rescan on