Merge pull request #8799 from vespa-engine/balder/allow-termwise-for-location

Allow termwise eval for geo prefilter iterators.

3 files changed, 6 insertions, 10 deletions

diff --git a/searchlib/src/vespa/searchlib/attribute/attribute_blueprint_factory.cpp b/searchlib/src/vespa/searchlib/attribute/attribute_blueprint_factory.cpp
index 49c378f0e3e..f09f48363db 100644
--- a/searchlib/src/vespa/searchlib/attribute/attribute_blueprint_factory.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/attribute_blueprint_factory.cpp
@@ -172,7 +172,8 @@ public:
             _should_use = true;
         }
         HitEstimate estimate(estHits, estHits == 0);
-        setEstimate(estimate);        
+        setEstimate(estimate);
+        set_allow_termwise_eval(true);
     }
 
     bool should_use() const { return _should_use; }
diff --git a/searchlib/src/vespa/searchlib/queryeval/ranksearch.cpp b/searchlib/src/vespa/searchlib/queryeval/ranksearch.cpp
index f499845df1f..2bcf2267b1d 100644
--- a/searchlib/src/vespa/searchlib/queryeval/ranksearch.cpp
+++ b/searchlib/src/vespa/searchlib/queryeval/ranksearch.cpp
@@ -2,8 +2,7 @@
 
 #include "ranksearch.h"
 
-namespace search {
-namespace queryeval {
+namespace search::queryeval {
 
 void
 RankSearch::doSeek(uint32_t docid)
@@ -59,5 +58,4 @@ RankSearch::create(const RankSearch::Children &children, bool strict) {
     }
 }
 
-}  // namespace queryeval
-}  // namespace search
+}
diff --git a/searchlib/src/vespa/searchlib/queryeval/ranksearch.h b/searchlib/src/vespa/searchlib/queryeval/ranksearch.h
index 4d5bb3d3bf9..60efed3c694 100644
--- a/searchlib/src/vespa/searchlib/queryeval/ranksearch.h
+++ b/searchlib/src/vespa/searchlib/queryeval/ranksearch.h
@@ -4,8 +4,7 @@
 
 #include "multisearch.h"
 
-namespace search {
-namespace queryeval {
+namespace search::queryeval {
 
 /**
  * A simple implementation of the Rank search operation.
@@ -28,6 +27,4 @@ public:
     static SearchIterator *create(const Children &children, bool strict);
 };
 
-} // namespace queryeval
-} // namespace search
-
+}