7 files changed, 7 insertions, 70 deletions
diff --git a/src/include/executor/execFlatten.h b/src/include/executor/execFlatten.h
index e42d5e09d97..6a7f26a729b 100644
--- a/src/include/executor/execFlatten.h
+++ b/src/include/executor/execFlatten.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: execFlatten.h,v 1.1 1996/08/28 07:22:04 scrappy Exp $
+ * $Id: execFlatten.h,v 1.2 1997/08/19 21:38:12 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,8 +17,6 @@ extern Datum ExecEvalIter(Iter *iterNode, ExprContext *econtext, bool *resultIsN
 
 extern void ExecEvalFjoin(TargetEntry *tlist, ExprContext *econtext, bool *isNullVect, bool *fj_isDone);
 
-extern bool FjoinBumpOuterNodes(TargetEntry *tlist, ExprContext *econtext, DatumPtr results, char *nulls);
-
 
 #endif /* EXECFLATTEN_H */
 
diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h
index c3a58716c53..6a525fbece0 100644
--- a/src/include/executor/executor.h
+++ b/src/include/executor/executor.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: executor.h,v 1.8 1997/05/31 16:52:19 momjian Exp $
+ * $Id: executor.h,v 1.9 1997/08/19 21:38:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -29,9 +29,6 @@
 extern void ExecOpenScanR(Oid relOid, int nkeys, ScanKey skeys, bool isindex,
 		   ScanDirection dir, TimeQual timeRange,
 		   Relation *returnRelation, Pointer *returnScanDesc);
-extern Relation ExecOpenR(Oid relationOid, bool isindex);
-extern Pointer ExecBeginScan(Relation relation, int nkeys, ScanKey skeys,
-		      bool isindex, ScanDirection dir, TimeQual time_range);
 extern void ExecCloseR(Plan *node);
 extern void ExecReScan(Plan *node, ExprContext *exprCtxt, Plan *parent);
 extern HeapScanDesc ExecReScanR(Relation relDesc, HeapScanDesc scanDesc,
@@ -52,7 +49,6 @@ extern HeapTuple ExecRemoveJunk(JunkFilter *junkfilter, TupleTableSlot *slot);
 /*
  * prototypes from functions in execMain.c
  */
-extern int ExecutorLimit(int limit);
 extern TupleDesc ExecutorStart(QueryDesc *queryDesc, EState *estate);
 extern TupleTableSlot* ExecutorRun(QueryDesc *queryDesc, EState *estate, int feature, int count);
 extern void ExecutorEnd(QueryDesc *queryDesc, EState *estate);
@@ -73,31 +69,13 @@ extern int 	execConstLen;
 
 extern Datum ExecExtractResult(TupleTableSlot *slot, AttrNumber attnum,
 			bool *isNull);
-extern Datum ExecEvalVar(Var *variable, ExprContext *econtext, bool *isNull);
 extern Datum ExecEvalParam(Param *expression, ExprContext *econtext,
 			   bool *isNull);
-extern char *GetAttributeByNum(TupleTableSlot *slot, AttrNumber attrno,
-			bool *isNull);
-extern char *att_by_num(TupleTableSlot *slot, AttrNumber attrno,
-			bool *isNull);
 /* stop here */
 extern char *GetAttributeByName(TupleTableSlot *slot, char *attname,
 				bool *isNull);
-extern char *att_by_name(TupleTableSlot *slot, char *attname, bool *isNull);
-extern void ExecEvalFuncArgs(FunctionCachePtr fcache, ExprContext *econtext,
-		      List *argList, Datum argV[], bool *argIsDone);
-extern Datum ExecMakeFunctionResult(Node *node, List *arguments,
-		ExprContext *econtext, bool *isNull, bool *isDone);
-extern Datum ExecEvalOper(Expr *opClause, ExprContext *econtext,
-			  bool *isNull);
-extern Datum ExecEvalFunc(Expr *funcClause, ExprContext *econtext,
-			  bool *isNull, bool *isDone);
-extern Datum ExecEvalNot(Expr *notclause, ExprContext *econtext, bool *isNull);
-extern Datum ExecEvalOr(Expr *orExpr, ExprContext *econtext, bool *isNull);
-extern Datum ExecEvalAnd(Expr *andExpr, ExprContext *econtext, bool *isNull);
 extern Datum ExecEvalExpr(Node *expression, ExprContext *econtext, bool *isNull,
 			  bool *isDone);
-extern bool ExecQualClause(Node *clause, ExprContext *econtext);
 extern bool ExecQual(List *qual, ExprContext *econtext);
 extern int ExecTargetListLength(List *targetlist);
 extern TupleTableSlot *ExecProject(ProjectionInfo *projInfo, bool *isDone);
@@ -118,24 +96,17 @@ extern TupleTableSlot* ExecStoreTuple(HeapTuple tuple,
 				      Buffer buffer,
 				      bool shouldFree);
 extern TupleTableSlot* ExecClearTuple(TupleTableSlot* slot);
-extern bool ExecSlotPolicy(TupleTableSlot *slot);
 extern bool ExecSetSlotPolicy(TupleTableSlot *slot, bool shouldFree);
 extern TupleDesc ExecSetSlotDescriptor(TupleTableSlot *slot,
 				       TupleDesc tupdesc);
 extern void ExecSetSlotDescriptorIsNew(TupleTableSlot *slot, bool isNew);
-extern TupleDesc ExecSetNewSlotDescriptor(TupleTableSlot *slot,
-					  TupleDesc tupdesc);
-extern Buffer ExecSetSlotBuffer(TupleTableSlot *slot, Buffer b);
 extern void ExecIncrSlotBufferRefcnt(TupleTableSlot *slot);
 extern bool TupIsNull(TupleTableSlot* slot);
-extern bool ExecSlotDescriptorIsNew(TupleTableSlot *slot);
 extern void ExecInitResultTupleSlot(EState *estate, CommonState *commonstate);
 extern void ExecInitScanTupleSlot(EState *estate,
 				  CommonScanState *commonscanstate);
 extern void ExecInitMarkedTupleSlot(EState *estate, MergeJoinState *mergestate);
 extern void ExecInitOuterTupleSlot(EState *estate, HashJoinState *hashstate);
-extern void ExecInitHashTupleSlot(EState *estate, HashJoinState *hashstate);
-extern TupleTableSlot *NodeGetResultTupleSlot(Plan *node);
 
 extern TupleDesc ExecGetTupType(Plan *node);
 extern TupleDesc ExecTypeFromTL(List *targetList);
@@ -144,7 +115,6 @@ extern TupleDesc ExecTypeFromTL(List *targetList);
  * prototypes from functions in execTuples.c
  */
 extern void ResetTupleCount(void);
-extern void DisplayTupleCount(FILE *statfp);
 extern void ExecAssignNodeBaseInfo(EState *estate, CommonState *basenode,
 				   Plan *parent);
 extern void ExecAssignExprContext(EState *estate, CommonState *commonstate);
@@ -154,24 +124,18 @@ extern void ExecAssignResultTypeFromOuterPlan(Plan *node,
 		CommonState *commonstate);
 extern void ExecAssignResultTypeFromTL(Plan *node, CommonState *commonstate);
 extern TupleDesc ExecGetResultType(CommonState *commonstate);
-extern void ExecFreeResultType(CommonState *commonstate);
 extern void ExecAssignProjectionInfo(Plan *node, CommonState *commonstate);
 extern void ExecFreeProjectionInfo(CommonState *commonstate);
 extern TupleDesc ExecGetScanType(CommonScanState *csstate);
-extern void ExecFreeScanType(CommonScanState *csstate);
 extern void ExecAssignScanType(CommonScanState	*csstate,
 			       TupleDesc tupDesc);
 extern void ExecAssignScanTypeFromOuterPlan(Plan *node,
 					    CommonScanState *csstate);
 extern AttributeTupleForm ExecGetTypeInfo(Relation relDesc);
 
-extern void ExecGetIndexKeyInfo(IndexTupleForm indexTuple, int *numAttsOutP,
-		 AttrNumber **attsOutP, FuncIndexInfoPtr fInfoP);
 extern void ExecOpenIndices(Oid resultRelationOid,
 			    RelationInfo *resultRelationInfo);
 extern void ExecCloseIndices(RelationInfo *resultRelationInfo);
-extern IndexTuple ExecFormIndexTuple(HeapTuple heapTuple,
-	Relation heapRelation, Relation indexRelation, IndexInfo *indexInfo);
 extern void ExecInsertIndexTuples(TupleTableSlot *slot, ItemPointer tupleid,
 				      EState *estate, bool is_update);
 extern void resetVarAttrLenForCreateTable(TupleDesc tupType);
diff --git a/src/include/executor/nodeAppend.h b/src/include/executor/nodeAppend.h
index 76c6c91a391..f2ac25c2aee 100644
--- a/src/include/executor/nodeAppend.h
+++ b/src/include/executor/nodeAppend.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeAppend.h,v 1.1 1996/08/28 07:22:15 scrappy Exp $
+ * $Id: nodeAppend.h,v 1.2 1997/08/19 21:38:19 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	NODEAPPEND_H
 #define	NODEAPPEND_H
 
-extern bool exec_append_initialize_next(Append *node);
 extern bool ExecInitAppend(Append *node, EState *estate, Plan *parent);
 extern int ExecCountSlotsAppend(Append *node);
 extern TupleTableSlot *ExecProcAppend(Append *node);
diff --git a/src/include/executor/nodeHash.h b/src/include/executor/nodeHash.h
index 2427958d145..b588b44531b 100644
--- a/src/include/executor/nodeHash.h
+++ b/src/include/executor/nodeHash.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeHash.h,v 1.1 1996/08/28 07:22:18 scrappy Exp $
+ * $Id: nodeHash.h,v 1.2 1997/08/19 21:38:20 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,19 +17,15 @@ extern TupleTableSlot *ExecHash(Hash *node);
 extern bool ExecInitHash(Hash *node, EState *estate, Plan *parent);
 extern int ExecCountSlotsHash(Hash *node);
 extern void ExecEndHash(Hash *node);
-extern RelativeAddr hashTableAlloc(int size, HashJoinTable hashtable);
 extern HashJoinTable ExecHashTableCreate(Hash *node);
 extern void ExecHashTableInsert(HashJoinTable hashtable, ExprContext *econtext,
 				Var *hashkey, File *batches);
 extern void ExecHashTableDestroy(HashJoinTable hashtable);
 extern int ExecHashGetBucket(HashJoinTable hashtable, ExprContext *econtext,
 			     Var *hashkey);
-extern void ExecHashOverflowInsert(HashJoinTable hashtable, HashBucket bucket,
-				   HeapTuple heapTuple);
 extern HeapTuple ExecScanHashBucket(HashJoinState *hjstate, HashBucket bucket,
 				    HeapTuple curtuple, List *hjclauses,
 				    ExprContext *econtext);
-extern int ExecHashPartition(Hash *node);
 extern void ExecHashTableReset(HashJoinTable hashtable, int ntuples);
 
 #endif	/* NODEHASH_H */
diff --git a/src/include/executor/nodeHashjoin.h b/src/include/executor/nodeHashjoin.h
index 8930b5b4993..62f02c976c6 100644
--- a/src/include/executor/nodeHashjoin.h
+++ b/src/include/executor/nodeHashjoin.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeHashjoin.h,v 1.1 1996/08/28 07:22:19 scrappy Exp $
+ * $Id: nodeHashjoin.h,v 1.2 1997/08/19 21:38:22 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,13 +21,8 @@ extern int ExecCountSlotsHashJoin(HashJoin *node);
 
 extern void ExecEndHashJoin(HashJoin *node);
 
-extern int ExecHashJoinNewBatch(HashJoinState *hjstate);
-
 extern char *ExecHashJoinSaveTuple(HeapTuple heapTuple, char *buffer,
 				   File file, char *position);
 
-extern int ExecHashJoinGetBatch(int bucketno, HashJoinTable hashtable,
-				int nbatch);
-
 
 #endif	/* NODEHASHJOIN_H */
diff --git a/src/include/executor/nodeMergejoin.h b/src/include/executor/nodeMergejoin.h
index 5199165e355..3b96ac50c5c 100644
--- a/src/include/executor/nodeMergejoin.h
+++ b/src/include/executor/nodeMergejoin.h
@@ -6,25 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeMergejoin.h,v 1.2 1996/11/10 03:05:09 momjian Exp $
+ * $Id: nodeMergejoin.h,v 1.3 1997/08/19 21:38:22 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	NODEMERGEJOIN_H
 #define	NODEMERGEJOIN_H
 
-extern bool MergeCompare(List *eqQual, List *compareQual, ExprContext *econtext);
-
-extern void ExecMergeTupleDumpInner(ExprContext *econtext);
-
-extern void ExecMergeTupleDumpOuter(ExprContext *econtext);
-
-extern void ExecMergeTupleDumpMarked(ExprContext *econtext,
-				     MergeJoinState *mergestate);
-
-extern void ExecMergeTupleDump(ExprContext *econtext,
-			       MergeJoinState *mergestate);
-
 extern TupleTableSlot *ExecMergeJoin(MergeJoin *node);
 
 extern bool ExecInitMergeJoin(MergeJoin *node, EState *estate, Plan *parent);
diff --git a/src/include/executor/nodeSeqscan.h b/src/include/executor/nodeSeqscan.h
index 166037f8c4d..99cb83e431c 100644
--- a/src/include/executor/nodeSeqscan.h
+++ b/src/include/executor/nodeSeqscan.h
@@ -6,17 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeSeqscan.h,v 1.1 1996/08/28 07:22:24 scrappy Exp $
+ * $Id: nodeSeqscan.h,v 1.2 1997/08/19 21:38:23 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	NODESEQSCAN_H
 #define	NODESEQSCAN_H
 
-extern TupleTableSlot *SeqNext(SeqScan *node);
 extern TupleTableSlot *ExecSeqScan(SeqScan *node);
-extern Oid InitScanRelation(SeqScan *node, EState *estate,
-			    CommonScanState *scanstate, Plan *outerPlan);
 extern bool ExecInitSeqScan(SeqScan *node, EState *estate, Plan *parent);
 extern int ExecCountSlotsSeqScan(SeqScan *node);
 extern void ExecEndSeqScan(SeqScan *node);