Merge pull request #26836 from vespa-engine/geirst/streaming-field-searcher-refactorv8.157.14

Streaming field searcher refactor

1 files changed, 4 insertions, 5 deletions

diff --git a/streamingvisitors/src/vespa/vsm/searcher/strchrfieldsearcher.cpp b/streamingvisitors/src/vespa/vsm/searcher/strchrfieldsearcher.cpp
index f15290526d9..6a46e4604be 100644
--- a/streamingvisitors/src/vespa/vsm/searcher/strchrfieldsearcher.cpp
+++ b/streamingvisitors/src/vespa/vsm/searcher/strchrfieldsearcher.cpp
@@ -34,10 +34,9 @@ bool StrChrFieldSearcher::matchDoc(const FieldRef & fieldRef)
       _words += countWords(fieldRef);
     }
   } else {
-    for(QueryTermList::iterator it=_qtl.begin(), mt=_qtl.end(); it != mt; it++) {
-      QueryTerm & qt = **it;
-      if (fieldRef.size() >= qt.termLen()) {
-        _words += matchTerm(fieldRef, qt);
+    for (auto qt : _qtl) {
+      if (fieldRef.size() >= qt->termLen()) {
+        _words += matchTerm(fieldRef, *qt);
       } else {
         _words += countWords(fieldRef);
       }
@@ -49,7 +48,7 @@ bool StrChrFieldSearcher::matchDoc(const FieldRef & fieldRef)
 size_t StrChrFieldSearcher::shortestTerm() const
 {
   size_t mintsz(_qtl.front()->termLen());
-  for(QueryTermList::const_iterator it=_qtl.begin()+1, mt=_qtl.end(); it != mt; it++) {
+  for (auto it=_qtl.begin()+1, mt=_qtl.end(); it != mt; it++) {
     const QueryTerm & qt = **it;
     mintsz = std::min(mintsz, qt.termLen());
   }