Commit60fbb4d

committed

Simplify cost_incremental_sort a bit

Commitde0dc1a added code to cost_incremental_sort to handle varno 0.Explicitly removing the RelabelType is not really necessary, because thepull_varnos handles that just fine, which simplifies the code a bit.Author: Richard GuoDiscussion:https://postgr.es/m/CAMbWs4_3_D2J5XxOuw68hvn0-gJsw9FXNSGcZka9aTymn9UJ8A%40mail.gmail.comDiscussion:https://postgr.es/m/20200411214639.GK2228%40telsasoft.com

1 parent2e08d31 commit60fbb4dCopy full SHA for 60fbb4d

File tree

-11

lines changed

-11

lines changed

Lines changed: 1 addition & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -1842,9 +1842,6 @@ cost_incremental_sort(Path *path,`
`1842`	`1842`	`*/`
`1843`	`1843`	`foreach(l,pathkeys)`
`1844`	`1844`	`{`
`1845`		`-Node*expr;`
`1846`		`-Relidsvarnos;`
`1847`		`-`
`1848`	`1845`	`PathKeykey= (PathKey)lfirst(l);`
`1849`	`1846`	`EquivalenceMembermember= (EquivalenceMember)`
`1850`	`1847`	`linitial(key->pk_eclass->ec_members);`
`@@ -1853,14 +1850,7 @@ cost_incremental_sort(Path *path,`
`1853`	`1850`	`* Check if the expression contains Var with "varno 0" so that we`
`1854`	`1851`	`* don't call estimate_num_groups in that case.`
`1855`	`1852`	`*/`
`1856`		`-expr= (Node*)member->em_expr;`
`1857`		`-`
`1858`		`-if (IsA(expr,RelabelType))`
`1859`		`-expr= (Node) ((RelabelType)expr)->arg;`
`1860`		`-`
`1861`		`-varnos=pull_varnos(expr);`
`1862`		`-`
`1863`		`-if (bms_is_member(0,varnos))`
	`1853`	`+if (bms_is_member(0,pull_varnos((Node*)member->em_expr)))`
`1864`	`1854`	`{`
`1865`	`1855`	`unknown_varno= true;`
`1866`	`1856`	`break;`

Comments

(0)