diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2003-08-11 20:46:47 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2003-08-11 20:46:47 +0000 |
| commit | 88381ade63de931c84f53dc873c986d40b8c8b61 (patch) | |
| tree | 1ec3c77e29b1d320718b64b38db10f8a8f0e0cd3 /src/backend/optimizer/plan/createplan.c | |
| parent | cae912d05bfb354d81427c6ae5354eab90869fe9 (diff) | |
| download | postgresql-88381ade63de931c84f53dc873c986d40b8c8b61.tar.gz postgresql-88381ade63de931c84f53dc873c986d40b8c8b61.zip | |
Code cleanup inspired by recent resname bug report (doesn't fix the bug
yet, though). Avoid using nth() to fetch tlist entries; provide a
common routine get_tle_by_resno() to search a tlist for a particular
resno. This replaces a couple uses of nth() and a dozen hand-coded
search loops. Also, replace a few uses of nth(length-1, list) with
llast().
Diffstat (limited to 'src/backend/optimizer/plan/createplan.c')
| -rw-r--r-- | src/backend/optimizer/plan/createplan.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c index 8abcfc576c1..2f7fd02fb4b 100644 --- a/src/backend/optimizer/plan/createplan.c +++ b/src/backend/optimizer/plan/createplan.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.153 2003/08/08 21:41:48 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.154 2003/08/11 20:46:46 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -28,6 +28,7 @@ #include "optimizer/restrictinfo.h" #include "optimizer/tlist.h" #include "optimizer/var.h" +#include "parser/parsetree.h" #include "parser/parse_clause.h" #include "parser/parse_expr.h" #include "utils/lsyscache.h" @@ -626,8 +627,8 @@ create_unique_plan(Query *root, UniquePath *best_path) { TargetEntry *tle; - tle = nth(groupColIdx[groupColPos] - 1, my_tlist); - Assert(tle->resdom->resno == groupColIdx[groupColPos]); + tle = get_tle_by_resno(my_tlist, groupColIdx[groupColPos]); + Assert(tle != NULL); sortList = addTargetToSortList(NULL, tle, sortList, my_tlist, NIL, false); } @@ -1975,7 +1976,7 @@ make_sort_from_groupcols(Query *root, foreach(i, groupcls) { GroupClause *grpcl = (GroupClause *) lfirst(i); - TargetEntry *tle = nth(grpColIdx[grpno] - 1, sub_tlist); + TargetEntry *tle = get_tle_by_resno(sub_tlist, grpColIdx[grpno]); Resdom *resdom = tle->resdom; /* |