diff options
author | Tor Egge <Tor.Egge@online.no> | 2023-01-23 11:03:20 +0100 |
---|---|---|
committer | Tor Egge <Tor.Egge@online.no> | 2023-01-23 11:03:20 +0100 |
commit | 4888ebde64d081a7551c8547cb49715f8cacf771 (patch) | |
tree | 0402408e8db24c019cba5040ae046dbf3d73c9ad /searchsummary/src | |
parent | d485fdef78704f15fbd0f988a639622ed73356c6 (diff) |
Rename KeywordExtractor to LegacyKeywordExtractor.
Diffstat (limited to 'searchsummary/src')
-rw-r--r-- | searchsummary/src/vespa/searchsummary/docsummary/CMakeLists.txt | 2 | ||||
-rw-r--r-- | searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp | 2 | ||||
-rw-r--r-- | searchsummary/src/vespa/searchsummary/docsummary/legacy_keyword_extractor.cpp (renamed from searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.cpp) | 20 | ||||
-rw-r--r-- | searchsummary/src/vespa/searchsummary/docsummary/legacy_keyword_extractor.h (renamed from searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.h) | 10 |
4 files changed, 17 insertions, 17 deletions
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/CMakeLists.txt b/searchsummary/src/vespa/searchsummary/docsummary/CMakeLists.txt index 1e328a275a9..cfc3eb6536d 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/CMakeLists.txt +++ b/searchsummary/src/vespa/searchsummary/docsummary/CMakeLists.txt @@ -23,7 +23,7 @@ vespa_add_library(searchsummary_docsummary OBJECT juniper_dfw_term_visitor.cpp juniper_query_adapter.cpp juniperproperties.cpp - keywordextractor.cpp + legacy_keyword_extractor.cpp legacy_keyword_extractor_factory.cpp linguisticsannotation.cpp matched_elements_filter_dfw.cpp diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp b/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp index d511fdcd4be..20cb9b47f4c 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp @@ -4,7 +4,7 @@ #include "docsumstate.h" #include "docsum_field_writer_state.h" #include "i_docsum_store_document.h" -#include "keywordextractor.h" +#include "legacy_keyword_extractor.h" #include <vespa/document/fieldvalue/fieldvalue.h> #include <vespa/searchlib/attribute/iattributemanager.h> #include <vespa/vespalib/util/issue.h> diff --git a/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.cpp b/searchsummary/src/vespa/searchsummary/docsummary/legacy_keyword_extractor.cpp index 8b9f6dc38a9..b3c644ad36d 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/legacy_keyword_extractor.cpp @@ -1,6 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include "keywordextractor.h" +#include "legacy_keyword_extractor.h" #include "idocsumenvironment.h" #include <vespa/searchlib/parsequery/stackdumpiterator.h> #include <vespa/vespalib/stllike/hashtable.hpp> @@ -17,7 +17,7 @@ bool useful(search::ParseItem::ItemCreator creator) } -KeywordExtractor::KeywordExtractor() +LegacyKeywordExtractor::LegacyKeywordExtractor() : IKeywordExtractor(), _legalPrefixes(), _legalIndexes() @@ -25,29 +25,29 @@ KeywordExtractor::KeywordExtractor() } -KeywordExtractor::~KeywordExtractor() = default; +LegacyKeywordExtractor::~LegacyKeywordExtractor() = default; bool -KeywordExtractor::isLegalIndexName(const char *idxName) const +LegacyKeywordExtractor::isLegalIndexName(const char *idxName) const { return _legalIndexes.find(idxName) != _legalIndexes.end(); } -KeywordExtractor::IndexPrefix::IndexPrefix(const char *prefix) noexcept +LegacyKeywordExtractor::IndexPrefix::IndexPrefix(const char *prefix) noexcept : _prefix(prefix) { } -KeywordExtractor::IndexPrefix::~IndexPrefix() = default; +LegacyKeywordExtractor::IndexPrefix::~IndexPrefix() = default; bool -KeywordExtractor::IndexPrefix::Match(const char *idxName) const +LegacyKeywordExtractor::IndexPrefix::Match(const char *idxName) const { return vespalib::starts_with(idxName, _prefix); } void -KeywordExtractor::addLegalIndexSpec(const char *spec) +LegacyKeywordExtractor::addLegalIndexSpec(const char *spec) { if (spec == nullptr) return; @@ -85,7 +85,7 @@ KeywordExtractor::addLegalIndexSpec(const char *spec) vespalib::string -KeywordExtractor::getLegalIndexSpec() +LegacyKeywordExtractor::getLegalIndexSpec() { vespalib::string spec; @@ -110,7 +110,7 @@ KeywordExtractor::getLegalIndexSpec() bool -KeywordExtractor::isLegalIndex(vespalib::stringref idx) const +LegacyKeywordExtractor::isLegalIndex(vespalib::stringref idx) const { vespalib::string resolvedIdxName; diff --git a/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.h b/searchsummary/src/vespa/searchsummary/docsummary/legacy_keyword_extractor.h index 6899d84091b..b339294f2f1 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/legacy_keyword_extractor.h @@ -7,7 +7,7 @@ namespace search::docsummary { -class KeywordExtractor : public IKeywordExtractor +class LegacyKeywordExtractor : public IKeywordExtractor { public: @@ -44,10 +44,10 @@ private: } bool isLegalIndexName(const char *idxName) const; public: - KeywordExtractor(); - KeywordExtractor(const KeywordExtractor &) = delete; - KeywordExtractor& operator=(const KeywordExtractor &) = delete; - ~KeywordExtractor(); + LegacyKeywordExtractor(); + LegacyKeywordExtractor(const LegacyKeywordExtractor &) = delete; + LegacyKeywordExtractor& operator=(const LegacyKeywordExtractor &) = delete; + ~LegacyKeywordExtractor(); /** |