Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-13 03:58:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/topic/bernhard/ticket1072'

Browse source 
* origin/topic/bernhard/ticket1072:
  and const 2 more functions
  update hll documentation, make a few functions private and create a new copy constructor.
  fix case where hll_error_margin could be undefined (thanks John)

BIT-1072 #merged
This commit is contained in:
Robin Sommer 2013-09-18 14:58:52 -07:00
commit c6de23ebe1
8 changed files with 133 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

12
scripts/base/frameworks/sumstats/plugins/hll_unique.bro
View file

@ -55,9 +55,19 @@ 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);
# Now at least one of rv1?$card or rv1?$card will be set, and
# potentially both.
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);