From 3b4a94c933ffb4c2525ca4e44043f7a5775fa287 Mon Sep 17 00:00:00 2001
From: Håvard Pettersen <havardpe@yahooinc.com>
Date: Wed, 13 Mar 2024 13:07:18 +0000
Subject: stop using non-heap strict OR

---
 .../queryeval/blueprint/intermediate_blueprints_test.cpp     | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'searchlib/src/tests/queryeval/blueprint/intermediate_blueprints_test.cpp')

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>",
-- 
cgit v1.2.3