Commitcbb4213

committed

if ( new_rel->size <= 0 )

new_rel->size = compute_rel_size(new_rel);

1 parent71b3e93 commitcbb4213Copy full SHA for cbb4213

File tree

+12

-12

lines changed

+12

-12

lines changed

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`*`
`6`	`6`	`* Copyright (c) 1994, Regents of the University of California`
`7`	`7`	`*`
`8`		`- * $Id: geqo_eval.c,v 1.10 1997/06/06 03:18:02 vadim Exp $`
	`8`	`+ * $Id: geqo_eval.c,v 1.11 1997/06/10 07:53:53 vadim Exp $`
`9`	`9`	`*`
`10`	`10`	`*-------------------------------------------------------------------------`
`11`	`11`	`*/`
`@@ -157,9 +157,8 @@ gimme_tree (Query root, Gene tour, int rel_count, int num_gene, Rel *outer_rel`
`157`	`157`	`geqo_rel_paths(new_rel);`
`158`	`158`
`159`	`159`	`/* processing of other new_rel attributes */`
`160`		`-#if0/* compute_joinrel_size already called by geqo_rel_paths */`
`161`		`-new_rel->size=compute_rel_size(new_rel);`
`162`		`-#endif`
	`160`	`+if (new_rel->size <=0 )`
	`161`	`+new_rel->size=compute_rel_size(new_rel);`
`163`	`162`	`new_rel->width=compute_rel_width(new_rel);`
`164`	`163`
`165`	`164`	`root->join_relation_list_=lcons(new_rel,NIL);`

Lines changed: 9 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`*`
`6`	`6`	`* Copyright (c) 1994, Regents of the University of California`
`7`	`7`	`*`
`8`		`- * $Id: geqo_paths.c,v 1.2 1997/02/19 14:52:06 scrappy Exp $`
	`8`	`+ * $Id: geqo_paths.c,v 1.3 1997/06/10 07:53:55 vadim Exp $`
`9`	`9`	`*`
`10`	`10`	`*-------------------------------------------------------------------------`
`11`	`11`	`*/`
`@@ -102,16 +102,17 @@ geqo_rel_paths(Rel *rel)`
`102`	`102`	`Pathpath= (Path)NULL;`
`103`	`103`	`JoinPathcheapest= (JoinPath)NULL;`
`104`	`104`
`105`		`-foreach(y,rel->pathlist) {`
`106`		`-path= (Path*)lfirst(y);`
	`105`	`+rel->size=0;`
	`106`	`+foreach(y,rel->pathlist)`
	`107`	`+ {`
	`108`	`+path= (Path*)lfirst(y);`
`107`	`109`
`108`		`-if(!path->p_ordering.ord.sortop) {`
	`110`	`+if(!path->p_ordering.ord.sortop)`
`109`	`111`	`break;`
`110`		`- }`
`111`		`-}`
	`112`	`+ }`
`112`	`113`
`113`		`-cheapest= (JoinPath*)set_paths(rel,path);`
`114`		`-rel->size=compute_joinrel_size(cheapest);`
	`114`	`+cheapest= (JoinPath*)set_paths(rel,path);`
	`115`	`+rel->size=compute_joinrel_size(cheapest);`
`115`	`116`	`}`
`116`	`117`
`117`	`118`

Comments

(0)