use predefined default rank value (-inf) when not known

5 files changed, 11 insertions, 8 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/matching/match_thread.h b/searchcore/src/vespa/searchcore/proton/matching/match_thread.h
index cd01c330931..2d056d0e761 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/match_thread.h
+++ b/searchcore/src/vespa/searchcore/proton/matching/match_thread.h
@@ -53,7 +53,7 @@ private:
         Context(double rankDropLimit, MatchTools &matchTools, RankProgram & ranking, HitCollector & hits,
                 uint32_t num_threads) __attribute__((noinline));
         void rankHit(uint32_t docId);
-        void addHit(uint32_t docId) { _hits.addHit(docId, 0.0); }
+        void addHit(uint32_t docId) { _hits.addHit(docId, search::default_rank_value); }
         bool isBelowLimit() const { return matches < _matches_limit; }
         bool    isAtLimit() const { return matches == _matches_limit; }
         bool   atSoftDoom() const { return _softDoom.doom(); }
diff --git a/searchlib/src/vespa/searchlib/common/hitrank.h b/searchlib/src/vespa/searchlib/common/hitrank.h
index abc714660cf..9f40cf9277c 100644
--- a/searchlib/src/vespa/searchlib/common/hitrank.h
+++ b/searchlib/src/vespa/searchlib/common/hitrank.h
@@ -2,10 +2,13 @@
 
 #pragma once
 
+#include <cmath>
+
 namespace search {
 
 typedef double HitRank;
 typedef double SignedHitRank;
+constexpr HitRank default_rank_value = -HUGE_VAL;
 
 } // namespace search
 
diff --git a/searchlib/src/vespa/searchlib/common/rankedhit.h b/searchlib/src/vespa/searchlib/common/rankedhit.h
index bd66f884a08..d56fa92442f 100644
--- a/searchlib/src/vespa/searchlib/common/rankedhit.h
+++ b/searchlib/src/vespa/searchlib/common/rankedhit.h
@@ -11,8 +11,8 @@
 namespace search {
 
 struct RankedHit {
-    RankedHit() : _docId(0), _rankValue(0) { }
-    RankedHit(unsigned int docId, HitRank rank=0.0) : _docId(docId), _rankValue(rank) { }
+    RankedHit() : _docId(0), _rankValue(default_rank_value) { }
+    RankedHit(unsigned int docId, HitRank rank = default_rank_value) : _docId(docId), _rankValue(rank) { }
     unsigned int getDocId() const { return _docId & 0x7fffffff; }
     bool hasMore()          const { return _docId & 0x80000000; }
     HitRank getRank()       const { return _rankValue; }
diff --git a/searchlib/src/vespa/searchlib/common/resultset.cpp b/searchlib/src/vespa/searchlib/common/resultset.cpp
index 69f3b13d709..5ad89bf49d7 100644
--- a/searchlib/src/vespa/searchlib/common/resultset.cpp
+++ b/searchlib/src/vespa/searchlib/common/resultset.cpp
@@ -111,7 +111,7 @@ ResultSet::mergeWithBitOverflow()
         // bitvector hits before array hits
         while (bidx < firstArrayHit) {
             tgtA->_docId = bidx;
-            tgtA->_rankValue = 0;
+            tgtA->_rankValue = default_rank_value;
             tgtA++;
             bidx = bitVector->getNextTrueBit(bidx + 1);
         }
@@ -123,7 +123,7 @@ ResultSet::mergeWithBitOverflow()
                 tgtA->_rankValue = oldA->_rankValue;
                 oldA++;
             } else {
-                tgtA->_rankValue = 0;
+                tgtA->_rankValue = default_rank_value;
             }
             tgtA++;
             bidx = bitVector->getNextTrueBit(bidx + 1);
@@ -134,7 +134,7 @@ ResultSet::mergeWithBitOverflow()
     // bitvector hits after array hits
     while (tgtA < tgtAEnd) {
         tgtA->_docId = bidx;
-        tgtA->_rankValue = 0;
+        tgtA->_rankValue = default_rank_value;
         tgtA++;
         bidx = bitVector->getNextTrueBit(bidx + 1);
     }
diff --git a/searchlib/src/vespa/searchlib/queryeval/hitcollector.cpp b/searchlib/src/vespa/searchlib/queryeval/hitcollector.cpp
index 3601a93fdc2..7d79d0f659e 100644
--- a/searchlib/src/vespa/searchlib/queryeval/hitcollector.cpp
+++ b/searchlib/src/vespa/searchlib/queryeval/hitcollector.cpp
@@ -306,7 +306,7 @@ HitCollector::getResultSet()
                     rh[j]._rankValue = getReScore(_hits[i].second);
                     ++i;
                 } else {
-                    rh[j]._rankValue = 0;
+                    rh[j]._rankValue = default_rank_value;
                 }
             }
         } else {
@@ -317,7 +317,7 @@ HitCollector::getResultSet()
                     rh[j]._rankValue = _hits[i].second;
                     ++i;
                 } else {
-                    rh[j]._rankValue = 0;
+                    rh[j]._rankValue = default_rank_value;
                 }
             }
         }