mirror of
https://github.com/postgres/postgres.git
synced 2025-11-12 05:01:15 +03:00
Rename Aggreg to Aggref.
This commit is contained in:
@@ -7,7 +7,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.31 1999/01/23 23:28:08 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.32 1999/01/24 00:28:20 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -611,8 +611,8 @@ replace_result_clause(Node *clause,
|
||||
((Var *) clause)->varno = (Index) OUTER;
|
||||
((Var *) clause)->varattno = subplanVar->resdom->resno;
|
||||
}
|
||||
else if (IsA(clause, Aggreg))
|
||||
replace_result_clause(((Aggreg *) clause)->target, subplanTargetList);
|
||||
else if (IsA(clause, Aggref))
|
||||
replace_result_clause(((Aggref *) clause)->target, subplanTargetList);
|
||||
else if (is_funcclause(clause))
|
||||
{
|
||||
List *subExpr;
|
||||
@@ -704,7 +704,7 @@ OperandIsInner(Node *opnd, int inner_relid)
|
||||
* changes the target list of an Agg node so that it points to
|
||||
* the tuples returned by its left tree subplan.
|
||||
*
|
||||
* We now also generate a linked list of Aggreg pointers for Agg.
|
||||
* We now also generate a linked list of Aggref pointers for Agg.
|
||||
*
|
||||
*/
|
||||
List *
|
||||
@@ -765,10 +765,10 @@ replace_agg_clause(Node *clause, List *subplanTargetList)
|
||||
}
|
||||
return agg_list;
|
||||
}
|
||||
else if (IsA(clause, Aggreg))
|
||||
else if (IsA(clause, Aggref))
|
||||
{
|
||||
return lcons(clause,
|
||||
replace_agg_clause(((Aggreg *) clause)->target, subplanTargetList));
|
||||
replace_agg_clause(((Aggref *) clause)->target, subplanTargetList));
|
||||
}
|
||||
else if (IsA(clause, ArrayRef))
|
||||
{
|
||||
@@ -866,11 +866,11 @@ del_agg_clause(Node *clause)
|
||||
foreach(t, ((Expr *) clause)->args)
|
||||
lfirst(t) = del_agg_clause(lfirst(t));
|
||||
}
|
||||
else if (IsA(clause, Aggreg))
|
||||
else if (IsA(clause, Aggref))
|
||||
{
|
||||
|
||||
/* here is the real action, to remove the Agg node */
|
||||
return del_agg_clause(((Aggreg *) clause)->target);
|
||||
return del_agg_clause(((Aggref *) clause)->target);
|
||||
|
||||
}
|
||||
else if (IsA(clause, ArrayRef))
|
||||
@@ -967,10 +967,10 @@ check_having_qual_for_vars(Node *clause, List *targetlist_so_far)
|
||||
}
|
||||
return targetlist_so_far;
|
||||
}
|
||||
else if (IsA(clause, Aggreg))
|
||||
else if (IsA(clause, Aggref))
|
||||
{
|
||||
targetlist_so_far =
|
||||
check_having_qual_for_vars(((Aggreg *) clause)->target, targetlist_so_far);
|
||||
check_having_qual_for_vars(((Aggref *) clause)->target, targetlist_so_far);
|
||||
return targetlist_so_far;
|
||||
}
|
||||
else if (IsA(clause, ArrayRef))
|
||||
@@ -1100,10 +1100,10 @@ check_having_qual_for_aggs(Node *clause, List *subplanTargetList, List *groupCla
|
||||
}
|
||||
return agg_list;
|
||||
}
|
||||
else if (IsA(clause, Aggreg))
|
||||
else if (IsA(clause, Aggref))
|
||||
{
|
||||
return lcons(clause,
|
||||
check_having_qual_for_aggs(((Aggreg *) clause)->target, subplanTargetList,
|
||||
check_having_qual_for_aggs(((Aggref *) clause)->target, subplanTargetList,
|
||||
groupClause));
|
||||
}
|
||||
else if (IsA(clause, ArrayRef))
|
||||
|
||||
@@ -282,8 +282,8 @@ _finalize_primnode(void *expr, List **subplan)
|
||||
else if (or_clause(expr) || and_clause(expr) || is_opclause(expr) ||
|
||||
not_clause(expr) || is_funcclause(expr))
|
||||
return _finalize_primnode(((Expr *) expr)->args, subplan);
|
||||
else if (IsA(expr, Aggreg))
|
||||
return _finalize_primnode(((Aggreg *) expr)->target, subplan);
|
||||
else if (IsA(expr, Aggref))
|
||||
return _finalize_primnode(((Aggref *) expr)->target, subplan);
|
||||
else if (IsA(expr, ArrayRef))
|
||||
{
|
||||
result = _finalize_primnode(((ArrayRef *) expr)->refupperindexpr, subplan);
|
||||
@@ -349,9 +349,9 @@ SS_replace_correlation_vars(Node *expr)
|
||||
not_clause(expr) || is_funcclause(expr))
|
||||
((Expr *) expr)->args = (List *)
|
||||
SS_replace_correlation_vars((Node *) ((Expr *) expr)->args);
|
||||
else if (IsA(expr, Aggreg))
|
||||
((Aggreg *) expr)->target =
|
||||
SS_replace_correlation_vars((Node *) ((Aggreg *) expr)->target);
|
||||
else if (IsA(expr, Aggref))
|
||||
((Aggref *) expr)->target =
|
||||
SS_replace_correlation_vars((Node *) ((Aggref *) expr)->target);
|
||||
else if (IsA(expr, ArrayRef))
|
||||
{
|
||||
((ArrayRef *) expr)->refupperindexpr = (List *)
|
||||
@@ -530,8 +530,8 @@ SS_pull_subplan(void *expr)
|
||||
else if (or_clause(expr) || and_clause(expr) || is_opclause(expr) ||
|
||||
not_clause(expr) || is_funcclause(expr))
|
||||
return SS_pull_subplan(((Expr *) expr)->args);
|
||||
else if (IsA(expr, Aggreg))
|
||||
return SS_pull_subplan(((Aggreg *) expr)->target);
|
||||
else if (IsA(expr, Aggref))
|
||||
return SS_pull_subplan(((Aggref *) expr)->target);
|
||||
else if (IsA(expr, ArrayRef))
|
||||
{
|
||||
result = SS_pull_subplan(((ArrayRef *) expr)->refupperindexpr);
|
||||
|
||||
Reference in New Issue
Block a user