diff options
Diffstat (limited to 'searchlib/src/tests/attribute/postinglistattribute/postinglistattribute_test.cpp')
| -rw-r--r-- | searchlib/src/tests/attribute/postinglistattribute/postinglistattribute_test.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/searchlib/src/tests/attribute/postinglistattribute/postinglistattribute_test.cpp b/searchlib/src/tests/attribute/postinglistattribute/postinglistattribute_test.cpp index 0bb10bcdbe6..9b4c72e1027 100644 --- a/searchlib/src/tests/attribute/postinglistattribute/postinglistattribute_test.cpp +++ b/searchlib/src/tests/attribute/postinglistattribute/postinglistattribute_test.cpp @@ -10,7 +10,6 @@ #include <vespa/searchlib/attribute/multinumericpostattribute.h> #include <vespa/searchlib/attribute/singlestringpostattribute.h> #include <vespa/searchlib/attribute/multistringpostattribute.h> -#include <vespa/searchlib/queryeval/executeinfo.h> #include <vespa/searchlib/parsequery/parse.h> #include <vespa/searchlib/attribute/enumstore.hpp> #include <vespa/searchlib/attribute/attributevector.hpp> @@ -376,7 +375,7 @@ PostingListAttributeTest::assertSearch(const std::string &exp, StringAttribute & { TermFieldMatchData md; SearchContextPtr sc = getSearch<StringAttribute>(sa); - sc->fetchPostings(queryeval::ExecuteInfo::TRUE); + sc->fetchPostings(true); SearchBasePtr sb = sc->createIterator(&md, true); if (!EXPECT_TRUE(assertIterator(exp, *sb))) return false; @@ -389,7 +388,7 @@ PostingListAttributeTest::assertSearch(const std::string &exp, StringAttribute & { TermFieldMatchData md; SearchContextPtr sc = getSearch<StringAttribute, std::string>(sa, key, false); - sc->fetchPostings(queryeval::ExecuteInfo::TRUE); + sc->fetchPostings(true); SearchBasePtr sb = sc->createIterator(&md, true); if (!EXPECT_TRUE(assertIterator(exp, *sb, &md))) return false; @@ -401,7 +400,7 @@ PostingListAttributeTest::assertSearch(const std::string &exp, IntegerAttribute { TermFieldMatchData md; SearchContextPtr sc = getSearch<IntegerAttribute, int32_t>(ia, key, false); - sc->fetchPostings(queryeval::ExecuteInfo::TRUE); + sc->fetchPostings(true); SearchBasePtr sb = sc->createIterator(&md, true); if (!EXPECT_TRUE(assertIterator(exp, *sb, &md))) return false; @@ -479,7 +478,7 @@ PostingListAttributeTest::checkSearch(bool useBitVector, const AttributeVector & { SearchContextPtr sc = getSearch(vec, term, false, attribute::SearchContextParams().useBitVector(useBitVector)); EXPECT_FALSE( ! sc ); - sc->fetchPostings(queryeval::ExecuteInfo::TRUE); + sc->fetchPostings(true); size_t approx = sc->approximateHits(); EXPECT_EQUAL(numHits, approx); if (docBegin == 0) { @@ -884,14 +883,15 @@ PostingListAttributeTest::testMinMax(AttributePtr &ptr1, uint32_t trimmed) { TermFieldMatchData md; SearchContextPtr sc = getSearch<VectorType>(as<VectorType>(ptr1)); - sc->fetchPostings(queryeval::ExecuteInfo::TRUE); + sc->fetchPostings(true); SearchBasePtr sb = sc->createIterator(&md, true); sb->initFullRange(); const PostingInfo *pi = sb->getPostingInfo(); - ASSERT_TRUE(pi != nullptr); - const MinMaxPostingInfo *mmpi = dynamic_cast<const MinMaxPostingInfo *>(pi); - ASSERT_TRUE(mmpi != nullptr); + ASSERT_TRUE(pi != NULL); + const MinMaxPostingInfo *mmpi = + dynamic_cast<const MinMaxPostingInfo *>(pi); + ASSERT_TRUE(mmpi != NULL); if (ptr1->hasMultiValue()) { if (trimmed == 2u) { @@ -909,17 +909,17 @@ PostingListAttributeTest::testMinMax(AttributePtr &ptr1, uint32_t trimmed) EXPECT_EQUAL(1u, sb->getDocId()); sc = getSearch2<VectorType>(as<VectorType>(ptr1)); - sc->fetchPostings(queryeval::ExecuteInfo::TRUE); + sc->fetchPostings(true); sb = sc->createIterator(&md, true); sb->initFullRange(); pi = sb->getPostingInfo(); if (trimmed == 2) { - ASSERT_TRUE(pi == nullptr); + ASSERT_TRUE(pi == NULL); } else { - ASSERT_TRUE(pi != nullptr); + ASSERT_TRUE(pi != NULL); mmpi = dynamic_cast<const MinMaxPostingInfo *>(pi); - ASSERT_TRUE(mmpi != nullptr); + ASSERT_TRUE(mmpi != NULL); if (ptr1->hasMultiValue()) { if (trimmed == 0) { |