diff options
6 files changed, 8 insertions, 8 deletions
diff --git a/searchsummary/src/vespa/juniper/rpinterface.cpp b/searchsummary/src/vespa/juniper/rpinterface.cpp index afda82c1110..702cfb11f4d 100644 --- a/searchsummary/src/vespa/juniper/rpinterface.cpp +++ b/searchsummary/src/vespa/juniper/rpinterface.cpp @@ -37,7 +37,7 @@ void SetDebug(unsigned int mask) } -Juniper::Juniper(IJuniperProperties* props, Fast_WordFolder* wordfolder, int api_version) : +Juniper::Juniper(IJuniperProperties* props, const Fast_WordFolder* wordfolder, int api_version) : _props(props), _wordfolder(wordfolder), _modifier(new QueryModifier()) diff --git a/searchsummary/src/vespa/juniper/rpinterface.h b/searchsummary/src/vespa/juniper/rpinterface.h index 5bfee1e2691..b6612f2a5b7 100644 --- a/searchsummary/src/vespa/juniper/rpinterface.h +++ b/searchsummary/src/vespa/juniper/rpinterface.h @@ -89,7 +89,7 @@ public: * compatibility between versions. */ Juniper(IJuniperProperties* props, - Fast_WordFolder* wordfolder, int api_version = JUNIPER_RP_ABI_VERSION); + const Fast_WordFolder* wordfolder, int api_version = JUNIPER_RP_ABI_VERSION); /** Deinitialize the Juniper subsystem. Release all remaining resources * associated with Juniper - reverse the effect of the Init function. * Assumes that all Result objects have been released. @@ -137,7 +137,7 @@ public: private: IJuniperProperties * _props; - Fast_WordFolder * _wordfolder; + const Fast_WordFolder * _wordfolder; std::unique_ptr<QueryModifier> _modifier; }; diff --git a/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp b/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp index f10ab0010ab..096f9ab4c50 100644 --- a/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp +++ b/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp @@ -14,7 +14,7 @@ namespace streaming { __thread SearchEnvironment::EnvMap * SearchEnvironment::_localEnvMap = nullptr; -SearchEnvironment::Env::Env(const config::ConfigUri& configUri, Fast_NormalizeWordFolder& wf) +SearchEnvironment::Env::Env(const config::ConfigUri& configUri, const 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)), diff --git a/streamingvisitors/src/vespa/searchvisitor/searchenvironment.h b/streamingvisitors/src/vespa/searchvisitor/searchenvironment.h index 243784ecc51..15a6edd667d 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 config::ConfigUri& configUri, Fast_NormalizeWordFolder& wf); + Env(const config::ConfigUri& configUri, const 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 88e628242f9..50ee380cac9 100644 --- a/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.cpp +++ b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.cpp @@ -174,7 +174,7 @@ VSMConfigSnapshot::VSMConfigSnapshot(const vespalib::string & configId, const co { } VSMConfigSnapshot::~VSMConfigSnapshot() = default; -VSMAdapter::VSMAdapter(const vespalib::string & configId, Fast_WordFolder & wordFolder) +VSMAdapter::VSMAdapter(const vespalib::string & configId, const Fast_WordFolder& wordFolder) : _configId(configId), _wordFolder(wordFolder), _fieldsCfg(), diff --git a/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h index 06b3b8fd478..2ca627c837b 100644 --- a/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h +++ b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h @@ -103,7 +103,7 @@ public: class VSMAdapter { public: - VSMAdapter(const vespalib::string & configId, Fast_WordFolder & wordFolder); + VSMAdapter(const vespalib::string& configId, const Fast_WordFolder& wordFolder); virtual ~VSMAdapter(); VsmfieldsHandle getFieldsConfig() const { return _fieldsCfg.get(); } @@ -111,7 +111,7 @@ public: void configure(const VSMConfigSnapshot & snapshot); private: const vespalib::string _configId; - Fast_WordFolder & _wordFolder; + const Fast_WordFolder& _wordFolder; vespalib::PtrHolder<VsmfieldsConfig> _fieldsCfg; vespalib::PtrHolder<DocsumTools> _docsumTools; std::unique_ptr<JuniperProperties> _juniperProps; |