diff options
author | Geir Storli <geirst@vespa.ai> | 2024-03-13 17:46:53 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-13 17:46:53 +0100 |
commit | 2bcf0208ae08dbda6dc8caf41ceeedf5e8aeff05 (patch) | |
tree | c00562090b5bb8bb55da461e93f085d6910ad5a6 /searchlib/src/tests/queryeval/blueprint/intermediate_blueprints_test.cpp | |
parent | 1a13f6f8867c86508eadabbceb06ec5fee787fa6 (diff) | |
parent | 3b4a94c933ffb4c2525ca4e44043f7a5775fa287 (diff) |
Merge pull request #30612 from vespa-engine/havardpe/stop-using-non-heap-strict-ORv8.319.9
stop using non-heap strict OR
Diffstat (limited to 'searchlib/src/tests/queryeval/blueprint/intermediate_blueprints_test.cpp')
-rw-r--r-- | searchlib/src/tests/queryeval/blueprint/intermediate_blueprints_test.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/searchlib/src/tests/queryeval/blueprint/intermediate_blueprints_test.cpp b/searchlib/src/tests/queryeval/blueprint/intermediate_blueprints_test.cpp index f192ea93b0e..d2df4a8c24f 100644 --- a/searchlib/src/tests/queryeval/blueprint/intermediate_blueprints_test.cpp +++ b/searchlib/src/tests/queryeval/blueprint/intermediate_blueprints_test.cpp @@ -36,6 +36,8 @@ using vespalib::slime::SlimeInserter; using vespalib::make_string_short::fmt; using Path = std::vector<std::variant<size_t,vespalib::stringref>>; +vespalib::string strict_equiv_name = "search::queryeval::EquivImpl<true, search::queryeval::StrictHeapOrSearch<search::queryeval::NoUnpack, vespalib::LeftArrayHeap, unsigned char> >"; + struct InvalidSelector : ISourceSelector { InvalidSelector() : ISourceSelector(Source()) {} void setSource(uint32_t, Source) override { abort(); } @@ -1141,7 +1143,7 @@ TEST("require that children does not optimize when parents refuse them to") { MatchData::UP md = MatchData::makeTestInstance(100, 10); top_up->fetchPostings(ExecuteInfo::FALSE); SearchIterator::UP search = top_up->createSearch(*md, true); - EXPECT_EQUAL("search::queryeval::EquivImpl<true>", search->getClassName()); + EXPECT_EQUAL(strict_equiv_name, search->getClassName()); { const auto & e = dynamic_cast<const MultiSearch &>(*search); EXPECT_EQUAL("search::BitVectorIteratorStrictT<false>", e.getChildren()[0]->getClassName()); @@ -1151,7 +1153,7 @@ TEST("require that children does not optimize when parents refuse them to") { md->resolveTermField(12)->tagAsNotNeeded(); search = top_up->createSearch(*md, true); - EXPECT_EQUAL("search::queryeval::EquivImpl<true>", search->getClassName()); + EXPECT_EQUAL(strict_equiv_name, search->getClassName()); { const auto & e = dynamic_cast<const MultiSearch &>(*search); EXPECT_EQUAL("search::BitVectorIteratorStrictT<false>", e.getChildren()[0]->getClassName()); @@ -1179,7 +1181,7 @@ TEST("require_that_unpack_optimization_is_not_overruled_by_equiv") { MatchData::UP md = MatchData::makeTestInstance(100, 10); top_up->fetchPostings(ExecuteInfo::FALSE); SearchIterator::UP search = top_up->createSearch(*md, true); - EXPECT_EQUAL("search::queryeval::EquivImpl<true>", search->getClassName()); + EXPECT_EQUAL(strict_equiv_name, search->getClassName()); { const auto & e = dynamic_cast<const MultiSearch &>(*search); EXPECT_EQUAL("search::queryeval::StrictHeapOrSearch<search::queryeval::(anonymous namespace)::FullUnpack, vespalib::LeftArrayHeap, unsigned char>", @@ -1188,7 +1190,7 @@ TEST("require_that_unpack_optimization_is_not_overruled_by_equiv") { md->resolveTermField(2)->tagAsNotNeeded(); search = top_up->createSearch(*md, true); - EXPECT_EQUAL("search::queryeval::EquivImpl<true>", search->getClassName()); + EXPECT_EQUAL(strict_equiv_name, search->getClassName()); { const auto & e = dynamic_cast<const MultiSearch &>(*search); EXPECT_EQUAL("search::queryeval::StrictHeapOrSearch<search::queryeval::(anonymous namespace)::SelectiveUnpack, vespalib::LeftArrayHeap, unsigned char>", @@ -1198,7 +1200,7 @@ TEST("require_that_unpack_optimization_is_not_overruled_by_equiv") { md->resolveTermField(1)->tagAsNotNeeded(); md->resolveTermField(3)->tagAsNotNeeded(); search = top_up->createSearch(*md, true); - EXPECT_EQUAL("search::queryeval::EquivImpl<true>", search->getClassName()); + EXPECT_EQUAL(strict_equiv_name, search->getClassName()); { const auto & e = dynamic_cast<const MultiSearch &>(*search); EXPECT_EQUAL("search::queryeval::StrictHeapOrSearch<search::queryeval::NoUnpack, vespalib::LeftArrayHeap, unsigned char>", |