Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit17467bb

Browse files
committed
Rename Aggreg to Aggref.
1 parent157349e commit17467bb

File tree

21 files changed

+221
-221
lines changed

21 files changed

+221
-221
lines changed

‎src/backend/executor/execQual.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.39 1998/12/04 15:33:19 thomas Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.40 1999/01/24 00:28:18 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -67,7 +67,7 @@ boolexecConstByVal;
6767
intexecConstLen;
6868

6969
/* static functions decls */
70-
staticDatumExecEvalAggreg(Aggreg*agg,ExprContext*econtext,bool*isNull);
70+
staticDatumExecEvalAggref(Aggref*agg,ExprContext*econtext,bool*isNull);
7171
staticDatumExecEvalArrayRef(ArrayRef*arrayRef,ExprContext*econtext,
7272
bool*isNull,bool*isDone);
7373
staticDatumExecEvalAnd(Expr*andExpr,ExprContext*econtext,bool*isNull);
@@ -185,14 +185,14 @@ ExecEvalArrayRef(ArrayRef *arrayRef,
185185

186186

187187
/* ----------------------------------------------------------------
188-
*ExecEvalAggreg
188+
*ExecEvalAggref
189189
*
190190
*Returns a Datum whose value is the value of the precomputed
191191
*aggregate found in the given expression context.
192192
* ----------------------------------------------------------------
193193
*/
194194
staticDatum
195-
ExecEvalAggreg(Aggreg*agg,ExprContext*econtext,bool*isNull)
195+
ExecEvalAggref(Aggref*agg,ExprContext*econtext,bool*isNull)
196196
{
197197
*isNull=econtext->ecxt_nulls[agg->aggno];
198198
returnecontext->ecxt_values[agg->aggno];
@@ -1268,8 +1268,8 @@ ExecEvalExpr(Node *expression,
12681268
isNull,
12691269
isDone);
12701270
break;
1271-
caseT_Aggreg:
1272-
retDatum= (Datum)ExecEvalAggreg((Aggreg*)expression,
1271+
caseT_Aggref:
1272+
retDatum= (Datum)ExecEvalAggref((Aggref*)expression,
12731273
econtext,
12741274
isNull);
12751275
break;

‎src/backend/executor/nodeAgg.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ typedef struct AggFuncInfo
4545
FmgrInfofinalfn;
4646
}AggFuncInfo;
4747

48-
staticDatumaggGetAttr(TupleTableSlot*tuple,Aggreg*agg,bool*isNull);
48+
staticDatumaggGetAttr(TupleTableSlot*tuple,Aggref*agg,bool*isNull);
4949

5050

5151
/* ---------------------------------------
@@ -90,7 +90,7 @@ ExecAgg(Agg *node)
9090
{
9191
AggState*aggstate;
9292
EState*estate;
93-
Aggreg**aggregates;
93+
Aggref**aggregates;
9494
Plan*outerPlan;
9595
inti,
9696
nagg;
@@ -133,7 +133,7 @@ ExecAgg(Agg *node)
133133

134134
nagg=length(node->aggs);
135135

136-
aggregates= (Aggreg**)palloc(sizeof(Aggreg*)*nagg);
136+
aggregates= (Aggref**)palloc(sizeof(Aggref*)*nagg);
137137

138138
/* take List* and make it an array that can be quickly indexed */
139139
alist=node->aggs;
@@ -163,7 +163,7 @@ ExecAgg(Agg *node)
163163

164164
for (i=0;i<nagg;i++)
165165
{
166-
Aggreg*agg;
166+
Aggref*agg;
167167
char*aggname;
168168
HeapTupleaggTuple;
169169
Form_pg_aggregateaggp;
@@ -628,7 +628,7 @@ ExecEndAgg(Agg *node)
628628
*/
629629
staticDatum
630630
aggGetAttr(TupleTableSlot*slot,
631-
Aggreg*agg,
631+
Aggref*agg,
632632
bool*isNull)
633633
{
634634
Datumresult;

‎src/backend/nodes/copyfuncs.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.53 1999/01/21 22:55:41 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.54 1999/01/24 00:28:19 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -899,13 +899,13 @@ _copyFunc(Func *from)
899899
}
900900

901901
/* ----------------
902-
*_copyAggreg
902+
*_copyAggref
903903
* ----------------
904904
*/
905-
staticAggreg*
906-
_copyAggreg(Aggreg*from)
905+
staticAggref*
906+
_copyAggref(Aggref*from)
907907
{
908-
Aggreg*newnode=makeNode(Aggreg);
908+
Aggref*newnode=makeNode(Aggref);
909909

910910
/* ----------------
911911
*copy remainder of node
@@ -1782,8 +1782,8 @@ copyObject(void *from)
17821782
caseT_ArrayRef:
17831783
retval=_copyArrayRef(from);
17841784
break;
1785-
caseT_Aggreg:
1786-
retval=_copyAggreg(from);
1785+
caseT_Aggref:
1786+
retval=_copyAggref(from);
17871787
break;
17881788
caseT_SubLink:
17891789
retval=_copySubLink(from);

‎src/backend/nodes/outfuncs.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
* Copyright (c) 1994, Regents of the University of California
77
*
8-
* $Id: outfuncs.c,v 1.60 1999/01/21 16:08:36 vadim Exp $
8+
* $Id: outfuncs.c,v 1.61 1999/01/24 00:28:20 momjian Exp $
99
*
1010
* NOTES
1111
* Every (plan) node in POSTGRES has an associated "out" routine which
@@ -686,10 +686,10 @@ _outConst(StringInfo str, Const *node)
686686
}
687687

688688
/*
689-
*Aggreg
689+
*Aggref
690690
*/
691691
staticvoid
692-
_outAggreg(StringInfostr,Aggreg*node)
692+
_outAggref(StringInfostr,Aggref*node)
693693
{
694694
appendStringInfo(str,
695695
" AGGREG :aggname %s :basetype %u :aggtype %u :target ",
@@ -1506,8 +1506,8 @@ _outNode(StringInfo str, void *obj)
15061506
caseT_Const:
15071507
_outConst(str,obj);
15081508
break;
1509-
caseT_Aggreg:
1510-
_outAggreg(str,obj);
1509+
caseT_Aggref:
1510+
_outAggref(str,obj);
15111511
break;
15121512
caseT_SubLink:
15131513
_outSubLink(str,obj);

‎src/backend/nodes/readfuncs.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.42 1999/01/21 16:08:37 vadim Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.43 1999/01/24 00:28:20 momjian Exp $
1111
*
1212
* NOTES
1313
* Most of the read functions for plan nodes are tested. (In fact, they
@@ -1161,19 +1161,19 @@ _readParam()
11611161
}
11621162

11631163
/* ----------------
1164-
*_readAggreg
1164+
*_readAggref
11651165
*
1166-
*Aggreg is a subclass of Node
1166+
*Aggref is a subclass of Node
11671167
* ----------------
11681168
*/
1169-
staticAggreg*
1170-
_readAggreg()
1169+
staticAggref*
1170+
_readAggref()
11711171
{
1172-
Aggreg*local_node;
1172+
Aggref*local_node;
11731173
char*token;
11741174
intlength;
11751175

1176-
local_node=makeNode(Aggreg);
1176+
local_node=makeNode(Aggref);
11771177

11781178
token=lsptok(NULL,&length);/* eat :aggname */
11791179
token=lsptok(NULL,&length);/* get aggname */
@@ -2040,7 +2040,7 @@ parsePlanString(void)
20402040
elseif (!strncmp(token,"SORT",length))
20412041
return_value=_readSort();
20422042
elseif (!strncmp(token,"AGGREG",length))
2043-
return_value=_readAggreg();
2043+
return_value=_readAggref();
20442044
elseif (!strncmp(token,"SUBLINK",length))
20452045
return_value=_readSubLink();
20462046
elseif (!strncmp(token,"AGG",length))

‎src/backend/optimizer/plan/setrefs.c‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.31 1999/01/23 23:28:08 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.32 1999/01/24 00:28:20 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -611,8 +611,8 @@ replace_result_clause(Node *clause,
611611
((Var*)clause)->varno= (Index)OUTER;
612612
((Var*)clause)->varattno=subplanVar->resdom->resno;
613613
}
614-
elseif (IsA(clause,Aggreg))
615-
replace_result_clause(((Aggreg*)clause)->target,subplanTargetList);
614+
elseif (IsA(clause,Aggref))
615+
replace_result_clause(((Aggref*)clause)->target,subplanTargetList);
616616
elseif (is_funcclause(clause))
617617
{
618618
List*subExpr;
@@ -704,7 +704,7 @@ OperandIsInner(Node *opnd, int inner_relid)
704704
* changes the target list of an Agg node so that it points to
705705
* the tuples returned by its left tree subplan.
706706
*
707-
*We now also generate a linked list ofAggreg pointers for Agg.
707+
*We now also generate a linked list ofAggref pointers for Agg.
708708
*
709709
*/
710710
List*
@@ -765,10 +765,10 @@ replace_agg_clause(Node *clause, List *subplanTargetList)
765765
}
766766
returnagg_list;
767767
}
768-
elseif (IsA(clause,Aggreg))
768+
elseif (IsA(clause,Aggref))
769769
{
770770
returnlcons(clause,
771-
replace_agg_clause(((Aggreg*)clause)->target,subplanTargetList));
771+
replace_agg_clause(((Aggref*)clause)->target,subplanTargetList));
772772
}
773773
elseif (IsA(clause,ArrayRef))
774774
{
@@ -866,11 +866,11 @@ del_agg_clause(Node *clause)
866866
foreach(t, ((Expr*)clause)->args)
867867
lfirst(t)=del_agg_clause(lfirst(t));
868868
}
869-
elseif (IsA(clause,Aggreg))
869+
elseif (IsA(clause,Aggref))
870870
{
871871

872872
/* here is the real action, to remove the Agg node */
873-
returndel_agg_clause(((Aggreg*)clause)->target);
873+
returndel_agg_clause(((Aggref*)clause)->target);
874874

875875
}
876876
elseif (IsA(clause,ArrayRef))
@@ -967,10 +967,10 @@ check_having_qual_for_vars(Node *clause, List *targetlist_so_far)
967967
}
968968
returntargetlist_so_far;
969969
}
970-
elseif (IsA(clause,Aggreg))
970+
elseif (IsA(clause,Aggref))
971971
{
972972
targetlist_so_far=
973-
check_having_qual_for_vars(((Aggreg*)clause)->target,targetlist_so_far);
973+
check_having_qual_for_vars(((Aggref*)clause)->target,targetlist_so_far);
974974
returntargetlist_so_far;
975975
}
976976
elseif (IsA(clause,ArrayRef))
@@ -1100,10 +1100,10 @@ check_having_qual_for_aggs(Node *clause, List *subplanTargetList, List *groupCla
11001100
}
11011101
returnagg_list;
11021102
}
1103-
elseif (IsA(clause,Aggreg))
1103+
elseif (IsA(clause,Aggref))
11041104
{
11051105
returnlcons(clause,
1106-
check_having_qual_for_aggs(((Aggreg*)clause)->target,subplanTargetList,
1106+
check_having_qual_for_aggs(((Aggref*)clause)->target,subplanTargetList,
11071107
groupClause));
11081108
}
11091109
elseif (IsA(clause,ArrayRef))

‎src/backend/optimizer/plan/subselect.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -282,8 +282,8 @@ _finalize_primnode(void *expr, List **subplan)
282282
elseif (or_clause(expr)||and_clause(expr)||is_opclause(expr)||
283283
not_clause(expr)||is_funcclause(expr))
284284
return_finalize_primnode(((Expr*)expr)->args,subplan);
285-
elseif (IsA(expr,Aggreg))
286-
return_finalize_primnode(((Aggreg*)expr)->target,subplan);
285+
elseif (IsA(expr,Aggref))
286+
return_finalize_primnode(((Aggref*)expr)->target,subplan);
287287
elseif (IsA(expr,ArrayRef))
288288
{
289289
result=_finalize_primnode(((ArrayRef*)expr)->refupperindexpr,subplan);
@@ -349,9 +349,9 @@ SS_replace_correlation_vars(Node *expr)
349349
not_clause(expr)||is_funcclause(expr))
350350
((Expr*)expr)->args= (List*)
351351
SS_replace_correlation_vars((Node*) ((Expr*)expr)->args);
352-
elseif (IsA(expr,Aggreg))
353-
((Aggreg*)expr)->target=
354-
SS_replace_correlation_vars((Node*) ((Aggreg*)expr)->target);
352+
elseif (IsA(expr,Aggref))
353+
((Aggref*)expr)->target=
354+
SS_replace_correlation_vars((Node*) ((Aggref*)expr)->target);
355355
elseif (IsA(expr,ArrayRef))
356356
{
357357
((ArrayRef*)expr)->refupperindexpr= (List*)
@@ -530,8 +530,8 @@ SS_pull_subplan(void *expr)
530530
elseif (or_clause(expr)||and_clause(expr)||is_opclause(expr)||
531531
not_clause(expr)||is_funcclause(expr))
532532
returnSS_pull_subplan(((Expr*)expr)->args);
533-
elseif (IsA(expr,Aggreg))
534-
returnSS_pull_subplan(((Aggreg*)expr)->target);
533+
elseif (IsA(expr,Aggref))
534+
returnSS_pull_subplan(((Aggref*)expr)->target);
535535
elseif (IsA(expr,ArrayRef))
536536
{
537537
result=SS_pull_subplan(((ArrayRef*)expr)->refupperindexpr);

‎src/backend/optimizer/util/clauses.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.26 1998/12/04 15:34:14 thomas Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.27 1999/01/24 00:28:21 momjian Exp $
1111
*
1212
* HISTORY
1313
* AUTHORDATEMAJOR EVENT
@@ -145,7 +145,7 @@ static bool
145145
agg_clause(Node*clause)
146146
{
147147
return
148-
(clause!=NULL&&nodeTag(clause)==T_Aggreg);
148+
(clause!=NULL&&nodeTag(clause)==T_Aggref);
149149
}
150150

151151
/*****************************************************************************
@@ -548,7 +548,7 @@ fix_opid(Node *clause)
548548
fix_opid((Node*)get_rightop((Expr*)clause));
549549
}
550550
elseif (agg_clause(clause))
551-
fix_opid(((Aggreg*)clause)->target);
551+
fix_opid(((Aggref*)clause)->target);
552552
elseif (is_subplan(clause)&&
553553
((SubPlan*) ((Expr*)clause)->oper)->sublink->subLinkType!=EXISTS_SUBLINK)
554554
{

‎src/backend/optimizer/util/tlist.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.21 1998/12/04 15:34:15 thomas Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.22 1999/01/24 00:28:22 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -483,7 +483,7 @@ flatten_tlistentry(Node *tlistentry, List *flat_tlist)
483483

484484
return ((Node*)make_funcclause((Func*)expr->oper,temp_result));
485485
}
486-
elseif (IsA(tlistentry,Aggreg))
486+
elseif (IsA(tlistentry,Aggref))
487487
{
488488
returntlistentry;
489489
}

‎src/backend/optimizer/util/var.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/var.c,v 1.14 1998/12/04 15:34:15 thomas Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/var.c,v 1.15 1999/01/24 00:28:22 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -194,8 +194,8 @@ pull_var_clause(Node *clause)
194194
retval=nconc(retval,
195195
pull_var_clause(lfirst(((Expr*)lfirst(temp))->args)));
196196
}
197-
elseif (IsA(clause,Aggreg))
198-
retval=pull_var_clause(((Aggreg*)clause)->target);
197+
elseif (IsA(clause,Aggref))
198+
retval=pull_var_clause(((Aggref*)clause)->target);
199199
elseif (IsA(clause,ArrayRef))
200200
{
201201
List*temp;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp