diff options
Diffstat (limited to 'searchsummary/src/vespa/juniper')
-rw-r--r-- | searchsummary/src/vespa/juniper/IJuniperProperties.h | 4 | ||||
-rw-r--r-- | searchsummary/src/vespa/juniper/config.cpp | 2 | ||||
-rw-r--r-- | searchsummary/src/vespa/juniper/config.h | 4 | ||||
-rw-r--r-- | searchsummary/src/vespa/juniper/juniperparams.cpp | 2 | ||||
-rw-r--r-- | searchsummary/src/vespa/juniper/juniperparams.h | 4 | ||||
-rw-r--r-- | searchsummary/src/vespa/juniper/propreader.cpp | 2 | ||||
-rw-r--r-- | searchsummary/src/vespa/juniper/propreader.h | 2 | ||||
-rw-r--r-- | searchsummary/src/vespa/juniper/rpinterface.cpp | 4 | ||||
-rw-r--r-- | searchsummary/src/vespa/juniper/rpinterface.h | 8 |
9 files changed, 16 insertions, 16 deletions
diff --git a/searchsummary/src/vespa/juniper/IJuniperProperties.h b/searchsummary/src/vespa/juniper/IJuniperProperties.h index 63ada17684c..4902d3d561d 100644 --- a/searchsummary/src/vespa/juniper/IJuniperProperties.h +++ b/searchsummary/src/vespa/juniper/IJuniperProperties.h @@ -15,7 +15,7 @@ public: * @param def A default value for the property if not found in configuration * @return The value of the property or @param def if no such property is set */ - virtual const char* GetProperty(const char* name, const char* def = nullptr) = 0; + virtual const char* GetProperty(const char* name, const char* def = nullptr) const = 0; - virtual ~IJuniperProperties() {}; + virtual ~IJuniperProperties() = default; }; diff --git a/searchsummary/src/vespa/juniper/config.cpp b/searchsummary/src/vespa/juniper/config.cpp index a82a8d74b8a..3daebfd1ea8 100644 --- a/searchsummary/src/vespa/juniper/config.cpp +++ b/searchsummary/src/vespa/juniper/config.cpp @@ -10,7 +10,7 @@ namespace juniper { -Config::Config(const char* config_name, Juniper & juniper) : +Config::Config(const char* config_name, const Juniper & juniper) : _docsumparams(), _matcherparams(), _sumconf(nullptr), diff --git a/searchsummary/src/vespa/juniper/config.h b/searchsummary/src/vespa/juniper/config.h index a9dabdd91d1..51e2c67cfae 100644 --- a/searchsummary/src/vespa/juniper/config.h +++ b/searchsummary/src/vespa/juniper/config.h @@ -16,7 +16,7 @@ class Juniper; class Config { public: - Config(const char* config_name, Juniper & juniper); + Config(const char* config_name, const Juniper & juniper); ~Config(); const char* GetProp(const char* name, const char* def); @@ -26,7 +26,7 @@ public: private: std::string _config_name; - Juniper & _juniper; + const Juniper& _juniper; Config(Config &); Config &operator=(Config &); diff --git a/searchsummary/src/vespa/juniper/juniperparams.cpp b/searchsummary/src/vespa/juniper/juniperparams.cpp index 2ee0f3c31f6..e5a63440fd6 100644 --- a/searchsummary/src/vespa/juniper/juniperparams.cpp +++ b/searchsummary/src/vespa/juniper/juniperparams.cpp @@ -102,7 +102,7 @@ size_t MatcherParams::StemMinLength() const { return _stem_min; } size_t MatcherParams::StemMaxExtend() const { return _stem_extend; } -MatcherParams& MatcherParams::SetWordFolder(Fast_WordFolder* wordfolder) +MatcherParams& MatcherParams::SetWordFolder(const Fast_WordFolder* wordfolder) { _wordfolder = wordfolder; return *this; diff --git a/searchsummary/src/vespa/juniper/juniperparams.h b/searchsummary/src/vespa/juniper/juniperparams.h index 415c254b3f0..77422b02677 100644 --- a/searchsummary/src/vespa/juniper/juniperparams.h +++ b/searchsummary/src/vespa/juniper/juniperparams.h @@ -67,7 +67,7 @@ public: MatcherParams& SetStemMaxExtend(size_t stem_extend); size_t StemMaxExtend() const; - MatcherParams& SetWordFolder(Fast_WordFolder* wordfolder); + MatcherParams& SetWordFolder(const Fast_WordFolder* wordfolder); const Fast_WordFolder* WordFolder() const noexcept { return _wordfolder; } MatcherParams& SetProximityFactor(double factor); @@ -79,7 +79,7 @@ private: size_t _max_match_candidates; size_t _stem_min; size_t _stem_extend; - Fast_WordFolder* _wordfolder; // The wordfolder object needed as 1st parameter to folderfun + const Fast_WordFolder* _wordfolder; // The wordfolder object needed as 1st parameter to folderfun double _proximity_factor; }; diff --git a/searchsummary/src/vespa/juniper/propreader.cpp b/searchsummary/src/vespa/juniper/propreader.cpp index 99a6e580126..bd20c885f6c 100644 --- a/searchsummary/src/vespa/juniper/propreader.cpp +++ b/searchsummary/src/vespa/juniper/propreader.cpp @@ -80,7 +80,7 @@ void PropReader::Process(const char* filename) } -const char* PropReader::GetProperty(const char* name, const char* def) +const char* PropReader::GetProperty(const char* name, const char* def) const { const char* v = _keymap.Lookup(name, def); LOG(debug, "Parameter lookup :%s: value :%s:", name, v); diff --git a/searchsummary/src/vespa/juniper/propreader.h b/searchsummary/src/vespa/juniper/propreader.h index fbc6f53bfb1..45557716cd0 100644 --- a/searchsummary/src/vespa/juniper/propreader.h +++ b/searchsummary/src/vespa/juniper/propreader.h @@ -11,7 +11,7 @@ class PropReader : public IJuniperProperties { public: PropReader(const char* filename); - const char* GetProperty(const char* name, const char* def = NULL) override; + const char* GetProperty(const char* name, const char* def = nullptr) const override; void UpdateProperty(const char* name, const char* value); ~PropReader() {} protected: diff --git a/searchsummary/src/vespa/juniper/rpinterface.cpp b/searchsummary/src/vespa/juniper/rpinterface.cpp index c54ae654ec7..202b96a442d 100644 --- a/searchsummary/src/vespa/juniper/rpinterface.cpp +++ b/searchsummary/src/vespa/juniper/rpinterface.cpp @@ -73,12 +73,12 @@ Juniper::~Juniper() { } -std::unique_ptr<Config> Juniper::CreateConfig(const char* config_name) +std::unique_ptr<Config> Juniper::CreateConfig(const char* config_name) const { return std::unique_ptr<Config>(new Config(config_name, *this)); } -std::unique_ptr<QueryHandle> Juniper::CreateQueryHandle(const IQuery& fquery, const char* juniperoptions) +std::unique_ptr<QueryHandle> Juniper::CreateQueryHandle(const IQuery& fquery, const char* juniperoptions) const { return std::make_unique<QueryHandle>(fquery, juniperoptions, *_modifier); } diff --git a/searchsummary/src/vespa/juniper/rpinterface.h b/searchsummary/src/vespa/juniper/rpinterface.h index ee1f4e3a3d8..41a40e2c98d 100644 --- a/searchsummary/src/vespa/juniper/rpinterface.h +++ b/searchsummary/src/vespa/juniper/rpinterface.h @@ -96,8 +96,8 @@ public: */ ~Juniper(); - Fast_WordFolder & getWordFolder() { return *_wordfolder; } - IJuniperProperties & getProp() { return *_props; } + const Fast_WordFolder & getWordFolder() const noexcept { return *_wordfolder; } + const IJuniperProperties & getProp() const noexcept { return *_props; } QueryModifier & getModifier() { return *_modifier; } /** Create a result processing configuration of Juniper for subsequent use @@ -111,7 +111,7 @@ public: * NULL if an error occurred. */ - std::unique_ptr<Config> CreateConfig(const char* config_name = "juniper"); + std::unique_ptr<Config> CreateConfig(const char* config_name = "juniper") const; /** Allocate a query handle for the given query for subsequent calls to Analyse * for different hits. Performs the necessary per query processing for Juniper. * @param query A query to start result processing for. @@ -122,7 +122,7 @@ public: * to the query language. * @return A unique pointer to a QueryHandle. */ - std::unique_ptr<QueryHandle> CreateQueryHandle(const IQuery& query, const char* juniperoptions); + std::unique_ptr<QueryHandle> CreateQueryHandle(const IQuery& query, const char* juniperoptions) const; /** Add an rewriter for all terms that are prefixed with the given index. * When Juniper encounter a term in the query tagged with this index, |