fix case where hll_error_margin could be undefined (thanks John)

This commit is contained in:
Bernhard Amann 2013-09-11 12:50:29 -07:00
parent 7c1dffa66f
commit 9834755948

View file

@ -55,9 +55,18 @@ hook compose_resultvals_hook(result: ResultVal, rv1: ResultVal, rv2: ResultVal)
if ( ! (rv1?$card || rv2?$card) )
return;
local rhll = hll_cardinality_init(rv1$hll_error_margin, rv1$hll_confidence);
local rhll: opaque of cardinality;
if ( rv1?$card )
{
rhll = hll_cardinality_init(rv1$hll_error_margin, rv1$hll_confidence);
hll_cardinality_merge_into(rhll, rv1$card);
}
else # if we do not have rv1, we have to have rv2...
{
rhll = hll_cardinality_init(rv2$hll_error_margin, rv2$hll_confidence);
}
if ( rv2?$card )
hll_cardinality_merge_into(rhll, rv2$card);