Unify merge loops

2 files changed, 9 insertions, 8 deletions

diff --git a/searchlib/src/vespa/searchlib/attribute/searchcontextelementiterator.cpp b/searchlib/src/vespa/searchlib/attribute/searchcontextelementiterator.cpp
index 8bfb07df938..87c09186746 100644
--- a/searchlib/src/vespa/searchlib/attribute/searchcontextelementiterator.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/searchcontextelementiterator.cpp
@@ -21,11 +21,12 @@ SearchContextElementIterator::mergeElementIds(uint32_t docId, std::vector<uint32
     int32_t id(-1);
     int32_t weight(0);
     for (int32_t candidate : elementIds) {
-        if (candidate >= id) {
+        if (candidate > id) {
             id = _searchContext.find(docId, candidate, weight);
-            if (id == candidate) {
-                elementIds[toKeep++] = candidate;
-            }
+            if (id < 0) break;
+        }
+        if (id == candidate) {
+            elementIds[toKeep++] = candidate;
         }
     }
     elementIds.resize(toKeep);
diff --git a/searchlib/src/vespa/searchlib/queryeval/elementiterator.cpp b/searchlib/src/vespa/searchlib/queryeval/elementiterator.cpp
index 4ad855da857..da4a088adea 100644
--- a/searchlib/src/vespa/searchlib/queryeval/elementiterator.cpp
+++ b/searchlib/src/vespa/searchlib/queryeval/elementiterator.cpp
@@ -36,15 +36,15 @@ ElementIteratorWrapper::mergeElementIds(uint32_t docId, std::vector<uint32_t> &
     int32_t id(-1);
     auto it = _tfmd.begin();
     for (int32_t candidate : elementIds) {
-        if (candidate >= id) {
+        if (candidate > id) {
             while ((it < _tfmd.end()) && (candidate > int(it->getElementId()))) {
                 it++;
             }
             if (it == _tfmd.end()) break;
             id = it->getElementId();
-            if (id == candidate) {
-                elementIds[toKeep++] = candidate;
-            }
+        }
+        if (id == candidate) {
+            elementIds[toKeep++] = candidate;
         }
     }
     elementIds.resize(toKeep);