diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-09-07 07:39:16 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2022-09-07 07:39:16 +0000 |
commit | 7092bc14ab8a99b496d1494e374e65a1734e9100 (patch) | |
tree | 40d2ee0e1a85acda1ea6ad8e2057892c33212c42 /streamingvisitors | |
parent | 13a1c96df7ea794ceca6d1ff4d154d898cae798b (diff) |
GC unused StringEnum, and avoid including config in header files.
Diffstat (limited to 'streamingvisitors')
3 files changed, 12 insertions, 17 deletions
diff --git a/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp b/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp index 2ccaf7f9bee..1ac452e11d4 100644 --- a/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp +++ b/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp @@ -2,6 +2,7 @@ #include "searchenvironment.h" #include <vespa/vespalib/stllike/hash_map.hpp> +#include <vespa/searchsummary/config/config-juniperrc.h> #include <vespa/log/log.h> LOG_SETUP(".visitor.instance.searchenvironment"); @@ -11,7 +12,7 @@ using vsm::VSMAdapter; namespace streaming { -__thread SearchEnvironment::EnvMap * SearchEnvironment::_localEnvMap=0; +__thread SearchEnvironment::EnvMap * SearchEnvironment::_localEnvMap = nullptr; SearchEnvironment::Env::Env(const vespalib::string & muffens, const config::ConfigUri & configUri, Fast_NormalizeWordFolder & wf) : _configId(configUri.getConfigId()), diff --git a/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.cpp b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.cpp index 59f10df0837..4877f114ebb 100644 --- a/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.cpp +++ b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.cpp @@ -5,6 +5,7 @@ #include "i_matching_elements_filler.h" #include <vespa/searchlib/common/matching_elements.h> #include <vespa/searchsummary/docsummary/keywordextractor.h> +#include <vespa/searchsummary/config/config-juniperrc.h> #include <vespa/log/log.h> LOG_SETUP(".vsm.vsm-adapter"); @@ -13,6 +14,8 @@ using search::docsummary::ResConfigEntry; using search::docsummary::KeywordExtractor; using search::MatchingElements; using config::ConfigSnapshot; +using vespa::config::search::SummaryConfig; +using vespa::config::search::summary::JuniperrcConfig; namespace vsm { @@ -37,12 +40,6 @@ void GetDocsumsStateCallback::FillRankFeatures(GetDocsumsState& state) } } -void GetDocsumsStateCallback::FillDocumentLocations(GetDocsumsState *state, IDocsumEnvironment * env) -{ - (void) state; - (void) env; -} - std::unique_ptr<MatchingElements> GetDocsumsStateCallback::fill_matching_elements(const search::MatchingElementsFields& fields) { @@ -91,10 +88,10 @@ DocsumTools::obtainFieldNames(const FastS_VsmsummaryHandle &cfg) { uint32_t defaultSummaryId = getResultConfig()->LookupResultClassId(cfg->outputclass); _resultClass = getResultConfig()->LookupResultClass(defaultSummaryId); - if (_resultClass != NULL) { + if (_resultClass != nullptr) { for (uint32_t i = 0; i < _resultClass->GetNumEntries(); ++i) { const ResConfigEntry * entry = _resultClass->GetEntry(i); - _fieldSpecs.push_back(FieldSpec()); + _fieldSpecs.emplace_back(); _fieldSpecs.back().setOutputName(entry->_bindname); bool found = false; if (cfg) { diff --git a/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h index c256264bbbf..ca7ead1afff 100644 --- a/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h +++ b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h @@ -19,8 +19,6 @@ using search::docsummary::GetDocsumsState; using search::docsummary::IDocsumEnvironment; using search::docsummary::JuniperProperties; -using vespa::config::search::SummaryConfig; -using vespa::config::search::summary::JuniperrcConfig; namespace config { class ConfigSnapshot; } namespace vsm { @@ -38,12 +36,11 @@ public: GetDocsumsStateCallback(); 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; + std::unique_ptr<search::MatchingElements> fill_matching_elements(const search::MatchingElementsFields& fields) override; void setSummaryFeatures(const search::FeatureSet::SP & sf) { _summaryFeatures = sf; } void setRankFeatures(const search::FeatureSet::SP & rf) { _rankFeatures = rf; } void set_matching_elements_filler(std::unique_ptr<IMatchingElementsFiller> matching_elements_filler); - ~GetDocsumsStateCallback(); + ~GetDocsumsStateCallback() override; }; class DocsumTools : public IDocsumEnvironment @@ -71,12 +68,12 @@ private: std::unique_ptr<juniper::Juniper> _juniper; const ResultClass * _resultClass; std::vector<FieldSpec> _fieldSpecs; - DocsumTools(const DocsumTools &); - DocsumTools &operator=(const DocsumTools &); public: DocsumTools(); - ~DocsumTools(); + DocsumTools(const DocsumTools &) = delete; + DocsumTools &operator=(const DocsumTools &) = delete; + ~DocsumTools() override; void set_writer(std::unique_ptr<DynamicDocsumWriter> writer); void setJuniper(std::unique_ptr<juniper::Juniper> juniper) { _juniper = std::move(juniper); } const ResultConfig *getResultConfig() const { return _writer->GetResultConfig(); } |