Remove unused code only used in tests

3 files changed, 8 insertions, 29 deletions

diff --git a/searchlib/src/tests/hitcollector/hitcollector_test.cpp b/searchlib/src/tests/hitcollector/hitcollector_test.cpp
index ec5d94c52cb..f9f977f4093 100644
--- a/searchlib/src/tests/hitcollector/hitcollector_test.cpp
+++ b/searchlib/src/tests/hitcollector/hitcollector_test.cpp
@@ -149,10 +149,14 @@ struct Fixture {
         }
     }
     size_t reRank() {
-        return hc.reRank(scorer);
+        return hc.reRank(scorer, hc.getSortedHeapHits());
     }
     size_t reRank(size_t count) {
-        return hc.reRank(scorer, count);
+        auto hits = hc.getSortedHeapHits();
+        if (hits.size() > count) {
+            hits.resize(count);
+        }
+        return hc.reRank(scorer, std::move(hits));
     }
 };
 
@@ -290,7 +294,7 @@ void testScaling(const std::vector<feature_t> &initScores,
 
     PredefinedScorer scorer(std::move(finalScores));
     // perform second phase ranking
-    EXPECT_EQUAL(2u, hc.reRank(scorer));
+    EXPECT_EQUAL(2u, hc.reRank(scorer, hc.getSortedHeapHits()));
 
     // check results
     std::unique_ptr<ResultSet> rs = hc.getResultSet();
@@ -457,7 +461,7 @@ TEST_F("require that result set is merged correctly with second phase ranking (d
         f.hc.addHit(i, i + 1000);
         addExpectedHitForMergeTest(f, expRh, i);
     }
-    EXPECT_EQUAL(f.maxHeapSize, f.hc.reRank(scorer));
+    EXPECT_EQUAL(f.maxHeapSize, f.hc.reRank(scorer, f.hc.getSortedHeapHits()));
     std::unique_ptr<ResultSet> rs = f.hc.getResultSet();
     TEST_DO(checkResult(*rs, expRh));
 }
diff --git a/searchlib/src/vespa/searchlib/queryeval/hitcollector.cpp b/searchlib/src/vespa/searchlib/queryeval/hitcollector.cpp
index 5419d44f939..2a38d8bf27e 100644
--- a/searchlib/src/vespa/searchlib/queryeval/hitcollector.cpp
+++ b/searchlib/src/vespa/searchlib/queryeval/hitcollector.cpp
@@ -181,29 +181,6 @@ HitCollector::getSortedHeapHits()
     return scores;
 }
 
-
-size_t
-HitCollector::reRank(DocumentScorer &scorer)
-{
-    return reRank(scorer, _maxReRankHitsSize);
-}
-
-size_t
-HitCollector::reRank(DocumentScorer &scorer, size_t count)
-{
-    size_t hitsToReRank = std::min(_hits.size(), count);
-    if (_hasReRanked || hitsToReRank == 0) {
-        return 0;
-    }
-    sortHitsByScore(hitsToReRank);
-    std::vector<Hit> hits;
-    hits.reserve(hitsToReRank);
-    for (size_t i(0); i < hitsToReRank; i++) {
-        hits.push_back(_hits[_scoreOrder[i]]);
-    }
-    return reRank(scorer, std::move(hits));
-}
-
 size_t
 HitCollector::reRank(DocumentScorer &scorer, std::vector<Hit> hits) {
     if (hits.empty()) { return 0; }
diff --git a/searchlib/src/vespa/searchlib/queryeval/hitcollector.h b/searchlib/src/vespa/searchlib/queryeval/hitcollector.h
index e14c07cb3f1..ef4bf76b66b 100644
--- a/searchlib/src/vespa/searchlib/queryeval/hitcollector.h
+++ b/searchlib/src/vespa/searchlib/queryeval/hitcollector.h
@@ -177,8 +177,6 @@ public:
      * method on the given document scorer. The best m hits are sorted on doc id
      * so that score() is called in doc id order.
      **/
-    size_t reRank(DocumentScorer &scorer);
-    size_t reRank(DocumentScorer &scorer, size_t count);
     size_t reRank(DocumentScorer &scorer, std::vector<Hit> hits);
 
     std::pair<Scores, Scores> getRanges() const;