Call clear_hidden_from_ranking() earlier, to reduce number of calls.

Author: toregge

searchlib/src/vespa/searchlib/queryeval/fake_search.cpp

@@ -38,8 +38,8 @@ FakeSearch::doSeek(uint32_t docid)
 void
 FakeSearch::doUnpack(uint32_t docid)
 {
+    _tfmda[0]->clear_hidden_from_ranking();
     if (_unpacked_docid == docid) {
-        _tfmda[0]->clear_hidden_from_ranking();
         return;
     }
     using PosCtx = fef::TermFieldMatchDataPosition;
@@ -50,7 +50,6 @@ FakeSearch::doUnpack(uint32_t docid)
     const Doc &doc = _result.inspect()[_offset];
     assert(doc.docId == docid);
     _tfmda[0]->reset(docid);
-    _tfmda[0]->clear_hidden_from_ranking();
     int32_t sum_weight = 0;
     for (uint32_t i = 0; i < doc.elements.size(); ++i) {
         const Elem &elem = doc.elements[i];

searchlib/src/vespa/searchlib/test/fakedata/fakeegcompr64filterocc.cpp

@@ -711,13 +711,12 @@ FakeFilterOccEGCompressed64ArrayIterator<bigEndian>::doUnpack(uint32_t docId)
     if (_matchData.size() != 1) {
         return;
     }
+    _matchData[0]->clear_hidden_from_ranking();
     if (getUnpacked()) {
-        _matchData[0]->clear_hidden_from_ranking();
         return;
     }
     assert(docId == getDocId());
     _matchData[0]->reset(docId);
-    _matchData[0]->clear_hidden_from_ranking();
     setUnpacked();
 }
 
@@ -1441,13 +1440,12 @@ FakeFilterOccEGCompressed64SkipArrayIterator<doSkip>::doUnpack(uint32_t docId)
     if (_matchData.size() != 1) {
         return;
     }
+    _matchData[0]->clear_hidden_from_ranking();
     if (getUnpacked()) {
-        _matchData[0]->clear_hidden_from_ranking();
         return;
     }
     assert(docId == getDocId());
     _matchData[0]->reset(docId);
-    _matchData[0]->clear_hidden_from_ranking();
     setUnpacked();
 }
 

searchlib/src/vespa/searchlib/test/fakedata/fakefilterocc.cpp

@@ -166,13 +166,12 @@ FakeFilterOccArrayIterator::doUnpack(uint32_t docId)
     if (_matchData.size() != 1) {
         return;
     }
+    _matchData[0]->clear_hidden_from_ranking();
     if (getUnpacked()) {
-        _matchData[0]->clear_hidden_from_ranking();
         return;
     }
     assert(docId == getDocId());
     _matchData[0]->reset(docId);
-    _matchData[0]->clear_hidden_from_ranking();
     setUnpacked();
 }
 

searchlib/src/vespa/searchlib/test/fakedata/fakezcbfilterocc.cpp

@@ -231,13 +231,12 @@ FakeFilterOccZCBArrayIterator::doUnpack(uint32_t docId)
     if (_matchData.size() != 1) {
         return;
     }
+    _matchData[0]->clear_hidden_from_ranking();
     if (getUnpacked()) {
-        _matchData[0]->clear_hidden_from_ranking();
         return;
     }
     assert(docId == getDocId());
     _matchData[0]->reset(docId);
-    _matchData[0]->clear_hidden_from_ranking();
     setUnpacked();
 }
 

searchlib/src/vespa/searchlib/test/fakedata/fakezcfilterocc.cpp

@@ -470,13 +470,12 @@ FakeFilterOccZCArrayIterator::doUnpack(uint32_t docId)
     if (_matchData.size() != 1) {
         return;
     }
+    _matchData[0]->clear_hidden_from_ranking();
     if (getUnpacked()) {
-        _matchData[0]->clear_hidden_from_ranking();
         return;
     }
     assert(docId == getDocId());
     _matchData[0]->reset(docId);
-    _matchData[0]->clear_hidden_from_ranking();
     setUnpacked();
 }