database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

When testing whether a sub-plan can do projection, use a general-purpose

Browse Source 
check instead of hardwiring assumptions that only certain plan node types
can appear at the places where we are testing.  This was always a pretty
fragile assumption, and it turns out to be broken in 7.4 for certain cases
involving IN-subselect tests that need type coercion.
Also, modify code that builds finished Plan tree so that node types that
don't do projection always copy their input node's targetlist, rather than
having the tlist passed in from the caller.  The old method makes it too
easy to write broken code that thinks it can modify the tlist when it
cannot.
This commit is contained in:
Tom Lane
2004-01-18 00:50:03 +00:00
parent de816a03c4
commit 6bdfde9a77
4 changed files with 81 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/optimizer/plan/planner.c,v 1.164 2004/01/12 22:20:28 tgl Exp $
* $PostgreSQL: pgsql/src/backend/optimizer/plan/planner.c,v 1.165 2004/01/18 00:50:02 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -1103,10 +1103,9 @@ grouping_planner(Query *parse, double tuple_fraction)
/*
* If the top-level plan node is one that cannot do expression
* evaluation, we must insert a Result node to project the
* desired tlist. Currently, the only plan node we might see
* here that falls into that category is Append.
* desired tlist.
*/
if (IsA(result_plan, Append))
if (!is_projection_capable_plan(result_plan))
{
result_plan = (Plan *) make_result(sub_tlist, NULL,
result_plan);
@ -1265,9 +1264,8 @@ grouping_planner(Query *parse, double tuple_fraction)
{
result_plan = (Plan *)
make_sort_from_sortclauses(parse,
tlist,
result_plan,
parse->sortClause);
parse->sortClause,
result_plan);
current_pathkeys = sort_pathkeys;
}
}
@ -1277,8 +1275,7 @@ grouping_planner(Query *parse, double tuple_fraction)
*/
if (parse->distinctClause)
{
result_plan = (Plan *) make_unique(tlist, result_plan,
parse->distinctClause);
result_plan = (Plan *) make_unique(result_plan, parse->distinctClause);
/*
* If there was grouping or aggregation, leave plan_rows as-is
@ -1303,7 +1300,7 @@ grouping_planner(Query *parse, double tuple_fraction)
*/
if (parse->limitOffset || parse->limitCount)
{
result_plan = (Plan *) make_limit(tlist, result_plan,
result_plan = (Plan *) make_limit(result_plan,
parse->limitOffset,
parse->limitCount);
}