Remove type argument to search::streaming::InTerm constructor.

Test InTerm::evaluate().

4 files changed, 7 insertions, 5 deletions

diff --git a/searchlib/src/tests/query/streaming_query_test.cpp b/searchlib/src/tests/query/streaming_query_test.cpp
index 3c399f40f0a..02416d0fa56 100644
--- a/searchlib/src/tests/query/streaming_query_test.cpp
+++ b/searchlib/src/tests/query/streaming_query_test.cpp
@@ -877,16 +877,18 @@ TEST(StreamingQueryTest, test_in_term)
 {
     auto term_vector = std::make_unique<StringTermVector>(1);
     term_vector->addTerm("7");
-    search::streaming::InTerm term({}, "index", TermType::WORD, std::move(term_vector));
+    search::streaming::InTerm term({}, "index", std::move(term_vector));
     SimpleTermData td;
     td.addField(10);
     td.addField(11);
     td.addField(12);
     td.lookupField(10)->setHandle(0);
     td.lookupField(12)->setHandle(1);
+    EXPECT_FALSE(term.evaluate());
     auto& q = *term.get_terms().front();
     q.add(0, 11, 0, 1);
     q.add(0, 12, 0, 1);
+    EXPECT_TRUE(term.evaluate());
     MatchData md(MatchData::params().numTermFields(2));
     term.unpack_match_data(23, td, md);
     auto tmd0 = md.resolveTermField(0);
diff --git a/searchlib/src/vespa/searchlib/query/streaming/in_term.cpp b/searchlib/src/vespa/searchlib/query/streaming/in_term.cpp
index f3c96fb9502..36303d4e991 100644
--- a/searchlib/src/vespa/searchlib/query/streaming/in_term.cpp
+++ b/searchlib/src/vespa/searchlib/query/streaming/in_term.cpp
@@ -12,8 +12,8 @@ using search::query::TermVector;
 
 namespace search::streaming {
 
-InTerm::InTerm(std::unique_ptr<QueryNodeResultBase> result_base, const string & index, Type type, std::unique_ptr<TermVector> terms)
-    : MultiTerm(std::move(result_base), index, type, std::move(terms))
+InTerm::InTerm(std::unique_ptr<QueryNodeResultBase> result_base, const string & index, std::unique_ptr<TermVector> terms)
+    : MultiTerm(std::move(result_base), index, Type::WORD, std::move(terms))
 {
 }
 
diff --git a/searchlib/src/vespa/searchlib/query/streaming/in_term.h b/searchlib/src/vespa/searchlib/query/streaming/in_term.h
index 00a57e61d30..7d03ed989c7 100644
--- a/searchlib/src/vespa/searchlib/query/streaming/in_term.h
+++ b/searchlib/src/vespa/searchlib/query/streaming/in_term.h
@@ -11,7 +11,7 @@ namespace search::streaming {
  */
 class InTerm : public MultiTerm {
 public:
-    InTerm(std::unique_ptr<QueryNodeResultBase> result_base, const string& index, Type type, std::unique_ptr<query::TermVector> terms);
+    InTerm(std::unique_ptr<QueryNodeResultBase> result_base, const string& index, std::unique_ptr<query::TermVector> terms);
     ~InTerm() override;
     void unpack_match_data(uint32_t docid, const fef::ITermData& td, fef::MatchData& match_data) override;
 };
diff --git a/searchlib/src/vespa/searchlib/query/streaming/querynode.cpp b/searchlib/src/vespa/searchlib/query/streaming/querynode.cpp
index e38dce4cc78..7e7d1f1f260 100644
--- a/searchlib/src/vespa/searchlib/query/streaming/querynode.cpp
+++ b/searchlib/src/vespa/searchlib/query/streaming/querynode.cpp
@@ -182,7 +182,7 @@ QueryNode::Build(const QueryNode * parent, const QueryNodeResultFactory & factor
     break;
     case ParseItem::ITEM_STRING_IN:
     case ParseItem::ITEM_NUMERIC_IN:
-        qn = std::make_unique<InTerm>(factory.create(), queryRep.getIndexName(), QueryTermSimple::Type::WORD, queryRep.get_terms());
+        qn = std::make_unique<InTerm>(factory.create(), queryRep.getIndexName(), queryRep.get_terms());
         break;
     default:
     {