postgres.git / summary / log / commit / refs
commit 0d4c8f26ae777f9a85916d57e7d793487c8a0129
Author: Tom Lane <tgl@sss.pgh.pa.us>
Date: Fri Feb 13 22:26:43 2004 +0000
First released in: 8.0.0, 7.4.2
Repair optimization bug I introduced in a moment of brain fade back in
Nov 2002: when constant-expression simplification removes all the
aggregate function calls from a query, that doesn't mean we can act as
though there never were any aggregates. Per bug report from Gabor Szucs.
src/backend/optimizer/plan/planner.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index 73010f2f37a..b1c5a8cb131 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.161 2003/09/25 06:58:00 petere Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.161.2.1 2004/02/13 22:26:43 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -701,19 +701,18 @@ grouping_planner(Query *parse, double tuple_fraction)
/*
* Will need actual number of aggregates for estimating costs.
- * Also, it's possible that optimization has eliminated all
- * aggregates, and we may as well check for that here.
*
* Note: we do not attempt to detect duplicate aggregates here; a
* somewhat-overestimated count is okay for our present purposes.
+ *
+ * Note: think not that we can turn off hasAggs if we find no aggs.
+ * It is possible for constant-expression simplification to remove
+ * all explicit references to aggs, but we still have to follow the
+ * aggregate semantics (eg, producing only one output row).
*/
if (parse->hasAggs)
- {
numAggs = count_agg_clause((Node *) tlist) +
count_agg_clause(parse->havingQual);
- if (numAggs == 0)
- parse->hasAggs = false;
- }
/*
* Figure out whether we need a sorted result from query_planner.
[parent: 3d6dabfc70c7]