Commit0705b02

committed

OR clause index fix

1 parentcbf8319 commit0705b02Copy full SHA for 0705b02

File tree

+13

-15

lines changed

+13

-15

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.31 1998/08/19 02:02:11 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.32 1998/08/31 07:19:54 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -340,10 +340,10 @@ match_index_orclause(RelOptInfo *rel,`
`340`	`340`	`index)&&`
`341`	`341`	`IsA(get_rightop((Expr*)clause),Const))\|\|`
`342`	`342`	`(match_index_to_operand(indexkey,`
`343`		`- (Expr)get_leftop((Expr)clause),`
	`343`	`+ (Expr)get_rightop((Expr)clause),`
`344`	`344`	`rel,`
`345`	`345`	`index)&&`
`346`		`-IsA(get_rightop((Expr*)clause),Const))))`
	`346`	`+IsA(get_leftop((Expr*)clause),Const))))`
`347`	`347`	`{`
`348`	`348`	`lfirst(matching_indices)=lcons(index,lfirst(matching_indices));`
`349`	`349`	`}`

Lines changed: 7 additions & 8 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/orindxpath.c,v 1.8 1998/08/01 22:12:13 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/orindxpath.c,v 1.9 1998/08/31 07:19:55 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -84,6 +84,7 @@ create_or_index_paths(Query *root,`
`84`	`84`	`break;`
`85`	`85`	`}`
`86`	`86`	`}`
	`87`	`+/* do they all have indexes? */`
`87`	`88`	`if (index_flag)`
`88`	`89`	`{/* used to be a lisp every function */`
`89`	`90`	`IndexPath*pathnode=makeNode(IndexPath);`
`@@ -215,6 +216,11 @@ best_or_subclause_index(Query *root,`
`215`	`216`	`{`
`216`	`217`	`List*ilist;`
`217`	`218`	`boolfirst_run= true;`
	`219`	`+`
	`220`	`+/* if we don't match anything, return zeros */`
	`221`	`+*retIndexid=0;`
	`222`	`+*retCost=0.0;`
	`223`	`+*retSelec=0.0;`
`218`	`224`
`219`	`225`	`foreach (ilist,indices)`
`220`	`226`	`{`
`@@ -268,12 +274,5 @@ best_or_subclause_index(Query *root,`
`268`	`274`	`}`
`269`	`275`	`}`
`270`	`276`
`271`		`-/* we didn't get any indexes, so zero return values */`
`272`		`-if (first_run)`
`273`		`-{`
`274`		`-*retIndexid=0;`
`275`		`-*retCost=0.0;`
`276`		`-*retSelec=0.0;`
`277`		`-}`
`278`	`277`	`return;`
`279`	`278`	`}`

Lines changed: 3 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/clauses.c,v 1.20 1998/08/10 02:26:29 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.21 1998/08/31 07:19:56 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`* HISTORY`
`13`	`13`	`* AUTHORDATEMAJOR EVENT`
`@@ -198,9 +198,8 @@ make_funcclause(Func func, List funcargs)`
`198`	`198`	`bool`
`199`	`199`	`or_clause(Node*clause)`
`200`	`200`	`{`
`201`		`-return`
`202`		`-(clause!=NULL&&`
`203`		`-nodeTag(clause)==T_Expr&& ((Expr*)clause)->opType==OR_EXPR);`
	`201`	`+returnclause!=NULL&&`
	`202`	`+nodeTag(clause)==T_Expr&& ((Expr*)clause)->opType==OR_EXPR);`
`204`	`203`	`}`
`205`	`204`
`206`	`205`	`/*`

Comments

(0)