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

Commita3855c5

Browse files
committed
Cause ExecCountSlots() accounting to bear some relationship to reality.
Rather surprising we hadn't seen bug reports about this ...
1 parent2bc1c14 commita3855c5

File tree

7 files changed

+15
-15
lines changed

7 files changed

+15
-15
lines changed

‎src/backend/executor/nodeHash.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
99
*
10-
*$Id: nodeHash.c,v 1.56 2001/03/22 06:16:12 momjian Exp $
10+
*$Id: nodeHash.c,v 1.57 2001/05/27 20:42:18 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -140,6 +140,8 @@ ExecInitHash(Hash *node, EState *estate, Plan *parent)
140140
*/
141141
ExecAssignExprContext(estate,&hashstate->cstate);
142142

143+
#defineHASH_NSLOTS 1
144+
143145
/*
144146
* initialize our result slot
145147
*/
@@ -164,7 +166,6 @@ ExecInitHash(Hash *node, EState *estate, Plan *parent)
164166
int
165167
ExecCountSlotsHash(Hash*node)
166168
{
167-
#defineHASH_NSLOTS 1
168169
returnExecCountSlotsNode(outerPlan(node))+
169170
ExecCountSlotsNode(innerPlan(node))+
170171
HASH_NSLOTS;

‎src/backend/executor/nodeIndexscan.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/nodeIndexscan.c,v 1.59 2001/03/22 06:16:13 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.60 2001/05/27 20:42:18 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -615,7 +615,7 @@ ExecInitIndexScan(IndexScan *node, EState *estate, Plan *parent)
615615
*/
616616
ExecAssignExprContext(estate,&scanstate->cstate);
617617

618-
#defineINDEXSCAN_NSLOTS3
618+
#defineINDEXSCAN_NSLOTS2
619619

620620
/*
621621
* tuple table initialization

‎src/backend/executor/nodeMaterial.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/nodeMaterial.c,v 1.35 2001/03/22 06:16:13 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/executor/nodeMaterial.c,v 1.36 2001/05/27 20:42:19 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -154,7 +154,7 @@ ExecInitMaterial(Material *node, EState *estate, Plan *parent)
154154
* ExecQual or ExecProject.
155155
*/
156156

157-
#defineMATERIAL_NSLOTS1
157+
#defineMATERIAL_NSLOTS2
158158

159159
/*
160160
* tuple table initialization

‎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.29 2001/03/22 06:16:13 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/executor/nodeSeqscan.c,v 1.30 2001/05/27 20:42:19 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -217,7 +217,7 @@ ExecInitSeqScan(SeqScan *node, EState *estate, Plan *parent)
217217
*/
218218
ExecAssignExprContext(estate,&scanstate->cstate);
219219

220-
#defineSEQSCAN_NSLOTS3
220+
#defineSEQSCAN_NSLOTS2
221221

222222
/*
223223
* tuple table initialization

‎src/backend/executor/nodeSort.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/nodeSort.c,v 1.33 2001/05/07 00:43:18 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/executor/nodeSort.c,v 1.34 2001/05/27 20:42:19 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -241,7 +241,7 @@ ExecInitSort(Sort *node, EState *estate, Plan *parent)
241241
* ExecQual or ExecProject.
242242
*/
243243

244-
#defineSORT_NSLOTS1
244+
#defineSORT_NSLOTS2
245245

246246
/*
247247
* tuple table initialization

‎src/backend/executor/nodeSubqueryscan.c

Lines changed: 2 additions & 3 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.8 2001/05/15 16:11:58 tgl Exp $
15+
* $Header: /cvsroot/pgsql/src/backend/executor/nodeSubqueryscan.c,v 1.9 2001/05/27 20:42:20 tgl Exp $
1616
*
1717
*-------------------------------------------------------------------------
1818
*/
@@ -134,7 +134,7 @@ ExecInitSubqueryScan(SubqueryScan *node, EState *estate, Plan *parent)
134134
*/
135135
ExecAssignExprContext(estate,&subquerystate->csstate.cstate);
136136

137-
#defineSUBQUERYSCAN_NSLOTS2
137+
#defineSUBQUERYSCAN_NSLOTS1
138138

139139
/*
140140
* tuple table initialization
@@ -177,7 +177,6 @@ ExecInitSubqueryScan(SubqueryScan *node, EState *estate, Plan *parent)
177177
int
178178
ExecCountSlotsSubqueryScan(SubqueryScan*node)
179179
{
180-
181180
/*
182181
* The subplan has its own tuple table and must not be counted here!
183182
*/

‎src/backend/executor/nodeTidscan.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/nodeTidscan.c,v 1.16 2001/03/22 06:16:13 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/executor/nodeTidscan.c,v 1.17 2001/05/27 20:42:20 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -411,7 +411,7 @@ ExecInitTidScan(TidScan *node, EState *estate, Plan *parent)
411411
*/
412412
ExecAssignExprContext(estate,&scanstate->cstate);
413413

414-
#defineTIDSCAN_NSLOTS3
414+
#defineTIDSCAN_NSLOTS2
415415

416416
/*
417417
* tuple table initialization

0 commit comments

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