diff options
Diffstat (limited to 'src/backend/executor')
-rw-r--r-- | src/backend/executor/execQual.c | 10 | ||||
-rw-r--r-- | src/backend/executor/execUtils.c | 6 | ||||
-rw-r--r-- | src/backend/executor/nodeAgg.c | 14 | ||||
-rw-r--r-- | src/backend/executor/nodeAppend.c | 14 | ||||
-rw-r--r-- | src/backend/executor/nodeGroup.c | 6 | ||||
-rw-r--r-- | src/backend/executor/nodeMergejoin.c | 14 | ||||
-rw-r--r-- | src/backend/executor/nodeNestloop.c | 4 |
7 files changed, 35 insertions, 33 deletions
diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c index a1e01402656..8248c8f5c36 100644 --- a/src/backend/executor/execQual.c +++ b/src/backend/executor/execQual.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.14 1997/09/08 02:22:33 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.15 1997/09/08 20:55:37 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -69,9 +69,9 @@ bool execConstByVal; int execConstLen; /* static functions decls */ -static Datum ExecEvalAggreg(Aggreg * agg, ExprContext * econtext, bool * isNull); +static Datum ExecEvalAggreg(Aggreg *agg, ExprContext * econtext, bool * isNull); static Datum -ExecEvalArrayRef(ArrayRef * arrayRef, ExprContext * econtext, +ExecEvalArrayRef(ArrayRef *arrayRef, ExprContext * econtext, bool * isNull, bool * isDone); static Datum ExecEvalAnd(Expr * andExpr, ExprContext * econtext, bool * isNull); static Datum @@ -101,7 +101,7 @@ static bool ExecQualClause(Node * clause, ExprContext * econtext); * -------------------------------- */ static Datum -ExecEvalArrayRef(ArrayRef * arrayRef, +ExecEvalArrayRef(ArrayRef *arrayRef, ExprContext * econtext, bool * isNull, bool * isDone) @@ -200,7 +200,7 @@ ExecEvalArrayRef(ArrayRef * arrayRef, * ---------------------------------------------------------------- */ static Datum -ExecEvalAggreg(Aggreg * agg, ExprContext * econtext, bool * isNull) +ExecEvalAggreg(Aggreg *agg, ExprContext * econtext, bool * isNull) { *isNull = econtext->ecxt_nulls[agg->aggno]; diff --git a/src/backend/executor/execUtils.c b/src/backend/executor/execUtils.c index 0f3338d3cb9..8d87e8591a9 100644 --- a/src/backend/executor/execUtils.c +++ b/src/backend/executor/execUtils.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.16 1997/09/08 02:22:36 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.17 1997/09/08 20:55:39 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -60,7 +60,7 @@ static void ExecGetIndexKeyInfo(IndexTupleForm indexTuple, int *numAttsOutP, - AttrNumber ** attsOutP, FuncIndexInfoPtr fInfoP); + AttrNumber **attsOutP, FuncIndexInfoPtr fInfoP); /* ---------------------------------------------------------------- * global counters for number of tuples processed, retrieved, @@ -608,7 +608,7 @@ QueryDescGetTypeInfo(QueryDesc * queryDesc) static void ExecGetIndexKeyInfo(IndexTupleForm indexTuple, int *numAttsOutP, - AttrNumber ** attsOutP, + AttrNumber **attsOutP, FuncIndexInfoPtr fInfoP) { int i; diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c index 92fa9bbe1ef..71646b67e00 100644 --- a/src/backend/executor/nodeAgg.c +++ b/src/backend/executor/nodeAgg.c @@ -45,9 +45,9 @@ typedef struct AggFuncInfo int xfn1_nargs; int xfn2_nargs; int finalfn_nargs; -} AggFuncInfo; +} AggFuncInfo; -static Datum aggGetAttr(TupleTableSlot * tuple, Aggreg * agg, bool * isNull); +static Datum aggGetAttr(TupleTableSlot * tuple, Aggreg *agg, bool * isNull); /* --------------------------------------- @@ -88,7 +88,7 @@ static Datum aggGetAttr(TupleTableSlot * tuple, Aggreg * agg, bool * isNull); * ------------------------------------------ */ TupleTableSlot * -ExecAgg(Agg * node) +ExecAgg(Agg *node) { AggState *aggstate; EState *estate; @@ -488,7 +488,7 @@ ExecAgg(Agg * node) * ----------------- */ bool -ExecInitAgg(Agg * node, EState * estate, Plan * parent) +ExecInitAgg(Agg *node, EState * estate, Plan * parent) { AggState *aggstate; Plan *outerPlan; @@ -551,7 +551,7 @@ ExecInitAgg(Agg * node, EState * estate, Plan * parent) } int -ExecCountSlotsAgg(Agg * node) +ExecCountSlotsAgg(Agg *node) { return ExecCountSlotsNode(outerPlan(node)) + ExecCountSlotsNode(innerPlan(node)) + @@ -564,7 +564,7 @@ ExecCountSlotsAgg(Agg * node) * ----------------------- */ void -ExecEndAgg(Agg * node) +ExecEndAgg(Agg *node) { AggState *aggstate; Plan *outerPlan; @@ -592,7 +592,7 @@ ExecEndAgg(Agg * node) */ static Datum aggGetAttr(TupleTableSlot * slot, - Aggreg * agg, + Aggreg *agg, bool * isNull) { Datum result; diff --git a/src/backend/executor/nodeAppend.c b/src/backend/executor/nodeAppend.c index da43dc8ee3d..786c93c7191 100644 --- a/src/backend/executor/nodeAppend.c +++ b/src/backend/executor/nodeAppend.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeAppend.c,v 1.7 1997/09/08 02:22:40 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeAppend.c,v 1.8 1997/09/08 20:55:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -64,7 +64,7 @@ #include "utils/mcxt.h" #include "parser/parsetree.h" /* for rt_store() macro */ -static bool exec_append_initialize_next(Append * node); +static bool exec_append_initialize_next(Append *node); /* ---------------------------------------------------------------- * exec-append-initialize-next @@ -76,7 +76,7 @@ static bool exec_append_initialize_next(Append * node); * ---------------------------------------------------------------- */ static bool -exec_append_initialize_next(Append * node) +exec_append_initialize_next(Append *node) { EState *estate; AppendState *unionstate; @@ -182,7 +182,7 @@ exec_append_initialize_next(Append * node) * ---------------------------------------------------------------- */ bool -ExecInitAppend(Append * node, EState * estate, Plan * parent) +ExecInitAppend(Append *node, EState * estate, Plan * parent) { AppendState *unionstate; int nplans; @@ -341,7 +341,7 @@ ExecInitAppend(Append * node, EState * estate, Plan * parent) } int -ExecCountSlotsAppend(Append * node) +ExecCountSlotsAppend(Append *node) { List *plan; List *unionplans = node->unionplans; @@ -363,7 +363,7 @@ ExecCountSlotsAppend(Append * node) * ---------------------------------------------------------------- */ TupleTableSlot * -ExecProcAppend(Append * node) +ExecProcAppend(Append *node) { EState *estate; AppendState *unionstate; @@ -456,7 +456,7 @@ ExecProcAppend(Append * node) * ---------------------------------------------------------------- */ void -ExecEndAppend(Append * node) +ExecEndAppend(Append *node) { AppendState *unionstate; int nplans; diff --git a/src/backend/executor/nodeGroup.c b/src/backend/executor/nodeGroup.c index c7e63696c0b..4e9ab4cfc81 100644 --- a/src/backend/executor/nodeGroup.c +++ b/src/backend/executor/nodeGroup.c @@ -13,7 +13,7 @@ * columns. (ie. tuples from the same group are consecutive) * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeGroup.c,v 1.7 1997/09/08 02:22:41 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeGroup.c,v 1.8 1997/09/08 20:55:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -32,7 +32,7 @@ static TupleTableSlot *ExecGroupEveryTuple(Group * node); static TupleTableSlot *ExecGroupOneTuple(Group * node); static bool sameGroup(TupleTableSlot * oldslot, TupleTableSlot * newslot, - int numCols, AttrNumber * grpColIdx, TupleDesc tupdesc); + int numCols, AttrNumber *grpColIdx, TupleDesc tupdesc); /* --------------------------------------- * ExecGroup - @@ -383,7 +383,7 @@ static bool sameGroup(TupleTableSlot * oldslot, TupleTableSlot * newslot, int numCols, - AttrNumber * grpColIdx, + AttrNumber *grpColIdx, TupleDesc tupdesc) { bool isNull1, diff --git a/src/backend/executor/nodeMergejoin.c b/src/backend/executor/nodeMergejoin.c index 621cfcea901..54c085b1d61 100644 --- a/src/backend/executor/nodeMergejoin.c +++ b/src/backend/executor/nodeMergejoin.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.10 1997/09/08 02:22:46 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.11 1997/09/08 20:55:45 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -734,8 +734,7 @@ ExecMergeJoin(MergeJoin * node) * This is the case when * * outer inner 4 5 - marked tuple outer tuple - 5 5 - * new outer tuple - 5 5 6 8 - inner tuple 7 - * 12 + * new outer tuple - 5 5 6 8 - inner tuple 7 12 * * new outer tuple = marked tuple * @@ -750,7 +749,8 @@ ExecMergeJoin(MergeJoin * node) * * new outer tuple > marked tuple * - ******************************* + ****************************** + * * * */ @@ -830,7 +830,8 @@ ExecMergeJoin(MergeJoin * node) * we have to advance the outer scan until we find the outer * 8. * - ******************************* + ****************************** + * * * */ @@ -932,7 +933,8 @@ ExecMergeJoin(MergeJoin * node) * we have to advance the inner scan until we find the inner * 12. * - ******************************* + ****************************** + * * * */ diff --git a/src/backend/executor/nodeNestloop.c b/src/backend/executor/nodeNestloop.c index d8d5f38d6db..fe6123a0aab 100644 --- a/src/backend/executor/nodeNestloop.c +++ b/src/backend/executor/nodeNestloop.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeNestloop.c,v 1.5 1997/09/08 02:22:48 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeNestloop.c,v 1.6 1997/09/08 20:55:46 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -86,7 +86,7 @@ ExecNestLoop(NestLoop * node, Plan * parent) */ econtext = nlstate->jstate.cs_ExprContext; - /* ---------------- * get the current outer tuple + /* ---------------- * get the current outer tuple * ---------------- */ outerTupleSlot = nlstate->jstate.cs_OuterTupleSlot; |