Commit c923e82a authored by Kevin Grittner's avatar Kevin Grittner

Eliminate unnecessary NULL checks in picksplit method of intarray.

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

Michael Paquier per Coverity
parent cb66f495
...@@ -416,9 +416,7 @@ g_int_picksplit(PG_FUNCTION_ARGS) ...@@ -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) ...@@ -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) ...@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment