Commitc923e82

committed

Eliminate unnecessary NULL checks in picksplit method of intarray.

Where these checks were being done there was no code path whichcould leave them NULL.Michael Paquier per Coverity

1 parentcb66f49 commitc923e82Copy full SHA for c923e82

File tree

-11

lines changed

-11

lines changed

Lines changed: 5 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -416,9 +416,7 @@ g_int_picksplit(PG_FUNCTION_ARGS)`
`416`	`416`	`size_waste=size_union-size_inter;`
`417`	`417`
`418`	`418`	`pfree(union_d);`
`419`		`-`
`420`		`-if (inter_d!= (ArrayType*)NULL)`
`421`		`-pfree(inter_d);`
	`419`	`+pfree(inter_d);`
`422`	`420`
`423`	`421`	`/*`
`424`	`422`	`* are these a more promising split that what we've already seen?`
`@@ -517,21 +515,17 @@ g_int_picksplit(PG_FUNCTION_ARGS)`
`517`	`515`	`/* pick which page to add it to */`
`518`	`516`	`if (size_alpha-size_l<size_beta-size_r+WISH_F(v->spl_nleft,v->spl_nright,0.01))`
`519`	`517`	`{`
`520`		`-if (datum_l)`
`521`		`-pfree(datum_l);`
`522`		`-if (union_dr)`
`523`		`-pfree(union_dr);`
	`518`	`+pfree(datum_l);`
	`519`	`+pfree(union_dr);`
`524`	`520`	`datum_l=union_dl;`
`525`	`521`	`size_l=size_alpha;`
`526`	`522`	`*left++=i;`
`527`	`523`	`v->spl_nleft++;`
`528`	`524`	`}`
`529`	`525`	`else`
`530`	`526`	`{`
`531`		`-if (datum_r)`
`532`		`-pfree(datum_r);`
`533`		`-if (union_dl)`
`534`		`-pfree(union_dl);`
	`527`	`+pfree(datum_r);`
	`528`	`+pfree(union_dl);`
`535`	`529`	`datum_r=union_dr;`
`536`	`530`	`size_r=size_beta;`
`537`	`531`	`*right++=i;`

Comments

(0)