diff options
author | Tor Egge <Tor.Egge@online.no> | 2023-01-05 12:57:17 +0100 |
---|---|---|
committer | Tor Egge <Tor.Egge@online.no> | 2023-01-05 12:57:17 +0100 |
commit | 1708cde088d3ef57ccc1866ac2cd6c71a0cc55f8 (patch) | |
tree | a1df609677250030fb57eb3aa2482f9baf62e909 /searchsummary/src | |
parent | 8a0767d63644ca9ee2b4df8d293b90d692f1d36e (diff) |
Remove unused IDocsumEnvironment::lookupIndex() member function.
Remove unused KeywordExtractor constructor argument.
Diffstat (limited to 'searchsummary/src')
3 files changed, 6 insertions, 14 deletions
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(); |