diff options
author | Henning Baldersheim <balder@oath.com> | 2018-02-06 12:35:36 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@oath.com> | 2018-02-06 12:35:36 +0100 |
commit | 5bcf2ebbed11f6225aa24c4ccac0482f6671fc23 (patch) | |
tree | 7ffc68feb48c9e0df81c8041e01fba04d5a84e22 /searchcore/src | |
parent | ddcefd82abc034dcaf9407850b69a00e5fcc3aee (diff) |
Actually set numCovered docs.
Diffstat (limited to 'searchcore/src')
-rw-r--r-- | searchcore/src/vespa/searchcore/proton/matching/match_thread.cpp | 5 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcore/proton/matching/matcher.cpp | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/matching/match_thread.cpp b/searchcore/src/vespa/searchcore/proton/matching/match_thread.cpp index 9483e119c60..4822dc57669 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/match_thread.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/match_thread.cpp @@ -172,7 +172,7 @@ void MatchThread::match_loop(MatchTools &tools, HitCollector &hits) { bool softDoomed = false; - uint32_t covered = 0; + uint32_t docsCovered = 0; Context context(matchParams.rankDropLimit, tools, hits, num_threads); for (DocidRange docid_range = scheduler.first_range(thread_id); !docid_range.empty() && ! softDoomed; @@ -180,7 +180,7 @@ MatchThread::match_loop(MatchTools &tools, HitCollector &hits) { uint32_t lastCovered = inner_match_loop<Strategy, do_rank, do_limit, do_share_work>(context, tools, docid_range); softDoomed = (lastCovered < docid_range.end); - covered += lastCovered - docid_range.begin; + docsCovered += lastCovered - docid_range.begin; } uint32_t matches = context.matches; if (do_limit && context.isBelowLimit()) { @@ -190,6 +190,7 @@ MatchThread::match_loop(MatchTools &tools, HitCollector &hits) estimate_match_frequency(matches, searchedSoFar); tools.match_limiter().updateDocIdSpaceEstimate(searchedSoFar, 0); } + thread_stats.docsCovered(docsCovered); thread_stats.docsMatched(matches); thread_stats.softDoomed(softDoomed); if (do_rank) { diff --git a/searchcore/src/vespa/searchcore/proton/matching/matcher.cpp b/searchcore/src/vespa/searchcore/proton/matching/matcher.cpp index 55e972ce35b..f21293299c7 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/matcher.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/matcher.cpp @@ -14,7 +14,6 @@ #include <vespa/searchlib/engine/searchreply.h> #include <vespa/searchlib/features/setup.h> #include <vespa/searchlib/fef/test/plugin/setup.h> -#include <cmath> #include <vespa/log/log.h> LOG_SETUP(".proton.matching.matcher"); |