Use reference to IDocsumEnvironemt instead of pointer.

5 files changed, 16 insertions, 21 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp b/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp
index 7b4db47f585..cb541c2836d 100644
--- a/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp
+++ b/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp
@@ -103,7 +103,7 @@ DocsumContext::createSlimeReply()
 DocsumContext::DocsumContext(const DocsumRequest & request, IDocsumWriter & docsumWriter,
                              IDocsumStore & docsumStore, std::shared_ptr<Matcher> matcher,
                              ISearchContext & searchCtx, IAttributeContext & attrCtx,
-                             IAttributeManager & attrMgr, SessionManager & sessionMgr) :
+                             const IAttributeManager & attrMgr, SessionManager & sessionMgr) :
     _request(request),
     _docsumWriter(docsumWriter),
     _docsumStore(docsumStore),
@@ -124,24 +124,24 @@ DocsumContext::getDocsums()
 }
 
 void
-DocsumContext::FillSummaryFeatures(search::docsummary::GetDocsumsState * state, search::docsummary::IDocsumEnvironment *)
+DocsumContext::FillSummaryFeatures(search::docsummary::GetDocsumsState& state)
 {
-    assert(&_docsumState == state);
+    assert(&_docsumState == &state);
     if (_matcher->canProduceSummaryFeatures()) {
-        state->_summaryFeatures = _matcher->getSummaryFeatures(_request, _searchCtx, _attrCtx, _sessionMgr);
+        state._summaryFeatures = _matcher->getSummaryFeatures(_request, _searchCtx, _attrCtx, _sessionMgr);
     }
-    state->_summaryFeaturesCached = false;
+    state._summaryFeaturesCached = false;
 }
 
 void
-DocsumContext::FillRankFeatures(search::docsummary::GetDocsumsState * state, search::docsummary::IDocsumEnvironment *)
+DocsumContext::FillRankFeatures(search::docsummary::GetDocsumsState& state)
 {
-    assert(&_docsumState == state);
+    assert(&_docsumState == &state);
     // check if we are allowed to run
-    if ( ! state->_args.dumpFeatures()) {
+    if ( ! state._args.dumpFeatures()) {
         return;
     }
-    state->_rankFeatures = _matcher->getRankFeatures(_request, _searchCtx, _attrCtx, _sessionMgr);
+    state._rankFeatures = _matcher->getRankFeatures(_request, _searchCtx, _attrCtx, _sessionMgr);
 }
 
 std::unique_ptr<MatchingElements>
diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.h b/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.h
index 958e19f9bed..5c1db91f05d 100644
--- a/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.h
+++ b/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.h
@@ -27,7 +27,7 @@ private:
     std::shared_ptr<matching::Matcher>     _matcher;
     matching::ISearchContext             & _searchCtx;
     search::attribute::IAttributeContext & _attrCtx;
-    search::IAttributeManager            & _attrMgr;
+    const search::IAttributeManager      & _attrMgr;
     search::docsummary::GetDocsumsState    _docsumState;
     matching::SessionManager             & _sessionMgr;
 
@@ -43,14 +43,14 @@ public:
                   std::shared_ptr<matching::Matcher> matcher,
                   matching::ISearchContext & searchCtx,
                   search::attribute::IAttributeContext & attrCtx,
-                  search::IAttributeManager & attrMgr,
+                  const search::IAttributeManager & attrMgr,
                   matching::SessionManager & sessionMgr);
 
     search::engine::DocsumReply::UP getDocsums();
 
     // Implements GetDocsumsStateCallback
-    void FillSummaryFeatures(search::docsummary::GetDocsumsState * state, search::docsummary::IDocsumEnvironment * env) override;
-    void FillRankFeatures(search::docsummary::GetDocsumsState * state, search::docsummary::IDocsumEnvironment * env) override;
+    void FillSummaryFeatures(search::docsummary::GetDocsumsState& state) override;
+    void FillRankFeatures(search::docsummary::GetDocsumsState& state) override;
     std::unique_ptr<search::MatchingElements> fill_matching_elements(const search::MatchingElementsFields &fields) override;
 };
 
diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/isummarymanager.h b/searchcore/src/vespa/searchcore/proton/docsummary/isummarymanager.h
index e3c4705104f..946c45feb4b 100644
--- a/searchcore/src/vespa/searchcore/proton/docsummary/isummarymanager.h
+++ b/searchcore/src/vespa/searchcore/proton/docsummary/isummarymanager.h
@@ -31,16 +31,11 @@ public:
         typedef std::unique_ptr<ISummarySetup> UP;
         typedef std::shared_ptr<ISummarySetup> SP;
 
-        virtual ~ISummarySetup() {}
+        ~ISummarySetup() override = default;
 
         virtual search::docsummary::IDocsumWriter &getDocsumWriter() const = 0;
         virtual const search::docsummary::ResultConfig &getResultConfig() = 0;
         virtual search::docsummary::IDocsumStore::UP createDocsumStore() = 0;
-
-        // Inherit doc from IDocsumEnvironment
-        virtual search::IAttributeManager *getAttributeManager() override = 0;
-        virtual vespalib::string lookupIndex(const vespalib::string & s) const override = 0;
-        virtual juniper::Juniper *getJuniper() override = 0;
     };
 
     typedef std::unique_ptr<ISummaryManager> UP;
diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp b/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp
index f398898ebb8..3e3a3529e46 100644
--- a/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp
+++ b/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp
@@ -104,7 +104,7 @@ SummarySetup(const vespalib::string & baseDir, const SummaryConfig & summaryCfg,
 
     _juniperConfig = std::make_unique<juniper::Juniper>(&_juniperProps, _wordFolder.get());
     _docsumWriter = std::make_unique<DynamicDocsumWriter>(std::move(resultConfig), std::unique_ptr<KeywordExtractor>());
-    DynamicDocsumConfig dynCfg(this, _docsumWriter.get());
+    DynamicDocsumConfig dynCfg(*this, _docsumWriter.get());
     dynCfg.configure(summarymapCfg);
 }
 
diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.h b/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.h
index 0fd45bb28fb..44874e69b31 100644
--- a/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.h
+++ b/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.h
@@ -43,7 +43,7 @@ public:
 
         search::docsummary::IDocsumStore::UP createDocsumStore() override;
 
-        search::IAttributeManager * getAttributeManager() override { return _attributeMgr.get(); }
+        const search::IAttributeManager * getAttributeManager() const override { return _attributeMgr.get(); }
         vespalib::string lookupIndex(const vespalib::string & s) const override { (void) s; return ""; }
         juniper::Juniper * getJuniper() override { return _juniperConfig.get(); }
     };