database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-30 21:42:05 +03:00
Code Activity

Rename Aggreg to Aggref.

Browse Source
This commit is contained in:
Bruce Momjian
1999-01-24 00:28:37 +00:00
parent 157349e3af
commit 17467bb7fb
21 changed files with 221 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/backend/executor/execQual.c
View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.39 1998/12/04 15:33:19 thomas Exp $
* $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.40 1999/01/24 00:28:18 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -67,7 +67,7 @@ bool execConstByVal;
int execConstLen;
/* static functions decls */
static Datum ExecEvalAggreg(Aggreg *agg, ExprContext *econtext, bool *isNull);
static Datum ExecEvalAggref(Aggref *agg, ExprContext *econtext, bool *isNull);
static Datum ExecEvalArrayRef(ArrayRef *arrayRef, ExprContext *econtext,
bool *isNull, bool *isDone);
static Datum ExecEvalAnd(Expr *andExpr, ExprContext *econtext, bool *isNull);
@ -185,14 +185,14 @@ ExecEvalArrayRef(ArrayRef *arrayRef,
/* ----------------------------------------------------------------
* ExecEvalAggreg
* ExecEvalAggref
*
* Returns a Datum whose value is the value of the precomputed
* aggregate found in the given expression context.
* ----------------------------------------------------------------
*/
static Datum
ExecEvalAggreg(Aggreg *agg, ExprContext *econtext, bool *isNull)
ExecEvalAggref(Aggref *agg, ExprContext *econtext, bool *isNull)
{
*isNull = econtext->ecxt_nulls[agg->aggno];
return econtext->ecxt_values[agg->aggno];
@ -1268,8 +1268,8 @@ ExecEvalExpr(Node *expression,
isNull,
isDone);
break;
case T_Aggreg:
retDatum = (Datum) ExecEvalAggreg((Aggreg *) expression,
case T_Aggref:
retDatum = (Datum) ExecEvalAggref((Aggref *) expression,
econtext,
isNull);
break;

10
src/backend/executor/nodeAgg.c
View File

@ -45,7 +45,7 @@ typedef struct AggFuncInfo
FmgrInfo finalfn;
} AggFuncInfo;
static Datum aggGetAttr(TupleTableSlot *tuple, Aggreg *agg, bool *isNull);
static Datum aggGetAttr(TupleTableSlot *tuple, Aggref *agg, bool *isNull);
/* ---------------------------------------
@ -90,7 +90,7 @@ ExecAgg(Agg *node)
{
AggState *aggstate;
EState *estate;
Aggreg **aggregates;
Aggref **aggregates;
Plan *outerPlan;
int i,
nagg;
@ -133,7 +133,7 @@ ExecAgg(Agg *node)
nagg = length(node->aggs);
aggregates = (Aggreg **) palloc(sizeof(Aggreg *) * nagg);
aggregates = (Aggref **) palloc(sizeof(Aggref *) * nagg);
/* take List* and make it an array that can be quickly indexed */
alist = node->aggs;
@ -163,7 +163,7 @@ ExecAgg(Agg *node)
for (i = 0; i < nagg; i++)
{
Aggreg *agg;
Aggref *agg;
char *aggname;
HeapTuple aggTuple;
Form_pg_aggregate aggp;
@ -628,7 +628,7 @@ ExecEndAgg(Agg *node)
*/
static Datum
aggGetAttr(TupleTableSlot *slot,
Aggreg *agg,
Aggref *agg,
bool *isNull)
{
Datum result;