Accumulate HitEstimate and apply when complete.

2 files changed, 12 insertions, 4 deletions

diff --git a/searchlib/src/tests/queryeval/filter_search/filter_search_test.cpp b/searchlib/src/tests/queryeval/filter_search/filter_search_test.cpp
index ea4753ab847..8f2f8f2e96b 100644
--- a/searchlib/src/tests/queryeval/filter_search/filter_search_test.cpp
+++ b/searchlib/src/tests/queryeval/filter_search/filter_search_test.cpp
@@ -273,7 +273,9 @@ struct WeightedSetTermAdapter {
     WeightedSetTermAdapter();
     ~WeightedSetTermAdapter();
     void addChild(std::unique_ptr<Blueprint> child) {
-        blueprint.addTerm(std::move(child), 100);
+        Blueprint::HitEstimate estimate = blueprint.getState().estimate();
+        blueprint.addTerm(std::move(child), 100, estimate);
+        blueprint.complete(estimate);
     }
     auto createFilterSearch(bool strict, Constraint constraint) const {
         return blueprint.createFilterSearch(strict, constraint);
@@ -292,7 +294,9 @@ struct DotProductAdapter {
     void addChild(std::unique_ptr<Blueprint> child) {
         auto child_field = blueprint.getNextChildField(field);
         auto term = std::make_unique<LeafProxy>(child_field, std::move(child));
-        blueprint.addTerm(std::move(term), 100);
+        Blueprint::HitEstimate estimate = blueprint.getState().estimate();
+        blueprint.addTerm(std::move(term), 100, estimate);
+        blueprint.complete(estimate);
     }
     auto createFilterSearch(bool strict, Constraint constraint) const {
         return blueprint.createFilterSearch(strict, constraint);
@@ -310,7 +314,9 @@ struct ParallelWeakAndAdapter {
     void addChild(std::unique_ptr<Blueprint> child) {
         auto child_field = blueprint.getNextChildField(field);
         auto term = std::make_unique<LeafProxy>(child_field, std::move(child));
-        blueprint.addTerm(std::move(term), 100);
+        Blueprint::HitEstimate estimate = blueprint.getState().estimate();
+        blueprint.addTerm(std::move(term), 100, estimate);
+        blueprint.complete(estimate);
     }
     auto createFilterSearch(bool strict, Constraint constraint) const {
         return blueprint.createFilterSearch(strict, constraint);
diff --git a/searchlib/src/tests/queryeval/weighted_set_term/weighted_set_term_test.cpp b/searchlib/src/tests/queryeval/weighted_set_term/weighted_set_term_test.cpp
index 90e16d4feff..f93aa537625 100644
--- a/searchlib/src/tests/queryeval/weighted_set_term/weighted_set_term_test.cpp
+++ b/searchlib/src/tests/queryeval/weighted_set_term/weighted_set_term_test.cpp
@@ -312,9 +312,11 @@ TEST("require that children get a common (yet separate) term field match data")
     auto top_handle = layout.allocTermField(42);
     FieldSpec top_spec("foo", 42, top_handle);
     WeightedSetTermBlueprint blueprint(top_spec);
+    queryeval::Blueprint::HitEstimate estimate;
     for (size_t i = 0; i < 5; ++i) {
-        blueprint.addTerm(vmd.create(blueprint.getNextChildField(top_spec)), 1);
+        blueprint.addTerm(vmd.create(blueprint.getNextChildField(top_spec)), 1, estimate);
     }
+    blueprint.complete(estimate);
     auto match_data = layout.createMatchData();
     auto search = blueprint.createSearch(*match_data, true);
     auto top_tfmd = match_data->resolveTermField(top_handle);