aboutsummaryrefslogtreecommitdiff
path: root/src/backend/executor
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/executor')
-rw-r--r--src/backend/executor/Makefile4
-rw-r--r--src/backend/executor/_deadcode/nodeTee.c (renamed from src/backend/executor/nodeTee.c)2
-rw-r--r--src/backend/executor/execAmi.c9
-rw-r--r--src/backend/executor/execMain.c5
-rw-r--r--src/backend/executor/execProcnode.c20
-rw-r--r--src/backend/executor/execTuples.c10
6 files changed, 9 insertions, 41 deletions
diff --git a/src/backend/executor/Makefile b/src/backend/executor/Makefile
index 59339d14733..4f8c1341c83 100644
--- a/src/backend/executor/Makefile
+++ b/src/backend/executor/Makefile
@@ -4,7 +4,7 @@
# Makefile for executor
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/executor/Makefile,v 1.7 1998/04/06 00:22:26 momjian Exp $
+# $Header: /cvsroot/pgsql/src/backend/executor/Makefile,v 1.8 1999/03/23 16:50:46 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -18,7 +18,7 @@ OBJS = execAmi.o execFlatten.o execJunk.o execMain.o \
execUtils.o functions.o nodeAppend.o nodeAgg.o nodeHash.o \
nodeHashjoin.o nodeIndexscan.o nodeMaterial.o nodeMergejoin.o \
nodeNestloop.o nodeResult.o nodeSeqscan.o nodeSort.o \
- nodeUnique.o nodeTee.o nodeGroup.o spi.o nodeSubplan.o
+ nodeUnique.o nodeGroup.o spi.o nodeSubplan.o
all: SUBSYS.o
diff --git a/src/backend/executor/nodeTee.c b/src/backend/executor/_deadcode/nodeTee.c
index ed9a6eea2fe..b06c700c462 100644
--- a/src/backend/executor/nodeTee.c
+++ b/src/backend/executor/_deadcode/nodeTee.c
@@ -14,7 +14,7 @@
* ExecInitTee
* ExecEndTee
*
- * $Id: nodeTee.c,v 1.30 1999/02/13 23:15:29 momjian Exp $
+ * $Id: nodeTee.c,v 1.1 1999/03/23 16:50:49 momjian Exp $
*
*-------------------------------------------------------------------------
*/
diff --git a/src/backend/executor/execAmi.c b/src/backend/executor/execAmi.c
index a25b2fa45dc..83d0c3b6cad 100644
--- a/src/backend/executor/execAmi.c
+++ b/src/backend/executor/execAmi.c
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: execAmi.c,v 1.32 1999/02/13 23:15:14 momjian Exp $
+ * $Id: execAmi.c,v 1.33 1999/03/23 16:50:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -34,7 +34,6 @@
#include "executor/nodeSeqscan.h"
#include "executor/nodeIndexscan.h"
#include "executor/nodeSort.h"
-#include "executor/nodeTee.h"
#include "executor/nodeMaterial.h"
#include "executor/nodeNestloop.h"
#include "executor/nodeHashjoin.h"
@@ -382,12 +381,6 @@ ExecReScan(Plan *node, ExprContext *exprCtxt, Plan *parent)
ExecReScanAppend((Append *) node, exprCtxt, parent);
break;
-/*
- * Tee is never used
- case T_Tee:
- ExecTeeReScan((Tee *) node, exprCtxt, parent);
- break;
- */
default:
elog(ERROR, "ExecReScan: node type %u not supported", nodeTag(node));
return;
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index 793d8d3c364..a4be9a3967c 100644
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -26,7 +26,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.81 1999/03/20 01:13:21 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.82 1999/03/23 16:50:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -884,7 +884,6 @@ ExecutePlan(EState *estate,
DestReceiver* destfunc)
{
JunkFilter *junkfilter;
-
TupleTableSlot *slot;
ItemPointer tupleid = NULL;
ItemPointerData tuple_ctid;
@@ -898,7 +897,7 @@ ExecutePlan(EState *estate,
current_tuple_count = 0;
result = NULL;
- /*
+ /*
* Set the direction.
*/
estate->es_direction = direction;
diff --git a/src/backend/executor/execProcnode.c b/src/backend/executor/execProcnode.c
index b41e3ed9d45..1b693cbcaf1 100644
--- a/src/backend/executor/execProcnode.c
+++ b/src/backend/executor/execProcnode.c
@@ -11,7 +11,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/execProcnode.c,v 1.13 1999/02/13 23:15:17 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/execProcnode.c,v 1.14 1999/03/23 16:50:48 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -90,7 +90,6 @@
#include "executor/nodeAgg.h"
#include "executor/nodeHash.h"
#include "executor/nodeHashjoin.h"
-#include "executor/nodeTee.h"
#include "executor/nodeSubplan.h"
/* ------------------------------------------------------------------------
@@ -196,10 +195,6 @@ ExecInitNode(Plan *node, EState *estate, Plan *parent)
result = ExecInitHashJoin((HashJoin *) node, estate, parent);
break;
- case T_Tee:
- result = ExecInitTee((Tee *) node, estate, parent);
- break;
-
default:
elog(ERROR, "ExecInitNode: node %d unsupported", nodeTag(node));
result = FALSE;
@@ -248,7 +243,7 @@ ExecProcNode(Plan *node, Plan *parent)
switch (nodeTag(node))
{
/* ----------------
- * control nodes
+ * control nodes
* ----------------
*/
case T_Result:
@@ -315,10 +310,6 @@ ExecProcNode(Plan *node, Plan *parent)
result = ExecHashJoin((HashJoin *) node);
break;
- case T_Tee:
- result = ExecTee((Tee *) node, parent);
- break;
-
default:
elog(ERROR, "ExecProcNode: node %d unsupported", nodeTag(node));
result = NULL;
@@ -390,9 +381,6 @@ ExecCountSlotsNode(Plan *node)
case T_HashJoin:
return ExecCountSlotsHashJoin((HashJoin *) node);
- case T_Tee:
- return ExecCountSlotsTee((Tee *) node);
-
default:
elog(ERROR, "ExecCountSlotsNode: node not yet supported: %d",
nodeTag(node));
@@ -509,10 +497,6 @@ ExecEndNode(Plan *node, Plan *parent)
ExecEndHashJoin((HashJoin *) node);
break;
- case T_Tee:
- ExecEndTee((Tee *) node, parent);
- break;
-
default:
elog(ERROR, "ExecEndNode: node %d unsupported", nodeTag(node));
break;
diff --git a/src/backend/executor/execTuples.c b/src/backend/executor/execTuples.c
index bcabdef6be4..148b6b11c17 100644
--- a/src/backend/executor/execTuples.c
+++ b/src/backend/executor/execTuples.c
@@ -14,7 +14,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.23 1999/02/13 23:15:19 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.24 1999/03/23 16:50:48 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -800,14 +800,6 @@ NodeGetResultTupleSlot(Plan *node)
}
break;
- case T_Tee:
- {
- TeeState *teestate = ((Tee *) node)->teestate;
-
- slot = teestate->cstate.cs_ResultTupleSlot;
- }
- break;
-
default:
/* ----------------
* should never get here