- Let DotProduct,Wand and WeightedSet be Term nodes in the query tree as they really are.

  That restricts the nodes to what they can really do and makes them significantly cheaper.
- In addition type conversion of numeric terms is delayed to when it is necessary.
   And as next step they can be avoided completely.

1 files changed, 3 insertions, 3 deletions

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 cbad6de25bb..167fc706f4d 100644
--- a/searchlib/src/tests/queryeval/fake_searchable/fake_searchable_test.cpp
+++ b/searchlib/src/tests/queryeval/fake_searchable/fake_searchable_test.cpp
@@ -156,9 +156,9 @@ TEST_F(FakeSearchableTest, require_that_weigheted_set_search_works) {
     source.addResult("fieldfoo", "friend3",
                      FakeResult().doc(5));
 
-    SimpleWeightedSetTerm weightedSet("fieldfoo", 1, w);
-    weightedSet.append(Node::UP(new SimpleStringTerm("friend1", "fieldfoo", 2, Weight(1))));
-    weightedSet.append(Node::UP(new SimpleStringTerm("friend2", "fieldfoo", 3, Weight(2))));
+    SimpleWeightedSetTerm weightedSet(2, "fieldfoo", 1, w);
+    weightedSet.addTerm("friend1", Weight(1));
+    weightedSet.addTerm("friend2", Weight(2));
 
     FieldSpecList fields;
     fields.add(FieldSpec("fieldfoo", 1, 1));