Merge pull request #10620 from vespa-engine/havardpe/unpacking-iterators-optimizer

Havardpe/unpacking iterators optimizer 

3 files changed, 20 insertions, 4 deletions

diff --git a/searchlib/src/tests/fef/properties/properties_test.cpp b/searchlib/src/tests/fef/properties/properties_test.cpp
index 380bbcfce5f..df868de3a97 100644
--- a/searchlib/src/tests/fef/properties/properties_test.cpp
+++ b/searchlib/src/tests/fef/properties/properties_test.cpp
@@ -262,6 +262,22 @@ TEST("test stuff") {
             p.add("vespa.dump.ignoredefaultfeatures", "true");
             EXPECT_TRUE(dump::IgnoreDefaultFeatures::check(p));
         }
+        { // vespa.matching.split_unpacking_iterators
+            EXPECT_EQUAL(matching::SplitUnpackingIterators::NAME, vespalib::string("vespa.matching.split_unpacking_iterators"));
+            EXPECT_EQUAL(matching::SplitUnpackingIterators::DEFAULT_VALUE, false);
+            Properties p;
+            EXPECT_EQUAL(matching::SplitUnpackingIterators::check(p), false);
+            p.add("vespa.matching.split_unpacking_iterators", "true");
+            EXPECT_EQUAL(matching::SplitUnpackingIterators::check(p), true);
+        }
+        { // vespa.matching.delay_unpacking_iterators
+            EXPECT_EQUAL(matching::DelayUnpackingIterators::NAME, vespalib::string("vespa.matching.delay_unpacking_iterators"));
+            EXPECT_EQUAL(matching::DelayUnpackingIterators::DEFAULT_VALUE, false);
+            Properties p;
+            EXPECT_EQUAL(matching::DelayUnpackingIterators::check(p), false);
+            p.add("vespa.matching.delay_unpacking_iterators", "true");
+            EXPECT_EQUAL(matching::DelayUnpackingIterators::check(p), true);
+        }
         { // vespa.matching.termwise_limit
             EXPECT_EQUAL(matching::TermwiseLimit::NAME, vespalib::string("vespa.matching.termwise_limit"));
             EXPECT_EQUAL(matching::TermwiseLimit::DEFAULT_VALUE, 1.0);
diff --git a/searchlib/src/tests/queryeval/same_element/same_element_test.cpp b/searchlib/src/tests/queryeval/same_element/same_element_test.cpp
index 45ebdd78fb3..6ec379140c0 100644
--- a/searchlib/src/tests/queryeval/same_element/same_element_test.cpp
+++ b/searchlib/src/tests/queryeval/same_element/same_element_test.cpp
@@ -15,7 +15,7 @@ using namespace search::queryeval;
 using search::attribute::ElementIterator;
 
 std::unique_ptr<SameElementBlueprint> make_blueprint(const std::vector<FakeResult> &children, bool fake_attr = false) {
-    auto result = std::make_unique<SameElementBlueprint>();
+    auto result = std::make_unique<SameElementBlueprint>(false);
     for (size_t i = 0; i < children.size(); ++i) {
         uint32_t field_id = i;
         vespalib::string field_name = vespalib::make_string("f%u", field_id);
diff --git a/searchlib/src/tests/queryeval/simple_phrase/simple_phrase_test.cpp b/searchlib/src/tests/queryeval/simple_phrase/simple_phrase_test.cpp
index aad448f7fe1..f5ce8a9608b 100644
--- a/searchlib/src/tests/queryeval/simple_phrase/simple_phrase_test.cpp
+++ b/searchlib/src/tests/queryeval/simple_phrase/simple_phrase_test.cpp
@@ -173,7 +173,7 @@ PhraseSearchTest::PhraseSearchTest(bool expiredDoom)
     : _requestContext(nullptr, expiredDoom ? 0 : std::numeric_limits<int64_t>::max()),
       _index(),
       _phrase_fs(field, fieldId, phrase_handle),
-      _phrase(_phrase_fs, _requestContext),
+      _phrase(_phrase_fs, _requestContext, false),
       _children(),
       _md(MatchData::makeTestInstance(100, 10)),
       _order(),
@@ -301,7 +301,7 @@ Test::requireThatBlueprintExposesFieldWithEstimate()
 {
     FakeRequestContext requestContext;
     FieldSpec f("foo", 1, 1);
-    SimplePhraseBlueprint phrase(f, requestContext);
+    SimplePhraseBlueprint phrase(f, requestContext, false);
     ASSERT_TRUE(phrase.getState().numFields() == 1);
     EXPECT_EQUAL(f.getFieldId(), phrase.getState().field(0).getFieldId());
     EXPECT_EQUAL(f.getHandle(), phrase.getState().field(0).getHandle());
@@ -327,7 +327,7 @@ Test::requireThatBlueprintForcesPositionDataOnChildren()
 {
     FakeRequestContext requestContext;
     FieldSpec f("foo", 1, 1, true);
-    SimplePhraseBlueprint phrase(f, requestContext);
+    SimplePhraseBlueprint phrase(f, requestContext, false);
     EXPECT_TRUE(f.isFilter());
     EXPECT_TRUE(!phrase.getNextChildField(f).isFilter());
 }