- Hide recall terms from ranking.

- Add noexcept.

2 files changed, 9 insertions, 19 deletions

diff --git a/streamingvisitors/src/vespa/searchvisitor/queryenvironment.h b/streamingvisitors/src/vespa/searchvisitor/queryenvironment.h
index efd5c93d267..734394c86ad 100644
--- a/streamingvisitors/src/vespa/searchvisitor/queryenvironment.h
+++ b/streamingvisitors/src/vespa/searchvisitor/queryenvironment.h
@@ -30,36 +30,24 @@ public:
     QueryEnvironment(const vespalib::string & location,
                      const IndexEnvironment & indexEnv,
                      const search::fef::Properties & properties,
-                     const search::IAttributeManager * attrMgr = nullptr);
-    ~QueryEnvironment();
+                     const search::IAttributeManager * attrMgr);
+    ~QueryEnvironment() override;
 
     void addGeoLocation(const vespalib::string &field, const vespalib::string &location);
+    const search::fef::Properties & getProperties() const override { return _properties; }
+    uint32_t getNumTerms() const override { return _queryTerms.size(); }
 
-    // inherit documentation
-    virtual const search::fef::Properties & getProperties() const override { return _properties; }
-
-    // inherit documentation
-    virtual uint32_t getNumTerms() const override { return _queryTerms.size(); }
-
-    // inherit documentation
-    virtual const search::fef::ITermData *getTerm(uint32_t idx) const override {
+    const search::fef::ITermData *getTerm(uint32_t idx) const override {
         if (idx >= _queryTerms.size()) {
             return nullptr;
         }
         return _queryTerms[idx];
     }
 
-    // inherit documentation
     GeoLocationSpecPtrs getAllLocations() const override;
-
-    // inherit documentation
-    virtual const search::attribute::IAttributeContext & getAttributeContext() const override { return *_attrCtx; }
-
+    const search::attribute::IAttributeContext & getAttributeContext() const override { return *_attrCtx; }
     double get_average_field_length(const vespalib::string &) const override { return 100.0; }
-
-    // inherit documentation
-    virtual const search::fef::IIndexEnvironment & getIndexEnvironment() const override { return _indexEnv; }
-
+    const search::fef::IIndexEnvironment & getIndexEnvironment() const override { return _indexEnv; }
     void addTerm(const search::fef::ITermData *term) { _queryTerms.push_back(term); }
 
     std::vector<vespalib::string> get_accessed_attributes() const { return _attrCtx->get_accessed_attributes(); }
diff --git a/streamingvisitors/src/vespa/searchvisitor/rankprocessor.cpp b/streamingvisitors/src/vespa/searchvisitor/rankprocessor.cpp
index ac7a61e5888..825630f057b 100644
--- a/streamingvisitors/src/vespa/searchvisitor/rankprocessor.cpp
+++ b/streamingvisitors/src/vespa/searchvisitor/rankprocessor.cpp
@@ -106,6 +106,8 @@ RankProcessor::initQueryEnvironment()
     QueryWrapper::TermList & terms = _query.getTermList();
 
     for (auto& term : terms) {
+        if (!term->isRanked()) continue;
+
         if (term->isGeoLoc()) {
             const vespalib::string & fieldName = term->index();
             const vespalib::string & locStr = term->getTermString();