diff options
author | Bruce Momjian <bruce@momjian.us> | 1998-01-15 19:00:16 +0000 |
---|---|---|
committer | Bruce Momjian <bruce@momjian.us> | 1998-01-15 19:00:16 +0000 |
commit | 763ff8aef848d71da079049890786edffc3302d6 (patch) | |
tree | a1aed2a633c409071dd6d724b6db2bc7bf4fcb75 /src/backend/optimizer/plan/createplan.c | |
parent | f22d8e6668e36a5855c35b04cc21a4d1593298d9 (diff) |
Remove Query->qry_aggs and qry_numaggs and replace with Query->hasAggs.
Pass List* of Aggregs into executor, and create needed array there.
No longer need to double-processs Aggregs with second copy in Query.
Fix crash when doing:
select sum(x+1) from test where 1 > 0;
Diffstat (limited to 'src/backend/optimizer/plan/createplan.c')
-rw-r--r-- | src/backend/optimizer/plan/createplan.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c index 3640eabcbcc..970a6a5ffb7 100644 --- a/src/backend/optimizer/plan/createplan.c +++ b/src/backend/optimizer/plan/createplan.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.22 1998/01/07 21:04:01 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.23 1998/01/15 18:59:37 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1106,7 +1106,7 @@ make_material(List *tlist, } Agg * -make_agg(List *tlist, int nagg, Aggreg **aggs, Plan *lefttree) +make_agg(List *tlist, Plan *lefttree) { Agg *node = makeNode(Agg); @@ -1116,8 +1116,7 @@ make_agg(List *tlist, int nagg, Aggreg **aggs, Plan *lefttree) node->plan.targetlist = tlist; node->plan.lefttree = lefttree; node->plan.righttree = (Plan *) NULL; - node->numAgg = nagg; - node->aggs = aggs; + node->aggs = NIL; return (node); } |