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

Use a cleaner substitute for the inability to apply length() to the tail

Browse Source 
of a list.  Per private discussion with Neil.
This commit is contained in:
Tom Lane 2004-05-26 18:35:41 +00:00
parent 0d5364fd98
commit 51227f8d9d
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/backend/optimizer/prep/prepjointree.c
View File

@ -16,7 +16,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/optimizer/prep/prepjointree.c,v 1.18 2004/05/26 04:41:26 neilc Exp $ * $PostgreSQL: pgsql/src/backend/optimizer/prep/prepjointree.c,v 1.19 2004/05/26 18:35:41 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -897,12 +897,15 @@ simplify_jointree(Query *parse, Node *jtnode)
{ {
FromExpr *f = (FromExpr *) jtnode; FromExpr *f = (FromExpr *) jtnode;
List *newlist = NIL; List *newlist = NIL;
int children_remaining;
ListCell *l; ListCell *l;
children_remaining = list_length(f->fromlist);
foreach(l, f->fromlist) foreach(l, f->fromlist)
{ {
Node *child = (Node *) lfirst(l); Node *child = (Node *) lfirst(l);
children_remaining--;
/* Recursively simplify this child... */ /* Recursively simplify this child... */
child = simplify_jointree(parse, child); child = simplify_jointree(parse, child);
/* Now, is it a FromExpr? */ /* Now, is it a FromExpr? */
@ -917,16 +920,7 @@ simplify_jointree(Query *parse, Node *jtnode)
*/ */
FromExpr *subf = (FromExpr *) child; FromExpr *subf = (FromExpr *) child;
int childlen = length(subf->fromlist); int childlen = length(subf->fromlist);
int myothers; int myothers = length(newlist) + children_remaining;
ListCell *l2;
/*
* XXX: This is a quick hack, not sure of the proper
* fix.
*/
myothers = length(newlist);
for_each_cell(l2, lnext(l))
myothers++;
if (childlen <= 1 || if (childlen <= 1 ||
(childlen + myothers) <= from_collapse_limit) (childlen + myothers) <= from_collapse_limit)