Commit129543e

committed

optimizer cleanup

1 parentdbd80c9 commit129543eCopy full SHA for 129543e

File tree

+11

-7

lines changed

+11

-7

lines changed

Lines changed: 2 additions & 3 deletions

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/joinutils.c,v 1.16 1999/02/10 21:02:39 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/joinutils.c,v 1.17 1999/02/11 05:29:07 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -373,8 +373,7 @@ new_join_pathkey(List *subkeys,`
`373`	`373`	`if (tlist_key)`
`374`	`374`	`{`
`375`	`375`	`if (!member(tlist_key,matched_subkeys))`
`376`		`-newly_considered_subkeys=lcons(tlist_key,`
`377`		`-matched_subkeys);`
	`376`	`+newly_considered_subkeys=lcons(tlist_key,matched_subkeys);`
`378`	`377`	`}`
`379`	`378`	`else`
`380`	`379`	`newly_considered_subkeys=matched_subkeys;`

Lines changed: 9 additions & 4 deletions

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/util/pathnode.c,v 1.24 1999/02/1104:08:43 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.25 1999/02/1105:29:08 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -195,14 +195,19 @@ better_path(Path new_path, List unique_paths, bool *is_new)`
`195`	`195`	`* more expensive and replace unordered path with ordered`
`196`	`196`	`* path if it is not more expensive.`
`197`	`197`	`*/`
	`198`	`+`
	`199`	`+/* same keys, and new is cheaper, use it */`
`198`	`200`	`if ((longer_key==0&&new_path->path_cost<path->path_cost)\|\|`
`199`		`-(longer_key==1&&new_path->path_cost <=path->path_cost)\|\|`
`200`		`-(longer_key==2&&new_path->path_cost>=path->path_cost))`
	`201`	`+/* new is longer, and cheaper, use it */`
	`202`	`+(longer_key==1&&new_path->path_cost<=path->path_cost))`
`201`	`203`	`{`
`202`	`204`	`*is_new= false;`
`203`	`205`	`returnnew_path;`
`204`	`206`	`}`
`205`		`-else`
	`207`	`+/* same keys, new is more expensive, stop */`
	`208`	`+elseif ((longer_key==0&&new_path->path_cost >=path->path_cost)\|\|`
	`209`	`+/* old is longer, and less expensive, stop */`
	`210`	`+ (longer_key==2&&new_path->path_cost >=path->path_cost))`
`206`	`211`	`{`
`207`	`212`	`*is_new= false;`
`208`	`213`	`returnNULL;`

Comments

(0)