remove features from match data

11 files changed, 30 insertions, 31 deletions

diff --git a/searchlib/src/tests/queryeval/blueprint/blueprint_test.cpp b/searchlib/src/tests/queryeval/blueprint/blueprint_test.cpp
index 7fcb1c20932..e8c2a20a21a 100644
--- a/searchlib/src/tests/queryeval/blueprint/blueprint_test.cpp
+++ b/searchlib/src/tests/queryeval/blueprint/blueprint_test.cpp
@@ -162,7 +162,7 @@ private:
 public:
     Test()
         : vespalib::TestApp(),
-          _md(MatchData::makeTestInstance(0, 100, 10))
+          _md(MatchData::makeTestInstance(100, 10))
     {
     }
     Blueprint::UP buildBlueprint1();
diff --git a/searchlib/src/tests/queryeval/blueprint/intermediate_blueprints_test.cpp b/searchlib/src/tests/queryeval/blueprint/intermediate_blueprints_test.cpp
index 62bbee6e08c..ae856f7d4a0 100644
--- a/searchlib/src/tests/queryeval/blueprint/intermediate_blueprints_test.cpp
+++ b/searchlib/src/tests/queryeval/blueprint/intermediate_blueprints_test.cpp
@@ -1043,7 +1043,7 @@ TEST("test WeakAnd Blueprint") {
         FakeResult z = FakeResult().doc(1).doc(4);
         {
             WeakAndBlueprint wa(456);
-            MatchData::UP md = MatchData::makeTestInstance(0, 100, 10);
+            MatchData::UP md = MatchData::makeTestInstance(100, 10);
             wa.addTerm(Blueprint::UP(new FakeBlueprint(field, x)), 120);
             wa.addTerm(Blueprint::UP(new FakeBlueprint(field, z)), 140);
             wa.addTerm(Blueprint::UP(new FakeBlueprint(field, y)), 130);
@@ -1099,7 +1099,7 @@ TEST("require_that_unpack_of_or_over_multisearch_is_optimized") {
                ap((new OrBlueprint())->
                        addChild(std::move(child1)).
                        addChild(std::move(child2))));
-    MatchData::UP md = MatchData::makeTestInstance(0, 100, 10);
+    MatchData::UP md = MatchData::makeTestInstance(100, 10);
     top_up->fetchPostings(false);
     EXPECT_EQUAL("search::queryeval::OrLikeSearch<false, search::queryeval::(anonymous namespace)::FullUnpack>",
                  top_up->createSearch(*md, false)->getClassName());
@@ -1125,7 +1125,7 @@ TEST("require_that_unpack_of_or_is_optimized") {
                        addChild(ap(MyLeafSpec(20).addField(1,1).create())).
                        addChild(ap(MyLeafSpec(20).addField(2,2).create())).
                        addChild(ap(MyLeafSpec(10).addField(3,3).create()))));
-    MatchData::UP md = MatchData::makeTestInstance(0, 100, 10);
+    MatchData::UP md = MatchData::makeTestInstance(100, 10);
     top_up->fetchPostings(false);
     EXPECT_EQUAL("search::queryeval::OrLikeSearch<false, search::queryeval::(anonymous namespace)::FullUnpack>",
                  top_up->createSearch(*md, false)->getClassName());
@@ -1144,7 +1144,7 @@ TEST("require_that_unpack_of_and_is_optimized") {
                        addChild(ap(MyLeafSpec(20).addField(1,1).create())).
                        addChild(ap(MyLeafSpec(20).addField(2,2).create())).
                        addChild(ap(MyLeafSpec(10).addField(3,3).create()))));
-    MatchData::UP md = MatchData::makeTestInstance(0, 100, 10);
+    MatchData::UP md = MatchData::makeTestInstance(100, 10);
     top_up->fetchPostings(false);
     EXPECT_EQUAL("search::queryeval::AndSearchNoStrict<search::queryeval::(anonymous namespace)::FullUnpack>",
                  top_up->createSearch(*md, false)->getClassName());
@@ -1164,7 +1164,7 @@ TEST("require_that_unpack_optimization_is_honoured_by_parents") {
                        addChild(ap(MyLeafSpec(20).addField(1,1).create())).
                        addChild(ap(MyLeafSpec(20).addField(2,2).create())).
                        addChild(ap(MyLeafSpec(10).addField(3,3).create()))))));
-    MatchData::UP md = MatchData::makeTestInstance(0, 100, 10);
+    MatchData::UP md = MatchData::makeTestInstance(100, 10);
     top_up->fetchPostings(false);
     EXPECT_EQUAL("search::queryeval::AndSearchNoStrict<search::queryeval::(anonymous namespace)::FullUnpack>",
                  top_up->createSearch(*md, false)->getClassName());
@@ -1213,7 +1213,7 @@ TEST("require that children does not optimize when parents refuse them to") {
                addTerm(index.getIndex().createBlueprint(requestContext,
                                                         FieldSpec("f2", 2, idxth21), makeTerm("w2")),
                        1.0)));
-    MatchData::UP md = MatchData::makeTestInstance(0, 100, 10);
+    MatchData::UP md = MatchData::makeTestInstance(100, 10);
     top_up->fetchPostings(false);
     SearchIterator::UP search = top_up->createSearch(*md, true);
     EXPECT_EQUAL("search::queryeval::EquivImpl<true>", search->getClassName());
@@ -1251,7 +1251,7 @@ TEST("require_that_unpack_optimization_is_overruled_by_equiv") {
                           addChild(ap(MyLeafSpec(20).addField(2,idxth2).create())).
                           addChild(ap(MyLeafSpec(10).addField(3,idxth3).create()))),
                        1.0)));
-    MatchData::UP md = MatchData::makeTestInstance(0, 100, 10);
+    MatchData::UP md = MatchData::makeTestInstance(100, 10);
     top_up->fetchPostings(false);
     SearchIterator::UP search = top_up->createSearch(*md, true);
     EXPECT_EQUAL("search::queryeval::EquivImpl<true>", search->getClassName());
diff --git a/searchlib/src/tests/queryeval/blueprint/leaf_blueprints_test.cpp b/searchlib/src/tests/queryeval/blueprint/leaf_blueprints_test.cpp
index 6efa3454d01..782e1ea5ea8 100644
--- a/searchlib/src/tests/queryeval/blueprint/leaf_blueprints_test.cpp
+++ b/searchlib/src/tests/queryeval/blueprint/leaf_blueprints_test.cpp
@@ -22,7 +22,7 @@ public:
 void
 Test::testEmptyBlueprint()
 {
-    MatchData::UP md(MatchData::makeTestInstance(0, 100, 10));
+    MatchData::UP md(MatchData::makeTestInstance(100, 10));
     EmptyBlueprint empty(FieldSpecBase(1, 11));
     ASSERT_TRUE(empty.getState().numFields() == 1u);
     EXPECT_EQUAL(1u, empty.getState().field(0).getFieldId());
@@ -40,7 +40,7 @@ Test::testEmptyBlueprint()
 void
 Test::testSimpleBlueprint()
 {
-    MatchData::UP md(MatchData::makeTestInstance(0, 100, 10));
+    MatchData::UP md(MatchData::makeTestInstance(100, 10));
     SimpleResult a;
     a.addHit(3).addHit(5).addHit(7);
     SimpleBlueprint simple(a);
@@ -59,7 +59,7 @@ Test::testSimpleBlueprint()
 void
 Test::testFakeBlueprint()
 {
-    MatchData::UP md(MatchData::makeTestInstance(0, 100, 10));
+    MatchData::UP md(MatchData::makeTestInstance(100, 10));
     FakeResult fake;
     fake.doc(10).len(50).pos(2).pos(3)
         .doc(25).len(10).pos(5);
diff --git a/searchlib/src/tests/queryeval/dot_product/dot_product_test.cpp b/searchlib/src/tests/queryeval/dot_product/dot_product_test.cpp
index e9dcc34219b..cc7350d35fd 100644
--- a/searchlib/src/tests/queryeval/dot_product/dot_product_test.cpp
+++ b/searchlib/src/tests/queryeval/dot_product/dot_product_test.cpp
@@ -61,7 +61,7 @@ struct DP {
     }
 
     FakeResult search(Searchable &searchable, const std::string &field, bool strict) const {
-        MatchData::UP md(MatchData::makeTestInstance(0, 1, 1));
+        MatchData::UP md(MatchData::makeTestInstance(1, 1));
         FakeRequestContext requestContext;
         Node::UP node = createNode();
         FieldSpecList fields = FieldSpecList().add(FieldSpec(field, fieldId, handle));
@@ -107,7 +107,7 @@ struct MockFixture {
         std::vector<SearchIterator*> children;
         std::vector<TermFieldMatchData*> childMatch;
         std::vector<int32_t> weights;
-        MatchData::UP md(MatchData::makeTestInstance(0, 1, 1));
+        MatchData::UP md(MatchData::makeTestInstance(1, 1));
         mock = new MockSearch(initial);
         children.push_back(mock);
         childMatch.push_back(md->resolveTermField(0));
diff --git a/searchlib/src/tests/queryeval/equiv/equiv_test.cpp b/searchlib/src/tests/queryeval/equiv/equiv_test.cpp
index 3d97d05995f..d838ded85c9 100644
--- a/searchlib/src/tests/queryeval/equiv/equiv_test.cpp
+++ b/searchlib/src/tests/queryeval/equiv/equiv_test.cpp
@@ -50,7 +50,7 @@ Test::testEquiv()
     for (int i = 0; i <= 1; ++i) {
         bool strict = (i == 0);
         TEST_STATE(strict ? "strict" : "non-strict");
-        MatchData::UP md = MatchData::makeTestInstance(0, 100, 10);
+        MatchData::UP md = MatchData::makeTestInstance(100, 10);
         bp->fetchPostings(strict);
         SearchIterator::UP search = bp->createSearch(*md, strict);
         search->initFullRange();
diff --git a/searchlib/src/tests/queryeval/fake_searchable/fake_searchable_test.cpp b/searchlib/src/tests/queryeval/fake_searchable/fake_searchable_test.cpp
index c3ff31625d3..c4bd736e74c 100644
--- a/searchlib/src/tests/queryeval/fake_searchable/fake_searchable_test.cpp
+++ b/searchlib/src/tests/queryeval/fake_searchable/fake_searchable_test.cpp
@@ -76,7 +76,7 @@ Test::testTerm()
     for (int i = 0; i <= 1; ++i) {
         bool strict = (i == 0);
         TEST_STATE(strict ? "strict" : "non-strict");
-        MatchData::UP md = MatchData::makeTestInstance(0, 100, 10);
+        MatchData::UP md = MatchData::makeTestInstance(100, 10);
         bp->fetchPostings(strict);
         SearchIterator::UP search = bp->createSearch(*md, strict);
         search->initFullRange();
@@ -130,7 +130,7 @@ Test::testPhrase()
     for (int i = 0; i <= 1; ++i) {
         bool strict = (i == 0);
         TEST_STATE(strict ? "strict" : "non-strict");
-        MatchData::UP md = MatchData::makeTestInstance(0, 100, 10);
+        MatchData::UP md = MatchData::makeTestInstance(100, 10);
         bp->fetchPostings(strict);
         SearchIterator::UP search = bp->createSearch(*md, strict);
         search->initFullRange();
@@ -186,7 +186,7 @@ Test::testWeightedSet()
     for (int i = 0; i <= 1; ++i) {
         bool strict = (i == 0);
         TEST_STATE(strict ? "strict" : "non-strict");
-        MatchData::UP md = MatchData::makeTestInstance(0, 100, 10);
+        MatchData::UP md = MatchData::makeTestInstance(100, 10);
         bp->fetchPostings(strict);
         SearchIterator::UP search = bp->createSearch(*md, strict);
         search->initFullRange();
@@ -262,7 +262,7 @@ Test::testMultiField()
     for (int i = 0; i <= 1; ++i) {
         bool strict = (i == 0);
         TEST_STATE(strict ? "strict" : "non-strict");
-        MatchData::UP md = MatchData::makeTestInstance(0, 100, 10);
+        MatchData::UP md = MatchData::makeTestInstance(100, 10);
         bp->fetchPostings(strict);
         SearchIterator::UP search = bp->createSearch(*md, strict);
         search->initFullRange();
@@ -351,7 +351,7 @@ Test::testPhraseWithEmptyChild()
     for (int i = 0; i <= 1; ++i) {
         bool strict = (i == 0);
         TEST_STATE(strict ? "strict" : "non-strict");
-        MatchData::UP md = MatchData::makeTestInstance(0, 100, 10);
+        MatchData::UP md = MatchData::makeTestInstance(100, 10);
         bp->fetchPostings(strict);
         SearchIterator::UP search = bp->createSearch(*md, strict);
         search->initFullRange();
diff --git a/searchlib/src/tests/queryeval/parallel_weak_and/parallel_weak_and_test.cpp b/searchlib/src/tests/queryeval/parallel_weak_and/parallel_weak_and_test.cpp
index 74aa052e486..fd74cdeff49 100644
--- a/searchlib/src/tests/queryeval/parallel_weak_and/parallel_weak_and_test.cpp
+++ b/searchlib/src/tests/queryeval/parallel_weak_and/parallel_weak_and_test.cpp
@@ -169,7 +169,7 @@ struct WandBlueprintSpec
     SearchIterator::UP iterator(Searchable &searchable, const std::string &field) const {
         Node::UP term = createNode();
         Blueprint::UP bp = blueprint(searchable, field, *term);
-        MatchData::UP md(MatchData::makeTestInstance(0, 1, 1));
+        MatchData::UP md(MatchData::makeTestInstance(1, 1));
         bp->fetchPostings(true);
         bp->setDocIdLimit(docIdLimit);
         SearchIterator::UP sb = bp->createSearch(*md, true);
@@ -184,7 +184,7 @@ struct WandBlueprintSpec
 
     FakeResult search(Searchable &searchable, const std::string &field, const search::query::Node &term) const {
         Blueprint::UP bp = blueprint(searchable, field, term);
-        MatchData::UP md(MatchData::makeTestInstance(0, 1, 1));
+        MatchData::UP md(MatchData::makeTestInstance(1, 1));
         bp->fetchPostings(true);
         bp->setDocIdLimit(docIdLimit);
         SearchIterator::UP sb = bp->createSearch(*md, true);
diff --git a/searchlib/src/tests/queryeval/queryeval.cpp b/searchlib/src/tests/queryeval/queryeval.cpp
index fe4ad7817d6..65feb69a3e2 100644
--- a/searchlib/src/tests/queryeval/queryeval.cpp
+++ b/searchlib/src/tests/queryeval/queryeval.cpp
@@ -218,7 +218,7 @@ TEST("testAnd") {
     a.addHit(5).addHit(10).addHit(16).addHit(30);
     b.addHit(3).addHit(5).addHit(17).addHit(30).addHit(52);
 
-    MatchData::UP md(MatchData::makeTestInstance(0, 100, 10));
+    MatchData::UP md(MatchData::makeTestInstance(100, 10));
     AndBlueprint *and_b = new AndBlueprint();
     and_b->addChild(Blueprint::UP(new SimpleBlueprint(a)));
     and_b->addChild(Blueprint::UP(new SimpleBlueprint(b)));
@@ -246,7 +246,7 @@ TEST("testOr") {
         a.addHit(5).addHit(10);
         b.addHit(5).addHit(17).addHit(30);
 
-        MatchData::UP md(MatchData::makeTestInstance(0, 100, 10));
+        MatchData::UP md(MatchData::makeTestInstance(100, 10));
         OrBlueprint *or_b = new OrBlueprint();
         or_b->addChild(Blueprint::UP(new SimpleBlueprint(a)));
         or_b->addChild(Blueprint::UP(new SimpleBlueprint(b)));
@@ -357,7 +357,7 @@ TEST("testAndNot") {
         a.addHit(5).addHit(10);
         b.addHit(5).addHit(17).addHit(30);
 
-        MatchData::UP md(MatchData::makeTestInstance(0, 100, 10));
+        MatchData::UP md(MatchData::makeTestInstance(100, 10));
         AndNotBlueprint *andnot_b = new AndNotBlueprint();
         andnot_b->addChild(Blueprint::UP(new SimpleBlueprint(a)));
         andnot_b->addChild(Blueprint::UP(new SimpleBlueprint(b)));
@@ -378,7 +378,7 @@ TEST("testAndNot") {
         a.addHit(1).addHit(5).addHit(10);
         b.addHit(5).addHit(17).addHit(30);
 
-        MatchData::UP md(MatchData::makeTestInstance(2, 100, 10));
+        MatchData::UP md(MatchData::makeTestInstance(100, 10));
         AndNotBlueprint *andnot_b = new AndNotBlueprint();
         andnot_b->addChild(Blueprint::UP(new SimpleBlueprint(a)));
         andnot_b->addChild(Blueprint::UP(new DummySingleValueBitNumericAttributeBlueprint(b)));
@@ -402,7 +402,7 @@ TEST("testAndNot") {
         b.addHit(5).addHit(17).addHit(30);
         c.addHit(1).addHit(5).addHit(10).addHit(17).addHit(30);
 
-        MatchData::UP md(MatchData::makeTestInstance(0, 100, 10));
+        MatchData::UP md(MatchData::makeTestInstance(100, 10));
         AndNotBlueprint *andnot_b = new AndNotBlueprint();
         andnot_b->addChild(Blueprint::UP(new SimpleBlueprint(a)));
         andnot_b->addChild(Blueprint::UP(new SimpleBlueprint(b)));
@@ -432,7 +432,7 @@ TEST("testRank") {
         a.addHit(5).addHit(10).addHit(16).addHit(30);
         b.addHit(3).addHit(5).addHit(17).addHit(30).addHit(52);
 
-        MatchData::UP md(MatchData::makeTestInstance(0, 100, 10));
+        MatchData::UP md(MatchData::makeTestInstance(100, 10));
         RankBlueprint *rank_b = new RankBlueprint();
         rank_b->addChild(Blueprint::UP(new SimpleBlueprint(a)));
         rank_b->addChild(Blueprint::UP(new SimpleBlueprint(b)));
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 f813d7203d0..85fce4a8215 100644
--- a/searchlib/src/tests/queryeval/simple_phrase/simple_phrase_test.cpp
+++ b/searchlib/src/tests/queryeval/simple_phrase/simple_phrase_test.cpp
@@ -111,7 +111,7 @@ public:
         _phrase_fs(field, fieldId, phrase_handle),
         _phrase(_phrase_fs, _requestContext),
         _children(),
-        _md(MatchData::makeTestInstance(0, 100, 10)),
+        _md(MatchData::makeTestInstance(100, 10)),
         _order(),
         _pos(1),
         _strict(false)
diff --git a/searchlib/src/tests/queryeval/sourceblender/sourceblender.cpp b/searchlib/src/tests/queryeval/sourceblender/sourceblender.cpp
index 2cfcf4e3f1d..1c8de3d4bf9 100644
--- a/searchlib/src/tests/queryeval/sourceblender/sourceblender.cpp
+++ b/searchlib/src/tests/queryeval/sourceblender/sourceblender.cpp
@@ -54,7 +54,7 @@ public:
 //-----------------------------------------------------------------------------
 
 TEST("test strictness") {
-    MatchData::UP md(MatchData::makeTestInstance(0, 100, 10));
+    MatchData::UP md(MatchData::makeTestInstance(100, 10));
     for (uint32_t i = 0; i < 2; ++i) {
         bool strict = (i == 0);
 
diff --git a/searchlib/src/tests/queryeval/termwise_eval/termwise_eval_test.cpp b/searchlib/src/tests/queryeval/termwise_eval/termwise_eval_test.cpp
index 0ef5f235ebc..95008afa574 100644
--- a/searchlib/src/tests/queryeval/termwise_eval/termwise_eval_test.cpp
+++ b/searchlib/src/tests/queryeval/termwise_eval/termwise_eval_test.cpp
@@ -202,10 +202,9 @@ void verify(const std::vector<uint32_t> &expect, SearchIterator &search, uint32_
 //-----------------------------------------------------------------------------
 
 MatchData::UP make_match_data() {
-    uint32_t num_features = 0;
     uint32_t num_handles = 100;
     uint32_t num_fields = 1;
-    return MatchData::makeTestInstance(num_features, num_handles, num_fields);
+    return MatchData::makeTestInstance(num_handles, num_fields);
 }
 
 //-----------------------------------------------------------------------------