NotificationsYou must be signed in to change notification settings
Fork5
Star27

Commit8d396a0

committed

Remove duplicate code in planner.c.

I noticed while hacking on join UNION transforms that planner.c'sfunction get_base_rel_indexes() just duplicates the functionality ofget_relids_in_jointree(). It doesn't even have the excuse of beingolder code :-(. Drop it and use the latter function instead.

1 parent0dfa89b commit8d396a0Copy full SHA for 8d396a0

File tree

1 file changed

-47

lines changed

src/backend/optimizer/plan
- planner.c

1 file changed

-47

lines changed

`‎src/backend/optimizer/plan/planner.c‎`

Lines changed: 1 addition & 47 deletions

Original file line number	Diff line number	Diff line change
`@@ -2098,52 +2098,6 @@ is_dummy_plan(Plan *plan)`
`2098`	`2098`	`return false;`
`2099`	`2099`	`}`
`2100`	`2100`
`2101`		`-/*`
`2102`		`- * Create a bitmapset of the RT indexes of live base relations`
`2103`		`- *`
`2104`		`- * Helper for preprocess_rowmarks ... at this point in the proceedings,`
`2105`		`- * the only good way to distinguish baserels from appendrel children`
`2106`		`- * is to see what is in the join tree.`
`2107`		`- */`
`2108`		`-staticBitmapset*`
`2109`		`-get_base_rel_indexes(Node*jtnode)`
`2110`		`-{`
`2111`		`-Bitmapset*result;`
`2112`		`-`
`2113`		`-if (jtnode==NULL)`
`2114`		`-returnNULL;`
`2115`		`-if (IsA(jtnode,RangeTblRef))`
`2116`		`-{`
`2117`		`-intvarno= ((RangeTblRef*)jtnode)->rtindex;`
`2118`		`-`
`2119`		`-result=bms_make_singleton(varno);`
`2120`		`-}`
`2121`		`-elseif (IsA(jtnode,FromExpr))`
`2122`		`-{`
`2123`		`-FromExprf= (FromExpr)jtnode;`
`2124`		`-ListCell*l;`
`2125`		`-`
`2126`		`-result=NULL;`
`2127`		`-foreach(l,f->fromlist)`
`2128`		`-result=bms_join(result,`
`2129`		`-get_base_rel_indexes(lfirst(l)));`
`2130`		`-}`
`2131`		`-elseif (IsA(jtnode,JoinExpr))`
`2132`		`-{`
`2133`		`-JoinExprj= (JoinExpr)jtnode;`
`2134`		`-`
`2135`		`-result=bms_join(get_base_rel_indexes(j->larg),`
`2136`		`-get_base_rel_indexes(j->rarg));`
`2137`		`-}`
`2138`		`-else`
`2139`		`-{`
`2140`		`-elog(ERROR,"unrecognized node type: %d",`
`2141`		`- (int)nodeTag(jtnode));`
`2142`		`-result=NULL;/* keep compiler quiet */`
`2143`		`-}`
`2144`		`-returnresult;`
`2145`		`-}`
`2146`		`-`
`2147`	`2101`	`/*`
`2148`	`2102`	`* preprocess_rowmarks - set up PlanRowMarks if needed`
`2149`	`2103`	`*/`
`@@ -2183,7 +2137,7 @@ preprocess_rowmarks(PlannerInfo *root)`
`2183`	`2137`	`* make a bitmapset of all base rels and then remove the items we don't`
`2184`	`2138`	`* need or have FOR [KEY] UPDATE/SHARE marks for.`
`2185`	`2139`	`*/`
`2186`		`-rels=get_base_rel_indexes((Node*)parse->jointree);`
	`2140`	`+rels=get_relids_in_jointree((Node*)parse->jointree, false);`
`2187`	`2141`	`if (parse->resultRelation)`
`2188`	`2142`	`rels=bms_del_member(rels,parse->resultRelation);`
`2189`	`2143`

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!

Commit8d396a0

File tree

1 file changed

1 file changed

`‎src/backend/optimizer/plan/planner.c‎`

0 commit comments