aboutsummaryrefslogtreecommitdiffstats
path: root/streamingvisitors/src/vespa/searchvisitor/hitcollector.cpp
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@yahoo-inc.com>2016-12-13 13:50:03 +0000
committerTor Egge <Tor.Egge@yahoo-inc.com>2016-12-13 13:50:03 +0000
commit294ee381b4f1cdd5489e5e6c88acbb2c2045aec3 (patch)
tree555ae07faa5e2b7c889ad91ed0a79c5cfb620ec6 /streamingvisitors/src/vespa/searchvisitor/hitcollector.cpp
parenta96055b2c1053c48c76b6d6845027951393dd327 (diff)
Remove docId from match data.
Diffstat (limited to 'streamingvisitors/src/vespa/searchvisitor/hitcollector.cpp')
-rw-r--r--streamingvisitors/src/vespa/searchvisitor/hitcollector.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/streamingvisitors/src/vespa/searchvisitor/hitcollector.cpp b/streamingvisitors/src/vespa/searchvisitor/hitcollector.cpp
index 09fa3fd5639..6cb49a77ed2 100644
--- a/streamingvisitors/src/vespa/searchvisitor/hitcollector.cpp
+++ b/streamingvisitors/src/vespa/searchvisitor/hitcollector.cpp
@@ -32,17 +32,17 @@ HitCollector::getDocSum(const search::DocumentIdT & docId) const
}
bool
-HitCollector::addHit(const vsm::StorageDocument::SP & doc, const search::fef::MatchData & data, double score)
+HitCollector::addHit(const vsm::StorageDocument::SP & doc, uint32_t docId, const search::fef::MatchData & data, double score)
{
- Hit h(doc, data, score);
+ Hit h(doc, docId, data, score);
return addHit(h);
}
bool
-HitCollector::addHit(const vsm::StorageDocument::SP & doc, const search::fef::MatchData & data,
+HitCollector::addHit(const vsm::StorageDocument::SP & doc, uint32_t docId, const search::fef::MatchData & data,
double score, const void * sortData, size_t sortDataLen)
{
- Hit h(doc, data, score, sortData, sortDataLen);
+ Hit h(doc, docId, data, score, sortData, sortDataLen);
return addHit(h);
}
@@ -139,8 +139,8 @@ HitCollector::getFeatureSet(IRankProgram &rankProgram,
}
FeatureSet::SP retval = FeatureSet::SP(new FeatureSet(names, _hits.size()));
for (HitVector::iterator it(_hits.begin()), mt(_hits.end()); it != mt; ++it) {
- const MatchData &matchData = rankProgram.run(it->getDocId(), it->getMatchData());
- uint32_t docId = matchData.getDocId();
+ rankProgram.run(it->getDocId(), it->getMatchData());
+ uint32_t docId = it->getDocId();
search::feature_t * f = retval->getFeaturesByIndex(retval->addDocId(docId));
for (uint32_t j = 0; j < names.size(); ++j) {
f[j] = *resolver.resolve_number(j);