git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/src/backend/optimizer/prep/prepjointree.c b/src/backend/optimizer/prep/prepjointree.c

index f916d54602d9b9aff14f8df78e006b415d18cc51..37c6e967cf1b54ad9d1ca4ec13009b1564e7380f 100644 (file)

--- a/src/backend/optimizer/prep/prepjointree.c

+++ b/src/backend/optimizer/prep/prepjointree.c

*

*

* 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 $

*

*-------------------------------------------------------------------------

*/

{

FromExpr *f = (FromExpr *) jtnode;

List *newlist = NIL;

+ int children_remaining;

ListCell *l;

+ children_remaining = list_length(f->fromlist);

foreach(l, f->fromlist)

{

Node *child = (Node *) lfirst(l);

+ children_remaining--;

/* Recursively simplify this child... */

child = simplify_jointree(parse, child);

/* Now, is it a FromExpr? */

*/

FromExpr *subf = (FromExpr *) child;

int childlen = length(subf->fromlist);

- int myothers;

- ListCell *l2;

-

- /*

- * XXX: This is a quick hack, not sure of the proper

- * fix.

- */

- myothers = length(newlist);

- for_each_cell(l2, lnext(l))

- myothers++;

+ int myothers = length(newlist) + children_remaining;

if (childlen <= 1 ||

(childlen + myothers) <= from_collapse_limit)