NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commitc2f0d56

committed

Now that hashjoin is reliable for large joins (knock on wood),

remove optimizer's arbitrary limit on how large a join it will use hashingfor. (The limit was too large to prevent the problems we'd been seeing,anyway...)

1 parent353d36f commitc2f0d56Copy full SHA for c2f0d56

File tree

1 file changed

+30

-47

lines changed

src/backend/optimizer/path
- joinpath.c

1 file changed

+30

-47

lines changed

`‎src/backend/optimizer/path/joinpath.c‎`

Lines changed: 30 additions & 47 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/joinpath.c,v 1.35 1999/05/16 19:45:37 tgl Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinpath.c,v 1.36 1999/05/18 21:36:10 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -37,7 +37,6 @@ static List match_unsorted_outer(RelOptInfo joinrel, RelOptInfo *outerrel, Rel`
`37`	`37`	`List*mergeinfo_list);`
`38`	`38`	`staticListmatch_unsorted_inner(RelOptInfojoinrel,RelOptInfoouterrel,RelOptInfoinnerrel,`
`39`	`39`	`Listinnerpath_list,Listmergeinfo_list);`
`40`		`-staticboolEnoughMemoryForHashjoin(RelOptInfo*hashrel);`
`41`	`40`	`staticListhash_inner_and_outer(RelOptInfojoinrel,RelOptInfoouterrel,RelOptInfoinnerrel,`
`42`	`41`	`List*hashinfo_list);`
`43`	`42`
`@@ -490,27 +489,6 @@ match_unsorted_inner(RelOptInfo *joinrel,`
`490`	`489`	`returnmp_list;`
`491`	`490`	`}`
`492`	`491`
`493`		`-staticbool`
`494`		`-EnoughMemoryForHashjoin(RelOptInfo*hashrel)`
`495`		`-{`
`496`		`-intntuples;`
`497`		`-inttupsize;`
`498`		`-intpages;`
`499`		`-`
`500`		`-ntuples=hashrel->size;`
`501`		`-if (ntuples==0)`
`502`		`-ntuples=1000;`
`503`		`-tupsize=hashrel->width+sizeof(HeapTupleData);`
`504`		`-pages=page_size(ntuples,tupsize);`
`505`		`-`
`506`		`-/*`
`507`		`- * if amount of buffer space below hashjoin threshold, return false`
`508`		`- */`
`509`		`-if (ceil(sqrt((double)pages))>NBuffers)`
`510`		`-return false;`
`511`		`-return true;`
`512`		`-}`
`513`		`-`
`514`	`492`	`/*`
`515`	`493`	`* hash_inner_and_outer--XXX HASH`
`516`	`494`	`* Create hashjoin join paths by explicitly hashing both the outer and`
`@@ -530,17 +508,17 @@ hash_inner_and_outer(RelOptInfo *joinrel,`
`530`	`508`	`RelOptInfo*innerrel,`
`531`	`509`	`List*hashinfo_list)`
`532`	`510`	`{`
`533`		`-HashInfoxhashinfo= (HashInfo)NULL;`
`534`	`511`	`List*hjoin_list=NIL;`
`535`		`-HashPathtemp_node= (HashPath)NULL;`
`536`		`-List*i=NIL;`
`537`		`-List*outerkeys=NIL;`
`538`		`-List*innerkeys=NIL;`
`539`		`-List*hash_pathkeys=NIL;`
	`512`	`+List*i;`
`540`	`513`
`541`	`514`	`foreach(i,hashinfo_list)`
`542`	`515`	`{`
`543`		`-xhashinfo= (HashInfo*)lfirst(i);`
	`516`	`+HashInfoxhashinfo= (HashInfo)lfirst(i);`
	`517`	`+List*outerkeys;`
	`518`	`+List*innerkeys;`
	`519`	`+List*hash_pathkeys;`
	`520`	`+HashPath*temp_node;`
	`521`	`+`
`544`	`522`	`outerkeys=make_pathkeys_from_joinkeys(`
`545`	`523`	`((JoinMethod*)xhashinfo)->jmkeys,`
`546`	`524`	`outerrel->targetlist,`
`@@ -549,26 +527,31 @@ hash_inner_and_outer(RelOptInfo *joinrel,`
`549`	`527`	`((JoinMethod*)xhashinfo)->jmkeys,`
`550`	`528`	`innerrel->targetlist,`
`551`	`529`	`INNER);`
	`530`	`+/* We cannot assume that the output of the hashjoin appears in any`
	`531`	`+ * particular order, so it should have NIL pathkeys.`
	`532`	`+ */`
	`533`	`+#ifdefNOT_USED`
`552`	`534`	`hash_pathkeys=new_join_pathkeys(outerkeys,`
`553`	`535`	`joinrel->targetlist,`
`554`	`536`	`((JoinMethod*)xhashinfo)->clauses);`
`555`		`-`
`556`		`-if (EnoughMemoryForHashjoin(innerrel))`
`557`		`-{`
`558`		`-temp_node=create_hashjoin_path(joinrel,`
`559`		`-outerrel->size,`
`560`		`-innerrel->size,`
`561`		`-outerrel->width,`
`562`		`-innerrel->width,`
`563`		`-(Path*)outerrel->cheapestpath,`
`564`		`-(Path*)innerrel->cheapestpath,`
`565`		`-hash_pathkeys,`
`566`		`-xhashinfo->hashop,`
`567`		`- ((JoinMethod*)xhashinfo)->clauses,`
`568`		`-outerkeys,`
`569`		`-innerkeys);`
`570`		`-hjoin_list=lappend(hjoin_list,temp_node);`
`571`		`-}`
	`537`	`+#else`
	`538`	`+hash_pathkeys=NIL;`
	`539`	`+#endif`
	`540`	`+`
	`541`	`+temp_node=create_hashjoin_path(joinrel,`
	`542`	`+outerrel->size,`
	`543`	`+innerrel->size,`
	`544`	`+outerrel->width,`
	`545`	`+innerrel->width,`
	`546`	`+ (Path*)outerrel->cheapestpath,`
	`547`	`+ (Path*)innerrel->cheapestpath,`
	`548`	`+hash_pathkeys,`
	`549`	`+xhashinfo->hashop,`
	`550`	`+ ((JoinMethod*)xhashinfo)->clauses,`
	`551`	`+outerkeys,`
	`552`	`+innerkeys);`
	`553`	`+hjoin_list=lappend(hjoin_list,temp_node);`
`572`	`554`	`}`
	`555`	`+`
`573`	`556`	`returnhjoin_list;`
`574`	`557`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitc2f0d56

File tree

1 file changed

1 file changed

`‎src/backend/optimizer/path/joinpath.c‎`

0 commit comments