NotificationsYou must be signed in to change notification settings
Fork15
Star24

Commit105c149

committed

check restrInfo->required_relids in order to discard irrelevant joins

1 parent971d2c5 commit105c149Copy full SHA for 105c149

File tree

1 file changed

+15

-13

lines changed

init.c

1 file changed

+15

-13

lines changed

`‎init.c‎`

Lines changed: 15 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,15 @@ join_pathlist_hook(PlannerInfo *root,`
`117`	`117`	`text*dist_func_name=cstring_to_text("dist(spoint,spoint)");`
`118`	`118`	`Oiddist_func;`
`119`	`119`	`List*restrict_clauses=extra->restrictlist;`
	`120`	`+Relidsrequired_relids=NULL;`
	`121`	`+`
	`122`	`+if (outerrel->reloptkind==RELOPT_BASEREL&&`
	`123`	`+innerrel->reloptkind==RELOPT_BASEREL)`
	`124`	`+{`
	`125`	`+required_relids=bms_add_member(required_relids,outerrel->relid);`
	`126`	`+required_relids=bms_add_member(required_relids,innerrel->relid);`
	`127`	`+}`
	`128`	`+elsereturn;/* one of relations can't have index */`
`120`	`129`
`121`	`130`	`dist_func=DatumGetObjectId(DirectFunctionCall1(to_regprocedure,`
`122`	`131`	`PointerGetDatum(dist_func_name)));`
`@@ -136,14 +145,9 @@ join_pathlist_hook(PlannerInfo *root,`
`136`	`145`	`{`
`137`	`146`	`RestrictInforestrInfo= (RestrictInfo)lfirst(restr);`
`138`	`147`
`139`		`-if (outerrel->reloptkind==RELOPT_BASEREL&&`
`140`		`-innerrel->reloptkind==RELOPT_BASEREL&&`
`141`		`-bms_is_member(outerrel->relid,restrInfo->clause_relids)&&`
`142`		`-bms_is_member(innerrel->relid,restrInfo->clause_relids))`
`143`		`-{`
`144`		`-/* This is our case */`
`145`		`-}`
`146`		`-elsecontinue;`
	`148`	`+/* Skip irrelevant JOIN case */`
	`149`	`+if (!bms_equal(required_relids,restrInfo->required_relids))`
	`150`	`+continue;`
`147`	`151`
`148`	`152`	`if (IsA(restrInfo->clause,OpExpr))`
`149`	`153`	`{`
`@@ -176,7 +180,6 @@ join_pathlist_hook(PlannerInfo *root,`
`176`	`180`	`required_outer,`
`177`	`181`	`&restrict_clauses);`
`178`	`182`
`179`		`-/* DEBUG */`
`180`	`183`	`create_crossmatch_path(root,joinrel,outer_path,inner_path,`
`181`	`184`	`param_info,restrict_clauses,required_outer);`
`182`	`185`
`@@ -187,6 +190,7 @@ join_pathlist_hook(PlannerInfo *root,`
`187`	`190`	`IsA(arg2,FuncExpr)&&`
`188`	`191`	`((FuncExpr*)arg2)->funcid==dist_func)`
`189`	`192`	`{`
	`193`	`+/* TODO: merge duplicate code */`
`190`	`194`	`Path*outer_path=crossmatch_find_cheapest_path(root,joinrel,outerrel);`
`191`	`195`	`Path*inner_path=crossmatch_find_cheapest_path(root,joinrel,innerrel);`
`192`	`196`
`@@ -200,14 +204,11 @@ join_pathlist_hook(PlannerInfo *root,`
`200`	`204`	`required_outer,`
`201`	`205`	`&restrict_clauses);`
`202`	`206`
`203`		`-/* DEBUG */`
`204`	`207`	`create_crossmatch_path(root,joinrel,outer_path,inner_path,`
`205`	`208`	`param_info,restrict_clauses,required_outer);`
`206`	`209`	`}`
`207`	`210`	`}`
`208`	`211`	`}`
`209`		`-`
`210`		`-pprint(root->parse->rtable);`
`211`	`212`	`}`
`212`	`213`
`213`	`214`	`staticPlan*`
`@@ -241,7 +242,7 @@ create_crossmatch_plan(PlannerInfo *root,`
`241`	`242`	`cscan->scan.plan.qual=NIL;`
`242`	`243`	`cscan->scan.scanrelid=0;`
`243`	`244`
`244`		`-cscan->custom_scan_tlist=tlist;`
	`245`	`+cscan->custom_scan_tlist=tlist;/* TODO: recheck target list */`
`245`	`246`
`246`	`247`	`elog(LOG,"tlist:");`
`247`	`248`	`pprint(tlist);`
`@@ -268,6 +269,7 @@ crossmatch_create_scan_state(CustomScan *node)`
`268`	`269`	`return (Node*)scan_state;`
`269`	`270`	`}`
`270`	`271`
	`272`	`+/* HACK: remove this */`
`271`	`273`	`staticinti=0;`
`272`	`274`
`273`	`275`	`staticvoid`

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!

Commit105c149

File tree

1 file changed

1 file changed

`‎init.c‎`

0 commit comments