optimizer cleanup

bmomjian · bmomjian · commit e78662d879de · 1999-02-18T04:55:54.000Z
diff --git a/src/backend/optimizer/geqo/geqo_eval.c b/src/backend/optimizer/geqo/geqo_eval.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_eval.c,v 1.33 1999/02/16 00:40:59 momjian Exp $
+ * $Id: geqo_eval.c,v 1.34 1999/02/18 04:55:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -86,12 +86,12 @@ geqo_eval(Query *root, Gene *tour, int num_gene)
  * gimme_tree 
  *	  this program presumes that only LEFT-SIDED TREES are considered!
  *
- * 'outer_rel' is the preceeding join
+ * 'old_rel' is the preceeding join
  *
  * Returns a new join relation incorporating all joins in a left-sided tree.
  */
 RelOptInfo *
-gimme_tree(Query *root, Gene *tour, int rel_count, int num_gene, RelOptInfo *outer_rel)
+gimme_tree(Query *root, Gene *tour, int rel_count, int num_gene, RelOptInfo *old_rel)
 {
 	RelOptInfo *inner_rel;		/* current relation */
 	int			base_rel_index;
@@ -115,16 +115,16 @@ gimme_tree(Query *root, Gene *tour, int rel_count, int num_gene, RelOptInfo *out
 		}
 		else
 		{						/* tree main part */
-			if (!(new_rels = make_rels_by_clause_joins(root, outer_rel,
+			if (!(new_rels = make_rels_by_clause_joins(root, old_rel,
 													   inner_rel->joininfo,
 													   inner_rel->relids)))
 			{
 				if (!BushyPlanFlag)
-					new_rels = make_rels_by_clauseless_joins(outer_rel,
+					new_rels = make_rels_by_clauseless_joins(old_rel,
 												 	lcons(inner_rel,NIL));
 				else
-					new_rels = make_rels_by_clauseless_joins(outer_rel,
-													 lcons(outer_rel,NIL));
+					new_rels = make_rels_by_clauseless_joins(old_rel,
+													 lcons(old_rel,NIL));
 			}
 
 			/* process new_rel->pathlist */
@@ -168,7 +168,7 @@ gimme_tree(Query *root, Gene *tour, int rel_count, int num_gene, RelOptInfo *out
 
 	}
 
-	return outer_rel;			/* tree finished ... */
+	return old_rel;			/* tree finished ... */
 }
 
 static RelOptInfo *
diff --git a/src/backend/optimizer/geqo/geqo_main.c b/src/backend/optimizer/geqo/geqo_main.c
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_main.c,v 1.13 1999/02/13 23:16:08 momjian Exp $
+ * $Id: geqo_main.c,v 1.14 1999/02/18 04:55:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -253,7 +253,8 @@ geqo(Query *root)
 	best_tour = (Gene *) pool->data[0].string;
 
 /* root->join_relation_list_ will be modified during this ! */
-	best_rel = (RelOptInfo *) gimme_tree(root, best_tour, 0, pool->string_length, NULL);
+	best_rel = (RelOptInfo *) gimme_tree(root, best_tour, 0,
+										 pool->string_length, NULL);
 
 /* DBG: show the query plan
 print_plan(best_plan, root);
diff --git a/src/include/optimizer/geqo.h b/src/include/optimizer/geqo.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo.h,v 1.12 1999/02/15 05:50:02 momjian Exp $
+ * $Id: geqo.h,v 1.13 1999/02/18 04:55:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -75,7 +75,8 @@ extern RelOptInfo *geqo(Query *root);
 extern void geqo_params(int string_length);
 
 extern Cost geqo_eval(Query *root, Gene *tour, int num_gene);
-extern RelOptInfo *gimme_tree(Query *root, Gene *tour, int rel_count, int num_gene, RelOptInfo *outer_rel);
+extern RelOptInfo *gimme_tree(Query *root, Gene *tour, int rel_count,
+							  int num_gene, RelOptInfo *old_rel);
 
 
 #endif	 /* GEQO_H */

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.33 1999/02/16 00:40:59 momjian Exp $`
	`8`	`+ * $Id: geqo_eval.c,v 1.34 1999/02/18 04:55:54 momjian Exp $`
`9`	`9`	`*`
`10`	`10`	`*-------------------------------------------------------------------------`
`11`	`11`	`*/`
`@@ -86,12 +86,12 @@ geqo_eval(Query root, Gene tour, int num_gene)`
`86`	`86`	`* gimme_tree`
`87`	`87`	`* this program presumes that only LEFT-SIDED TREES are considered!`
`88`	`88`	`*`
`89`		`- * 'outer_rel' is the preceeding join`
	`89`	`+ * 'old_rel' is the preceeding join`
`90`	`90`	`*`
`91`	`91`	`* Returns a new join relation incorporating all joins in a left-sided tree.`
`92`	`92`	`*/`
`93`	`93`	`RelOptInfo *`
`94`		`-gimme_tree(Query root, Gene tour, int rel_count, int num_gene, RelOptInfo *outer_rel)`
	`94`	`+gimme_tree(Query root, Gene tour, int rel_count, int num_gene, RelOptInfo *old_rel)`
`95`	`95`	`{`
`96`	`96`	`RelOptInfo inner_rel; / current relation */`
`97`	`97`	`int base_rel_index;`
`@@ -115,16 +115,16 @@ gimme_tree(Query root, Gene tour, int rel_count, int num_gene, RelOptInfo *out`
`115`	`115`	`}`
`116`	`116`	`else`
`117`	`117`	`{ /* tree main part */`
`118`		`- if (!(new_rels = make_rels_by_clause_joins(root, outer_rel,`
	`118`	`+ if (!(new_rels = make_rels_by_clause_joins(root, old_rel,`
`119`	`119`	`inner_rel->joininfo,`
`120`	`120`	`inner_rel->relids)))`
`121`	`121`	`{`
`122`	`122`	`if (!BushyPlanFlag)`
`123`		`- new_rels = make_rels_by_clauseless_joins(outer_rel,`
	`123`	`+ new_rels = make_rels_by_clauseless_joins(old_rel,`
`124`	`124`	`lcons(inner_rel,NIL));`
`125`	`125`	`else`
`126`		`- new_rels = make_rels_by_clauseless_joins(outer_rel,`
`127`		`- lcons(outer_rel,NIL));`
	`126`	`+ new_rels = make_rels_by_clauseless_joins(old_rel,`
	`127`	`+ lcons(old_rel,NIL));`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`/* process new_rel->pathlist */`
`@@ -168,7 +168,7 @@ gimme_tree(Query root, Gene tour, int rel_count, int num_gene, RelOptInfo *out`
`168`	`168`
`169`	`169`	`}`
`170`	`170`
`171`		`- return outer_rel; /* tree finished ... */`
	`171`	`+ return old_rel; /* tree finished ... */`
`172`	`172`	`}`
`173`	`173`
`174`	`174`	`static RelOptInfo *`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`* Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $Id: geqo_main.c,v 1.13 1999/02/13 23:16:08 momjian Exp $`
	`9`	`+ * $Id: geqo_main.c,v 1.14 1999/02/18 04:55:54 momjian Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -253,7 +253,8 @@ geqo(Query *root)`
`253`	`253`	`best_tour = (Gene *) pool->data[0].string;`
`254`	`254`
`255`	`255`	`/* root->join_relation_list_ will be modified during this ! */`
`256`		`- best_rel = (RelOptInfo *) gimme_tree(root, best_tour, 0, pool->string_length, NULL);`
	`256`	`+ best_rel = (RelOptInfo *) gimme_tree(root, best_tour, 0,`
	`257`	`+ pool->string_length, NULL);`
`257`	`258`
`258`	`259`	`/* DBG: show the query plan`
`259`	`260`	`print_plan(best_plan, root);`
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.h,v 1.12 1999/02/15 05:50:02 momjian Exp $`
	`8`	`+ * $Id: geqo.h,v 1.13 1999/02/18 04:55:54 momjian Exp $`
`9`	`9`	`*`
`10`	`10`	`*-------------------------------------------------------------------------`
`11`	`11`	`*/`
`@@ -75,7 +75,8 @@ extern RelOptInfo geqo(Query root);`
`75`	`75`	`extern void geqo_params(int string_length);`
`76`	`76`
`77`	`77`	`extern Cost geqo_eval(Query root, Gene tour, int num_gene);`
`78`		`-extern RelOptInfo gimme_tree(Query root, Gene tour, int rel_count, int num_gene, RelOptInfo outer_rel);`
	`78`	`+extern RelOptInfo gimme_tree(Query root, Gene *tour, int rel_count,`
	`79`	`+ int num_gene, RelOptInfo *old_rel);`
`79`	`80`
`80`	`81`
`81`	`82`	`#endif /* GEQO_H */`