Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit d51260a

Browse files
committed
Fix wrong/misleading comments, be more consistent about where to call
ExecAssignResultTypeFromTL().
1 parent b05204a commit d51260a

File tree

6 files changed

+14
-17
lines changed

6 files changed

+14
-17
lines changed

src/backend/executor/nodeFunctionscan.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/executor/nodeFunctionscan.c,v 1.16 2002/12/15 16:17:46 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/executor/nodeFunctionscan.c,v 1.17 2003/01/12 22:01:38 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -247,7 +247,7 @@ ExecInitFunctionScan(FunctionScan *node, EState *estate)
247247
scanstate->ss.ps.ps_TupFromTlist = false;
248248

249249
/*
250-
* initialize tuple type
250+
* Initialize result tuple type and projection info.
251251
*/
252252
ExecAssignResultTypeFromTL(&scanstate->ss.ps);
253253
ExecAssignProjectionInfo(&scanstate->ss.ps);

src/backend/executor/nodeGroup.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* locate group boundaries.
1616
*
1717
* IDENTIFICATION
18-
* $Header: /cvsroot/pgsql/src/backend/executor/nodeGroup.c,v 1.54 2003/01/10 23:54:24 tgl Exp $
18+
* $Header: /cvsroot/pgsql/src/backend/executor/nodeGroup.c,v 1.55 2003/01/12 22:01:38 tgl Exp $
1919
*
2020
*-------------------------------------------------------------------------
2121
*/
@@ -180,8 +180,7 @@ ExecInitGroup(Group *node, EState *estate)
180180
ExecAssignScanTypeFromOuterPlan(&grpstate->ss);
181181

182182
/*
183-
* Initialize tuple type for both result and scan. This node does no
184-
* projection
183+
* Initialize result tuple type and projection info.
185184
*/
186185
ExecAssignResultTypeFromTL(&grpstate->ss.ps);
187186
ExecAssignProjectionInfo(&grpstate->ss.ps);

src/backend/executor/nodeIndexscan.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.76 2002/12/18 00:14:24 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.77 2003/01/12 22:01:38 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -583,9 +583,9 @@ ExecInitIndexScan(IndexScan *node, EState *estate)
583583
ExecInitScanTupleSlot(estate, &indexstate->ss);
584584

585585
/*
586-
* initialize projection info. result type comes from scan desc
587-
* below..
586+
* Initialize result tuple type and projection info.
588587
*/
588+
ExecAssignResultTypeFromTL(&indexstate->ss.ps);
589589
ExecAssignProjectionInfo(&indexstate->ss.ps);
590590

591591
/*
@@ -893,7 +893,6 @@ ExecInitIndexScan(IndexScan *node, EState *estate)
893893
* get the scan type from the relation descriptor.
894894
*/
895895
ExecAssignScanType(&indexstate->ss, RelationGetDescr(currentRelation), false);
896-
ExecAssignResultTypeFromTL(&indexstate->ss.ps);
897896

898897
/*
899898
* open the index relations and initialize relation and scan

src/backend/executor/nodeSeqscan.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/executor/nodeSeqscan.c,v 1.41 2002/12/15 16:17:46 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/executor/nodeSeqscan.c,v 1.42 2003/01/12 22:01:38 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -229,7 +229,7 @@ ExecInitSeqScan(SeqScan *node, EState *estate)
229229
scanstate->ps.ps_TupFromTlist = false;
230230

231231
/*
232-
* initialize tuple type
232+
* Initialize result tuple type and projection info.
233233
*/
234234
ExecAssignResultTypeFromTL(&scanstate->ps);
235235
ExecAssignProjectionInfo(&scanstate->ps);

src/backend/executor/nodeSubqueryscan.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
*
1414
* IDENTIFICATION
15-
* $Header: /cvsroot/pgsql/src/backend/executor/nodeSubqueryscan.c,v 1.16 2002/12/15 16:17:46 tgl Exp $
15+
* $Header: /cvsroot/pgsql/src/backend/executor/nodeSubqueryscan.c,v 1.17 2003/01/12 22:01:38 tgl Exp $
1616
*
1717
*-------------------------------------------------------------------------
1818
*/
@@ -189,7 +189,7 @@ ExecInitSubqueryScan(SubqueryScan *node, EState *estate)
189189
subquerystate->ss.ps.ps_TupFromTlist = false;
190190

191191
/*
192-
* initialize tuple type
192+
* Initialize result tuple type and projection info.
193193
*/
194194
ExecAssignResultTypeFromTL(&subquerystate->ss.ps);
195195
ExecAssignProjectionInfo(&subquerystate->ss.ps);

src/backend/executor/nodeTidscan.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/executor/nodeTidscan.c,v 1.30 2002/12/15 16:17:46 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/executor/nodeTidscan.c,v 1.31 2003/01/12 22:01:38 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -384,9 +384,9 @@ ExecInitTidScan(TidScan *node, EState *estate)
384384
ExecInitScanTupleSlot(estate, &tidstate->ss);
385385

386386
/*
387-
* initialize projection info. result type comes from scan desc
388-
* below..
387+
* Initialize result tuple type and projection info.
389388
*/
389+
ExecAssignResultTypeFromTL(&tidstate->ss.ps);
390390
ExecAssignProjectionInfo(&tidstate->ss.ps);
391391

392392
/*
@@ -431,7 +431,6 @@ ExecInitTidScan(TidScan *node, EState *estate)
431431
* get the scan type from the relation descriptor.
432432
*/
433433
ExecAssignScanType(&tidstate->ss, RelationGetDescr(currentRelation), false);
434-
ExecAssignResultTypeFromTL(&tidstate->ss.ps);
435434

436435
/*
437436
* if there are some PARAM_EXEC in skankeys then force tid rescan on

0 commit comments

Comments
 (0)