Merge pull request #16653 from vespa-engine/arnej/expect-distance-threshold-always

expect QRS to always send distance threshold

1 files changed, 4 insertions, 7 deletions

diff --git a/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.cpp b/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.cpp
index ce24de02281..9b0196f4f29 100644
--- a/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.cpp
+++ b/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.cpp
@@ -273,13 +273,10 @@ SimpleQueryStackDumpIterator::next()
             _extraIntArg1 = readCompressedPositiveInt(p); // targetNumHits
             _extraIntArg2 = readCompressedPositiveInt(p); // allow_approximate
             _extraIntArg3 = readCompressedPositiveInt(p); // explore_additional_hits
-            if ((_extraIntArg2 & 0x40) != 0) {
-                _extraIntArg2 &= ~0x40;
-                // in some later release, do this always:
-                _extraDoubleArg4 = read_double(p); // distance threshold
-            } else {
-                _extraDoubleArg4 = std::numeric_limits<double>::max();
-            }
+            // XXX: remove later when QRS doesn't send this extra flag
+            _extraIntArg2 &= ~0x40;
+            // QRS always sends this now:
+            _extraDoubleArg4 = read_double(p); // distance threshold
             _currArity = 0;
         } catch (...) {
             return false;