diff options
author | Geir Storli <geirst@verizonmedia.com> | 2019-11-28 09:44:19 +0000 |
---|---|---|
committer | Geir Storli <geirst@verizonmedia.com> | 2019-11-28 10:15:37 +0000 |
commit | ed3af8b46574ec5c039c6267046dad324e508c97 (patch) | |
tree | 70c0384a7f60d05e67a84de60bf37cdc4051f4d5 /vsm/src | |
parent | 14035635959cd41fe0dec0ab7b2a4e9206e5a6c9 (diff) |
Move query classes used in streaming search to namespace search::streaming.
Diffstat (limited to 'vsm/src')
31 files changed, 68 insertions, 66 deletions
diff --git a/vsm/src/tests/searcher/searcher.cpp b/vsm/src/tests/searcher/searcher.cpp index 855dad65a39..a31f5451e89 100644 --- a/vsm/src/tests/searcher/searcher.cpp +++ b/vsm/src/tests/searcher/searcher.cpp @@ -17,9 +17,10 @@ #include <vespa/document/fieldvalue/fieldvalues.h> using namespace document; -using search::QueryNodeResultFactory; -using search::QueryTerm; -using search::QueryTermList; +using search::streaming::HitList; +using search::streaming::QueryNodeResultFactory; +using search::streaming::QueryTerm; +using search::streaming::QueryTermList; using namespace vsm; template <typename T> @@ -328,7 +329,7 @@ assertSearch(FieldSearcher & fs, const StringList & query, const FieldValue & fv EXPECT_EQUAL(qtv.size(), exp.size()); ASSERT_TRUE(qtv.size() == exp.size()); for (size_t i = 0; i < qtv.size(); ++i) { - const search::HitList & hl = qtv[i].getHitList(); + const HitList & hl = qtv[i].getHitList(); EXPECT_EQUAL(hl.size(), exp[i].size()); ASSERT_TRUE(hl.size() == exp[i].size()); for (size_t j = 0; j < hl.size(); ++j) { diff --git a/vsm/src/vespa/vsm/searcher/boolfieldsearcher.cpp b/vsm/src/vespa/vsm/searcher/boolfieldsearcher.cpp index a9f765546a8..88342cb8d3b 100644 --- a/vsm/src/vespa/vsm/searcher/boolfieldsearcher.cpp +++ b/vsm/src/vespa/vsm/searcher/boolfieldsearcher.cpp @@ -2,8 +2,8 @@ #include "boolfieldsearcher.h" #include <vespa/document/fieldvalue/boolfieldvalue.h> -using search::QueryTerm; -using search::QueryTermList; +using search::streaming::QueryTerm; +using search::streaming::QueryTermList; namespace vsm { diff --git a/vsm/src/vespa/vsm/searcher/boolfieldsearcher.h b/vsm/src/vespa/vsm/searcher/boolfieldsearcher.h index b7f9419465d..5ff4b14ffd1 100644 --- a/vsm/src/vespa/vsm/searcher/boolfieldsearcher.h +++ b/vsm/src/vespa/vsm/searcher/boolfieldsearcher.h @@ -11,7 +11,7 @@ public: std::unique_ptr<FieldSearcher> duplicate() const override; BoolFieldSearcher(FieldIdT fId); ~BoolFieldSearcher(); - void prepare(search::QueryTermList & qtl, const SharedSearcherBuf & buf) override; + void prepare(search::streaming::QueryTermList & qtl, const SharedSearcherBuf & buf) override; void onValue(const document::FieldValue & fv) override; private: std::vector<bool> _terms; diff --git a/vsm/src/vespa/vsm/searcher/fieldsearcher.cpp b/vsm/src/vespa/vsm/searcher/fieldsearcher.cpp index 4bb36d3f968..74e55c958fe 100644 --- a/vsm/src/vespa/vsm/searcher/fieldsearcher.cpp +++ b/vsm/src/vespa/vsm/searcher/fieldsearcher.cpp @@ -8,10 +8,10 @@ LOG_SETUP(".vsm.searcher.fieldsearcher"); using search::byte; -using search::QueryTerm; -using search::QueryTermList; +using search::streaming::Query; +using search::streaming::QueryTerm; +using search::streaming::QueryTermList; using search::v16qi; -using search::Query; namespace vsm { diff --git a/vsm/src/vespa/vsm/searcher/fieldsearcher.h b/vsm/src/vespa/vsm/searcher/fieldsearcher.h index dd0efd32631..d3cb5415ec1 100644 --- a/vsm/src/vespa/vsm/searcher/fieldsearcher.h +++ b/vsm/src/vespa/vsm/searcher/fieldsearcher.h @@ -25,7 +25,7 @@ typedef std::vector<char> CharVector; class FieldSearcherBase { protected: - search::QueryTermList _qtl; + search::streaming::QueryTermList _qtl; private: CharVector _qtlFastBuffer; protected: @@ -33,7 +33,7 @@ protected: FieldSearcherBase(const FieldSearcherBase & org); virtual ~FieldSearcherBase(void); FieldSearcherBase & operator = (const FieldSearcherBase & org); - void prepare(const search::QueryTermList & qtl); + void prepare(const search::streaming::QueryTermList & qtl); size_t _qtlFastSize; search::v16qi *_qtlFast; }; @@ -53,7 +53,7 @@ public: ~FieldSearcher() override; virtual std::unique_ptr<FieldSearcher> duplicate() const = 0; bool search(const StorageDocument & doc); - virtual void prepare(search::QueryTermList & qtl, const SharedSearcherBuf & buf); + virtual void prepare(search::streaming::QueryTermList & qtl, const SharedSearcherBuf & buf); const FieldIdT & field() const { return _field; } void field(const FieldIdT & v) { _field = v; prepareFieldId(); } bool prefix() const { return _matchType == PREFIX; } @@ -126,7 +126,7 @@ protected: * Adds a hit to the given query term. * For each call to onValue() a batch of words are processed, and the position is local to this batch. **/ - void addHit(search::QueryTerm & qt, uint32_t pos) const { + void addHit(search::streaming::QueryTerm & qt, uint32_t pos) const { qt.add(_words + pos, field(), _currentElementId, getCurrentWeight()); } public: @@ -140,7 +140,7 @@ typedef std::vector<FieldSearcherContainer> FieldIdTSearcherMapT; class FieldIdTSearcherMap : public FieldIdTSearcherMapT { public: - void prepare(const DocumentTypeIndexFieldMapT & difm, const SharedSearcherBuf & searcherBuf, search::Query & query); + void prepare(const DocumentTypeIndexFieldMapT & difm, const SharedSearcherBuf & searcherBuf, search::streaming::Query & query); }; } diff --git a/vsm/src/vespa/vsm/searcher/floatfieldsearcher.cpp b/vsm/src/vespa/vsm/searcher/floatfieldsearcher.cpp index 41a07a03bf2..6043a88fc22 100644 --- a/vsm/src/vespa/vsm/searcher/floatfieldsearcher.cpp +++ b/vsm/src/vespa/vsm/searcher/floatfieldsearcher.cpp @@ -2,8 +2,8 @@ #include "floatfieldsearcher.h" -using search::QueryTerm; -using search::QueryTermList; +using search::streaming::QueryTerm; +using search::streaming::QueryTermList; namespace vsm { diff --git a/vsm/src/vespa/vsm/searcher/floatfieldsearcher.h b/vsm/src/vespa/vsm/searcher/floatfieldsearcher.h index 5f56ff67b30..efbdb961081 100644 --- a/vsm/src/vespa/vsm/searcher/floatfieldsearcher.h +++ b/vsm/src/vespa/vsm/searcher/floatfieldsearcher.h @@ -11,7 +11,7 @@ class FloatFieldSearcherT : public FieldSearcher public: FloatFieldSearcherT(FieldIdT fId=0); ~FloatFieldSearcherT(); - void prepare(search::QueryTermList & qtl, const SharedSearcherBuf & buf) override; + void prepare(search::streaming::QueryTermList & qtl, const SharedSearcherBuf & buf) override; void onValue(const document::FieldValue & fv) override; protected: class FloatInfo diff --git a/vsm/src/vespa/vsm/searcher/futf8strchrfieldsearcher.cpp b/vsm/src/vespa/vsm/searcher/futf8strchrfieldsearcher.cpp index e85cc20d418..de67272946b 100644 --- a/vsm/src/vespa/vsm/searcher/futf8strchrfieldsearcher.cpp +++ b/vsm/src/vespa/vsm/searcher/futf8strchrfieldsearcher.cpp @@ -3,10 +3,10 @@ #include "futf8strchrfieldsearcher.h" #include "fold.h" -using vespalib::Optimized; using search::byte; -using search::QueryTerm; +using search::streaming::QueryTerm; using search::v16qi; +using vespalib::Optimized; namespace vsm { diff --git a/vsm/src/vespa/vsm/searcher/futf8strchrfieldsearcher.h b/vsm/src/vespa/vsm/searcher/futf8strchrfieldsearcher.h index 0539bdc6ea6..4876654a2b6 100644 --- a/vsm/src/vespa/vsm/searcher/futf8strchrfieldsearcher.h +++ b/vsm/src/vespa/vsm/searcher/futf8strchrfieldsearcher.h @@ -16,10 +16,10 @@ public: static bool lfoldaa(const char * toFold, size_t sz, char * folded, size_t & unalignedStart); static bool lfoldua(const char * toFold, size_t sz, char * folded, size_t & alignedStart); private: - size_t matchTerm(const FieldRef & f, search::QueryTerm & qt) override; + size_t matchTerm(const FieldRef & f, search::streaming::QueryTerm & qt) override; size_t matchTerms(const FieldRef&, const size_t shortestTerm) override; - virtual size_t match(const char *folded, size_t sz, search::QueryTerm & qt); - size_t match(const char *folded, size_t sz, size_t mintsz, search::QueryTerm ** qtl, size_t qtlSize); + virtual size_t match(const char *folded, size_t sz, search::streaming::QueryTerm & qt); + size_t match(const char *folded, size_t sz, size_t mintsz, search::streaming::QueryTerm ** qtl, size_t qtlSize); std::vector<char> _folded; }; diff --git a/vsm/src/vespa/vsm/searcher/intfieldsearcher.cpp b/vsm/src/vespa/vsm/searcher/intfieldsearcher.cpp index 5886a17cf4a..f4e68c60119 100644 --- a/vsm/src/vespa/vsm/searcher/intfieldsearcher.cpp +++ b/vsm/src/vespa/vsm/searcher/intfieldsearcher.cpp @@ -1,8 +1,8 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "intfieldsearcher.h" -using search::QueryTerm; -using search::QueryTermList; +using search::streaming::QueryTerm; +using search::streaming::QueryTermList; namespace vsm { diff --git a/vsm/src/vespa/vsm/searcher/intfieldsearcher.h b/vsm/src/vespa/vsm/searcher/intfieldsearcher.h index ea190bf07cd..47fde7cd0ad 100644 --- a/vsm/src/vespa/vsm/searcher/intfieldsearcher.h +++ b/vsm/src/vespa/vsm/searcher/intfieldsearcher.h @@ -11,7 +11,7 @@ public: std::unique_ptr<FieldSearcher> duplicate() const override; IntFieldSearcher(FieldIdT fId=0); ~IntFieldSearcher(); - void prepare(search::QueryTermList & qtl, const SharedSearcherBuf & buf) override; + void prepare(search::streaming::QueryTermList & qtl, const SharedSearcherBuf & buf) override; void onValue(const document::FieldValue & fv) override; protected: class IntInfo diff --git a/vsm/src/vespa/vsm/searcher/strchrfieldsearcher.cpp b/vsm/src/vespa/vsm/searcher/strchrfieldsearcher.cpp index 1be1326807e..ccc37340ff7 100644 --- a/vsm/src/vespa/vsm/searcher/strchrfieldsearcher.cpp +++ b/vsm/src/vespa/vsm/searcher/strchrfieldsearcher.cpp @@ -2,8 +2,8 @@ #include "strchrfieldsearcher.h" #include <vespa/document/fieldvalue/stringfieldvalue.h> -using search::QueryTerm; -using search::QueryTermList; +using search::streaming::QueryTerm; +using search::streaming::QueryTermList; namespace vsm { diff --git a/vsm/src/vespa/vsm/searcher/strchrfieldsearcher.h b/vsm/src/vespa/vsm/searcher/strchrfieldsearcher.h index 147e0667ffe..15f7c177afe 100644 --- a/vsm/src/vespa/vsm/searcher/strchrfieldsearcher.h +++ b/vsm/src/vespa/vsm/searcher/strchrfieldsearcher.h @@ -11,11 +11,11 @@ public: StrChrFieldSearcher() : FieldSearcher(0) { } StrChrFieldSearcher(FieldIdT fId) : FieldSearcher(fId) { } void onValue(const document::FieldValue & fv) override; - void prepare(search::QueryTermList & qtl, const SharedSearcherBuf & buf) override; + void prepare(search::streaming::QueryTermList & qtl, const SharedSearcherBuf & buf) override; private: size_t shortestTerm() const; bool matchDoc(const FieldRef & field); - virtual size_t matchTerm(const FieldRef & f, search::QueryTerm & qt) = 0; + virtual size_t matchTerm(const FieldRef & f, search::streaming::QueryTerm & qt) = 0; virtual size_t matchTerms(const FieldRef & f, const size_t shortestTerm) = 0; }; diff --git a/vsm/src/vespa/vsm/searcher/utf8exactstringfieldsearcher.cpp b/vsm/src/vespa/vsm/searcher/utf8exactstringfieldsearcher.cpp index 1de8c40c93a..2105ceec426 100644 --- a/vsm/src/vespa/vsm/searcher/utf8exactstringfieldsearcher.cpp +++ b/vsm/src/vespa/vsm/searcher/utf8exactstringfieldsearcher.cpp @@ -2,8 +2,8 @@ #include "utf8exactstringfieldsearcher.h" using search::byte; -using search::QueryTerm; -using search::QueryTermList; +using search::streaming::QueryTerm; +using search::streaming::QueryTermList; namespace vsm { diff --git a/vsm/src/vespa/vsm/searcher/utf8exactstringfieldsearcher.h b/vsm/src/vespa/vsm/searcher/utf8exactstringfieldsearcher.h index 49557b8097d..f6595d917aa 100644 --- a/vsm/src/vespa/vsm/searcher/utf8exactstringfieldsearcher.h +++ b/vsm/src/vespa/vsm/searcher/utf8exactstringfieldsearcher.h @@ -12,7 +12,7 @@ namespace vsm class UTF8ExactStringFieldSearcher : public UTF8StringFieldSearcherBase { protected: - virtual size_t matchTerm(const FieldRef & f, search::QueryTerm & qt) override; + virtual size_t matchTerm(const FieldRef & f, search::streaming::QueryTerm & qt) override; virtual size_t matchTerms(const FieldRef & f, const size_t shortestTerm) override; public: diff --git a/vsm/src/vespa/vsm/searcher/utf8flexiblestringfieldsearcher.cpp b/vsm/src/vespa/vsm/searcher/utf8flexiblestringfieldsearcher.cpp index 77708a682a2..a6fb4794cc4 100644 --- a/vsm/src/vespa/vsm/searcher/utf8flexiblestringfieldsearcher.cpp +++ b/vsm/src/vespa/vsm/searcher/utf8flexiblestringfieldsearcher.cpp @@ -4,8 +4,8 @@ #include <vespa/log/log.h> LOG_SETUP(".vsm.searcher.utf8flexiblestringfieldsearcher"); -using search::QueryTerm; -using search::QueryTermList; +using search::streaming::QueryTerm; +using search::streaming::QueryTermList; namespace vsm { diff --git a/vsm/src/vespa/vsm/searcher/utf8flexiblestringfieldsearcher.h b/vsm/src/vespa/vsm/searcher/utf8flexiblestringfieldsearcher.h index f91bb48a068..deea42ff5c1 100644 --- a/vsm/src/vespa/vsm/searcher/utf8flexiblestringfieldsearcher.h +++ b/vsm/src/vespa/vsm/searcher/utf8flexiblestringfieldsearcher.h @@ -17,7 +17,7 @@ private: * Tries to match the given query term against the content of the given field reference. * Search strategy is choosen based on the query term type. **/ - virtual size_t matchTerm(const FieldRef & f, search::QueryTerm & qt) override; + virtual size_t matchTerm(const FieldRef & f, search::streaming::QueryTerm & qt) override; /** * Tries to match each query term in the underlying query against the content of the given field reference. diff --git a/vsm/src/vespa/vsm/searcher/utf8strchrfieldsearcher.cpp b/vsm/src/vespa/vsm/searcher/utf8strchrfieldsearcher.cpp index fc78101737e..eb3dc3540a1 100644 --- a/vsm/src/vespa/vsm/searcher/utf8strchrfieldsearcher.cpp +++ b/vsm/src/vespa/vsm/searcher/utf8strchrfieldsearcher.cpp @@ -1,8 +1,8 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "utf8strchrfieldsearcher.h" -using search::QueryTerm; -using search::QueryTermList; +using search::streaming::QueryTerm; +using search::streaming::QueryTermList; using search::byte; namespace vsm { diff --git a/vsm/src/vespa/vsm/searcher/utf8strchrfieldsearcher.h b/vsm/src/vespa/vsm/searcher/utf8strchrfieldsearcher.h index acfe1256ee5..a175ae8b48a 100644 --- a/vsm/src/vespa/vsm/searcher/utf8strchrfieldsearcher.h +++ b/vsm/src/vespa/vsm/searcher/utf8strchrfieldsearcher.h @@ -17,7 +17,7 @@ public: UTF8StrChrFieldSearcher(FieldIdT fId) : UTF8StringFieldSearcherBase(fId) { } protected: - size_t matchTerm(const FieldRef & f, search::QueryTerm & qt) override; + size_t matchTerm(const FieldRef & f, search::streaming::QueryTerm & qt) override; size_t matchTerms(const FieldRef & f, const size_t shortestTerm) override; }; diff --git a/vsm/src/vespa/vsm/searcher/utf8stringfieldsearcherbase.cpp b/vsm/src/vespa/vsm/searcher/utf8stringfieldsearcherbase.cpp index 872cfebfd70..4055a886421 100644 --- a/vsm/src/vespa/vsm/searcher/utf8stringfieldsearcherbase.cpp +++ b/vsm/src/vespa/vsm/searcher/utf8stringfieldsearcherbase.cpp @@ -3,8 +3,8 @@ #include "utf8stringfieldsearcherbase.h" #include <cassert> -using search::QueryTerm; -using search::QueryTermList; +using search::streaming::QueryTerm; +using search::streaming::QueryTermList; using search::byte; namespace vsm { diff --git a/vsm/src/vespa/vsm/searcher/utf8stringfieldsearcherbase.h b/vsm/src/vespa/vsm/searcher/utf8stringfieldsearcherbase.h index f1315285714..c0aa21a248d 100644 --- a/vsm/src/vespa/vsm/searcher/utf8stringfieldsearcherbase.h +++ b/vsm/src/vespa/vsm/searcher/utf8stringfieldsearcherbase.h @@ -71,7 +71,7 @@ protected: * @param qt the query term trying to match. * @return the number of words in the field ref. **/ - size_t matchTermRegular(const FieldRef & f, search::QueryTerm & qt); + size_t matchTermRegular(const FieldRef & f, search::streaming::QueryTerm & qt); /** * Matches the given query term against the characters in the given field reference @@ -81,7 +81,7 @@ protected: * @param qt the query term trying to match. * @return the number of words in the field ref. **/ - size_t matchTermSubstring(const FieldRef & f, search::QueryTerm & qt); + size_t matchTermSubstring(const FieldRef & f, search::streaming::QueryTerm & qt); /** * Matches the given query term against the words in the given field reference @@ -91,7 +91,7 @@ protected: * @param qt the query term trying to match. * @return the number of words in the field ref. **/ - size_t matchTermSuffix(const FieldRef & f, search::QueryTerm & qt); + size_t matchTermSuffix(const FieldRef & f, search::streaming::QueryTerm & qt); /** * Matches the given query term against the words in the given field reference @@ -101,13 +101,13 @@ protected: * @param qt the query term trying to match. * @return the number of words in the field ref. **/ - size_t matchTermExact(const FieldRef & f, search::QueryTerm & qt); + size_t matchTermExact(const FieldRef & f, search::streaming::QueryTerm & qt); public: UTF8StringFieldSearcherBase(); UTF8StringFieldSearcherBase(FieldIdT fId); ~UTF8StringFieldSearcherBase(); - void prepare(search::QueryTermList & qtl, const SharedSearcherBuf & buf) override; + void prepare(search::streaming::QueryTermList & qtl, const SharedSearcherBuf & buf) override; /** * Matches the given query term against the given word using suffix match strategy. * diff --git a/vsm/src/vespa/vsm/searcher/utf8substringsearcher.cpp b/vsm/src/vespa/vsm/searcher/utf8substringsearcher.cpp index 8cda3e27bd5..03b79bb2ae2 100644 --- a/vsm/src/vespa/vsm/searcher/utf8substringsearcher.cpp +++ b/vsm/src/vespa/vsm/searcher/utf8substringsearcher.cpp @@ -3,8 +3,8 @@ #include <vespa/vsm/searcher/utf8substringsearcher.h> using search::byte; -using search::QueryTerm; -using search::QueryTermList; +using search::streaming::QueryTerm; +using search::streaming::QueryTermList; namespace vsm { diff --git a/vsm/src/vespa/vsm/searcher/utf8substringsearcher.h b/vsm/src/vespa/vsm/searcher/utf8substringsearcher.h index 9e01a56bdba..b284b1bf76c 100644 --- a/vsm/src/vespa/vsm/searcher/utf8substringsearcher.h +++ b/vsm/src/vespa/vsm/searcher/utf8substringsearcher.h @@ -15,7 +15,7 @@ public: UTF8SubStringFieldSearcher() : UTF8StringFieldSearcherBase() { } UTF8SubStringFieldSearcher(FieldIdT fId) : UTF8StringFieldSearcherBase(fId) { } protected: - size_t matchTerm(const FieldRef & f, search::QueryTerm & qt) override; + size_t matchTerm(const FieldRef & f, search::streaming::QueryTerm & qt) override; size_t matchTerms(const FieldRef & f, const size_t shortestTerm) override; }; diff --git a/vsm/src/vespa/vsm/searcher/utf8substringsnippetmodifier.cpp b/vsm/src/vespa/vsm/searcher/utf8substringsnippetmodifier.cpp index c19259273d0..d2ae8ad89fa 100644 --- a/vsm/src/vespa/vsm/searcher/utf8substringsnippetmodifier.cpp +++ b/vsm/src/vespa/vsm/searcher/utf8substringsnippetmodifier.cpp @@ -3,8 +3,8 @@ #include <cassert> using search::byte; -using search::QueryTerm; -using search::QueryTermList; +using search::streaming::QueryTerm; +using search::streaming::QueryTermList; namespace vsm { diff --git a/vsm/src/vespa/vsm/searcher/utf8substringsnippetmodifier.h b/vsm/src/vespa/vsm/searcher/utf8substringsnippetmodifier.h index fce0fdc2175..bac183dd1d5 100644 --- a/vsm/src/vespa/vsm/searcher/utf8substringsnippetmodifier.h +++ b/vsm/src/vespa/vsm/searcher/utf8substringsnippetmodifier.h @@ -23,7 +23,7 @@ private: const char * _readPtr; // buffer to read from (field reference) char _unitSep; // the unit separator character to use - virtual size_t matchTerm(const FieldRef & f, search::QueryTerm & qt) override; + virtual size_t matchTerm(const FieldRef & f, search::streaming::QueryTerm & qt) override; virtual size_t matchTerms(const FieldRef & f, const size_t shortestTerm) override; /** @@ -65,7 +65,7 @@ public: UTF8SubstringSnippetModifier(FieldIdT fId, const CharBuffer::SP & modBuf, const SharedOffsetBuffer & offBuf); const CharBuffer & getModifiedBuf() const { return *_modified; } - const search::QueryTermList & getQueryTerms() const { return _qtl; } + const search::streaming::QueryTermList & getQueryTerms() const { return _qtl; } }; } diff --git a/vsm/src/vespa/vsm/searcher/utf8suffixstringfieldsearcher.cpp b/vsm/src/vespa/vsm/searcher/utf8suffixstringfieldsearcher.cpp index 1e9ec246743..93a78554620 100644 --- a/vsm/src/vespa/vsm/searcher/utf8suffixstringfieldsearcher.cpp +++ b/vsm/src/vespa/vsm/searcher/utf8suffixstringfieldsearcher.cpp @@ -2,8 +2,8 @@ #include "utf8suffixstringfieldsearcher.h" using search::byte; -using search::QueryTerm; -using search::QueryTermList; +using search::streaming::QueryTerm; +using search::streaming::QueryTermList; namespace vsm { diff --git a/vsm/src/vespa/vsm/searcher/utf8suffixstringfieldsearcher.h b/vsm/src/vespa/vsm/searcher/utf8suffixstringfieldsearcher.h index cc55ee7bb43..999c85a7f12 100644 --- a/vsm/src/vespa/vsm/searcher/utf8suffixstringfieldsearcher.h +++ b/vsm/src/vespa/vsm/searcher/utf8suffixstringfieldsearcher.h @@ -12,7 +12,7 @@ namespace vsm class UTF8SuffixStringFieldSearcher : public UTF8StringFieldSearcherBase { protected: - virtual size_t matchTerm(const FieldRef & f, search::QueryTerm & qt) override; + virtual size_t matchTerm(const FieldRef & f, search::streaming::QueryTerm & qt) override; virtual size_t matchTerms(const FieldRef & f, const size_t shortestTerm) override; public: diff --git a/vsm/src/vespa/vsm/vsm/fieldsearchspec.cpp b/vsm/src/vespa/vsm/vsm/fieldsearchspec.cpp index e56df354d2a..3b1c98cd319 100644 --- a/vsm/src/vespa/vsm/vsm/fieldsearchspec.cpp +++ b/vsm/src/vespa/vsm/vsm/fieldsearchspec.cpp @@ -18,8 +18,9 @@ LOG_SETUP(".vsm.fieldsearchspec"); #define DEBUGMASK 0x01 -using search::Query; -using search::ConstQueryTermList; +using search::streaming::ConstQueryTermList; +using search::streaming::Query; +using search::streaming::QueryTerm; namespace vsm { @@ -112,7 +113,7 @@ FieldSearchSpec::FieldSearchSpec(const FieldIdT & fid, const vespalib::string & } void -FieldSearchSpec::reconfig(const search::QueryTerm & term) +FieldSearchSpec::reconfig(const QueryTerm & term) { if (_reconfigured) { return; @@ -269,7 +270,7 @@ bool FieldSearchSpecMap::buildFromConfig(const VsmfieldsHandle & conf) } void -FieldSearchSpecMap::reconfigFromQuery(const search::Query & query) +FieldSearchSpecMap::reconfigFromQuery(const Query & query) { ConstQueryTermList qtl; query.getLeafs(qtl); diff --git a/vsm/src/vespa/vsm/vsm/fieldsearchspec.h b/vsm/src/vespa/vsm/vsm/fieldsearchspec.h index d3feb8621b5..f8631cc0ace 100644 --- a/vsm/src/vespa/vsm/vsm/fieldsearchspec.h +++ b/vsm/src/vespa/vsm/vsm/fieldsearchspec.h @@ -24,7 +24,7 @@ public: /** * Reconfigures the field searcher based on information in the given query term. **/ - void reconfig(const search::QueryTerm & term); + void reconfig(const search::streaming::QueryTerm & term); friend vespalib::asciistream & operator <<(vespalib::asciistream & os, const FieldSearchSpec & f); @@ -61,13 +61,13 @@ public: /** * Reconfigures some of the field searchers based on information in the given query. **/ - void reconfigFromQuery(const search::Query & query); + void reconfigFromQuery(const search::streaming::Query & query); /** * Adds a [field name, field id] entry to the given mapping for each field name used in the given query. * This is achieved by mapping from query term index name -> list of field ids -> [field name, field id] pairs. **/ - bool buildFieldsInQuery(const search::Query & query, StringFieldIdTMap & fieldsInQuery) const; + bool buildFieldsInQuery(const search::streaming::Query & query, StringFieldIdTMap & fieldsInQuery) const; /** * Adds a [field name, field id] entry to the given mapping for each field name in the given vector. diff --git a/vsm/src/vespa/vsm/vsm/snippetmodifier.cpp b/vsm/src/vespa/vsm/vsm/snippetmodifier.cpp index 9704902c598..d3c952f78a4 100644 --- a/vsm/src/vespa/vsm/vsm/snippetmodifier.cpp +++ b/vsm/src/vespa/vsm/vsm/snippetmodifier.cpp @@ -8,8 +8,8 @@ LOG_SETUP(".vsm.snippetmodifier"); using namespace document; -using search::QueryTerm; -using search::QueryTermList; +using search::streaming::QueryTerm; +using search::streaming::QueryTermList; typedef vespalib::hash_map<vsm::FieldIdT, QueryTermList> FieldQueryTermMap; namespace { diff --git a/vsm/src/vespa/vsm/vsm/snippetmodifier.h b/vsm/src/vespa/vsm/vsm/snippetmodifier.h index 82badf97ef3..81b8c447341 100644 --- a/vsm/src/vespa/vsm/vsm/snippetmodifier.h +++ b/vsm/src/vespa/vsm/vsm/snippetmodifier.h @@ -100,7 +100,7 @@ public: * @param specMap mapping from field id to search spec objects. * @param fieldMap mapping from index (used in the query) to a list of field ids. **/ - void setup(const search::QueryTermList & queryTerms, + void setup(const search::streaming::QueryTermList & queryTerms, const FieldSearchSpecMapT & specMap, const IndexFieldMapT & fieldMap); const FieldModifierMap & getModifiers() const { return _modifiers; } |