Use reference to IDocsumEnvironemt instead of pointer.

6 files changed, 13 insertions, 15 deletions

diff --git a/streamingvisitors/src/vespa/vsm/vsm/docsum_field_writer_factory.cpp b/streamingvisitors/src/vespa/vsm/vsm/docsum_field_writer_factory.cpp
index dcf093ee92b..c7ca9b52dc9 100644
--- a/streamingvisitors/src/vespa/vsm/vsm/docsum_field_writer_factory.cpp
+++ b/streamingvisitors/src/vespa/vsm/vsm/docsum_field_writer_factory.cpp
@@ -35,7 +35,7 @@ void populate_fields(MatchingElementsFields& fields, VsmfieldsConfig& fields_con
 
 }
 
-DocsumFieldWriterFactory::DocsumFieldWriterFactory(bool use_v8_geo_positions, IDocsumEnvironment* env, const vespa::config::search::vsm::VsmfieldsConfig& vsm_fields_config)
+DocsumFieldWriterFactory::DocsumFieldWriterFactory(bool use_v8_geo_positions, IDocsumEnvironment& env, const vespa::config::search::vsm::VsmfieldsConfig& vsm_fields_config)
     : search::docsummary::DocsumFieldWriterFactory(use_v8_geo_positions, env),
       _vsm_fields_config(vsm_fields_config)
 {
diff --git a/streamingvisitors/src/vespa/vsm/vsm/docsum_field_writer_factory.h b/streamingvisitors/src/vespa/vsm/vsm/docsum_field_writer_factory.h
index 4084b435bf2..b8362c06f78 100644
--- a/streamingvisitors/src/vespa/vsm/vsm/docsum_field_writer_factory.h
+++ b/streamingvisitors/src/vespa/vsm/vsm/docsum_field_writer_factory.h
@@ -16,7 +16,7 @@ class DocsumFieldWriterFactory : public search::docsummary::DocsumFieldWriterFac
     const vespa::config::search::vsm::VsmfieldsConfig& _vsm_fields_config;
 
 public:
-    DocsumFieldWriterFactory(bool use_v8_geo_positions, search::docsummary::IDocsumEnvironment* env, const vespa::config::search::vsm::VsmfieldsConfig& vsm_fields_config);
+    DocsumFieldWriterFactory(bool use_v8_geo_positions, search::docsummary::IDocsumEnvironment& env, const vespa::config::search::vsm::VsmfieldsConfig& vsm_fields_config);
     ~DocsumFieldWriterFactory() override;
     std::unique_ptr<search::docsummary::DocsumFieldWriter>
     create_docsum_field_writer(const vespalib::string& fieldName, const vespalib::string& overrideName, const vespalib::string& argument, bool& rc) override;
diff --git a/streamingvisitors/src/vespa/vsm/vsm/docsumconfig.cpp b/streamingvisitors/src/vespa/vsm/vsm/docsumconfig.cpp
index 22c3b270836..7525477fb52 100644
--- a/streamingvisitors/src/vespa/vsm/vsm/docsumconfig.cpp
+++ b/streamingvisitors/src/vespa/vsm/vsm/docsumconfig.cpp
@@ -9,7 +9,7 @@ using vespa::config::search::vsm::VsmfieldsConfig;
 
 namespace vsm {
 
-DynamicDocsumConfig::DynamicDocsumConfig(search::docsummary::IDocsumEnvironment* env, search::docsummary::DynamicDocsumWriter* writer, std::shared_ptr<VsmfieldsConfig> vsm_fields_config)
+DynamicDocsumConfig::DynamicDocsumConfig(search::docsummary::IDocsumEnvironment& env, search::docsummary::DynamicDocsumWriter* writer, std::shared_ptr<VsmfieldsConfig> vsm_fields_config)
     : Parent(env, writer),
       _vsm_fields_config(std::move(vsm_fields_config))
 {
diff --git a/streamingvisitors/src/vespa/vsm/vsm/docsumconfig.h b/streamingvisitors/src/vespa/vsm/vsm/docsumconfig.h
index f423a0b478a..d5b7e258165 100644
--- a/streamingvisitors/src/vespa/vsm/vsm/docsumconfig.h
+++ b/streamingvisitors/src/vespa/vsm/vsm/docsumconfig.h
@@ -18,7 +18,7 @@ public:
 private:
     std::shared_ptr<VsmfieldsConfig> _vsm_fields_config;
 public:
-    DynamicDocsumConfig(search::docsummary::IDocsumEnvironment* env, search::docsummary::DynamicDocsumWriter* writer, std::shared_ptr<VsmfieldsConfig> vsm_fields_config);
+    DynamicDocsumConfig(search::docsummary::IDocsumEnvironment& env, search::docsummary::DynamicDocsumWriter* writer, std::shared_ptr<VsmfieldsConfig> vsm_fields_config);
 private:
     std::unique_ptr<search::docsummary::IDocsumFieldWriterFactory> make_docsum_field_writer_factory() override;
 };
diff --git a/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.cpp b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.cpp
index 03965e6c63e..2bf6b2f3972 100644
--- a/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.cpp
+++ b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.cpp
@@ -22,20 +22,18 @@ GetDocsumsStateCallback::GetDocsumsStateCallback() :
     _matching_elements_filler()
 { }
 
-void GetDocsumsStateCallback::FillSummaryFeatures(GetDocsumsState * state, IDocsumEnvironment * env)
+void GetDocsumsStateCallback::FillSummaryFeatures(GetDocsumsState& state)
 {
-    (void) env;
     if (_summaryFeatures) { // set the summary features to write to the docsum
-        state->_summaryFeatures = _summaryFeatures;
-        state->_summaryFeaturesCached = true;
+        state._summaryFeatures = _summaryFeatures;
+        state._summaryFeaturesCached = true;
     }
 }
 
-void GetDocsumsStateCallback::FillRankFeatures(GetDocsumsState * state, IDocsumEnvironment * env)
+void GetDocsumsStateCallback::FillRankFeatures(GetDocsumsState& state)
 {
-    (void) env;
     if (_rankFeatures) { // set the rank features to write to the docsum
-        state->_rankFeatures = _rankFeatures;
+        state._rankFeatures = _rankFeatures;
     }
 }
 
@@ -168,7 +166,7 @@ VSMAdapter::configure(const VSMConfigSnapshot & snapshot)
     docsumTools->set_writer(std::move(writer));
 
     // configure dynamic docsum writer
-    DynamicDocsumConfig dynDocsumConfig(docsumTools.get(), docsumTools->getDocsumWriter(), _fieldsCfg.get());
+    DynamicDocsumConfig dynDocsumConfig(*docsumTools, docsumTools->getDocsumWriter(), _fieldsCfg.get());
     dynDocsumConfig.configure(*summaryMap.get());
 
     // configure new docsum tools
diff --git a/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h
index 2788475b4ad..b8583dc801d 100644
--- a/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h
+++ b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h
@@ -38,8 +38,8 @@ private:
 
 public:
     GetDocsumsStateCallback();
-    void FillSummaryFeatures(GetDocsumsState * state, IDocsumEnvironment * env) override;
-    void FillRankFeatures(GetDocsumsState * state, IDocsumEnvironment * env) override;
+    void FillSummaryFeatures(GetDocsumsState& state) override;
+    void FillRankFeatures(GetDocsumsState& state) override;
     virtual void FillDocumentLocations(GetDocsumsState * state, IDocsumEnvironment * env);
     virtual std::unique_ptr<search::MatchingElements> fill_matching_elements(const search::MatchingElementsFields& fields) override;
     void setSummaryFeatures(const search::FeatureSet::SP & sf) { _summaryFeatures = sf; }
@@ -88,7 +88,7 @@ public:
     bool obtainFieldNames(const FastS_VsmsummaryHandle &cfg);
 
     // inherit doc from IDocsumEnvironment
-    search::IAttributeManager * getAttributeManager() override { return NULL; }
+    const search::IAttributeManager * getAttributeManager() const override { return nullptr; }
     vespalib::string lookupIndex(const vespalib::string&) const override { return ""; }
     juniper::Juniper * getJuniper() override { return _juniper.get(); }
 };