mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve planner estimates for size of tuple hash tables.

Browse Source
This commit is contained in:
Tom Lane 2006-06-28 20:04:38 +00:00
parent 485375a1c9
commit 1c1ecd5124
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/optimizer/plan/planner.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/optimizer/plan/planner.c,v 1.199 2006/03/05 15:58:29 momjian Exp $ * $PostgreSQL: pgsql/src/backend/optimizer/plan/planner.c,v 1.200 2006/06/28 20:04:38 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1298,7 +1298,7 @@ choose_hashed_grouping(PlannerInfo *root, double tuple_fraction,
} }
/* Estimate per-hash-entry space at tuple width... */ /* Estimate per-hash-entry space at tuple width... */
hashentrysize = cheapest_path_width; hashentrysize = MAXALIGN(cheapest_path_width) + MAXALIGN(sizeof(MinimalTupleData));
/* plus space for pass-by-ref transition values... */ /* plus space for pass-by-ref transition values... */
hashentrysize += agg_counts->transitionSpace; hashentrysize += agg_counts->transitionSpace;
/* plus the per-hash-entry overhead */ /* plus the per-hash-entry overhead */

10
src/backend/optimizer/plan/subselect.c
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/optimizer/plan/subselect.c,v 1.107 2006/05/03 00:24:56 tgl Exp $ * $PostgreSQL: pgsql/src/backend/optimizer/plan/subselect.c,v 1.108 2006/06/28 20:04:38 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -585,11 +585,13 @@ subplan_is_hashable(SubLink *slink, SubPlan *node)
return false; return false;
/* /*
* The estimated size of the subquery result must fit in work_mem. (XXX * The estimated size of the subquery result must fit in work_mem.
* what about hashtable overhead?) * (Note: we use sizeof(HeapTupleHeaderData) here even though the tuples
* will actually be stored as MinimalTuples; this provides some fudge
* factor for hashtable overhead.)
*/ */
subquery_size = node->plan->plan_rows * subquery_size = node->plan->plan_rows *
(MAXALIGN(node->plan->plan_width) + MAXALIGN(sizeof(HeapTupleData))); (MAXALIGN(node->plan->plan_width) + MAXALIGN(sizeof(HeapTupleHeaderData)));
if (subquery_size > work_mem * 1024L) if (subquery_size > work_mem * 1024L)
return false; return false;