Commit48437f5

committed

Ensure that mergejoin plan will be considered for FULL OUTER JOIN even

if enable_mergejoin = OFF. Must do this, because we have no otherimplementation method for full joins.

1 parent5479c11 commit48437f5Copy full SHA for 48437f5

File tree

+13

-6

lines changed

+13

-6

lines changed

Lines changed: 6 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/joinpath.c,v 1.58 2000/10/05 19:48:26 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinpath.c,v 1.59 2000/11/23 03:57:31 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -75,9 +75,12 @@ add_paths_to_joinrel(Query *root,`
`75`	`75`	`List*mergeclause_list=NIL;`
`76`	`76`
`77`	`77`	`/*`
`78`		`- * Find potential mergejoin clauses.`
	`78`	`+ * Find potential mergejoin clauses. We can skip this if we are not`
	`79`	`+ * interested in doing a mergejoin. However, mergejoin is currently`
	`80`	`+ * our only way of implementing full outer joins, so override`
	`81`	`+ * mergejoin disable if it's a full join.`
`79`	`82`	`*/`
`80`		`-if (enable_mergejoin)`
	`83`	`+if (enable_mergejoin\|\|jointype==JOIN_FULL)`
`81`	`84`	`mergeclause_list=select_mergejoin_clauses(joinrel,`
`82`	`85`	`outerrel,`
`83`	`86`	`innerrel,`

Lines changed: 7 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/plan/initsplan.c,v 1.52 2000/11/16 22:30:25 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/initsplan.c,v 1.53 2000/11/23 03:57:31 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -454,9 +454,13 @@ distribute_qual_to_rels(Query root, Node clause,`
`454`	`454`	`* joining.`
`455`	`455`	`*`
`456`	`456`	`* We don't bother setting the merge/hashjoin info if we're not`
`457`		`- * going to need it.`
	`457`	`+ * going to need it. We do want to know about mergejoinable ops`
	`458`	`+ * in any potential equijoin clause (see later in this routine),`
	`459`	`+ * and we ignore enable_mergejoin if isouterjoin is true, because`
	`460`	`+ * mergejoin is the only implementation we have for full and right`
	`461`	`+ * outer joins.`
`458`	`462`	`*/`
`459`		`-if (enable_mergejoin\|\|can_be_equijoin)`
	`463`	`+if (enable_mergejoin\|\|isouterjoin\|\|can_be_equijoin)`
`460`	`464`	`check_mergejoinable(restrictinfo);`
`461`	`465`	`if (enable_hashjoin)`
`462`	`466`	`check_hashjoinable(restrictinfo);`

Comments

(0)