use heap for strict or

4 files changed, 7 insertions, 7 deletions

diff --git a/searchlib/src/tests/queryeval/blueprint/intermediate_blueprints_test.cpp b/searchlib/src/tests/queryeval/blueprint/intermediate_blueprints_test.cpp
index 2cf523b508b..241d6c67e0a 100644
--- a/searchlib/src/tests/queryeval/blueprint/intermediate_blueprints_test.cpp
+++ b/searchlib/src/tests/queryeval/blueprint/intermediate_blueprints_test.cpp
@@ -1166,7 +1166,7 @@ TEST("require_that_unpack_optimization_is_not_overruled_by_equiv") {
     EXPECT_EQUAL("search::queryeval::EquivImpl<true>", search->getClassName());
     {
         const auto & e = dynamic_cast<const MultiSearch &>(*search);
-        EXPECT_EQUAL("search::queryeval::OrLikeSearch<true, search::queryeval::(anonymous namespace)::FullUnpack>",
+        EXPECT_EQUAL("search::queryeval::StrictHeapOrSearch<search::queryeval::(anonymous namespace)::FullUnpack, vespalib::LeftArrayHeap, unsigned char>",
                      e.getChildren()[0]->getClassName());
     }
 
@@ -1175,7 +1175,7 @@ TEST("require_that_unpack_optimization_is_not_overruled_by_equiv") {
     EXPECT_EQUAL("search::queryeval::EquivImpl<true>", search->getClassName());
     {
         const auto & e = dynamic_cast<const MultiSearch &>(*search);
-        EXPECT_EQUAL("search::queryeval::OrLikeSearch<true, search::queryeval::(anonymous namespace)::SelectiveUnpack>",
+        EXPECT_EQUAL("search::queryeval::StrictHeapOrSearch<search::queryeval::(anonymous namespace)::SelectiveUnpack, vespalib::LeftArrayHeap, unsigned char>",
                      e.getChildren()[0]->getClassName());
     }
 
@@ -1185,7 +1185,7 @@ TEST("require_that_unpack_optimization_is_not_overruled_by_equiv") {
     EXPECT_EQUAL("search::queryeval::EquivImpl<true>", search->getClassName());
     {
         const auto & e = dynamic_cast<const MultiSearch &>(*search);
-        EXPECT_EQUAL("search::queryeval::OrLikeSearch<true, search::queryeval::NoUnpack>",
+        EXPECT_EQUAL("search::queryeval::StrictHeapOrSearch<search::queryeval::NoUnpack, vespalib::LeftArrayHeap, unsigned char>",
                      e.getChildren()[0]->getClassName());
     }
 }
diff --git a/searchlib/src/tests/queryeval/profiled_iterator/profiled_iterator_test.cpp b/searchlib/src/tests/queryeval/profiled_iterator/profiled_iterator_test.cpp
index aa096552da3..d0942e14f7c 100644
--- a/searchlib/src/tests/queryeval/profiled_iterator/profiled_iterator_test.cpp
+++ b/searchlib/src/tests/queryeval/profiled_iterator/profiled_iterator_test.cpp
@@ -182,7 +182,7 @@ TEST(ProfiledIteratorTest, iterator_tree_can_be_profiled) {
     auto counts = collect_counts(slime.get());
     print_counts(counts);
     EXPECT_EQ(counts["/AndSearchStrict/init"], 2);
-    EXPECT_EQ(counts["/0/OrLikeSearch/init"], 2);
+    EXPECT_EQ(counts["/0/StrictHeapOrSearch/init"], 2);
     EXPECT_EQ(counts["/0/0/SimpleSearch/init"], 2);
     EXPECT_EQ(counts["/0/1/SimpleSearch/init"], 2);
     EXPECT_EQ(counts["/1/SourceBlenderSearchNonStrict/init"], 2);
diff --git a/searchlib/src/tests/queryeval/queryeval_test.cpp b/searchlib/src/tests/queryeval/queryeval_test.cpp
index 3fabb45a7ff..c3a9a0d326e 100644
--- a/searchlib/src/tests/queryeval/queryeval_test.cpp
+++ b/searchlib/src/tests/queryeval/queryeval_test.cpp
@@ -271,7 +271,7 @@ TEST(QueryEvalTest, test_or)
         EXPECT_EQ(res, expect);
         std::string dump = filter_ab->asString();
         expect_match(dump, "upper");
-        expect_match(dump, "OrLikeSearch.true.*NoUnpack.*SimpleSearch.*upper.*SimpleSearch.*upper");
+        expect_match(dump, "StrictHeapOrSearch.*NoUnpack.*SimpleSearch.*upper.*SimpleSearch.*upper");
         filter_ab = or_b->createFilterSearch(false, lower_bound);
         dump = filter_ab->asString();
         expect_match(dump, "lower");
diff --git a/searchlib/src/vespa/searchlib/queryeval/orsearch.cpp b/searchlib/src/vespa/searchlib/queryeval/orsearch.cpp
index 29ec8632612..858ca4dd268 100644
--- a/searchlib/src/vespa/searchlib/queryeval/orsearch.cpp
+++ b/searchlib/src/vespa/searchlib/queryeval/orsearch.cpp
@@ -110,12 +110,12 @@ SearchIterator::UP
 OrSearch::create(ChildrenIterators children, bool strict) {
     UnpackInfo unpackInfo;
     unpackInfo.forceAll();
-    return create(std::move(children), strict, unpackInfo, StrictImpl::PLAIN);
+    return create(std::move(children), strict, unpackInfo);
 }
 
 SearchIterator::UP
 OrSearch::create(ChildrenIterators children, bool strict, const UnpackInfo & unpackInfo) {
-    return create(std::move(children), strict, unpackInfo, StrictImpl::PLAIN);
+    return create(std::move(children), strict, unpackInfo, StrictImpl::HEAP);
 }
 
 SearchIterator::UP