diff options
6 files changed, 7 insertions, 17 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.h b/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.h index 97ab10e8903..bd6d8240df0 100644 --- a/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.h +++ b/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.h @@ -43,7 +43,6 @@ public: search::docsummary::IDocsumStore::UP createDocsumStore() override; const search::IAttributeManager * getAttributeManager() const override { return _attributeMgr.get(); } - vespalib::string lookupIndex(const vespalib::string & s) const override { (void) s; return ""; } const juniper::Juniper * getJuniper() const override { return _juniperConfig.get(); } }; diff --git a/searchsummary/src/vespa/searchsummary/docsummary/idocsumenvironment.h b/searchsummary/src/vespa/searchsummary/docsummary/idocsumenvironment.h index 8af35d9ce3a..26d3bfe3c5c 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/idocsumenvironment.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/idocsumenvironment.h @@ -13,7 +13,6 @@ namespace search::docsummary { class IDocsumEnvironment { public: virtual const search::IAttributeManager * getAttributeManager() const = 0; - virtual vespalib::string lookupIndex(const vespalib::string & s) const = 0; virtual const juniper::Juniper * getJuniper() const = 0; virtual ~IDocsumEnvironment() = default; }; diff --git a/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.cpp b/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.cpp index 333fddf1f68..9eab825d049 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.cpp @@ -17,9 +17,8 @@ bool useful(search::ParseItem::ItemCreator creator) } -KeywordExtractor::KeywordExtractor(const IDocsumEnvironment * env) - : _env(env), - _legalPrefixes(), +KeywordExtractor::KeywordExtractor() + : _legalPrefixes(), _legalIndexes() { } @@ -114,15 +113,10 @@ KeywordExtractor::isLegalIndex(vespalib::stringref idx) const { vespalib::string resolvedIdxName; - if (_env != nullptr) { - resolvedIdxName = _env->lookupIndex(idx); + if ( ! idx.empty() ) { + resolvedIdxName = idx; } else { - - if ( ! idx.empty() ) { - resolvedIdxName = idx; - } else { - resolvedIdxName = "__defaultindex"; - } + resolvedIdxName = "__defaultindex"; } if (resolvedIdxName.empty()) diff --git a/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.h b/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.h index 71e27e96ac1..fbc16550542 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.h @@ -24,7 +24,6 @@ public: private: using Set = vespalib::hash_set<vespalib::string>; - const IDocsumEnvironment *_env; std::vector<IndexPrefix> _legalPrefixes; Set _legalIndexes; @@ -46,7 +45,7 @@ private: } bool isLegalIndexName(const char *idxName) const; public: - explicit KeywordExtractor(const IDocsumEnvironment * env); + KeywordExtractor(); KeywordExtractor(const KeywordExtractor &) = delete; KeywordExtractor& operator=(const KeywordExtractor &) = delete; ~KeywordExtractor(); diff --git a/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.cpp b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.cpp index dc055bd5fec..563eda2249c 100644 --- a/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.cpp +++ b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.cpp @@ -153,7 +153,7 @@ VSMAdapter::configure(const VSMConfigSnapshot & snapshot) docsum_field_writer_factory.reset(); // init keyword extractor - auto kwExtractor = std::make_unique<KeywordExtractor>(nullptr); + auto kwExtractor = std::make_unique<KeywordExtractor>(); kwExtractor->addLegalIndexSpec(_highlightindexes.c_str()); vespalib::string spec = kwExtractor->getLegalIndexSpec(); LOG(debug, "index highlight spec: '%s'", spec.c_str()); diff --git a/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h index 650a7121a2e..36bf3a923f6 100644 --- a/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h +++ b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h @@ -84,7 +84,6 @@ public: // inherit doc from IDocsumEnvironment const search::IAttributeManager * getAttributeManager() const override { return nullptr; } - vespalib::string lookupIndex(const vespalib::string&) const override { return ""; } const juniper::Juniper * getJuniper() const override { return _juniper.get(); } }; |