Commit4de2f24

committed

Fix for queries with 3 or more relations participating in

one clause.

1 parent6eb0525 commit4de2f24Copy full SHA for 4de2f24

File tree

+23

-6

lines changed

+23

-6

lines changed

Lines changed: 10 additions & 2 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/joinrels.c,v 1.1.1.1 1996/07/09 06:21:36 scrappy Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinrels.c,v 1.2 1997/02/20 02:54:09 vadim Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -297,10 +297,18 @@ new_joininfo_list(List joininfo_list, List join_relids)`
`297`	`297`	`List*xjoininfo=NIL;`
`298`	`298`
`299`	`299`	`foreach (xjoininfo,joininfo_list) {`
	`300`	`+List*or;`
`300`	`301`	`JInfojoininfo= (JInfo)lfirst(xjoininfo);`
`301`	`302`
`302`	`303`	`new_otherrels=joininfo->otherrels;`
`303`		`-if (nonoverlap_sets(new_otherrels,join_relids)) {`
	`304`	`+foreach (or,new_otherrels)`
	`305`	`+{`
	`306`	`+if (intMember (lfirsti(or),join_relids) )`
	`307`	`+new_otherrels=lremove ((void*)lfirst(or),new_otherrels);`
	`308`	`+}`
	`309`	`+joininfo->otherrels=new_otherrels;`
	`310`	`+if (new_otherrels!=NIL )`
	`311`	`+{`
`304`	`312`	`other_joininfo=joininfo_member(new_otherrels,`
`305`	`313`	`current_joininfo_list);`
`306`	`314`	`if(other_joininfo) {`

Lines changed: 13 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/plan/initsplan.c,v 1.2 1996/10/31 10:59:13 scrappy Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/initsplan.c,v 1.3 1997/02/20 02:53:26 vadim Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -250,10 +250,19 @@ add_join_clause_info_to_rels(Query root, CInfo clauseinfo, List *join_relids)`
`250`	`250`	`List*join_relid;`
`251`	`251`
`252`	`252`	`foreach (join_relid,join_relids) {`
`253`		`-JInfo*joininfo=`
	`253`	`+JInfo*joininfo;`
	`254`	`+List*other_rels=NIL;`
	`255`	`+List*rel;`
	`256`	`+`
	`257`	`+foreach (rel,join_relids)`
	`258`	`+ {`
	`259`	`+if ( (int)lfirst(rel)!= (int)lfirst(join_relid) )`
	`260`	`+other_rels=lappendi (other_rels,lfirst(rel));`
	`261`	`+ }`
	`262`	`+`
	`263`	`+joininfo=`
`254`	`264`	`find_joininfo_node(get_base_rel(root,lfirsti(join_relid)),`
`255`		`-intLispRemove((int)lfirst(join_relid),`
`256`		`-join_relids));`
	`265`	`+other_rels);`
`257`	`266`	`joininfo->jinfoclauseinfo=`
`258`	`267`	`lcons(clauseinfo,joininfo->jinfoclauseinfo);`
`259`	`268`

Comments

(0)