Revert "Havardpe/reuse termwise vector in second phase"

4 files changed, 19 insertions, 27 deletions

diff --git a/searchlib/src/tests/features/item_raw_score/item_raw_score_test.cpp b/searchlib/src/tests/features/item_raw_score/item_raw_score_test.cpp
index a954710f153..f407aea811b 100644
--- a/searchlib/src/tests/features/item_raw_score/item_raw_score_test.cpp
+++ b/searchlib/src/tests/features/item_raw_score/item_raw_score_test.cpp
@@ -67,14 +67,13 @@ struct SingleLabel : public Labels {
 struct RankFixture : BlueprintFactoryFixture, IndexFixture {
     QueryEnvironment         queryEnv;
     RankSetup                rankSetup;
-    MatchDataLayout          mdl;
-    MatchData::UP            match_data;
     RankProgram::UP          rankProgram;
+    MatchDataLayout          mdl;
     std::vector<TermFieldHandle> fooHandles;
     std::vector<TermFieldHandle> barHandles;
     RankFixture(size_t fooCnt, size_t barCnt, const Labels &labels)
         : queryEnv(&indexEnv), rankSetup(factory, indexEnv),
-          mdl(), match_data(), rankProgram(), fooHandles(), barHandles()
+          rankProgram(), mdl(), fooHandles(), barHandles()
     {
         for (size_t i = 0; i < fooCnt; ++i) {
             uint32_t fieldId = indexEnv.getFieldByName("foo")->id();
@@ -96,15 +95,14 @@ struct RankFixture : BlueprintFactoryFixture, IndexFixture {
         rankSetup.setFirstPhaseRank(featureName);
         rankSetup.setIgnoreDefaultRankFeatures(true);
         ASSERT_TRUE(rankSetup.compile());
-        match_data = mdl.createMatchData();
         rankProgram = rankSetup.create_first_phase_program();
-        rankProgram->setup(*match_data, queryEnv);
+        rankProgram->setup(mdl, queryEnv);
     }
     feature_t getScore(uint32_t docId) {
         return Utils::getScoreFeature(*rankProgram, docId);
     }
     void setScore(TermFieldHandle handle, uint32_t docId, feature_t score) {
-        match_data->resolveTermField(handle)->setRawScore(docId, score);
+        rankProgram->match_data().resolveTermField(handle)->setRawScore(docId, score);
     }
     void setFooScore(uint32_t i, uint32_t docId, feature_t score) {
         ASSERT_LESS(i, fooHandles.size());
diff --git a/searchlib/src/tests/features/native_dot_product/native_dot_product_test.cpp b/searchlib/src/tests/features/native_dot_product/native_dot_product_test.cpp
index 1da912ccb3a..5ba7504f7d2 100644
--- a/searchlib/src/tests/features/native_dot_product/native_dot_product_test.cpp
+++ b/searchlib/src/tests/features/native_dot_product/native_dot_product_test.cpp
@@ -72,15 +72,14 @@ std::vector<uint32_t> vec(uint32_t w1, uint32_t w2, uint32_t w3) {
 struct RankFixture : BlueprintFactoryFixture, IndexFixture {
     QueryEnvironment         queryEnv;
     RankSetup                rankSetup;
-    MatchDataLayout          mdl;
-    MatchData::UP            match_data;
     RankProgram::UP          rankProgram;
+    MatchDataLayout          mdl;
     std::vector<TermFieldHandle> fooHandles;
     std::vector<TermFieldHandle> barHandles;
     RankFixture(const std::vector<uint32_t> &fooWeights,
                 const std::vector<uint32_t> &barWeights)
         : queryEnv(&indexEnv), rankSetup(factory, indexEnv),
-          mdl(), match_data(), rankProgram(), fooHandles(), barHandles()
+          rankProgram(), mdl(), fooHandles(), barHandles()
     {
         for (size_t i = 0; i < fooWeights.size(); ++i) {
             uint32_t fieldId = indexEnv.getFieldByName("foo")->id();
@@ -101,9 +100,8 @@ struct RankFixture : BlueprintFactoryFixture, IndexFixture {
         rankSetup.setFirstPhaseRank(featureName);
         rankSetup.setIgnoreDefaultRankFeatures(true);
         ASSERT_TRUE(rankSetup.compile());
-        match_data = mdl.createMatchData();
         rankProgram = rankSetup.create_first_phase_program();
-        rankProgram->setup(*match_data, queryEnv);
+        rankProgram->setup(mdl, queryEnv);
     }
     feature_t getScore(uint32_t docId) {
         return Utils::getScoreFeature(*rankProgram, docId);
@@ -112,15 +110,15 @@ struct RankFixture : BlueprintFactoryFixture, IndexFixture {
         ASSERT_LESS(i, fooHandles.size());
         TermFieldMatchDataPosition pos;
         pos.setElementWeight(index_weight);
-        match_data->resolveTermField(fooHandles[i])->reset(docId);
-        match_data->resolveTermField(fooHandles[i])->appendPosition(pos);
+        rankProgram->match_data().resolveTermField(fooHandles[i])->reset(docId);
+        rankProgram->match_data().resolveTermField(fooHandles[i])->appendPosition(pos);
     }
     void setBarWeight(uint32_t i, uint32_t docId, int32_t index_weight) {
         ASSERT_LESS(i, barHandles.size());
         TermFieldMatchDataPosition pos;
         pos.setElementWeight(index_weight);
-        match_data->resolveTermField(barHandles[i])->reset(docId);
-        match_data->resolveTermField(barHandles[i])->appendPosition(pos);
+        rankProgram->match_data().resolveTermField(barHandles[i])->reset(docId);
+        rankProgram->match_data().resolveTermField(barHandles[i])->appendPosition(pos);
     }
 };
 
diff --git a/searchlib/src/tests/features/raw_score/raw_score_test.cpp b/searchlib/src/tests/features/raw_score/raw_score_test.cpp
index 4aad6c6896e..52587c0d8f9 100644
--- a/searchlib/src/tests/features/raw_score/raw_score_test.cpp
+++ b/searchlib/src/tests/features/raw_score/raw_score_test.cpp
@@ -45,14 +45,13 @@ struct FeatureDumpFixture : public IDumpFeatureVisitor {
 struct RankFixture : BlueprintFactoryFixture, IndexFixture {
     QueryEnvironment         queryEnv;
     RankSetup                rankSetup;
-    MatchDataLayout          mdl;
-    MatchData::UP            match_data;
     RankProgram::UP          rankProgram;
+    MatchDataLayout          mdl;
     std::vector<TermFieldHandle> fooHandles;
     std::vector<TermFieldHandle> barHandles;
     RankFixture(size_t fooCnt, size_t barCnt)
         : queryEnv(&indexEnv), rankSetup(factory, indexEnv),
-          mdl(), match_data(), rankProgram(), fooHandles(), barHandles()
+          rankProgram(), mdl(), fooHandles(), barHandles()
     {
         for (size_t i = 0; i < fooCnt; ++i) {
             uint32_t fieldId = indexEnv.getFieldByName("foo")->id();
@@ -71,15 +70,14 @@ struct RankFixture : BlueprintFactoryFixture, IndexFixture {
         rankSetup.setFirstPhaseRank(featureName);
         rankSetup.setIgnoreDefaultRankFeatures(true);
         ASSERT_TRUE(rankSetup.compile());
-        match_data = mdl.createMatchData();
         rankProgram = rankSetup.create_first_phase_program();
-        rankProgram->setup(*match_data, queryEnv);
+        rankProgram->setup(mdl, queryEnv);
     }
     feature_t getScore(uint32_t docId) {
         return Utils::getScoreFeature(*rankProgram, docId);
     }
     void setScore(TermFieldHandle handle, uint32_t docId, feature_t score) {
-        match_data->resolveTermField(handle)->setRawScore(docId, score);
+        rankProgram->match_data().resolveTermField(handle)->setRawScore(docId, score);
     }
     void setFooScore(uint32_t i, uint32_t docId, feature_t score) {
         ASSERT_LESS(i, fooHandles.size());
diff --git a/searchlib/src/tests/features/subqueries/subqueries_test.cpp b/searchlib/src/tests/features/subqueries/subqueries_test.cpp
index d275cf134c6..37e43b4d2b0 100644
--- a/searchlib/src/tests/features/subqueries/subqueries_test.cpp
+++ b/searchlib/src/tests/features/subqueries/subqueries_test.cpp
@@ -43,24 +43,22 @@ struct FeatureDumpFixture : public IDumpFeatureVisitor {
 struct RankFixture : BlueprintFactoryFixture, IndexFixture {
     QueryEnvironment         queryEnv;
     RankSetup                rankSetup;
-    MatchDataLayout          mdl;
-    MatchData::UP            match_data;
     RankProgram::UP          rankProgram;
+    MatchDataLayout          mdl;
     std::vector<TermFieldHandle> fooHandles;
     std::vector<TermFieldHandle> barHandles;
     RankFixture(size_t fooCnt, size_t barCnt,
                 std::string featureName = "subqueries(foo)")
         : queryEnv(&indexEnv), rankSetup(factory, indexEnv),
-          mdl(), match_data(), rankProgram(), fooHandles(), barHandles()
+          rankProgram(), mdl(), fooHandles(), barHandles()
     {
         fooHandles = addFields(fooCnt, indexEnv.getFieldByName("foo")->id());
         barHandles = addFields(barCnt, indexEnv.getFieldByName("bar")->id());
         rankSetup.setFirstPhaseRank(featureName);
         rankSetup.setIgnoreDefaultRankFeatures(true);
         ASSERT_TRUE(rankSetup.compile());
-        match_data = mdl.createMatchData();
         rankProgram = rankSetup.create_first_phase_program();
-        rankProgram->setup(*match_data, queryEnv);
+        rankProgram->setup(mdl, queryEnv);
     }
     std::vector<TermFieldHandle> addFields(size_t count, uint32_t fieldId) {
         std::vector<TermFieldHandle> handles;
@@ -77,7 +75,7 @@ struct RankFixture : BlueprintFactoryFixture, IndexFixture {
     }
     void setSubqueries(TermFieldHandle handle, uint32_t docId,
                        uint64_t subqueries) {
-        match_data->resolveTermField(handle)->setSubqueries(docId, subqueries);
+        rankProgram->match_data().resolveTermField(handle)->setSubqueries(docId, subqueries);
     }
     void setFooSubqueries(uint32_t i, uint32_t docId, uint64_t subqueries) {
         ASSERT_LESS(i, fooHandles.size());