|
10 | 10 | * |
11 | 11 | * |
12 | 12 | * IDENTIFICATION |
13 | | - * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.136 2003/02/09 06:56:27 tgl Exp $ |
| 13 | + * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.137 2003/02/16 06:06:32 tgl Exp $ |
14 | 14 | * |
15 | 15 | *------------------------------------------------------------------------- |
16 | 16 | */ |
|
35 | 35 |
|
36 | 36 | staticScan*create_scan_plan(Query*root,Path*best_path); |
37 | 37 | staticbooluse_physical_tlist(RelOptInfo*rel); |
| 38 | +staticvoiddisuse_physical_tlist(Plan*plan,Path*path); |
38 | 39 | staticJoin*create_join_plan(Query*root,JoinPath*best_path); |
39 | 40 | staticAppend*create_append_plan(Query*root,AppendPath*best_path); |
40 | 41 | staticResult*create_result_plan(Query*root,ResultPath*best_path); |
@@ -310,6 +311,33 @@ use_physical_tlist(RelOptInfo *rel) |
310 | 311 | return true; |
311 | 312 | } |
312 | 313 |
|
| 314 | +/* |
| 315 | + * disuse_physical_tlist |
| 316 | + *Switch a plan node back to emitting only Vars actually referenced. |
| 317 | + * |
| 318 | + * If the plan node immediately above a scan would prefer to get only |
| 319 | + * needed Vars and not a physical tlist, it must call this routine to |
| 320 | + * undo the decision made by use_physical_tlist(). Currently, Hash, Sort, |
| 321 | + * and Material nodes want this, so they don't have to store useless columns. |
| 322 | + */ |
| 323 | +staticvoid |
| 324 | +disuse_physical_tlist(Plan*plan,Path*path) |
| 325 | +{ |
| 326 | +/* Only need to undo it for path types handled by create_scan_plan() */ |
| 327 | +switch (path->pathtype) |
| 328 | +{ |
| 329 | +caseT_IndexScan: |
| 330 | +caseT_SeqScan: |
| 331 | +caseT_TidScan: |
| 332 | +caseT_SubqueryScan: |
| 333 | +caseT_FunctionScan: |
| 334 | +plan->targetlist=path->parent->targetlist; |
| 335 | +break; |
| 336 | +default: |
| 337 | +break; |
| 338 | +} |
| 339 | +} |
| 340 | + |
313 | 341 | /* |
314 | 342 | * create_join_plan |
315 | 343 | * Create a join plan for 'best_path' and (recursively) plans for its |
@@ -468,6 +496,9 @@ create_material_plan(Query *root, MaterialPath *best_path) |
468 | 496 |
|
469 | 497 | subplan=create_plan(root,best_path->subpath); |
470 | 498 |
|
| 499 | +/* We don't want any excess columns in the materialized tuples */ |
| 500 | +disuse_physical_tlist(subplan,best_path->subpath); |
| 501 | + |
471 | 502 | plan=make_material(subplan->targetlist,subplan); |
472 | 503 |
|
473 | 504 | copy_path_costsize(&plan->plan, (Path*)best_path); |
@@ -906,20 +937,27 @@ create_mergejoin_plan(Query *root, |
906 | 937 | /* |
907 | 938 | * Create explicit sort nodes for the outer and inner join paths if |
908 | 939 | * necessary. The sort cost was already accounted for in the path. |
| 940 | + * Make sure there are no excess columns in the inputs if sorting. |
909 | 941 | */ |
910 | 942 | if (best_path->outersortkeys) |
| 943 | +{ |
| 944 | +disuse_physical_tlist(outer_plan,best_path->jpath.outerjoinpath); |
911 | 945 | outer_plan= (Plan*) |
912 | 946 | make_sort_from_pathkeys(root, |
913 | 947 | outer_plan, |
914 | 948 | best_path->jpath.outerjoinpath->parent->relids, |
915 | 949 | best_path->outersortkeys); |
| 950 | +} |
916 | 951 |
|
917 | 952 | if (best_path->innersortkeys) |
| 953 | +{ |
| 954 | +disuse_physical_tlist(inner_plan,best_path->jpath.innerjoinpath); |
918 | 955 | inner_plan= (Plan*) |
919 | 956 | make_sort_from_pathkeys(root, |
920 | 957 | inner_plan, |
921 | 958 | best_path->jpath.innerjoinpath->parent->relids, |
922 | 959 | best_path->innersortkeys); |
| 960 | +} |
923 | 961 |
|
924 | 962 | /* |
925 | 963 | * Now we can build the mergejoin node. |
@@ -976,6 +1014,9 @@ create_hashjoin_plan(Query *root, |
976 | 1014 | innerhashkeys=lappend(innerhashkeys,get_rightop(lfirst(hcl))); |
977 | 1015 | } |
978 | 1016 |
|
| 1017 | +/* We don't want any excess columns in the hashed tuples */ |
| 1018 | +disuse_physical_tlist(inner_plan,best_path->jpath.innerjoinpath); |
| 1019 | + |
979 | 1020 | /* |
980 | 1021 | * Build the hash node and hash join node. |
981 | 1022 | */ |
|