diff options
Diffstat (limited to 'src/include/executor')
29 files changed, 45 insertions, 75 deletions
diff --git a/src/include/executor/execFlatten.h b/src/include/executor/execFlatten.h index b922ab845a4..0028beadb0d 100644 --- a/src/include/executor/execFlatten.h +++ b/src/include/executor/execFlatten.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: execFlatten.h,v 1.14 2001/03/22 04:00:44 momjian Exp $ + * $Id: execFlatten.h,v 1.15 2001/10/25 05:49:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,5 +24,4 @@ extern Datum ExecEvalIter(Iter *iterNode, ExprContext *econtext, extern void ExecEvalFjoin(TargetEntry *tlist, ExprContext *econtext, bool *isNullVect, ExprDoneCond *fj_isDone); - #endif /* EXECFLATTEN_H */ diff --git a/src/include/executor/execdebug.h b/src/include/executor/execdebug.h index 2ce7771b612..92ca247d29e 100644 --- a/src/include/executor/execdebug.h +++ b/src/include/executor/execdebug.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: execdebug.h,v 1.16 2001/09/20 21:07:57 tgl Exp $ + * $Id: execdebug.h,v 1.17 2001/10/25 05:49:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -281,7 +281,6 @@ extern int NIndexTupleInserted; #define MJ_DEBUG_QUAL(clause, res) #define MJ_DEBUG_MERGE_COMPARE(qual, res) #define MJ_DEBUG_PROC_NODE(slot) - #endif /* EXEC_MERGEJOINDEBUG */ /* ---------------------------------------------------------------- @@ -298,5 +297,4 @@ extern int NIndexTupleInserted; extern long NDirectFileRead; extern long NDirectFileWrite; - #endif /* ExecDebugIncluded */ diff --git a/src/include/executor/execdefs.h b/src/include/executor/execdefs.h index 5254102457a..857e3db2c82 100644 --- a/src/include/executor/execdefs.h +++ b/src/include/executor/execdefs.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: execdefs.h,v 1.8 2001/01/24 19:43:23 momjian Exp $ + * $Id: execdefs.h,v 1.9 2001/10/25 05:49:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -50,5 +50,4 @@ #define EXEC_MJ_SKIPINNER_ADVANCE 13 #define EXEC_MJ_ENDOUTER 14 #define EXEC_MJ_ENDINNER 15 - #endif /* EXECDEFS_H */ diff --git a/src/include/executor/execdesc.h b/src/include/executor/execdesc.h index 4ee4299a891..4232f6d2b46 100644 --- a/src/include/executor/execdesc.h +++ b/src/include/executor/execdesc.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: execdesc.h,v 1.14 2001/01/24 19:43:23 momjian Exp $ + * $Id: execdesc.h,v 1.15 2001/10/25 05:49:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -36,5 +36,4 @@ typedef struct QueryDesc /* in pquery.c */ extern QueryDesc *CreateQueryDesc(Query *parsetree, Plan *plantree, CommandDest dest); - #endif /* EXECDESC_H */ diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h index a72594982cb..05f31e10b55 100644 --- a/src/include/executor/executor.h +++ b/src/include/executor/executor.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: executor.h,v 1.58 2001/05/27 20:48:51 tgl Exp $ + * $Id: executor.h,v 1.59 2001/10/25 05:49:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -44,7 +44,7 @@ extern void ExecRestrPos(Plan *node); * prototypes from functions in execJunk.c */ extern JunkFilter *ExecInitJunkFilter(List *targetList, TupleDesc tupType, - TupleTableSlot *slot); + TupleTableSlot *slot); extern void ExecFreeJunkFilter(JunkFilter *junkfilter); extern bool ExecGetJunkAttribute(JunkFilter *junkfilter, TupleTableSlot *slot, char *attrName, Datum *value, bool *isNull); @@ -177,5 +177,4 @@ extern void ExecOpenIndices(ResultRelInfo *resultRelInfo); extern void ExecCloseIndices(ResultRelInfo *resultRelInfo); extern void ExecInsertIndexTuples(TupleTableSlot *slot, ItemPointer tupleid, EState *estate, bool is_update); - #endif /* EXECUTOR_H */ diff --git a/src/include/executor/functions.h b/src/include/executor/functions.h index 676a63e94f9..dc98d50f2c0 100644 --- a/src/include/executor/functions.h +++ b/src/include/executor/functions.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: functions.h,v 1.15 2001/01/24 19:43:23 momjian Exp $ + * $Id: functions.h,v 1.16 2001/10/25 05:49:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,5 +17,4 @@ #include "fmgr.h" extern Datum fmgr_sql(PG_FUNCTION_ARGS); - #endif /* FUNCTIONS_H */ diff --git a/src/include/executor/hashjoin.h b/src/include/executor/hashjoin.h index 8aaf5d16ed4..9f8b7417947 100644 --- a/src/include/executor/hashjoin.h +++ b/src/include/executor/hashjoin.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: hashjoin.h,v 1.22 2001/03/22 04:00:44 momjian Exp $ + * $Id: hashjoin.h,v 1.23 2001/10/25 05:49:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -92,5 +92,4 @@ typedef struct HashTableData } HashTableData; typedef HashTableData *HashJoinTable; - #endif /* HASHJOIN_H */ diff --git a/src/include/executor/instrument.h b/src/include/executor/instrument.h index ca6aa4208ab..152d5444a78 100644 --- a/src/include/executor/instrument.h +++ b/src/include/executor/instrument.h @@ -6,7 +6,7 @@ * * Copyright (c) 2001, PostgreSQL Global Development Group * - * $Id: instrument.h,v 1.1 2001/09/18 01:59:06 tgl Exp $ + * $Id: instrument.h,v 1.2 2001/10/25 05:49:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,21 +19,20 @@ typedef struct Instrumentation { /* Info about current plan cycle: */ - bool running; /* TRUE if we've completed first tuple */ + bool running; /* TRUE if we've completed first tuple */ struct timeval starttime; /* Start time of current iteration of node */ struct timeval counter; /* Accumulates runtime for this node */ - double firsttuple; /* Time for first tuple of this cycle */ - double tuplecount; /* Tuples so far this cycle */ + double firsttuple; /* Time for first tuple of this cycle */ + double tuplecount; /* Tuples so far this cycle */ /* Accumulated statistics across all completed cycles: */ - double startup; /* Total startup time (in seconds) */ - double total; /* Total total time (in seconds) */ - double ntuples; /* Total tuples produced */ - double nloops; /* # of run cycles for this node */ + double startup; /* Total startup time (in seconds) */ + double total; /* Total total time (in seconds) */ + double ntuples; /* Total tuples produced */ + double nloops; /* # of run cycles for this node */ } Instrumentation; extern Instrumentation *InstrAlloc(void); extern void InstrStartNode(Instrumentation *instr); extern void InstrStopNode(Instrumentation *instr, bool returnedTuple); extern void InstrEndLoop(Instrumentation *instr); - -#endif /* INSTRUMENT_H */ +#endif /* INSTRUMENT_H */ diff --git a/src/include/executor/nodeAgg.h b/src/include/executor/nodeAgg.h index e6762642993..90643c58ccd 100644 --- a/src/include/executor/nodeAgg.h +++ b/src/include/executor/nodeAgg.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeAgg.h,v 1.12 2001/01/24 19:43:23 momjian Exp $ + * $Id: nodeAgg.h,v 1.13 2001/10/25 05:49:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,5 +21,4 @@ extern bool ExecInitAgg(Agg *node, EState *estate, Plan *parent); extern int ExecCountSlotsAgg(Agg *node); extern void ExecEndAgg(Agg *node); extern void ExecReScanAgg(Agg *node, ExprContext *exprCtxt, Plan *parent); - #endif /* NODEAGG_H */ diff --git a/src/include/executor/nodeAppend.h b/src/include/executor/nodeAppend.h index bb5fea8c1a2..3cd54021a55 100644 --- a/src/include/executor/nodeAppend.h +++ b/src/include/executor/nodeAppend.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeAppend.h,v 1.13 2001/01/24 19:43:23 momjian Exp $ + * $Id: nodeAppend.h,v 1.14 2001/10/25 05:49:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,5 +21,4 @@ extern int ExecCountSlotsAppend(Append *node); extern TupleTableSlot *ExecProcAppend(Append *node); extern void ExecEndAppend(Append *node); extern void ExecReScanAppend(Append *node, ExprContext *exprCtxt, Plan *parent); - #endif /* NODEAPPEND_H */ diff --git a/src/include/executor/nodeGroup.h b/src/include/executor/nodeGroup.h index 2fadbf6dcbb..ed6fe7ab0ff 100644 --- a/src/include/executor/nodeGroup.h +++ b/src/include/executor/nodeGroup.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeGroup.h,v 1.18 2001/01/24 19:43:23 momjian Exp $ + * $Id: nodeGroup.h,v 1.19 2001/10/25 05:49:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -32,5 +32,4 @@ extern bool execTuplesMatch(HeapTuple tuple1, extern FmgrInfo *execTuplesMatchPrepare(TupleDesc tupdesc, int numCols, AttrNumber *matchColIdx); - #endif /* NODEGROUP_H */ diff --git a/src/include/executor/nodeHash.h b/src/include/executor/nodeHash.h index 512edec6d18..731208905d2 100644 --- a/src/include/executor/nodeHash.h +++ b/src/include/executor/nodeHash.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeHash.h,v 1.20 2001/06/11 00:17:07 tgl Exp $ + * $Id: nodeHash.h,v 1.21 2001/10/25 05:49:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -33,8 +33,7 @@ extern HeapTuple ExecScanHashBucket(HashJoinState *hjstate, List *hjclauses, extern void ExecHashTableReset(HashJoinTable hashtable, long ntuples); extern void ExecReScanHash(Hash *node, ExprContext *exprCtxt, Plan *parent); extern void ExecChooseHashTableSize(double ntuples, int tupwidth, - int *virtualbuckets, - int *physicalbuckets, - int *numbatches); - + int *virtualbuckets, + int *physicalbuckets, + int *numbatches); #endif /* NODEHASH_H */ diff --git a/src/include/executor/nodeHashjoin.h b/src/include/executor/nodeHashjoin.h index 893e9d014ed..f3e04b3df1f 100644 --- a/src/include/executor/nodeHashjoin.h +++ b/src/include/executor/nodeHashjoin.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeHashjoin.h,v 1.19 2001/01/24 19:43:23 momjian Exp $ + * $Id: nodeHashjoin.h,v 1.20 2001/10/25 05:49:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,5 +22,4 @@ extern int ExecCountSlotsHashJoin(HashJoin *node); extern void ExecEndHashJoin(HashJoin *node); extern void ExecHashJoinSaveTuple(HeapTuple heapTuple, BufFile *file); extern void ExecReScanHashJoin(HashJoin *node, ExprContext *exprCtxt, Plan *parent); - #endif /* NODEHASHJOIN_H */ diff --git a/src/include/executor/nodeIndexscan.h b/src/include/executor/nodeIndexscan.h index 91f8abd6fcc..bae08bd0461 100644 --- a/src/include/executor/nodeIndexscan.h +++ b/src/include/executor/nodeIndexscan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeIndexscan.h,v 1.11 2001/01/24 19:43:23 momjian Exp $ + * $Id: nodeIndexscan.h,v 1.12 2001/10/25 05:49:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,5 +25,4 @@ extern void ExecUpdateIndexScanKeys(IndexScan *node, ExprContext *econtext); extern bool ExecInitIndexScan(IndexScan *node, EState *estate, Plan *parent); extern int ExecCountSlotsIndexScan(IndexScan *node); extern void ExecIndexReScan(IndexScan *node, ExprContext *exprCtxt, Plan *parent); - #endif /* NODEINDEXSCAN_H */ diff --git a/src/include/executor/nodeLimit.h b/src/include/executor/nodeLimit.h index 3bfcd76d77e..6b0acd4baa0 100644 --- a/src/include/executor/nodeLimit.h +++ b/src/include/executor/nodeLimit.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeLimit.h,v 1.2 2001/01/24 19:43:23 momjian Exp $ + * $Id: nodeLimit.h,v 1.3 2001/10/25 05:49:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,5 +21,4 @@ extern bool ExecInitLimit(Limit *node, EState *estate, Plan *parent); extern int ExecCountSlotsLimit(Limit *node); extern void ExecEndLimit(Limit *node); extern void ExecReScanLimit(Limit *node, ExprContext *exprCtxt, Plan *parent); - #endif /* NODELIMIT_H */ diff --git a/src/include/executor/nodeMaterial.h b/src/include/executor/nodeMaterial.h index ce5a8b172f5..e8e23dfeaa5 100644 --- a/src/include/executor/nodeMaterial.h +++ b/src/include/executor/nodeMaterial.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeMaterial.h,v 1.14 2001/01/24 19:43:23 momjian Exp $ + * $Id: nodeMaterial.h,v 1.15 2001/10/25 05:49:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,5 +23,4 @@ extern void ExecEndMaterial(Material *node); extern void ExecMaterialMarkPos(Material *node); extern void ExecMaterialRestrPos(Material *node); extern void ExecMaterialReScan(Material *node, ExprContext *exprCtxt, Plan *parent); - #endif /* NODEMATERIAL_H */ diff --git a/src/include/executor/nodeMergejoin.h b/src/include/executor/nodeMergejoin.h index 7850bbc6731..94c4ef302e8 100644 --- a/src/include/executor/nodeMergejoin.h +++ b/src/include/executor/nodeMergejoin.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeMergejoin.h,v 1.13 2001/01/24 19:43:23 momjian Exp $ + * $Id: nodeMergejoin.h,v 1.14 2001/10/25 05:49:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,5 +21,4 @@ extern bool ExecInitMergeJoin(MergeJoin *node, EState *estate, Plan *parent); extern int ExecCountSlotsMergeJoin(MergeJoin *node); extern void ExecEndMergeJoin(MergeJoin *node); extern void ExecReScanMergeJoin(MergeJoin *node, ExprContext *exprCtxt, Plan *parent); - #endif /* NODEMERGEJOIN_H; */ diff --git a/src/include/executor/nodeNestloop.h b/src/include/executor/nodeNestloop.h index cd27030e992..7f0ae110243 100644 --- a/src/include/executor/nodeNestloop.h +++ b/src/include/executor/nodeNestloop.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeNestloop.h,v 1.14 2001/01/24 19:43:23 momjian Exp $ + * $Id: nodeNestloop.h,v 1.15 2001/10/25 05:49:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,5 +22,4 @@ extern int ExecCountSlotsNestLoop(NestLoop *node); extern void ExecEndNestLoop(NestLoop *node); extern void ExecReScanNestLoop(NestLoop *node, ExprContext *exprCtxt, Plan *parent); - #endif /* NODENESTLOOP_H */ diff --git a/src/include/executor/nodeResult.h b/src/include/executor/nodeResult.h index 39f15a385a2..7ee4fb712bc 100644 --- a/src/include/executor/nodeResult.h +++ b/src/include/executor/nodeResult.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeResult.h,v 1.11 2001/01/24 19:43:23 momjian Exp $ + * $Id: nodeResult.h,v 1.12 2001/10/25 05:49:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,5 +21,4 @@ extern bool ExecInitResult(Result *node, EState *estate, Plan *parent); extern int ExecCountSlotsResult(Result *node); extern void ExecEndResult(Result *node); extern void ExecReScanResult(Result *node, ExprContext *exprCtxt, Plan *parent); - #endif /* NODERESULT_H */ diff --git a/src/include/executor/nodeSeqscan.h b/src/include/executor/nodeSeqscan.h index 8f425740999..b0ebbc325b7 100644 --- a/src/include/executor/nodeSeqscan.h +++ b/src/include/executor/nodeSeqscan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeSeqscan.h,v 1.11 2001/01/24 19:43:23 momjian Exp $ + * $Id: nodeSeqscan.h,v 1.12 2001/10/25 05:49:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,5 +23,4 @@ extern void ExecEndSeqScan(SeqScan *node); extern void ExecSeqReScan(SeqScan *node, ExprContext *exprCtxt, Plan *parent); extern void ExecSeqMarkPos(SeqScan *node); extern void ExecSeqRestrPos(SeqScan *node); - #endif /* NODESEQSCAN_H */ diff --git a/src/include/executor/nodeSetOp.h b/src/include/executor/nodeSetOp.h index 81805afe134..86ac187cbf0 100644 --- a/src/include/executor/nodeSetOp.h +++ b/src/include/executor/nodeSetOp.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeSetOp.h,v 1.2 2001/01/24 19:43:23 momjian Exp $ + * $Id: nodeSetOp.h,v 1.3 2001/10/25 05:49:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,5 +21,4 @@ extern bool ExecInitSetOp(SetOp *node, EState *estate, Plan *parent); extern int ExecCountSlotsSetOp(SetOp *node); extern void ExecEndSetOp(SetOp *node); extern void ExecReScanSetOp(SetOp *node, ExprContext *exprCtxt, Plan *parent); - #endif /* NODESETOP_H */ diff --git a/src/include/executor/nodeSort.h b/src/include/executor/nodeSort.h index 2b3a26398a5..a667f9bb347 100644 --- a/src/include/executor/nodeSort.h +++ b/src/include/executor/nodeSort.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeSort.h,v 1.11 2001/01/24 19:43:23 momjian Exp $ + * $Id: nodeSort.h,v 1.12 2001/10/25 05:49:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,5 +23,4 @@ extern void ExecEndSort(Sort *node); extern void ExecSortMarkPos(Sort *node); extern void ExecSortRestrPos(Sort *node); extern void ExecReScanSort(Sort *node, ExprContext *exprCtxt, Plan *parent); - #endif /* NODESORT_H */ diff --git a/src/include/executor/nodeSubplan.h b/src/include/executor/nodeSubplan.h index f7c46c3ca92..0b12f3d61d2 100644 --- a/src/include/executor/nodeSubplan.h +++ b/src/include/executor/nodeSubplan.h @@ -15,5 +15,4 @@ extern bool ExecInitSubPlan(SubPlan *node, EState *estate, Plan *parent); extern void ExecReScanSetParamPlan(SubPlan *node, Plan *parent); extern void ExecSetParamPlan(SubPlan *node, ExprContext *econtext); extern void ExecEndSubPlan(SubPlan *node); - #endif /* NODESUBPLAN_H */ diff --git a/src/include/executor/nodeSubqueryscan.h b/src/include/executor/nodeSubqueryscan.h index d58e80c4586..acbc98aa54a 100644 --- a/src/include/executor/nodeSubqueryscan.h +++ b/src/include/executor/nodeSubqueryscan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeSubqueryscan.h,v 1.2 2001/01/24 19:43:23 momjian Exp $ + * $Id: nodeSubqueryscan.h,v 1.3 2001/10/25 05:49:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,5 +21,4 @@ extern void ExecEndSubqueryScan(SubqueryScan *node); extern bool ExecInitSubqueryScan(SubqueryScan *node, EState *estate, Plan *parent); extern int ExecCountSlotsSubqueryScan(SubqueryScan *node); extern void ExecSubqueryReScan(SubqueryScan *node, ExprContext *exprCtxt, Plan *parent); - #endif /* NODESUBQUERYSCAN_H */ diff --git a/src/include/executor/nodeTidscan.h b/src/include/executor/nodeTidscan.h index f49255c7cdb..c9cd06b141f 100644 --- a/src/include/executor/nodeTidscan.h +++ b/src/include/executor/nodeTidscan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeTidscan.h,v 1.5 2001/01/24 19:43:23 momjian Exp $ + * $Id: nodeTidscan.h,v 1.6 2001/10/25 05:49:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,5 +23,4 @@ extern void ExecTidMarkPos(TidScan *node); extern bool ExecInitTidScan(TidScan *node, EState *estate, Plan *parent); extern int ExecCountSlotsTidScan(TidScan *node); extern void ExecTidReScan(TidScan *node, ExprContext *exprCtxt, Plan *parent); - #endif /* NODETIDSCAN_H */ diff --git a/src/include/executor/nodeUnique.h b/src/include/executor/nodeUnique.h index d3fc08dcec2..40fc0d29554 100644 --- a/src/include/executor/nodeUnique.h +++ b/src/include/executor/nodeUnique.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeUnique.h,v 1.11 2001/01/24 19:43:23 momjian Exp $ + * $Id: nodeUnique.h,v 1.12 2001/10/25 05:49:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,5 +21,4 @@ extern bool ExecInitUnique(Unique *node, EState *estate, Plan *parent); extern int ExecCountSlotsUnique(Unique *node); extern void ExecEndUnique(Unique *node); extern void ExecReScanUnique(Unique *node, ExprContext *exprCtxt, Plan *parent); - #endif /* NODEUNIQUE_H */ diff --git a/src/include/executor/spi.h b/src/include/executor/spi.h index bef68bc7a6e..26531a49fc1 100644 --- a/src/include/executor/spi.h +++ b/src/include/executor/spi.h @@ -2,7 +2,7 @@ * * spi.h * - * $Id: spi.h,v 1.28 2001/08/02 18:08:43 tgl Exp $ + * $Id: spi.h,v 1.29 2001/10/25 05:49:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -85,7 +85,7 @@ extern int SPI_exec(char *src, int tcount); extern int SPI_execp(void *plan, Datum *values, char *Nulls, int tcount); extern void *SPI_prepare(char *src, int nargs, Oid *argtypes); extern void *SPI_saveplan(void *plan); -extern int SPI_freeplan(void *plan); +extern int SPI_freeplan(void *plan); extern HeapTuple SPI_copytuple(HeapTuple tuple); extern TupleDesc SPI_copytupledesc(TupleDesc tupdesc); @@ -104,13 +104,12 @@ extern void SPI_pfree(void *pointer); extern void SPI_freetuple(HeapTuple pointer); extern void SPI_freetuptable(SPITupleTable *tuptable); -extern Portal SPI_cursor_open(char *name, void *plan, +extern Portal SPI_cursor_open(char *name, void *plan, Datum *Values, char *Nulls); extern Portal SPI_cursor_find(char *name); -extern void SPI_cursor_fetch(Portal portal, bool forward, int count); -extern void SPI_cursor_move(Portal portal, bool forward, int count); -extern void SPI_cursor_close(Portal portal); +extern void SPI_cursor_fetch(Portal portal, bool forward, int count); +extern void SPI_cursor_move(Portal portal, bool forward, int count); +extern void SPI_cursor_close(Portal portal); extern void AtEOXact_SPI(void); - #endif /* SPI_H */ diff --git a/src/include/executor/spi_priv.h b/src/include/executor/spi_priv.h index e5626634001..d7f036506b0 100644 --- a/src/include/executor/spi_priv.h +++ b/src/include/executor/spi_priv.h @@ -3,7 +3,7 @@ * spi.c * Server Programming Interface private declarations * - * $Header: /cvsroot/pgsql/src/include/executor/spi_priv.h,v 1.8 2001/05/21 14:22:18 wieck Exp $ + * $Header: /cvsroot/pgsql/src/include/executor/spi_priv.h,v 1.9 2001/10/25 05:49:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -35,5 +35,4 @@ typedef struct #define _SPI_CPLAN_CURCXT 0 #define _SPI_CPLAN_PROCXT 1 #define _SPI_CPLAN_TOPCXT 2 - #endif /* SPI_PRIV_H */ diff --git a/src/include/executor/tuptable.h b/src/include/executor/tuptable.h index 7def0be4b69..06f1387fe90 100644 --- a/src/include/executor/tuptable.h +++ b/src/include/executor/tuptable.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: tuptable.h,v 1.18 2001/01/29 00:39:20 tgl Exp $ + * $Id: tuptable.h,v 1.19 2001/10/25 05:49:59 momjian Exp $ * * NOTES * The tuple table interface is getting pretty ugly. @@ -80,5 +80,4 @@ typedef struct TupleTableData } TupleTableData; typedef TupleTableData *TupleTable; - #endif /* TUPTABLE_H */ |