Fix nasty little typo that prevented get_cheapest_path_for_joinkeys

tglsfdc · tglsfdc · commit 11a0027e289e · 1999-04-30T03:59:06.000Z
from ever returning a path.  This put a bit of a crimp in the system's
ability to generate intelligent merge-join plans...
diff --git a/src/backend/optimizer/path/pathkeys.c b/src/backend/optimizer/path/pathkeys.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/pathkeys.c,v 1.7 1999/02/22 05:26:20 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/pathkeys.c,v 1.8 1999/04/30 03:59:06 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -240,10 +240,8 @@ get_cheapest_path_for_joinkeys(List *joinkeys,
 			pathorder_match(ordering, path->pathorder, &better_sort) &&
 			better_sort == 0)
 		{
-			if (matched_path)
-				if (path->path_cost < matched_path->path_cost)
-					matched_path = path;
-			else
+			if (matched_path == NULL ||
+				path->path_cost < matched_path->path_cost)
 				matched_path = path;
 		}
 	}

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/pathkeys.c,v 1.7 1999/02/22 05:26:20 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/pathkeys.c,v 1.8 1999/04/30 03:59:06 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -240,10 +240,8 @@ get_cheapest_path_for_joinkeys(List *joinkeys,`
`240`	`240`	`pathorder_match(ordering, path->pathorder, &better_sort) &&`
`241`	`241`	`better_sort == 0)`
`242`	`242`	`{`
`243`		`- if (matched_path)`
`244`		`- if (path->path_cost < matched_path->path_cost)`
`245`		`- matched_path = path;`
`246`		`- else`
	`243`	`+ if (matched_path == NULL \|\|`
	`244`	`+ path->path_cost < matched_path->path_cost)`
`247`	`245`	`matched_path = path;`
`248`	`246`	`}`
`249`	`247`	`}`