diff options
Diffstat (limited to 'src/include/executor')
-rw-r--r-- | src/include/executor/execdesc.h | 5 | ||||
-rw-r--r-- | src/include/executor/executor.h | 57 | ||||
-rw-r--r-- | src/include/executor/functions.h | 8 | ||||
-rw-r--r-- | src/include/executor/nodeHash.h | 13 | ||||
-rw-r--r-- | src/include/executor/nodeHashjoin.h | 5 | ||||
-rw-r--r-- | src/include/executor/nodeMaterial.h | 4 | ||||
-rw-r--r-- | src/include/executor/nodeSubplan.h | 4 | ||||
-rw-r--r-- | src/include/executor/spi.h | 19 |
8 files changed, 71 insertions, 44 deletions
diff --git a/src/include/executor/execdesc.h b/src/include/executor/execdesc.h index 503df7a5368..b7d71250ea0 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.7 1998/01/24 22:48:50 momjian Exp $ + * $Id: execdesc.h,v 1.8 1998/02/26 04:41:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -33,7 +33,8 @@ typedef struct QueryDesc } QueryDesc; /* in pquery.c */ -extern QueryDesc * CreateQueryDesc(Query *parsetree, Plan *plantree, +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 6769c5df76c..0ce8dc3fc9f 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.20 1998/02/13 03:43:33 vadim Exp $ + * $Id: executor.h,v 1.21 1998/02/26 04:41:19 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,12 +21,14 @@ /* * prototypes from functions in execAmi.c */ -extern void ExecOpenScanR(Oid relOid, int nkeys, ScanKey skeys, bool isindex, +extern void +ExecOpenScanR(Oid relOid, int nkeys, ScanKey skeys, bool isindex, ScanDirection dir, 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, +extern HeapScanDesc +ExecReScanR(Relation relDesc, HeapScanDesc scanDesc, ScanDirection direction, int nkeys, ScanKey skeys); extern void ExecMarkPos(Plan *node); extern void ExecRestrPos(Plan *node); @@ -36,7 +38,8 @@ 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, +extern bool +ExecGetJunkAttribute(JunkFilter *junkfilter, TupleTableSlot *slot, char *attrName, Datum *value, bool *isNull); extern HeapTuple ExecRemoveJunk(JunkFilter *junkfilter, TupleTableSlot *slot); @@ -63,16 +66,20 @@ extern void ExecEndNode(Plan *node, Plan *parent); extern bool execConstByVal; extern int execConstLen; -extern Datum ExecExtractResult(TupleTableSlot *slot, AttrNumber attnum, +extern Datum +ExecExtractResult(TupleTableSlot *slot, AttrNumber attnum, bool *isNull); -extern Datum ExecEvalParam(Param *expression, ExprContext *econtext, +extern Datum +ExecEvalParam(Param *expression, ExprContext *econtext, bool *isNull); /* stop here */ -extern char *GetAttributeByNum(TupleTableSlot *slot, AttrNumber attrno, - bool *isNull); +extern char * +GetAttributeByNum(TupleTableSlot *slot, AttrNumber attrno, + bool *isNull); extern char *GetAttributeByName(TupleTableSlot *slot, char *attname, bool *isNull); -extern Datum ExecEvalExpr(Node *expression, ExprContext *econtext, 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); @@ -89,53 +96,63 @@ extern TupleTableSlot *ExecScan(Scan *node, TupleTableSlot *(*accessMtd) ()); extern TupleTable ExecCreateTupleTable(int initialSize); extern void ExecDestroyTupleTable(TupleTable table, bool shouldFree); extern TupleTableSlot *ExecAllocTableSlot(TupleTable table); -extern TupleTableSlot *ExecStoreTuple(HeapTuple tuple, +extern TupleTableSlot * +ExecStoreTuple(HeapTuple tuple, TupleTableSlot *slot, Buffer buffer, bool shouldFree); extern TupleTableSlot *ExecClearTuple(TupleTableSlot *slot); extern bool ExecSetSlotPolicy(TupleTableSlot *slot, bool shouldFree); -extern TupleDesc ExecSetSlotDescriptor(TupleTableSlot *slot, +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 ExecInitScanTupleSlot(EState *estate, +extern void +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 void SetChangedParamList (Plan *node, List *newchg); +extern void SetChangedParamList(Plan *node, List *newchg); /* * prototypes from functions in execTuples.c */ extern void ResetTupleCount(void); -extern void ExecAssignNodeBaseInfo(EState *estate, CommonState *basenode, +extern void +ExecAssignNodeBaseInfo(EState *estate, CommonState *basenode, Plan *parent); extern void ExecAssignExprContext(EState *estate, CommonState *commonstate); -extern void ExecAssignResultType(CommonState *commonstate, +extern void +ExecAssignResultType(CommonState *commonstate, TupleDesc tupDesc); -extern void ExecAssignResultTypeFromOuterPlan(Plan *node, +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); -extern void ExecAssignScanType(CommonScanState *csstate, +extern void +ExecAssignScanType(CommonScanState *csstate, TupleDesc tupDesc); -extern void ExecAssignScanTypeFromOuterPlan(Plan *node, +extern void +ExecAssignScanTypeFromOuterPlan(Plan *node, CommonScanState *csstate); extern AttributeTupleForm ExecGetTypeInfo(Relation relDesc); -extern void ExecOpenIndices(Oid resultRelationOid, +extern void +ExecOpenIndices(Oid resultRelationOid, RelationInfo *resultRelationInfo); extern void ExecCloseIndices(RelationInfo *resultRelationInfo); -extern void ExecInsertIndexTuples(TupleTableSlot *slot, ItemPointer tupleid, +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 d54afe99a31..209d4b34e9d 100644 --- a/src/include/executor/functions.h +++ b/src/include/executor/functions.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: functions.h,v 1.6 1998/01/24 22:48:55 momjian Exp $ + * $Id: functions.h,v 1.7 1998/02/26 04:41:20 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,10 +18,12 @@ #include "nodes/primnodes.h" #include "utils/syscache.h" -extern Datum ProjectAttribute(TupleDesc TD, TargetEntry *tlist, +extern Datum +ProjectAttribute(TupleDesc TD, TargetEntry *tlist, HeapTuple tup, bool *isnullP); -extern Datum postquel_function(Func *funcNode, char **args, +extern Datum +postquel_function(Func *funcNode, char **args, bool *isNull, bool *isDone); #endif /* FUNCTIONS_H */ diff --git a/src/include/executor/nodeHash.h b/src/include/executor/nodeHash.h index a814c61ed6f..720fcf80678 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.8 1998/02/13 03:43:35 vadim Exp $ + * $Id: nodeHash.h,v 1.9 1998/02/26 04:41:21 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,18 +20,21 @@ #include "nodes/plannodes.h" #include "storage/fd.h" #include "utils/syscache.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 void ExecHashTableInsert(HashJoinTable hashtable, ExprContext *econtext, +extern void +ExecHashTableInsert(HashJoinTable hashtable, ExprContext *econtext, Var *hashkey, File *batches); extern void ExecHashTableDestroy(HashJoinTable hashtable); -extern int ExecHashGetBucket(HashJoinTable hashtable, ExprContext *econtext, +extern int +ExecHashGetBucket(HashJoinTable hashtable, ExprContext *econtext, Var *hashkey); -extern HeapTuple ExecScanHashBucket(HashJoinState *hjstate, HashBucket bucket, +extern HeapTuple +ExecScanHashBucket(HashJoinState *hjstate, HashBucket bucket, HeapTuple curtuple, List *hjclauses, ExprContext *econtext); extern void ExecHashTableReset(HashJoinTable hashtable, int ntuples); diff --git a/src/include/executor/nodeHashjoin.h b/src/include/executor/nodeHashjoin.h index e88e1a67cf4..08827cec072 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.8 1998/02/13 03:43:36 vadim Exp $ + * $Id: nodeHashjoin.h,v 1.9 1998/02/26 04:41:23 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,7 +21,8 @@ extern TupleTableSlot *ExecHashJoin(HashJoin *node); extern bool ExecInitHashJoin(HashJoin *node, EState *estate, Plan *parent); extern int ExecCountSlotsHashJoin(HashJoin *node); extern void ExecEndHashJoin(HashJoin *node); -extern char * ExecHashJoinSaveTuple(HeapTuple heapTuple, char *buffer, +extern char * +ExecHashJoinSaveTuple(HeapTuple heapTuple, char *buffer, File file, char *position); extern void ExecReScanHashJoin(HashJoin *node, ExprContext *exprCtxt, Plan *parent); diff --git a/src/include/executor/nodeMaterial.h b/src/include/executor/nodeMaterial.h index 1c612ea4fa4..c52e06ec98f 100644 --- a/src/include/executor/nodeMaterial.h +++ b/src/include/executor/nodeMaterial.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeMaterial.h,v 1.6 1998/02/13 03:43:37 vadim Exp $ + * $Id: nodeMaterial.h,v 1.7 1998/02/26 04:41:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,8 +22,10 @@ extern bool ExecInitMaterial(Material *node, EState *estate, Plan *parent); extern int ExecCountSlotsMaterial(Material *node); extern void ExecEndMaterial(Material *node); extern void ExecMaterialReScan(Material *node, ExprContext *exprCtxt, Plan *parent); + #if 0 extern List ExecMaterialMarkPos(Material *node); extern void ExecMaterialRestrPos(Material *node); + #endif #endif /* NODEMATERIAL_H */ diff --git a/src/include/executor/nodeSubplan.h b/src/include/executor/nodeSubplan.h index 6fa8945482e..dc25902a793 100644 --- a/src/include/executor/nodeSubplan.h +++ b/src/include/executor/nodeSubplan.h @@ -13,8 +13,8 @@ extern Datum ExecSubPlan(SubPlan *node, List *pvar, ExprContext *econtext); extern bool ExecInitSubPlan(SubPlan *node, EState *estate, Plan *parent); -extern void ExecReScanSetParamPlan (SubPlan *node, Plan *parent); -extern void ExecSetParamPlan (SubPlan *node); +extern void ExecReScanSetParamPlan(SubPlan *node, Plan *parent); +extern void ExecSetParamPlan(SubPlan *node); extern void ExecEndSubPlan(SubPlan *node); #endif /* NODESUBPLAN_H */ diff --git a/src/include/executor/spi.h b/src/include/executor/spi.h index ef8b268faab..d5479007087 100644 --- a/src/include/executor/spi.h +++ b/src/include/executor/spi.h @@ -41,7 +41,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,22 +73,23 @@ extern int SPI_result; extern int SPI_connect(void); extern int SPI_finish(void); 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 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 HeapTuple SPI_copytuple(HeapTuple tuple); -extern HeapTuple SPI_modifytuple(Relation rel, HeapTuple tuple, int natts, - int *attnum, Datum * Values, char *Nulls); +extern HeapTuple +SPI_modifytuple(Relation rel, HeapTuple tuple, int natts, + int *attnum, Datum *Values, char *Nulls); extern int SPI_fnumber(TupleDesc tupdesc, char *fname); extern char *SPI_fname(TupleDesc tupdesc, int fnumber); extern char *SPI_getvalue(HeapTuple tuple, TupleDesc tupdesc, int fnumber); -extern Datum SPI_getbinval(HeapTuple tuple, TupleDesc tupdesc, int fnumber, bool * isnull); +extern Datum 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); -extern void *SPI_palloc (Size size); -extern void *SPI_repalloc(void *pointer, Size size); -extern void SPI_pfree(void *pointer); +extern void *SPI_palloc(Size size); +extern void *SPI_repalloc(void *pointer, Size size); +extern void SPI_pfree(void *pointer); #endif /* SPI_H */ |