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

Fixed an issue with the HLL_UNIQUE SumStats plugin that caused a reporter error.

Browse source
This commit is contained in:
Seth Hall 2013-09-06 15:31:00 -04:00
parent b76d8eedbb
commit 7c1dffa66f
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -43,7 +43,6 @@ hook register_observe_plugins()
rv$card = hll_cardinality_init(r$hll_error_margin, r$hll_confidence);
rv$hll_error_margin = r$hll_error_margin;
rv$hll_confidence = r$hll_confidence;
rv$hll_unique = 0;
}
hll_cardinality_add(rv$card, obs);
@ -53,9 +52,14 @@ hook register_observe_plugins()
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);
hll_cardinality_merge_into(rhll, rv1$card);
hll_cardinality_merge_into(rhll, rv2$card);
if ( rv1?$card )
hll_cardinality_merge_into(rhll, rv1$card);
if ( rv2?$card )
hll_cardinality_merge_into(rhll, rv2$card);
result$card = rhll;
result$hll_unique = double_to_count(hll_cardinality_estimate(rhll));