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

Commit 344dfc0

Browse files
bmomjianbmomjian
committed
Remove Tee code, move to _deadcode.
1 parent 92781fc commit 344dfc0

File tree

13 files changed

+24
-102
lines changed

13 files changed

+24
-102
lines changed

‎src/backend/commands/explain.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* Copyright (c) 1994-5, Regents of the University of California
66
*
7-
* $Id: explain.c,v 1.32 1999/02/13 23:15:06 momjian Exp $
7+
* $Id: explain.c,v 1.33 1999/03/23 16:50:46 momjian Exp $
88
*
99
*/
1010
#include <stdio.h>
@@ -194,9 +194,6 @@ explain_outNode(StringInfo str, Plan *plan, int indent, ExplainState *es)
194194
case T_Hash:
195195
pname = "Hash";
196196
break;
197-
case T_Tee:
198-
pname = "Tee";
199-
break;
200197
default:
201198
pname = "";
202199
break;

‎src/backend/executor/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for executor
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/executor/Makefile,v 1.7 1998/04/06 00:22:26 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/executor/Makefile,v 1.8 1999/03/23 16:50:46 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -18,7 +18,7 @@ OBJS = execAmi.o execFlatten.o execJunk.o execMain.o \
1818
execUtils.o functions.o nodeAppend.o nodeAgg.o nodeHash.o \
1919
nodeHashjoin.o nodeIndexscan.o nodeMaterial.o nodeMergejoin.o \
2020
nodeNestloop.o nodeResult.o nodeSeqscan.o nodeSort.o \
21-
nodeUnique.o nodeTee.o nodeGroup.o spi.o nodeSubplan.o
21+
nodeUnique.o nodeGroup.o spi.o nodeSubplan.o
2222

2323
all: SUBSYS.o
2424

‎src/backend/executor/nodeTee.c renamed to ‎src/backend/executor/_deadcode/nodeTee.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* ExecInitTee
1515
* ExecEndTee
1616
*
17-
* $Id: nodeTee.c,v 1.30 1999/02/13 23:15:29 momjian Exp $
17+
* $Id: nodeTee.c,v 1.1 1999/03/23 16:50:49 momjian Exp $
1818
*
1919
*-------------------------------------------------------------------------
2020
*/

‎src/backend/executor/execAmi.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
* Copyright (c) 1994, Regents of the University of California
77
*
8-
* $Id: execAmi.c,v 1.32 1999/02/13 23:15:14 momjian Exp $
8+
* $Id: execAmi.c,v 1.33 1999/03/23 16:50:47 momjian Exp $
99
*
1010
*-------------------------------------------------------------------------
1111
*/
@@ -34,7 +34,6 @@
3434
#include "executor/nodeSeqscan.h"
3535
#include "executor/nodeIndexscan.h"
3636
#include "executor/nodeSort.h"
37-
#include "executor/nodeTee.h"
3837
#include "executor/nodeMaterial.h"
3938
#include "executor/nodeNestloop.h"
4039
#include "executor/nodeHashjoin.h"
@@ -382,12 +381,6 @@ ExecReScan(Plan *node, ExprContext *exprCtxt, Plan *parent)
382381
ExecReScanAppend((Append *) node, exprCtxt, parent);
383382
break;
384383

385-
/*
386-
* Tee is never used
387-
case T_Tee:
388-
ExecTeeReScan((Tee *) node, exprCtxt, parent);
389-
break;
390-
*/
391384
default:
392385
elog(ERROR, "ExecReScan: node type %u not supported", nodeTag(node));
393386
return;

‎src/backend/executor/execMain.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
*
2727
*
2828
* IDENTIFICATION
29-
* $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.81 1999/03/20 01:13:21 momjian Exp $
29+
* $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.82 1999/03/23 16:50:47 momjian Exp $
3030
*
3131
*-------------------------------------------------------------------------
3232
*/
@@ -884,7 +884,6 @@ ExecutePlan(EState *estate,
884884
DestReceiver* destfunc)
885885
{
886886
JunkFilter *junkfilter;
887-
888887
TupleTableSlot *slot;
889888
ItemPointer tupleid = NULL;
890889
ItemPointerData tuple_ctid;
@@ -898,7 +897,7 @@ ExecutePlan(EState *estate,
898897
current_tuple_count = 0;
899898
result = NULL;
900899

901-
/*
900+
/*
902901
* Set the direction.
903902
*/
904903
estate->es_direction = direction;

‎src/backend/executor/execProcnode.c

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*
1212
*
1313
* IDENTIFICATION
14-
* $Header: /cvsroot/pgsql/src/backend/executor/execProcnode.c,v 1.13 1999/02/13 23:15:17 momjian Exp $
14+
* $Header: /cvsroot/pgsql/src/backend/executor/execProcnode.c,v 1.14 1999/03/23 16:50:48 momjian Exp $
1515
*
1616
*-------------------------------------------------------------------------
1717
*/
@@ -90,7 +90,6 @@
9090
#include "executor/nodeAgg.h"
9191
#include "executor/nodeHash.h"
9292
#include "executor/nodeHashjoin.h"
93-
#include "executor/nodeTee.h"
9493
#include "executor/nodeSubplan.h"
9594

9695
/* ------------------------------------------------------------------------
@@ -196,10 +195,6 @@ ExecInitNode(Plan *node, EState *estate, Plan *parent)
196195
result = ExecInitHashJoin((HashJoin *) node, estate, parent);
197196
break;
198197

199-
case T_Tee:
200-
result = ExecInitTee((Tee *) node, estate, parent);
201-
break;
202-
203198
default:
204199
elog(ERROR, "ExecInitNode: node %d unsupported", nodeTag(node));
205200
result = FALSE;
@@ -248,7 +243,7 @@ ExecProcNode(Plan *node, Plan *parent)
248243
switch (nodeTag(node))
249244
{
250245
/* ----------------
251-
* control nodes
246+
* control nodes
252247
* ----------------
253248
*/
254249
case T_Result:
@@ -315,10 +310,6 @@ ExecProcNode(Plan *node, Plan *parent)
315310
result = ExecHashJoin((HashJoin *) node);
316311
break;
317312

318-
case T_Tee:
319-
result = ExecTee((Tee *) node, parent);
320-
break;
321-
322313
default:
323314
elog(ERROR, "ExecProcNode: node %d unsupported", nodeTag(node));
324315
result = NULL;
@@ -390,9 +381,6 @@ ExecCountSlotsNode(Plan *node)
390381
case T_HashJoin:
391382
return ExecCountSlotsHashJoin((HashJoin *) node);
392383

393-
case T_Tee:
394-
return ExecCountSlotsTee((Tee *) node);
395-
396384
default:
397385
elog(ERROR, "ExecCountSlotsNode: node not yet supported: %d",
398386
nodeTag(node));
@@ -509,10 +497,6 @@ ExecEndNode(Plan *node, Plan *parent)
509497
ExecEndHashJoin((HashJoin *) node);
510498
break;
511499

512-
case T_Tee:
513-
ExecEndTee((Tee *) node, parent);
514-
break;
515-
516500
default:
517501
elog(ERROR, "ExecEndNode: node %d unsupported", nodeTag(node));
518502
break;

‎src/backend/executor/execTuples.c

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*
1515
*
1616
* IDENTIFICATION
17-
* $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.23 1999/02/13 23:15:19 momjian Exp $
17+
* $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.24 1999/03/23 16:50:48 momjian Exp $
1818
*
1919
*-------------------------------------------------------------------------
2020
*/
@@ -800,14 +800,6 @@ NodeGetResultTupleSlot(Plan *node)
800800
}
801801
break;
802802

803-
case T_Tee:
804-
{
805-
TeeState *teestate = ((Tee *) node)->teestate;
806-
807-
slot = teestate->cstate.cs_ResultTupleSlot;
808-
}
809-
break;
810-
811803
default:
812804
/* ----------------
813805
* should never get here

‎src/backend/nodes/outfuncs.c

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
* Copyright (c) 1994, Regents of the University of California
77
*
8-
* $Id: outfuncs.c,v 1.77 1999/03/01 00:10:31 tgl Exp $
8+
* $Id: outfuncs.c,v 1.78 1999/03/23 16:50:53 momjian Exp $
99
*
1010
* NOTES
1111
* Every (plan) node in POSTGRES has an associated "out" routine which
@@ -544,20 +544,6 @@ _outHash(StringInfo str, Hash *node)
544544
node->hashtablesize);
545545
}
546546

547-
static void
548-
_outTee(StringInfo str, Tee *node)
549-
{
550-
appendStringInfo(str, " TEE ");
551-
_outPlanInfo(str, (Plan *) node);
552-
553-
appendStringInfo(str, " :leftParent %X :rightParent %X ",
554-
(int) node->leftParent,
555-
(int) node->rightParent);
556-
557-
appendStringInfo(str, " :rtentries ");
558-
_outNode(str, node->rtentries);
559-
}
560-
561547
/*****************************************************************************
562548
*
563549
* Stuff from primnodes.h.
@@ -1528,9 +1514,6 @@ _outNode(StringInfo str, void *obj)
15281514
case T_SubPlan:
15291515
_outSubPlan(str, obj);
15301516
break;
1531-
case T_Tee:
1532-
_outTee(str, obj);
1533-
break;
15341517
case T_Resdom:
15351518
_outResdom(str, obj);
15361519
break;

‎src/backend/nodes/print.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/nodes/print.c,v 1.25 1999/02/22 01:57:50 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/nodes/print.c,v 1.26 1999/03/23 16:50:54 momjian Exp $
1111
*
1212
* HISTORY
1313
* AUTHOR DATE MAJOR EVENT
@@ -339,9 +339,6 @@ plannode_type(Plan *p)
339339
case T_Hash:
340340
return "HASH";
341341
break;
342-
case T_Tee:
343-
return "TEE";
344-
break;
345342
case T_Choose:
346343
return "CHOOSE";
347344
break;

‎src/include/executor/nodeTee.h

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎src/include/nodes/execnodes.h

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: execnodes.h,v 1.26 1999/02/28 00:36:04 tgl Exp $
9+
* $Id: execnodes.h,v 1.27 1999/03/23 16:51:00 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -686,6 +686,7 @@ typedef struct HashState
686686
File *hashBatches;
687687
} HashState;
688688

689+
#ifdef NOT_USED
689690
/* -----------------------
690691
* TeeState information
691692
* leftPlace : next item in the queue unseen by the left parent
@@ -704,13 +705,14 @@ typedef struct TeeState
704705
{
705706
CommonState cstate; /* its first field is NodeTag */
706707
int tee_leftPlace,
707-
tee_rightPlace,
708-
tee_lastPlace;
708+
tee_rightPlace,
709+
tee_lastPlace;
709710
char *tee_bufferRelname;
710-
Relation tee_bufferRel;
711+
Relation tee_bufferRel;
711712
MemoryContext tee_mcxt;
712-
HeapScanDesc tee_leftScanDesc,
713-
tee_rightScanDesc;
713+
HeapScanDesc tee_leftScanDesc,
714+
tee_rightScanDesc;
714715
} TeeState;
716+
#endif
715717

716718
#endif /* EXECNODES_H */

‎src/include/nodes/nodes.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: nodes.h,v 1.47 1999/03/07 03:34:11 momjian Exp $
9+
* $Id: nodes.h,v 1.48 1999/03/23 16:51:03 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -45,7 +45,6 @@ typedef enum NodeTag
4545
T_Unique,
4646
T_Hash,
4747
T_Choose,
48-
T_Tee,
4948
T_Group,
5049
T_SubPlan,
5150

@@ -117,7 +116,6 @@ typedef enum NodeTag
117116
T_SortState,
118117
T_UniqueState,
119118
T_HashState,
120-
T_TeeState,
121119

122120
/*---------------------
123121
* TAGS FOR MEMORY NODES (memnodes.h)

‎src/include/nodes/plannodes.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: plannodes.h,v 1.23 1999/03/01 00:10:36 tgl Exp $
9+
* $Id: plannodes.h,v 1.24 1999/03/23 16:51:04 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -325,6 +325,7 @@ typedef struct Hash
325325
int hashtablesize;
326326
} Hash;
327327

328+
#ifdef NOT_USED
328329
/* -------------------
329330
* Tee node information
330331
*
@@ -344,6 +345,7 @@ typedef struct Tee
344345
* Tee may be different than the parent
345346
* plans */
346347
} Tee;
348+
#endif
347349

348350
/* ---------------------
349351
* SubPlan node

0 commit comments

Comments
 (0)