Update optimizer comments.

bmomjian · bmomjian · commit ae12e25263d6 · 1999-02-04T19:20:12.000Z
diff --git a/src/backend/optimizer/path/prune.c b/src/backend/optimizer/path/prune.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/prune.c,v 1.18 1999/02/04 01:46:58 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/prune.c,v 1.19 1999/02/04 19:20:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -64,16 +64,18 @@ prune_joinrel(RelOptInfo *rel, List *other_rels)
 	List	   *i = NIL;
 	List	   *result = NIL;
 
-	foreach(i, other_rels)
+	foreach(r1, other_rels)
 	{
-		RelOptInfo *other_rel = (RelOptInfo *) lfirst(i);
+		RelOptInfo *other_rel = (RelOptInfo *) lfirst(r1);
 
 		if (same(rel->relids, other_rel->relids))
-		{
+			/*
+			 *	This are on the same relations,
+			 *	so get the best of their pathlists.
+			 */
 			rel->pathlist = add_pathlist(rel,
 										 rel->pathlist,
 										 other_rel->pathlist);
-		}
 		else
 			result = nconc(result, lcons(other_rel, NIL));
 	}
diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.17 1999/02/04 01:46:59 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.18 1999/02/04 19:20:12 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -101,21 +101,24 @@ set_cheapest(RelOptInfo *parent_rel, List *pathlist)
 List *
 add_pathlist(RelOptInfo *parent_rel, List *unique_paths, List *new_paths)
 {
-	List	   *x;
-	Path	   *new_path;
-	Path	   *old_path;
-	bool		noOther;
+	List	   *p1;
 
-	foreach(x, new_paths)
+	foreach(p1, new_paths)
 	{
-		new_path = (Path *) lfirst(x);
+		Path	   *new_path = (Path *) lfirst(p1);
+ 		Path	   *old_path;
+		bool		noOther;
+
+		/* Is this new path already in unique_paths? */
 		if (member(new_path, unique_paths))
 			continue;
+
+		/* Find best matching path */
 		old_path = better_path(new_path, unique_paths, &noOther);
 
 		if (noOther)
 		{
-			/* Is a brand new path.  */
+			/* This is a brand new path.  */
 			new_path->parent = parent_rel;
 			unique_paths = lcons(new_path, unique_paths);
 		}

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/prune.c,v 1.18 1999/02/04 01:46:58 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/prune.c,v 1.19 1999/02/04 19:20:11 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -64,16 +64,18 @@ prune_joinrel(RelOptInfo rel, List other_rels)`
`64`	`64`	`List *i = NIL;`
`65`	`65`	`List *result = NIL;`
`66`	`66`
`67`		`- foreach(i, other_rels)`
	`67`	`+ foreach(r1, other_rels)`
`68`	`68`	`{`
`69`		`- RelOptInfo other_rel = (RelOptInfo ) lfirst(i);`
	`69`	`+ RelOptInfo other_rel = (RelOptInfo ) lfirst(r1);`
`70`	`70`
`71`	`71`	`if (same(rel->relids, other_rel->relids))`
`72`		`- {`
	`72`	`+ /*`
	`73`	`+ * This are on the same relations,`
	`74`	`+ * so get the best of their pathlists.`
	`75`	`+ */`
`73`	`76`	`rel->pathlist = add_pathlist(rel,`
`74`	`77`	`rel->pathlist,`
`75`	`78`	`other_rel->pathlist);`
`76`		`- }`
`77`	`79`	`else`
`78`	`80`	`result = nconc(result, lcons(other_rel, NIL));`
`79`	`81`	`}`