mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-15 08:20:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Eliminate unnecessary NULL checks in picksplit method of intarray.

Browse Source 
Where these checks were being done there was no code path which
could leave them NULL.

Michael Paquier per Coverity
This commit is contained in:
Kevin Grittner 2015-02-16 15:26:23 -06:00
parent cb66f495f5
commit c923e82a23
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
contrib/intarray/_int_gist.c
View File

@ -416,9 +416,7 @@ g_int_picksplit(PG_FUNCTION_ARGS)
size_waste = size_union - size_inter; size_waste = size_union - size_inter;
pfree(union_d); pfree(union_d);
pfree(inter_d);
if (inter_d != (ArrayType *) NULL)
pfree(inter_d);
/* /*
* are these a more promising split that what we've already seen? * are these a more promising split that what we've already seen?
@ -517,10 +515,8 @@ g_int_picksplit(PG_FUNCTION_ARGS)
/* pick which page to add it to */ /* pick which page to add it to */
if (size_alpha - size_l < size_beta - size_r + WISH_F(v->spl_nleft, v->spl_nright, 0.01)) if (size_alpha - size_l < size_beta - size_r + WISH_F(v->spl_nleft, v->spl_nright, 0.01))
{ {
if (datum_l) pfree(datum_l);
pfree(datum_l); pfree(union_dr);
if (union_dr)
pfree(union_dr);
datum_l = union_dl; datum_l = union_dl;
size_l = size_alpha; size_l = size_alpha;
*left++ = i; *left++ = i;
@ -528,10 +524,8 @@ g_int_picksplit(PG_FUNCTION_ARGS)
} }
else else
{ {
if (datum_r) pfree(datum_r);
pfree(datum_r); pfree(union_dl);
if (union_dl)
pfree(union_dl);
datum_r = union_dr; datum_r = union_dr;
size_r = size_beta; size_r = size_beta;
*right++ = i; *right++ = i;