Remove unused highlightindexes member variable.

4 files changed, 10 insertions, 12 deletions

diff --git a/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp b/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp
index 4da9164021d..f10ab0010ab 100644
--- a/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp
+++ b/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp
@@ -14,11 +14,11 @@ namespace streaming {
 
 __thread SearchEnvironment::EnvMap * SearchEnvironment::_localEnvMap = nullptr;
 
-SearchEnvironment::Env::Env(const vespalib::string & muffens, const config::ConfigUri & configUri, Fast_NormalizeWordFolder & wf) :
-    _configId(configUri.getConfigId()),
-    _configurer(std::make_unique<config::SimpleConfigRetriever>(createKeySet(configUri.getConfigId()), configUri.getContext()), this),
-    _vsmAdapter(std::make_unique<VSMAdapter>(muffens, _configId, wf)),
-    _rankManager(std::make_unique<RankManager>(_vsmAdapter.get()))
+SearchEnvironment::Env::Env(const config::ConfigUri& configUri, Fast_NormalizeWordFolder& wf)
+    : _configId(configUri.getConfigId()),
+      _configurer(std::make_unique<config::SimpleConfigRetriever>(createKeySet(configUri.getConfigId()), configUri.getContext()), this),
+      _vsmAdapter(std::make_unique<VSMAdapter>(_configId, wf)),
+      _rankManager(std::make_unique<RankManager>(_vsmAdapter.get()))
 {
     
     _configurer.start();
@@ -79,7 +79,7 @@ SearchEnvironment::getEnv(const vespalib::string & searchCluster)
         EnvMap::iterator found = _envMap.find(searchCluster);
         if (found == _envMap.end()) {
             LOG(debug, "Init VSMAdapter with config id = '%s'", searchCluster.c_str());
-            Env::SP env = std::make_shared<Env>("*", searchClusterUri, _wordFolder);
+            Env::SP env = std::make_shared<Env>(searchClusterUri, _wordFolder);
             _envMap[searchCluster] = std::move(env);
             found = _envMap.find(searchCluster);
         }
diff --git a/streamingvisitors/src/vespa/searchvisitor/searchenvironment.h b/streamingvisitors/src/vespa/searchvisitor/searchenvironment.h
index 844c99ad347..243784ecc51 100644
--- a/streamingvisitors/src/vespa/searchvisitor/searchenvironment.h
+++ b/streamingvisitors/src/vespa/searchvisitor/searchenvironment.h
@@ -18,7 +18,7 @@ private:
     class Env : public config::SimpleConfigurable {
     public:
         using SP = std::shared_ptr<Env>;
-        Env(const vespalib::string & muffens, const config::ConfigUri & configUri, Fast_NormalizeWordFolder & wf);
+        Env(const config::ConfigUri& configUri, Fast_NormalizeWordFolder& wf);
         ~Env() override;
         const vsm::VSMAdapter * getVSMAdapter() const { return _vsmAdapter.get(); }
         const RankManager * getRankManager() const { return _rankManager.get(); }
diff --git a/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.cpp b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.cpp
index 8a3226ee52a..88e628242f9 100644
--- a/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.cpp
+++ b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.cpp
@@ -174,9 +174,8 @@ VSMConfigSnapshot::VSMConfigSnapshot(const vespalib::string & configId, const co
 { }
 VSMConfigSnapshot::~VSMConfigSnapshot() = default;
 
-VSMAdapter::VSMAdapter(const vespalib::string & highlightindexes, const vespalib::string & configId, Fast_WordFolder & wordFolder)
-    : _highlightindexes(highlightindexes),
-      _configId(configId),
+VSMAdapter::VSMAdapter(const vespalib::string & configId, Fast_WordFolder & wordFolder)
+    : _configId(configId),
       _wordFolder(wordFolder),
       _fieldsCfg(),
       _docsumTools(),
diff --git a/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h
index ba87ccfef05..06b3b8fd478 100644
--- a/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h
+++ b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h
@@ -103,14 +103,13 @@ public:
 class VSMAdapter
 {
 public:
-    VSMAdapter(const vespalib::string & highlightindexes, const vespalib::string & configId, Fast_WordFolder & wordFolder);
+    VSMAdapter(const vespalib::string & configId, Fast_WordFolder & wordFolder);
     virtual ~VSMAdapter();
 
     VsmfieldsHandle getFieldsConfig() const { return _fieldsCfg.get(); }
     DocsumToolsPtr getDocsumTools()   const { return _docsumTools.get(); }
     void configure(const VSMConfigSnapshot & snapshot);
 private:
-    vespalib::string                          _highlightindexes;
     const vespalib::string                    _configId;
     Fast_WordFolder                         & _wordFolder;
     vespalib::PtrHolder<VsmfieldsConfig>      _fieldsCfg;