diff options
Diffstat (limited to 'src/include/executor')
-rw-r--r-- | src/include/executor/execFlatten.h | 6 | ||||
-rw-r--r-- | src/include/executor/execdesc.h | 6 | ||||
-rw-r--r-- | src/include/executor/executor.h | 136 | ||||
-rw-r--r-- | src/include/executor/functions.h | 14 | ||||
-rw-r--r-- | src/include/executor/hashjoin.h | 8 | ||||
-rw-r--r-- | src/include/executor/nodeAgg.h | 4 | ||||
-rw-r--r-- | src/include/executor/nodeAppend.h | 4 | ||||
-rw-r--r-- | src/include/executor/nodeGroup.h | 10 | ||||
-rw-r--r-- | src/include/executor/nodeHash.h | 28 | ||||
-rw-r--r-- | src/include/executor/nodeHashjoin.h | 10 | ||||
-rw-r--r-- | src/include/executor/nodeIndexscan.h | 20 | ||||
-rw-r--r-- | src/include/executor/nodeMaterial.h | 14 | ||||
-rw-r--r-- | src/include/executor/nodeMergejoin.h | 10 | ||||
-rw-r--r-- | src/include/executor/nodeNestloop.h | 10 | ||||
-rw-r--r-- | src/include/executor/nodeResult.h | 10 | ||||
-rw-r--r-- | src/include/executor/nodeSeqscan.h | 16 | ||||
-rw-r--r-- | src/include/executor/nodeSort.h | 14 | ||||
-rw-r--r-- | src/include/executor/nodeTee.h | 12 | ||||
-rw-r--r-- | src/include/executor/nodeUnique.h | 10 | ||||
-rw-r--r-- | src/include/executor/spi.h | 6 | ||||
-rw-r--r-- | src/include/executor/tuptable.h | 6 |
21 files changed, 177 insertions, 177 deletions
diff --git a/src/include/executor/execFlatten.h b/src/include/executor/execFlatten.h index 3682f6319b5..8dc8236e22e 100644 --- a/src/include/executor/execFlatten.h +++ b/src/include/executor/execFlatten.h @@ -6,16 +6,16 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: execFlatten.h,v 1.4 1997/09/08 02:36:08 momjian Exp $ + * $Id: execFlatten.h,v 1.5 1997/09/08 21:51:49 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef EXECFLATTEN_H #define EXECFLATTEN_H -extern Datum ExecEvalIter(Iter * iterNode, ExprContext * econtext, bool * resultIsNull, bool * iterIsDone); +extern Datum ExecEvalIter(Iter *iterNode, ExprContext *econtext, bool *resultIsNull, bool *iterIsDone); -extern void ExecEvalFjoin(TargetEntry * tlist, ExprContext * econtext, bool * isNullVect, bool * fj_isDone); +extern void ExecEvalFjoin(TargetEntry *tlist, ExprContext *econtext, bool *isNullVect, bool *fj_isDone); #endif /* EXECFLATTEN_H */ diff --git a/src/include/executor/execdesc.h b/src/include/executor/execdesc.h index f97e196f4fe..b0c55737b9d 100644 --- a/src/include/executor/execdesc.h +++ b/src/include/executor/execdesc.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: execdesc.h,v 1.5 1997/09/08 02:36:16 momjian Exp $ + * $Id: execdesc.h,v 1.6 1997/09/08 21:51:50 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,11 +30,11 @@ typedef struct QueryDesc Query *parsetree; Plan *plantree; CommandDest dest; /* the destination output of the execution */ -} QueryDesc; +} QueryDesc; /* in pquery.c */ extern QueryDesc * -CreateQueryDesc(Query * parsetree, Plan * plantree, +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 efa8dc3f01d..219984f17b8 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.12 1997/09/08 02:36:17 momjian Exp $ + * $Id: executor.h,v 1.13 1997/09/08 21:51:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -29,41 +29,41 @@ extern void ExecOpenScanR(Oid relOid, int nkeys, ScanKey skeys, bool isindex, ScanDirection dir, TimeQual timeRange, - Relation * returnRelation, Pointer * returnScanDesc); -extern void ExecCloseR(Plan * node); -extern void ExecReScan(Plan * node, ExprContext * exprCtxt, Plan * parent); -extern HeapScanDesc + Relation *returnRelation, Pointer *returnScanDesc); +extern void ExecCloseR(Plan *node); +extern void ExecReScan(Plan *node, ExprContext *exprCtxt, Plan *parent); +extern HeapScanDesc ExecReScanR(Relation relDesc, HeapScanDesc scanDesc, ScanDirection direction, int nkeys, ScanKey skeys); -extern void ExecMarkPos(Plan * node); -extern void ExecRestrPos(Plan * node); +extern void ExecMarkPos(Plan *node); +extern void ExecRestrPos(Plan *node); extern Relation ExecCreatR(TupleDesc tupType, Oid relationOid); /* * prototypes from functions in execJunk.c */ -extern JunkFilter *ExecInitJunkFilter(List * targetList); -extern bool -ExecGetJunkAttribute(JunkFilter * junkfilter, TupleTableSlot * slot, - char *attrName, Datum * value, bool * isNull); -extern HeapTuple ExecRemoveJunk(JunkFilter * junkfilter, TupleTableSlot * slot); +extern JunkFilter *ExecInitJunkFilter(List *targetList); +extern bool +ExecGetJunkAttribute(JunkFilter *junkfilter, TupleTableSlot *slot, + char *attrName, Datum *value, bool *isNull); +extern HeapTuple ExecRemoveJunk(JunkFilter *junkfilter, TupleTableSlot *slot); /* * prototypes from functions in execMain.c */ -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); +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); extern HeapTuple ExecConstraints(char *caller, Relation rel, HeapTuple tuple); /* * prototypes from functions in execProcnode.c */ -extern bool ExecInitNode(Plan * node, EState * estate, Plan * parent); -extern TupleTableSlot *ExecProcNode(Plan * node, Plan * parent); -extern int ExecCountSlotsNode(Plan * node); -extern void ExecEndNode(Plan * node, Plan * parent); +extern bool ExecInitNode(Plan *node, EState *estate, Plan *parent); +extern TupleTableSlot *ExecProcNode(Plan *node, Plan *parent); +extern int ExecCountSlotsNode(Plan *node); +extern void ExecEndNode(Plan *node, Plan *parent); /* * prototypes from functions in execQual.c @@ -71,28 +71,28 @@ extern void ExecEndNode(Plan * node, Plan * parent); extern bool execConstByVal; extern int execConstLen; -extern Datum -ExecExtractResult(TupleTableSlot * slot, AttrNumber attnum, - bool * isNull); -extern Datum -ExecEvalParam(Param * expression, ExprContext * econtext, - bool * isNull); +extern Datum +ExecExtractResult(TupleTableSlot *slot, AttrNumber attnum, + bool *isNull); +extern Datum +ExecEvalParam(Param *expression, ExprContext *econtext, + bool *isNull); /* stop here */ extern char * -GetAttributeByName(TupleTableSlot * slot, char *attname, - bool * isNull); -extern Datum -ExecEvalExpr(Node * expression, ExprContext * econtext, bool * isNull, - bool * isDone); -extern bool ExecQual(List * qual, ExprContext * econtext); -extern int ExecTargetListLength(List * targetlist); -extern TupleTableSlot *ExecProject(ProjectionInfo * projInfo, bool * isDone); +GetAttributeByName(TupleTableSlot *slot, char *attname, + bool *isNull); +extern Datum +ExecEvalExpr(Node *expression, ExprContext *econtext, bool *isNull, + bool *isDone); +extern bool ExecQual(List *qual, ExprContext *econtext); +extern int ExecTargetListLength(List *targetlist); +extern TupleTableSlot *ExecProject(ProjectionInfo *projInfo, bool *isDone); /* * prototypes from functions in execScan.c */ -extern TupleTableSlot *ExecScan(Scan * node, TupleTableSlot * (*accessMtd) ()); +extern TupleTableSlot *ExecScan(Scan *node, TupleTableSlot *(*accessMtd) ()); /* * prototypes from functions in execTuples.c @@ -102,65 +102,65 @@ extern void ExecDestroyTupleTable(TupleTable table, bool shouldFree); extern TupleTableSlot *ExecAllocTableSlot(TupleTable table); extern TupleTableSlot * ExecStoreTuple(HeapTuple tuple, - TupleTableSlot * slot, + TupleTableSlot *slot, Buffer buffer, bool shouldFree); -extern TupleTableSlot *ExecClearTuple(TupleTableSlot * slot); -extern bool ExecSetSlotPolicy(TupleTableSlot * slot, bool shouldFree); -extern TupleDesc -ExecSetSlotDescriptor(TupleTableSlot * slot, +extern TupleTableSlot *ExecClearTuple(TupleTableSlot *slot); +extern bool ExecSetSlotPolicy(TupleTableSlot *slot, bool shouldFree); +extern TupleDesc +ExecSetSlotDescriptor(TupleTableSlot *slot, TupleDesc tupdesc); -extern void ExecSetSlotDescriptorIsNew(TupleTableSlot * slot, bool isNew); -extern void ExecIncrSlotBufferRefcnt(TupleTableSlot * slot); -extern bool TupIsNull(TupleTableSlot * slot); -extern void ExecInitResultTupleSlot(EState * estate, CommonState * commonstate); +extern void ExecSetSlotDescriptorIsNew(TupleTableSlot *slot, bool isNew); +extern void ExecIncrSlotBufferRefcnt(TupleTableSlot *slot); +extern bool TupIsNull(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); +ExecInitScanTupleSlot(EState *estate, + CommonScanState *commonscanstate); +extern void ExecInitMarkedTupleSlot(EState *estate, MergeJoinState *mergestate); +extern void ExecInitOuterTupleSlot(EState *estate, HashJoinState *hashstate); -extern TupleDesc ExecGetTupType(Plan * node); -extern TupleDesc ExecTypeFromTL(List * targetList); +extern TupleDesc ExecGetTupType(Plan *node); +extern TupleDesc ExecTypeFromTL(List *targetList); /* * prototypes from functions in execTuples.c */ extern void ResetTupleCount(void); extern void -ExecAssignNodeBaseInfo(EState * estate, CommonState * basenode, - Plan * parent); -extern void ExecAssignExprContext(EState * estate, CommonState * commonstate); +ExecAssignNodeBaseInfo(EState *estate, CommonState *basenode, + Plan *parent); +extern void ExecAssignExprContext(EState *estate, CommonState *commonstate); extern void -ExecAssignResultType(CommonState * commonstate, +ExecAssignResultType(CommonState *commonstate, TupleDesc tupDesc); extern void -ExecAssignResultTypeFromOuterPlan(Plan * node, - CommonState * commonstate); -extern void ExecAssignResultTypeFromTL(Plan * node, CommonState * commonstate); -extern TupleDesc ExecGetResultType(CommonState * commonstate); -extern void ExecAssignProjectionInfo(Plan * node, CommonState * commonstate); -extern void ExecFreeProjectionInfo(CommonState * commonstate); -extern TupleDesc ExecGetScanType(CommonScanState * csstate); +ExecAssignResultTypeFromOuterPlan(Plan *node, + CommonState *commonstate); +extern void ExecAssignResultTypeFromTL(Plan *node, CommonState *commonstate); +extern TupleDesc ExecGetResultType(CommonState *commonstate); +extern void ExecAssignProjectionInfo(Plan *node, CommonState *commonstate); +extern void ExecFreeProjectionInfo(CommonState *commonstate); +extern TupleDesc ExecGetScanType(CommonScanState *csstate); extern void -ExecAssignScanType(CommonScanState * csstate, +ExecAssignScanType(CommonScanState *csstate, TupleDesc tupDesc); extern void -ExecAssignScanTypeFromOuterPlan(Plan * node, - CommonScanState * csstate); +ExecAssignScanTypeFromOuterPlan(Plan *node, + CommonScanState *csstate); extern AttributeTupleForm ExecGetTypeInfo(Relation relDesc); extern void ExecOpenIndices(Oid resultRelationOid, - RelationInfo * resultRelationInfo); -extern void ExecCloseIndices(RelationInfo * resultRelationInfo); + RelationInfo *resultRelationInfo); +extern void ExecCloseIndices(RelationInfo *resultRelationInfo); extern void -ExecInsertIndexTuples(TupleTableSlot * slot, ItemPointer tupleid, - EState * estate, bool is_update); +ExecInsertIndexTuples(TupleTableSlot *slot, ItemPointer tupleid, + EState *estate, bool is_update); extern void resetVarAttrLenForCreateTable(TupleDesc tupType); extern void setVarAttrLenForCreateTable(TupleDesc tupType, - List * targetList, List * rangeTable); + List *targetList, List *rangeTable); /* ---------------------------------------------------------------- diff --git a/src/include/executor/functions.h b/src/include/executor/functions.h index 72b399663ca..a1bed2a7385 100644 --- a/src/include/executor/functions.h +++ b/src/include/executor/functions.h @@ -6,19 +6,19 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: functions.h,v 1.3 1997/09/08 02:36:18 momjian Exp $ + * $Id: functions.h,v 1.4 1997/09/08 21:51:59 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef FUNCTIONS_H #define FUNCTIONS_H -extern Datum -ProjectAttribute(TupleDesc TD, TargetEntry * tlist, - HeapTuple tup, bool * isnullP); +extern Datum +ProjectAttribute(TupleDesc TD, TargetEntry *tlist, + HeapTuple tup, bool *isnullP); -extern Datum -postquel_function(Func * funcNode, char **args, - bool * isNull, bool * isDone); +extern Datum +postquel_function(Func *funcNode, char **args, + bool *isNull, bool *isDone); #endif /* FUNCTIONS_H */ diff --git a/src/include/executor/hashjoin.h b/src/include/executor/hashjoin.h index 6950bb25bde..e6f0766b720 100644 --- a/src/include/executor/hashjoin.h +++ b/src/include/executor/hashjoin.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: hashjoin.h,v 1.5 1997/09/08 02:36:20 momjian Exp $ + * $Id: hashjoin.h,v 1.6 1997/09/08 21:52:00 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -57,7 +57,7 @@ typedef struct HashTableData int curbatch; int nprocess; int pcount; -} HashTableData; /* real hash table follows here */ +} HashTableData; /* real hash table follows here */ typedef HashTableData *HashJoinTable; @@ -65,7 +65,7 @@ typedef struct OverflowTupleData { RelativeAddr tuple; /* HeapTuple */ RelativeAddr next; /* struct OverflowTupleData * */ -} OverflowTupleData; /* real tuple follows here */ +} OverflowTupleData; /* real tuple follows here */ typedef OverflowTupleData *OverflowTuple; @@ -75,7 +75,7 @@ typedef struct HashBucketData RelativeAddr bottom; /* HeapTuple */ RelativeAddr firstotuple; /* OverflowTuple */ RelativeAddr lastotuple; /* OverflowTuple */ -} HashBucketData; /* real bucket follows here */ +} HashBucketData; /* real bucket follows here */ typedef HashBucketData *HashBucket; diff --git a/src/include/executor/nodeAgg.h b/src/include/executor/nodeAgg.h index 35c7e7fb5c7..c752c6ce176 100644 --- a/src/include/executor/nodeAgg.h +++ b/src/include/executor/nodeAgg.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeAgg.h,v 1.4 1997/09/08 20:58:17 momjian Exp $ + * $Id: nodeAgg.h,v 1.5 1997/09/08 21:52:01 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -14,7 +14,7 @@ #define NODEAGG_H extern TupleTableSlot *ExecAgg(Agg *node); -extern bool ExecInitAgg(Agg *node, EState * estate, Plan * parent); +extern bool ExecInitAgg(Agg *node, EState *estate, Plan *parent); extern int ExecCountSlotsAgg(Agg *node); extern void ExecEndAgg(Agg *node); diff --git a/src/include/executor/nodeAppend.h b/src/include/executor/nodeAppend.h index e546503910e..c0aa2d1c753 100644 --- a/src/include/executor/nodeAppend.h +++ b/src/include/executor/nodeAppend.h @@ -6,14 +6,14 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeAppend.h,v 1.5 1997/09/08 20:58:19 momjian Exp $ + * $Id: nodeAppend.h,v 1.6 1997/09/08 21:52:02 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef NODEAPPEND_H #define NODEAPPEND_H -extern bool ExecInitAppend(Append *node, EState * estate, Plan * parent); +extern bool ExecInitAppend(Append *node, EState *estate, Plan *parent); extern int ExecCountSlotsAppend(Append *node); extern TupleTableSlot *ExecProcAppend(Append *node); extern void ExecEndAppend(Append *node); diff --git a/src/include/executor/nodeGroup.h b/src/include/executor/nodeGroup.h index 26d398d8bb5..294f59103b2 100644 --- a/src/include/executor/nodeGroup.h +++ b/src/include/executor/nodeGroup.h @@ -6,16 +6,16 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeGroup.h,v 1.3 1997/09/08 02:36:23 momjian Exp $ + * $Id: nodeGroup.h,v 1.4 1997/09/08 21:52:02 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef NODEGROUP_H #define NODEGROUP_H -extern TupleTableSlot *ExecGroup(Group * node); -extern bool ExecInitGroup(Group * node, EState * estate, Plan * parent); -extern int ExecCountSlotsGroup(Group * node); -extern void ExecEndGroup(Group * node); +extern TupleTableSlot *ExecGroup(Group *node); +extern bool ExecInitGroup(Group *node, EState *estate, Plan *parent); +extern int ExecCountSlotsGroup(Group *node); +extern void ExecEndGroup(Group *node); #endif /* NODEGROUP_H */ diff --git a/src/include/executor/nodeHash.h b/src/include/executor/nodeHash.h index c18403b030f..2348e99d97d 100644 --- a/src/include/executor/nodeHash.h +++ b/src/include/executor/nodeHash.h @@ -6,29 +6,29 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeHash.h,v 1.4 1997/09/08 02:36:23 momjian Exp $ + * $Id: nodeHash.h,v 1.5 1997/09/08 21:52:04 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef NODEHASH_H #define NODEHASH_H -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 HashJoinTable ExecHashTableCreate(Hash * node); +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 HashJoinTable ExecHashTableCreate(Hash *node); extern void -ExecHashTableInsert(HashJoinTable hashtable, ExprContext * econtext, - Var * hashkey, File * batches); +ExecHashTableInsert(HashJoinTable hashtable, ExprContext *econtext, + Var *hashkey, File *batches); extern void ExecHashTableDestroy(HashJoinTable hashtable); extern int -ExecHashGetBucket(HashJoinTable hashtable, ExprContext * econtext, - Var * hashkey); -extern HeapTuple -ExecScanHashBucket(HashJoinState * hjstate, HashBucket bucket, - HeapTuple curtuple, List * hjclauses, - ExprContext * econtext); +ExecHashGetBucket(HashJoinTable hashtable, ExprContext *econtext, + Var *hashkey); +extern HeapTuple +ExecScanHashBucket(HashJoinState *hjstate, HashBucket bucket, + HeapTuple curtuple, List *hjclauses, + ExprContext *econtext); 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 e26f92c65fc..96ed987718a 100644 --- a/src/include/executor/nodeHashjoin.h +++ b/src/include/executor/nodeHashjoin.h @@ -6,20 +6,20 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeHashjoin.h,v 1.4 1997/09/08 02:36:25 momjian Exp $ + * $Id: nodeHashjoin.h,v 1.5 1997/09/08 21:52:05 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef NODEHASHJOIN_H #define NODEHASHJOIN_H -extern TupleTableSlot *ExecHashJoin(HashJoin * node); +extern TupleTableSlot *ExecHashJoin(HashJoin *node); -extern bool ExecInitHashJoin(HashJoin * node, EState * estate, Plan * parent); +extern bool ExecInitHashJoin(HashJoin *node, EState *estate, Plan *parent); -extern int ExecCountSlotsHashJoin(HashJoin * node); +extern int ExecCountSlotsHashJoin(HashJoin *node); -extern void ExecEndHashJoin(HashJoin * node); +extern void ExecEndHashJoin(HashJoin *node); extern char * ExecHashJoinSaveTuple(HeapTuple heapTuple, char *buffer, diff --git a/src/include/executor/nodeIndexscan.h b/src/include/executor/nodeIndexscan.h index 4137ec90f7b..5b149d8aed8 100644 --- a/src/include/executor/nodeIndexscan.h +++ b/src/include/executor/nodeIndexscan.h @@ -6,29 +6,29 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeIndexscan.h,v 1.4 1997/09/08 02:36:25 momjian Exp $ + * $Id: nodeIndexscan.h,v 1.5 1997/09/08 21:52:06 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef NODEINDEXSCAN_H #define NODEINDEXSCAN_H -extern TupleTableSlot *ExecIndexScan(IndexScan * node); +extern TupleTableSlot *ExecIndexScan(IndexScan *node); -extern void ExecIndexReScan(IndexScan * node, ExprContext * exprCtxt, Plan * parent); +extern void ExecIndexReScan(IndexScan *node, ExprContext *exprCtxt, Plan *parent); -extern void ExecEndIndexScan(IndexScan * node); +extern void ExecEndIndexScan(IndexScan *node); -extern void ExecIndexMarkPos(IndexScan * node); +extern void ExecIndexMarkPos(IndexScan *node); -extern void ExecIndexRestrPos(IndexScan * node); +extern void ExecIndexRestrPos(IndexScan *node); -extern void ExecUpdateIndexScanKeys(IndexScan * node, ExprContext * econtext); +extern void ExecUpdateIndexScanKeys(IndexScan *node, ExprContext *econtext); -extern bool ExecInitIndexScan(IndexScan * node, EState * estate, Plan * parent); +extern bool ExecInitIndexScan(IndexScan *node, EState *estate, Plan *parent); -extern int ExecCountSlotsIndexScan(IndexScan * node); +extern int ExecCountSlotsIndexScan(IndexScan *node); -extern void ExecIndexReScan(IndexScan * node, ExprContext * exprCtxt, Plan * parent); +extern void ExecIndexReScan(IndexScan *node, ExprContext *exprCtxt, Plan *parent); #endif /* NODEINDEXSCAN_H */ diff --git a/src/include/executor/nodeMaterial.h b/src/include/executor/nodeMaterial.h index cd97d6b3c9a..98daa35f319 100644 --- a/src/include/executor/nodeMaterial.h +++ b/src/include/executor/nodeMaterial.h @@ -6,18 +6,18 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeMaterial.h,v 1.3 1997/09/08 02:36:26 momjian Exp $ + * $Id: nodeMaterial.h,v 1.4 1997/09/08 21:52:07 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef NODEMATERIAL_H #define NODEMATERIAL_H -extern TupleTableSlot *ExecMaterial(Material * node); -extern bool ExecInitMaterial(Material * node, EState * estate, Plan * parent); -extern int ExecCountSlotsMaterial(Material * node); -extern void ExecEndMaterial(Material * node); -extern List ExecMaterialMarkPos(Material * node); -extern void ExecMaterialRestrPos(Material * node); +extern TupleTableSlot *ExecMaterial(Material *node); +extern bool ExecInitMaterial(Material *node, EState *estate, Plan *parent); +extern int ExecCountSlotsMaterial(Material *node); +extern void ExecEndMaterial(Material *node); +extern List ExecMaterialMarkPos(Material *node); +extern void ExecMaterialRestrPos(Material *node); #endif /* NODEMATERIAL_H */ diff --git a/src/include/executor/nodeMergejoin.h b/src/include/executor/nodeMergejoin.h index 5bd870fabd4..96a74e0fc9d 100644 --- a/src/include/executor/nodeMergejoin.h +++ b/src/include/executor/nodeMergejoin.h @@ -6,19 +6,19 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeMergejoin.h,v 1.5 1997/09/08 02:36:29 momjian Exp $ + * $Id: nodeMergejoin.h,v 1.6 1997/09/08 21:52:09 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef NODEMERGEJOIN_H #define NODEMERGEJOIN_H -extern TupleTableSlot *ExecMergeJoin(MergeJoin * node); +extern TupleTableSlot *ExecMergeJoin(MergeJoin *node); -extern bool ExecInitMergeJoin(MergeJoin * node, EState * estate, Plan * parent); +extern bool ExecInitMergeJoin(MergeJoin *node, EState *estate, Plan *parent); -extern int ExecCountSlotsMergeJoin(MergeJoin * node); +extern int ExecCountSlotsMergeJoin(MergeJoin *node); -extern void ExecEndMergeJoin(MergeJoin * node); +extern void ExecEndMergeJoin(MergeJoin *node); #endif /* NODEMERGEJOIN_H; */ diff --git a/src/include/executor/nodeNestloop.h b/src/include/executor/nodeNestloop.h index f68539e2929..2c4fa13fe1b 100644 --- a/src/include/executor/nodeNestloop.h +++ b/src/include/executor/nodeNestloop.h @@ -6,16 +6,16 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeNestloop.h,v 1.3 1997/09/08 02:36:34 momjian Exp $ + * $Id: nodeNestloop.h,v 1.4 1997/09/08 21:52:10 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef NODENESTLOOP_H #define NODENESTLOOP_H -extern TupleTableSlot *ExecNestLoop(NestLoop * node, Plan * parent); -extern bool ExecInitNestLoop(NestLoop * node, EState * estate, Plan * parent); -extern int ExecCountSlotsNestLoop(NestLoop * node); -extern void ExecEndNestLoop(NestLoop * node); +extern TupleTableSlot *ExecNestLoop(NestLoop *node, Plan *parent); +extern bool ExecInitNestLoop(NestLoop *node, EState *estate, Plan *parent); +extern int ExecCountSlotsNestLoop(NestLoop *node); +extern void ExecEndNestLoop(NestLoop *node); #endif /* NODENESTLOOP_H */ diff --git a/src/include/executor/nodeResult.h b/src/include/executor/nodeResult.h index 2dcb411db94..c66e069f468 100644 --- a/src/include/executor/nodeResult.h +++ b/src/include/executor/nodeResult.h @@ -6,16 +6,16 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeResult.h,v 1.3 1997/09/08 02:36:38 momjian Exp $ + * $Id: nodeResult.h,v 1.4 1997/09/08 21:52:11 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef NODERESULT_H #define NODERESULT_H -extern TupleTableSlot *ExecResult(Result * node); -extern bool ExecInitResult(Result * node, EState * estate, Plan * parent); -extern int ExecCountSlotsResult(Result * node); -extern void ExecEndResult(Result * node); +extern TupleTableSlot *ExecResult(Result *node); +extern bool ExecInitResult(Result *node, EState *estate, Plan *parent); +extern int ExecCountSlotsResult(Result *node); +extern void ExecEndResult(Result *node); #endif /* NODERESULT_H */ diff --git a/src/include/executor/nodeSeqscan.h b/src/include/executor/nodeSeqscan.h index 22154ea1f2c..d6afe03ac93 100644 --- a/src/include/executor/nodeSeqscan.h +++ b/src/include/executor/nodeSeqscan.h @@ -6,19 +6,19 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeSeqscan.h,v 1.4 1997/09/08 02:36:39 momjian Exp $ + * $Id: nodeSeqscan.h,v 1.5 1997/09/08 21:52:12 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef NODESEQSCAN_H #define NODESEQSCAN_H -extern TupleTableSlot *ExecSeqScan(SeqScan * node); -extern bool ExecInitSeqScan(SeqScan * node, EState * estate, Plan * parent); -extern int ExecCountSlotsSeqScan(SeqScan * node); -extern void ExecEndSeqScan(SeqScan * node); -extern void ExecSeqReScan(SeqScan * node, ExprContext * exprCtxt, Plan * parent); -extern void ExecSeqMarkPos(SeqScan * node); -extern void ExecSeqRestrPos(SeqScan * node); +extern TupleTableSlot *ExecSeqScan(SeqScan *node); +extern bool ExecInitSeqScan(SeqScan *node, EState *estate, Plan *parent); +extern int ExecCountSlotsSeqScan(SeqScan *node); +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/nodeSort.h b/src/include/executor/nodeSort.h index a4c0a1b388c..69b4dbe9a86 100644 --- a/src/include/executor/nodeSort.h +++ b/src/include/executor/nodeSort.h @@ -6,18 +6,18 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeSort.h,v 1.3 1997/09/08 02:36:40 momjian Exp $ + * $Id: nodeSort.h,v 1.4 1997/09/08 21:52:12 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef NODESORT_H #define NODESORT_H -extern TupleTableSlot *ExecSort(Sort * node); -extern bool ExecInitSort(Sort * node, EState * estate, Plan * parent); -extern int ExecCountSlotsSort(Sort * node); -extern void ExecEndSort(Sort * node); -extern void ExecSortMarkPos(Sort * node); -extern void ExecSortRestrPos(Sort * node); +extern TupleTableSlot *ExecSort(Sort *node); +extern bool ExecInitSort(Sort *node, EState *estate, Plan *parent); +extern int ExecCountSlotsSort(Sort *node); +extern void ExecEndSort(Sort *node); +extern void ExecSortMarkPos(Sort *node); +extern void ExecSortRestrPos(Sort *node); #endif /* NODESORT_H */ diff --git a/src/include/executor/nodeTee.h b/src/include/executor/nodeTee.h index a0fb3831424..c4a603aa3a9 100644 --- a/src/include/executor/nodeTee.h +++ b/src/include/executor/nodeTee.h @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeTee.h,v 1.3 1997/09/08 02:36:41 momjian Exp $ + * $Id: nodeTee.h,v 1.4 1997/09/08 21:52:13 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -13,10 +13,10 @@ #ifndef NODETEE_H #define NODETEE_H -extern TupleTableSlot *ExecTee(Tee * node, Plan * parent); -extern bool ExecInitTee(Tee * node, EState * estate, Plan * parent); -extern void ExecTeeReScan(Tee * node, ExprContext * exprCtxt, Plan * parent); -extern void ExecEndTee(Tee * node, Plan * parent); -extern int ExecCountSlotsTee(Tee * node); +extern TupleTableSlot *ExecTee(Tee *node, Plan *parent); +extern bool ExecInitTee(Tee *node, EState *estate, Plan *parent); +extern void ExecTeeReScan(Tee *node, ExprContext *exprCtxt, Plan *parent); +extern void ExecEndTee(Tee *node, Plan *parent); +extern int ExecCountSlotsTee(Tee *node); #endif /* NODETEE_H */ diff --git a/src/include/executor/nodeUnique.h b/src/include/executor/nodeUnique.h index 24042581f34..61ab85828cf 100644 --- a/src/include/executor/nodeUnique.h +++ b/src/include/executor/nodeUnique.h @@ -6,16 +6,16 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeUnique.h,v 1.3 1997/09/08 02:36:42 momjian Exp $ + * $Id: nodeUnique.h,v 1.4 1997/09/08 21:52:14 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef NODEUNIQUE_H #define NODEUNIQUE_H -extern TupleTableSlot *ExecUnique(Unique * node); -extern bool ExecInitUnique(Unique * node, EState * estate, Plan * parent); -extern int ExecCountSlotsUnique(Unique * node); -extern void ExecEndUnique(Unique * node); +extern TupleTableSlot *ExecUnique(Unique *node); +extern bool ExecInitUnique(Unique *node, EState *estate, Plan *parent); +extern int ExecCountSlotsUnique(Unique *node); +extern void ExecEndUnique(Unique *node); #endif /* NODEUNIQUE_H */ diff --git a/src/include/executor/spi.h b/src/include/executor/spi.h index 34ffef800ab..d5db0aa3d81 100644 --- a/src/include/executor/spi.h +++ b/src/include/executor/spi.h @@ -40,7 +40,7 @@ typedef struct uint32 free; /* # of free vals */ TupleDesc tupdesc; /* tuple descriptor */ HeapTuple *vals; /* tuples */ -} SPITupleTable; +} SPITupleTable; #define SPI_ERROR_CONNECT -1 #define SPI_ERROR_COPY -2 @@ -73,12 +73,12 @@ extern int SPI_connect(void); extern int SPI_finish(void); extern int SPI_exec(char *src, int tcount); extern int SPI_execp(void *plan, char **values, char *Nulls, int tcount); -extern void *SPI_prepare(char *src, int nargs, Oid * argtypes); +extern void *SPI_prepare(char *src, int nargs, Oid *argtypes); extern void *SPI_saveplan(void *plan); extern int SPI_fnumber(TupleDesc tupdesc, char *fname); extern char *SPI_getvalue(HeapTuple tuple, TupleDesc tupdesc, int fnumber); -extern char *SPI_getbinval(HeapTuple tuple, TupleDesc tupdesc, int fnumber, bool * isnull); +extern char *SPI_getbinval(HeapTuple tuple, TupleDesc tupdesc, int fnumber, bool *isnull); extern char *SPI_gettype(TupleDesc tupdesc, int fnumber); extern Oid SPI_gettypeid(TupleDesc tupdesc, int fnumber); extern char *SPI_getrelname(Relation rel); diff --git a/src/include/executor/tuptable.h b/src/include/executor/tuptable.h index ae824188163..1df589265e2 100644 --- a/src/include/executor/tuptable.h +++ b/src/include/executor/tuptable.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: tuptable.h,v 1.6 1997/09/08 02:36:45 momjian Exp $ + * $Id: tuptable.h,v 1.7 1997/09/08 21:52:16 momjian Exp $ * * NOTES * The tuple table interface is getting pretty ugly. @@ -53,7 +53,7 @@ typedef struct TupleTableSlot TupleDesc ttc_tupleDescriptor; Buffer ttc_buffer; int ttc_whichplan; -} TupleTableSlot; +} TupleTableSlot; /* ---------------- * tuple table data structure @@ -64,7 +64,7 @@ typedef struct TupleTableData int size; /* size of the table */ int next; /* next available slot number */ TupleTableSlot *array; /* array of TupleTableSlot's */ -} TupleTableData; +} TupleTableData; typedef TupleTableData *TupleTable; |