Cost cleanup.

This commit is contained in:
Bruce Momjian 1997-12-18 12:30:44 +00:00
parent d3f0e87d17
commit 4469eb63a3
2 changed files with 4 additions and 5 deletions

View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.18 1997/12/18 12:20:30 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.19 1997/12/18 12:30:43 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1114,7 +1114,7 @@ make_agg(List *tlist, int nagg, Aggreg **aggs, Plan *lefttree)
node->plan.state = (EState *) NULL; node->plan.state = (EState *) NULL;
node->plan.qual = NULL; node->plan.qual = NULL;
node->plan.targetlist = tlist; node->plan.targetlist = tlist;
node->plan.lefttree = (Plan *) NULL; node->plan.lefttree = lefttree;
node->plan.righttree = (Plan *) NULL; node->plan.righttree = (Plan *) NULL;
node->numAgg = nagg; node->numAgg = nagg;
node->aggs = aggs; node->aggs = aggs;

View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planmain.c,v 1.9 1997/12/18 03:03:38 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planmain.c,v 1.10 1997/12/18 12:30:44 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -200,8 +200,7 @@ query_planner(Query *root,
*/ */
if (root->qry_aggs) if (root->qry_aggs)
{ {
aggplan = make_agg(tlist, root->qry_numAgg, root->qry_aggs); aggplan = make_agg(tlist, root->qry_numAgg, root->qry_aggs, subplan);
aggplan->plan.lefttree = subplan;
/* /*
* set the varno/attno entries to the appropriate references to * set the varno/attno entries to the appropriate references to