From ddbbf02d0598cd0dbd31bb71c57c7f0f2293f597 Mon Sep 17 00:00:00 2001 From: Tor Egge Date: Tue, 29 Mar 2022 19:20:46 +0200 Subject: Move SearchContext out from AttributeVector. --- searchlib/src/tests/attribute/benchmark/attributesearcher.h | 7 ++++--- searchlib/src/tests/attribute/bitvector/bitvector_test.cpp | 3 ++- .../src/tests/attribute/enumeratedsave/enumeratedsave_test.cpp | 3 ++- .../attribute/postinglistattribute/postinglistattribute_test.cpp | 3 ++- .../attribute/reference_attribute/reference_attribute_test.cpp | 1 + searchlib/src/tests/attribute/searchcontext/searchcontext_test.cpp | 6 +++--- .../src/tests/attribute/stringattribute/stringattribute_test.cpp | 3 ++- 7 files changed, 16 insertions(+), 10 deletions(-) (limited to 'searchlib/src/tests/attribute') diff --git a/searchlib/src/tests/attribute/benchmark/attributesearcher.h b/searchlib/src/tests/attribute/benchmark/attributesearcher.h index 3bf3d6e8fa5..43531b48f05 100644 --- a/searchlib/src/tests/attribute/benchmark/attributesearcher.h +++ b/searchlib/src/tests/attribute/benchmark/attributesearcher.h @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -130,7 +131,7 @@ AttributeFindSearcher::doRun() this->buildTermQuery(_query, _attrPtr->getName(), ss.str().data()); AttributeGuard guard(_attrPtr); - std::unique_ptr searchContext = + std::unique_ptr searchContext = _attrPtr->getSearch(vespalib::stringref(&_query[0], _query.size()), attribute::SearchContextParams()); @@ -208,7 +209,7 @@ AttributeRangeSearcher::doRun() buildTermQuery(_query, _attrPtr->getName(), ss.str().data()); AttributeGuard guard(_attrPtr); - std::unique_ptr searchContext = + std::unique_ptr searchContext = _attrPtr->getSearch(vespalib::stringref(&_query[0], _query.size()), attribute::SearchContextParams()); @@ -247,7 +248,7 @@ AttributePrefixSearcher::doRun() buildTermQuery(_query, _attrPtr->getName(), _values[i % _values.size()].c_str(), true); AttributeGuard guard(_attrPtr); - std::unique_ptr searchContext = + std::unique_ptr searchContext = _attrPtr->getSearch(vespalib::stringref(&_query[0], _query.size()), attribute::SearchContextParams()); diff --git a/searchlib/src/tests/attribute/bitvector/bitvector_test.cpp b/searchlib/src/tests/attribute/bitvector/bitvector_test.cpp index 714a96f91b9..e34c0f52e41 100644 --- a/searchlib/src/tests/attribute/bitvector/bitvector_test.cpp +++ b/searchlib/src/tests/attribute/bitvector/bitvector_test.cpp @@ -31,11 +31,12 @@ using search::StringAttribute; using search::attribute::BasicType; using search::attribute::CollectionType; using search::attribute::Config; +using search::attribute::SearchContext; using search::attribute::SearchContextParams; using search::fef::TermFieldMatchData; using search::queryeval::SearchIterator; -typedef std::unique_ptr SearchContextPtr; +using SearchContextPtr = std::unique_ptr; typedef std::unique_ptr SearchBasePtr; struct BitVectorTest diff --git a/searchlib/src/tests/attribute/enumeratedsave/enumeratedsave_test.cpp b/searchlib/src/tests/attribute/enumeratedsave/enumeratedsave_test.cpp index e9d928e0910..9a4728edba8 100644 --- a/searchlib/src/tests/attribute/enumeratedsave/enumeratedsave_test.cpp +++ b/searchlib/src/tests/attribute/enumeratedsave/enumeratedsave_test.cpp @@ -39,10 +39,11 @@ using search::StringAttribute; using search::attribute::BasicType; using search::attribute::CollectionType; using search::attribute::Config; +using search::attribute::SearchContext; using search::attribute::SearchContextParams; using search::fef::TermFieldMatchData; -typedef std::unique_ptr SearchContextPtr; +using SearchContextPtr = std::unique_ptr; typedef std::unique_ptr SearchBasePtr; diff --git a/searchlib/src/tests/attribute/postinglistattribute/postinglistattribute_test.cpp b/searchlib/src/tests/attribute/postinglistattribute/postinglistattribute_test.cpp index 868f7d5a93b..ad49212fffc 100644 --- a/searchlib/src/tests/attribute/postinglistattribute/postinglistattribute_test.cpp +++ b/searchlib/src/tests/attribute/postinglistattribute/postinglistattribute_test.cpp @@ -37,10 +37,11 @@ using attribute::BasicType; using attribute::Config; using queryeval::PostingInfo; using queryeval::MinMaxPostingInfo; +using search::attribute::SearchContext; using search::fef::TermFieldMatchData; using search::queryeval::SearchIterator; -typedef std::unique_ptr SearchContextPtr; +using SearchContextPtr = std::unique_ptr; typedef std::unique_ptr SearchBasePtr; void diff --git a/searchlib/src/tests/attribute/reference_attribute/reference_attribute_test.cpp b/searchlib/src/tests/attribute/reference_attribute/reference_attribute_test.cpp index 1a8eda40f52..5cee31bf909 100644 --- a/searchlib/src/tests/attribute/reference_attribute/reference_attribute_test.cpp +++ b/searchlib/src/tests/attribute/reference_attribute/reference_attribute_test.cpp @@ -3,6 +3,7 @@ #include #include #include +#include #include #include #include diff --git a/searchlib/src/tests/attribute/searchcontext/searchcontext_test.cpp b/searchlib/src/tests/attribute/searchcontext/searchcontext_test.cpp index 65de302ae04..aa64e944baa 100644 --- a/searchlib/src/tests/attribute/searchcontext/searchcontext_test.cpp +++ b/searchlib/src/tests/attribute/searchcontext/searchcontext_test.cpp @@ -47,8 +47,8 @@ isUnsignedSmallIntAttribute(const AttributeVector &a) using AttributePtr = AttributeVector::SP; using ResultSetPtr = std::unique_ptr; using SearchBasePtr = queryeval::SearchIterator::UP; -using SearchContext = AttributeVector::SearchContext; -using SearchContextPtr = std::unique_ptr; +using search::attribute::SearchContext; +using SearchContextPtr = std::unique_ptr; using largeint_t = AttributeVector::largeint_t; using attribute::BasicType; @@ -1910,7 +1910,7 @@ public: } _attr.commit(); } - search::AttributeVector::SearchContext::UP create_search_context(const std::string& term) const { + std::unique_ptr create_search_context(const std::string& term) const { return _attr.getSearch(std::make_unique(term, search::TermType::WORD), SearchContextParams().useBitVector(true)); } diff --git a/searchlib/src/tests/attribute/stringattribute/stringattribute_test.cpp b/searchlib/src/tests/attribute/stringattribute/stringattribute_test.cpp index d8619386892..576a2ddb467 100644 --- a/searchlib/src/tests/attribute/stringattribute/stringattribute_test.cpp +++ b/searchlib/src/tests/attribute/stringattribute/stringattribute_test.cpp @@ -17,6 +17,7 @@ LOG_SETUP("stringattribute_test"); using search::attribute::CollectionType; using search::attribute::IAttributeVector; +using search::attribute::SearchContext; using vespalib::datastore::EntryRef; using namespace search; @@ -385,7 +386,7 @@ testSingleValue(Attribute & svsa, Config &cfg) TEST("testSingleValue") { - EXPECT_EQUAL(24u, sizeof(AttributeVector::SearchContext)); + EXPECT_EQUAL(24u, sizeof(SearchContext)); EXPECT_EQUAL(56u, sizeof(StringSearchHelper)); EXPECT_EQUAL(88u, sizeof(SingleValueStringAttribute::StringSingleImplSearchContext)); { -- cgit v1.2.3