diff options
Diffstat (limited to 'src/include/executor')
-rw-r--r-- | src/include/executor/execdesc.h | 8 | ||||
-rw-r--r-- | src/include/executor/executor.h | 104 | ||||
-rw-r--r-- | src/include/executor/hashjoin.h | 7 | ||||
-rw-r--r-- | src/include/executor/nodeHash.h | 4 | ||||
-rw-r--r-- | src/include/executor/nodeSeqscan.h | 12 | ||||
-rw-r--r-- | src/include/executor/nodeSubplan.h | 16 | ||||
-rw-r--r-- | src/include/executor/spi.h | 6 | ||||
-rw-r--r-- | src/include/executor/spi_priv.h | 7 | ||||
-rw-r--r-- | src/include/executor/tstoreReceiver.h | 6 |
9 files changed, 87 insertions, 83 deletions
diff --git a/src/include/executor/execdesc.h b/src/include/executor/execdesc.h index 5eecb53b8d2..05e04c72eba 100644 --- a/src/include/executor/execdesc.h +++ b/src/include/executor/execdesc.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: execdesc.h,v 1.24 2003/05/08 18:16:37 tgl Exp $ + * $Id: execdesc.h,v 1.25 2003/08/04 00:43:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -45,9 +45,9 @@ typedef struct QueryDesc /* in pquery.c */ extern QueryDesc *CreateQueryDesc(Query *parsetree, Plan *plantree, - DestReceiver *dest, - ParamListInfo params, - bool doInstrument); + DestReceiver *dest, + ParamListInfo params, + bool doInstrument); extern void FreeQueryDesc(QueryDesc *qdesc); diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h index 741b99c75f2..d68289ffe06 100644 --- a/src/include/executor/executor.h +++ b/src/include/executor/executor.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: executor.h,v 1.96 2003/07/21 17:05:10 tgl Exp $ + * $Id: executor.h,v 1.97 2003/08/04 00:43:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,9 +31,9 @@ /* * prototypes from functions in execAmi.c */ -extern void ExecReScan(PlanState *node, ExprContext *exprCtxt); -extern void ExecMarkPos(PlanState *node); -extern void ExecRestrPos(PlanState *node); +extern void ExecReScan(PlanState * node, ExprContext *exprCtxt); +extern void ExecMarkPos(PlanState * node); +extern void ExecRestrPos(PlanState * node); extern bool ExecSupportsMarkRestore(NodeTag plantype); extern bool ExecSupportsBackwardScan(Plan *node); @@ -48,31 +48,31 @@ extern bool execTuplesMatch(HeapTuple tuple1, FmgrInfo *eqfunctions, MemoryContext evalContext); extern bool execTuplesUnequal(HeapTuple tuple1, - HeapTuple tuple2, - TupleDesc tupdesc, - int numCols, - AttrNumber *matchColIdx, - FmgrInfo *eqfunctions, - MemoryContext evalContext); + HeapTuple tuple2, + TupleDesc tupdesc, + int numCols, + AttrNumber *matchColIdx, + FmgrInfo *eqfunctions, + MemoryContext evalContext); extern FmgrInfo *execTuplesMatchPrepare(TupleDesc tupdesc, int numCols, AttrNumber *matchColIdx); extern void execTuplesHashPrepare(TupleDesc tupdesc, - int numCols, - AttrNumber *matchColIdx, - FmgrInfo **eqfunctions, - FmgrInfo **hashfunctions); + int numCols, + AttrNumber *matchColIdx, + FmgrInfo **eqfunctions, + FmgrInfo **hashfunctions); extern TupleHashTable BuildTupleHashTable(int numCols, AttrNumber *keyColIdx, - FmgrInfo *eqfunctions, - FmgrInfo *hashfunctions, - int nbuckets, Size entrysize, - MemoryContext tablecxt, - MemoryContext tempcxt); + FmgrInfo *eqfunctions, + FmgrInfo *hashfunctions, + int nbuckets, Size entrysize, + MemoryContext tablecxt, + MemoryContext tempcxt); extern TupleHashEntry LookupTupleHashEntry(TupleHashTable hashtable, - TupleTableSlot *slot, - bool *isnew); + TupleTableSlot *slot, + bool *isnew); extern TupleHashEntry ScanTupleHashTable(TupleHashTable hashtable, - TupleHashIterator *state); + TupleHashIterator * state); /* * prototypes from functions in execJunk.c @@ -93,7 +93,7 @@ extern TupleTableSlot *ExecutorRun(QueryDesc *queryDesc, extern void ExecutorEnd(QueryDesc *queryDesc); extern void ExecutorRewind(QueryDesc *queryDesc); extern void ExecCheckRTPerms(List *rangeTable, CmdType operation); -extern void ExecEndPlan(PlanState *planstate, EState *estate); +extern void ExecEndPlan(PlanState * planstate, EState *estate); extern void ExecConstraints(ResultRelInfo *resultRelInfo, TupleTableSlot *slot, EState *estate); extern TupleTableSlot *EvalPlanQual(EState *estate, Index rti, @@ -103,9 +103,9 @@ extern TupleTableSlot *EvalPlanQual(EState *estate, Index rti, * prototypes from functions in execProcnode.c */ extern PlanState *ExecInitNode(Plan *node, EState *estate); -extern TupleTableSlot *ExecProcNode(PlanState *node); +extern TupleTableSlot *ExecProcNode(PlanState * node); extern int ExecCountSlotsNode(Plan *node); -extern void ExecEndNode(PlanState *node); +extern void ExecEndNode(PlanState * node); /* * prototypes from functions in execQual.c @@ -114,22 +114,22 @@ extern Datum GetAttributeByNum(TupleTableSlot *slot, AttrNumber attrno, bool *isNull); extern Datum GetAttributeByName(TupleTableSlot *slot, char *attname, bool *isNull); -extern void init_fcache(Oid foid, FuncExprState *fcache, - MemoryContext fcacheCxt); -extern Datum ExecMakeFunctionResult(FuncExprState *fcache, +extern void init_fcache(Oid foid, FuncExprState * fcache, + MemoryContext fcacheCxt); +extern Datum ExecMakeFunctionResult(FuncExprState * fcache, ExprContext *econtext, bool *isNull, ExprDoneCond *isDone); -extern Tuplestorestate *ExecMakeTableFunctionResult(ExprState *funcexpr, +extern Tuplestorestate *ExecMakeTableFunctionResult(ExprState * funcexpr, ExprContext *econtext, TupleDesc expectedDesc, TupleDesc *returnDesc); -extern Datum ExecEvalExpr(ExprState *expression, ExprContext *econtext, +extern Datum ExecEvalExpr(ExprState * expression, ExprContext *econtext, bool *isNull, ExprDoneCond *isDone); -extern Datum ExecEvalExprSwitchContext(ExprState *expression, ExprContext *econtext, +extern Datum ExecEvalExprSwitchContext(ExprState * expression, ExprContext *econtext, bool *isNull, ExprDoneCond *isDone); -extern ExprState *ExecInitExpr(Expr *node, PlanState *parent); -extern SubPlanState *ExecInitExprInitPlan(SubPlan *node, PlanState *parent); +extern ExprState *ExecInitExpr(Expr *node, PlanState * parent); +extern SubPlanState *ExecInitExprInitPlan(SubPlan *node, PlanState * parent); extern ExprState *ExecPrepareExpr(Expr *node, EState *estate); extern bool ExecQual(List *qual, ExprContext *econtext, bool resultForNull); extern int ExecTargetListLength(List *targetlist); @@ -140,10 +140,10 @@ extern TupleTableSlot *ExecProject(ProjectionInfo *projInfo, /* * prototypes from functions in execScan.c */ -typedef TupleTableSlot *(*ExecScanAccessMtd) (ScanState *node); +typedef TupleTableSlot *(*ExecScanAccessMtd) (ScanState * node); -extern TupleTableSlot *ExecScan(ScanState *node, ExecScanAccessMtd accessMtd); -extern void ExecAssignScanProjectionInfo(ScanState *node); +extern TupleTableSlot *ExecScan(ScanState * node, ExecScanAccessMtd accessMtd); +extern void ExecAssignScanProjectionInfo(ScanState * node); /* * prototypes from functions in execTuples.c @@ -160,14 +160,14 @@ extern TupleTableSlot *ExecClearTuple(TupleTableSlot *slot); extern void ExecSetSlotDescriptor(TupleTableSlot *slot, TupleDesc tupdesc, bool shouldFree); extern void ExecSetSlotDescriptorIsNew(TupleTableSlot *slot, bool isNew); -extern void ExecInitResultTupleSlot(EState *estate, PlanState *planstate); -extern void ExecInitScanTupleSlot(EState *estate, ScanState *scanstate); +extern void ExecInitResultTupleSlot(EState *estate, PlanState * planstate); +extern void ExecInitScanTupleSlot(EState *estate, ScanState * scanstate); extern TupleTableSlot *ExecInitExtraTupleSlot(EState *estate); extern TupleTableSlot *ExecInitNullTupleSlot(EState *estate, TupleDesc tupType); extern TupleDesc ExecTypeFromTL(List *targetList, bool hasoid); extern TupleDesc ExecCleanTypeFromTL(List *targetList, bool hasoid); -extern void UpdateChangedParamSet(PlanState *node, Bitmapset *newchg); +extern void UpdateChangedParamSet(PlanState * node, Bitmapset * newchg); typedef struct TupOutputState { @@ -177,7 +177,7 @@ typedef struct TupOutputState } TupOutputState; extern TupOutputState *begin_tup_output_tupdesc(DestReceiver *dest, - TupleDesc tupdesc); + TupleDesc tupdesc); extern void do_tup_output(TupOutputState *tstate, char **values); extern void do_text_output_multiline(TupOutputState *tstate, char *text); extern void end_tup_output(TupOutputState *tstate); @@ -224,21 +224,21 @@ extern ExprContext *MakePerTupleExprContext(EState *estate); ResetExprContext((estate)->es_per_tuple_exprcontext); \ } while (0) -extern void ExecAssignExprContext(EState *estate, PlanState *planstate); -extern void ExecAssignResultType(PlanState *planstate, +extern void ExecAssignExprContext(EState *estate, PlanState * planstate); +extern void ExecAssignResultType(PlanState * planstate, TupleDesc tupDesc, bool shouldFree); -extern void ExecAssignResultTypeFromOuterPlan(PlanState *planstate); -extern void ExecAssignResultTypeFromTL(PlanState *planstate); -extern TupleDesc ExecGetResultType(PlanState *planstate); +extern void ExecAssignResultTypeFromOuterPlan(PlanState * planstate); +extern void ExecAssignResultTypeFromTL(PlanState * planstate); +extern TupleDesc ExecGetResultType(PlanState * planstate); extern ProjectionInfo *ExecBuildProjectionInfo(List *targetList, - ExprContext *econtext, - TupleTableSlot *slot); -extern void ExecAssignProjectionInfo(PlanState *planstate); -extern void ExecFreeExprContext(PlanState *planstate); -extern TupleDesc ExecGetScanType(ScanState *scanstate); -extern void ExecAssignScanType(ScanState *scanstate, + ExprContext *econtext, + TupleTableSlot *slot); +extern void ExecAssignProjectionInfo(PlanState * planstate); +extern void ExecFreeExprContext(PlanState * planstate); +extern TupleDesc ExecGetScanType(ScanState * scanstate); +extern void ExecAssignScanType(ScanState * scanstate, TupleDesc tupDesc, bool shouldFree); -extern void ExecAssignScanTypeFromOuterPlan(ScanState *scanstate); +extern void ExecAssignScanTypeFromOuterPlan(ScanState * scanstate); extern void ExecOpenIndices(ResultRelInfo *resultRelInfo); extern void ExecCloseIndices(ResultRelInfo *resultRelInfo); diff --git a/src/include/executor/hashjoin.h b/src/include/executor/hashjoin.h index da7e0bf98c4..1407e537813 100644 --- a/src/include/executor/hashjoin.h +++ b/src/include/executor/hashjoin.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: hashjoin.h,v 1.28 2003/06/22 22:04:55 tgl Exp $ + * $Id: hashjoin.h,v 1.29 2003/08/04 00:43:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -71,8 +71,9 @@ typedef struct HashTableData /* * Info about the datatype-specific hash functions for the datatypes * being hashed. We assume that the inner and outer sides of each - * hashclause are the same type, or at least share the same hash function. - * This is an array of the same length as the number of hash keys. + * hashclause are the same type, or at least share the same hash + * function. This is an array of the same length as the number of hash + * keys. */ FmgrInfo *hashfunctions; /* lookup data for hash functions */ diff --git a/src/include/executor/nodeHash.h b/src/include/executor/nodeHash.h index d6d7ea627ea..4f4359c23e3 100644 --- a/src/include/executor/nodeHash.h +++ b/src/include/executor/nodeHash.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeHash.h,v 1.30 2003/06/22 22:04:55 tgl Exp $ + * $Id: nodeHash.h,v 1.31 2003/08/04 00:43:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,7 +30,7 @@ extern void ExecHashTableInsert(HashJoinTable hashtable, extern int ExecHashGetBucket(HashJoinTable hashtable, ExprContext *econtext, List *hashkeys); -extern int ExecHashGetBatch(int bucketno, HashJoinTable hashtable); +extern int ExecHashGetBatch(int bucketno, HashJoinTable hashtable); extern HeapTuple ExecScanHashBucket(HashJoinState *hjstate, List *hjclauses, ExprContext *econtext); extern void ExecHashTableReset(HashJoinTable hashtable, long ntuples); diff --git a/src/include/executor/nodeSeqscan.h b/src/include/executor/nodeSeqscan.h index 683c4ab7dc9..593a2120a23 100644 --- a/src/include/executor/nodeSeqscan.h +++ b/src/include/executor/nodeSeqscan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeSeqscan.h,v 1.16 2002/12/05 15:50:38 tgl Exp $ + * $Id: nodeSeqscan.h,v 1.17 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,10 +18,10 @@ extern int ExecCountSlotsSeqScan(SeqScan *node); extern SeqScanState *ExecInitSeqScan(SeqScan *node, EState *estate); -extern TupleTableSlot *ExecSeqScan(SeqScanState *node); -extern void ExecEndSeqScan(SeqScanState *node); -extern void ExecSeqMarkPos(SeqScanState *node); -extern void ExecSeqRestrPos(SeqScanState *node); -extern void ExecSeqReScan(SeqScanState *node, ExprContext *exprCtxt); +extern TupleTableSlot *ExecSeqScan(SeqScanState * node); +extern void ExecEndSeqScan(SeqScanState * node); +extern void ExecSeqMarkPos(SeqScanState * node); +extern void ExecSeqRestrPos(SeqScanState * node); +extern void ExecSeqReScan(SeqScanState * node, ExprContext *exprCtxt); #endif /* NODESEQSCAN_H */ diff --git a/src/include/executor/nodeSubplan.h b/src/include/executor/nodeSubplan.h index 8a3e74ebd1c..ccab4dd3475 100644 --- a/src/include/executor/nodeSubplan.h +++ b/src/include/executor/nodeSubplan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeSubplan.h,v 1.15 2002/12/14 00:17:59 tgl Exp $ + * $Id: nodeSubplan.h,v 1.16 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,13 +16,13 @@ #include "nodes/execnodes.h" -extern void ExecInitSubPlan(SubPlanState *node, EState *estate); -extern Datum ExecSubPlan(SubPlanState *node, - ExprContext *econtext, - bool *isNull); -extern void ExecEndSubPlan(SubPlanState *node); -extern void ExecReScanSetParamPlan(SubPlanState *node, PlanState *parent); +extern void ExecInitSubPlan(SubPlanState * node, EState *estate); +extern Datum ExecSubPlan(SubPlanState * node, + ExprContext *econtext, + bool *isNull); +extern void ExecEndSubPlan(SubPlanState * node); +extern void ExecReScanSetParamPlan(SubPlanState * node, PlanState * parent); -extern void ExecSetParamPlan(SubPlanState *node, ExprContext *econtext); +extern void ExecSetParamPlan(SubPlanState * node, ExprContext *econtext); #endif /* NODESUBPLAN_H */ diff --git a/src/include/executor/spi.h b/src/include/executor/spi.h index ead328da247..c7366c1af55 100644 --- a/src/include/executor/spi.h +++ b/src/include/executor/spi.h @@ -2,7 +2,7 @@ * * spi.h * - * $Id: spi.h,v 1.36 2003/03/10 03:53:51 tgl Exp $ + * $Id: spi.h,v 1.37 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -82,8 +82,8 @@ extern int SPI_finish(void); extern void SPI_push(void); extern void SPI_pop(void); extern int SPI_exec(const char *src, int tcount); -extern int SPI_execp(void *plan, Datum *values, const char *Nulls, - int tcount); +extern int SPI_execp(void *plan, Datum *values, const char *Nulls, + int tcount); extern void *SPI_prepare(const char *src, int nargs, Oid *argtypes); extern void *SPI_saveplan(void *plan); extern int SPI_freeplan(void *plan); diff --git a/src/include/executor/spi_priv.h b/src/include/executor/spi_priv.h index 5dd0ff2a6e3..c4a6f65dbff 100644 --- a/src/include/executor/spi_priv.h +++ b/src/include/executor/spi_priv.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: spi_priv.h,v 1.14 2003/05/02 20:54:35 tgl Exp $ + * $Id: spi_priv.h,v 1.15 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,7 +27,10 @@ typedef struct typedef struct { - /* context containing _SPI_plan itself as well as subsidiary structures */ + /* + * context containing _SPI_plan itself as well as subsidiary + * structures + */ MemoryContext plancxt; /* List of List of querytrees; one sublist per original parsetree */ List *qtlist; diff --git a/src/include/executor/tstoreReceiver.h b/src/include/executor/tstoreReceiver.h index e7d9497ffee..b345fcbaedf 100644 --- a/src/include/executor/tstoreReceiver.h +++ b/src/include/executor/tstoreReceiver.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: tstoreReceiver.h,v 1.2 2003/05/06 20:26:28 tgl Exp $ + * $Id: tstoreReceiver.h,v 1.3 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,6 +20,6 @@ extern DestReceiver *CreateTuplestoreDestReceiver(Tuplestorestate *tStore, - MemoryContext tContext); + MemoryContext tContext); -#endif /* TSTORE_RECEIVER_H */ +#endif /* TSTORE_RECEIVER_H */ |