Revert "Balder/add executeinfo"

3 files changed, 10 insertions, 12 deletions

diff --git a/searchcore/src/tests/proton/matching/match_phase_limiter/match_phase_limiter_test.cpp b/searchcore/src/tests/proton/matching/match_phase_limiter/match_phase_limiter_test.cpp
index 201824cd764..2d0482b0d92 100644
--- a/searchcore/src/tests/proton/matching/match_phase_limiter/match_phase_limiter_test.cpp
+++ b/searchcore/src/tests/proton/matching/match_phase_limiter/match_phase_limiter_test.cpp
@@ -4,7 +4,6 @@
 #include <vespa/searchlib/queryeval/termasstring.h>
 #include <vespa/searchlib/queryeval/andsearchstrict.h>
 #include <vespa/searchlib/queryeval/fake_requestcontext.h>
-#include <vespa/searchlib/fef/termfieldmatchdataarray.h>
 #include <vespa/searchlib/engine/trace.h>
 #include <vespa/vespalib/data/slime/slime.h>
 
@@ -55,7 +54,7 @@ struct MockBlueprint : SimpleLeafBlueprint {
     FieldSpec spec;
     vespalib::string term;
     bool postings_fetched = false;
-    search::queryeval::ExecuteInfo postings_strict = search::queryeval::ExecuteInfo::FALSE;
+    bool postings_strict = false;
     MockBlueprint(const FieldSpec &spec_in, const vespalib::string &term_in)
         : SimpleLeafBlueprint(FieldSpecBaseList().add(spec_in)), spec(spec_in), term(term_in)
     {
@@ -65,13 +64,13 @@ struct MockBlueprint : SimpleLeafBlueprint {
                                                 bool strict) const override
     {
         if (postings_fetched) {
-            EXPECT_EQUAL(postings_strict.isStrict(), strict);
+            EXPECT_EQUAL(postings_strict, strict);
         }
         return SearchIterator::UP(new MockSearch(spec, term, strict, tfmda,
                                                  postings_fetched));
     }
-    virtual void fetchPostings(const search::queryeval::ExecuteInfo &execInfo) override {
-        postings_strict = execInfo;
+    virtual void fetchPostings(bool strict) override {
+        postings_strict = strict;
         postings_fetched = true;
     }
 };
diff --git a/searchcore/src/tests/proton/matching/query_test.cpp b/searchcore/src/tests/proton/matching/query_test.cpp
index 96e1eb3cc22..85234ea9725 100644
--- a/searchcore/src/tests/proton/matching/query_test.cpp
+++ b/searchcore/src/tests/proton/matching/query_test.cpp
@@ -69,7 +69,6 @@ using search::queryeval::AndBlueprint;
 using search::queryeval::IntermediateBlueprint;
 using search::queryeval::AndNotBlueprint;
 using search::queryeval::SourceBlenderBlueprint;
-using search::queryeval::ExecuteInfo;
 
 using std::string;
 using std::vector;
@@ -455,7 +454,7 @@ SearchIterator::UP Test::getIterator(Node &node, ISearchContext &context) {
 
     _blueprint = BlueprintBuilder::build(_requestContext, node, context);
 
-    _blueprint->fetchPostings(ExecuteInfo::TRUE);
+    _blueprint->fetchPostings(true);
     SearchIterator::UP search(_blueprint->createSearch(*_match_data, true));
     search->initFullRange();
     return search;
@@ -822,10 +821,10 @@ Test::requireThatFakeFieldSearchDumpsDiffer()
     Blueprint::UP l3(a.createBlueprint(requestContext, fields2, n3)); // field
     Blueprint::UP l4(b.createBlueprint(requestContext, fields1, n1)); // tag
 
-    l1->fetchPostings(ExecuteInfo::TRUE);
-    l2->fetchPostings(ExecuteInfo::TRUE);
-    l3->fetchPostings(ExecuteInfo::TRUE);
-    l4->fetchPostings(ExecuteInfo::TRUE);
+    l1->fetchPostings(true);
+    l2->fetchPostings(true);
+    l3->fetchPostings(true);
+    l4->fetchPostings(true);
 
     SearchIterator::UP s1(l1->createSearch(*match_data, true));
     SearchIterator::UP s2(l2->createSearch(*match_data, true));
diff --git a/searchcore/src/tests/proton/matching/querynodes_test.cpp b/searchcore/src/tests/proton/matching/querynodes_test.cpp
index 5d01753dfb6..297f75054b2 100644
--- a/searchcore/src/tests/proton/matching/querynodes_test.cpp
+++ b/searchcore/src/tests/proton/matching/querynodes_test.cpp
@@ -201,7 +201,7 @@ public:
         MatchData::UP match_data = mdl.createMatchData();
 
         Blueprint::UP blueprint = BlueprintBuilder::build(requestContext, node, context);
-        blueprint->fetchPostings(search::queryeval::ExecuteInfo::TRUE);
+        blueprint->fetchPostings(true);
         return blueprint->createSearch(*match_data, true)->asString();
     }