Pass all params in constructor and make members const.

3 files changed, 17 insertions, 20 deletions

diff --git a/searchlib/src/vespa/searchlib/attribute/attribute_blueprint_factory.cpp b/searchlib/src/vespa/searchlib/attribute/attribute_blueprint_factory.cpp
index 70b86bf22a1..20300999192 100644
--- a/searchlib/src/vespa/searchlib/attribute/attribute_blueprint_factory.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/attribute_blueprint_factory.cpp
@@ -11,7 +11,6 @@
 #include "in_term_search.h"
 #include "multi_term_or_filter_search.h"
 #include "predicate_attribute.h"
-#include <vespa/eval/eval/value.h>
 #include <vespa/searchcommon/attribute/config.h>
 #include <vespa/searchcommon/attribute/hit_estimate_flow_stats_adapter.h>
 #include <vespa/searchlib/common/location.h>
@@ -508,9 +507,8 @@ public:
             return std::make_unique<queryeval::EmptySearch>();
         }
         return queryeval::ParallelWeakAndSearch::create(*tfmda[0],
-                queryeval::ParallelWeakAndSearch::MatchParams(_scores, _scoreThreshold,
-                                                              _thresholdBoostFactor, _scoresAdjustFrequency)
-                                                        .setDocIdLimit(get_docid_limit()),
+                queryeval::ParallelWeakAndSearch::MatchParams(_scores, _scoreThreshold, _thresholdBoostFactor,
+                                                              _scoresAdjustFrequency, get_docid_limit()),
                                                         _weights, _terms, _attr, strict());
     }
     std::unique_ptr<SearchIterator> createFilterSearch(FilterConstraint constraint) const override;
diff --git a/searchlib/src/vespa/searchlib/queryeval/wand/parallel_weak_and_blueprint.cpp b/searchlib/src/vespa/searchlib/queryeval/wand/parallel_weak_and_blueprint.cpp
index c13b633a39f..2a200acbd94 100644
--- a/searchlib/src/vespa/searchlib/queryeval/wand/parallel_weak_and_blueprint.cpp
+++ b/searchlib/src/vespa/searchlib/queryeval/wand/parallel_weak_and_blueprint.cpp
@@ -105,10 +105,8 @@ ParallelWeakAndBlueprint::createLeafSearch(const search::fef::TermFieldMatchData
                            childState.field(0).resolve(*childrenMatchData));
     }
     return ParallelWeakAndSearch::create(terms,
-                                         ParallelWeakAndSearch::MatchParams(_scores,
-                                                                            _scoreThreshold,
-                                                                            _thresholdBoostFactor,
-                                                                            _scoresAdjustFrequency).setDocIdLimit(get_docid_limit()),
+                                         ParallelWeakAndSearch::MatchParams(_scores, _scoreThreshold, _thresholdBoostFactor,
+                                                                            _scoresAdjustFrequency, get_docid_limit()),
                                          ParallelWeakAndSearch::RankParams(*tfmda[0],std::move(childrenMatchData)),
                                          strict());
 }
diff --git a/searchlib/src/vespa/searchlib/queryeval/wand/parallel_weak_and_search.h b/searchlib/src/vespa/searchlib/queryeval/wand/parallel_weak_and_search.h
index d40ba6b1a63..70520e267e6 100644
--- a/searchlib/src/vespa/searchlib/queryeval/wand/parallel_weak_and_search.h
+++ b/searchlib/src/vespa/searchlib/queryeval/wand/parallel_weak_and_search.h
@@ -22,20 +22,23 @@ struct ParallelWeakAndSearch : public SearchIterator
      */
     struct MatchParams : wand::MatchParams
     {
-        double       thresholdBoostFactor;
-        docid_t      docIdLimit;
+        const double  thresholdBoostFactor;
+        const docid_t docIdLimit;
         MatchParams(WeakAndHeap &scores_in,
                     score_t scoreThreshold_in,
                     double thresholdBoostFactor_in,
-                    uint32_t scoresAdjustFrequency_in) noexcept
+                    uint32_t scoresAdjustFrequency_in,
+                    uint32_t docIdLimit_in) noexcept
             : wand::MatchParams(scores_in, scoreThreshold_in, scoresAdjustFrequency_in),
               thresholdBoostFactor(thresholdBoostFactor_in),
-              docIdLimit(0)
+              docIdLimit(docIdLimit_in)
+        {}
+        MatchParams(WeakAndHeap &scores_in,
+                    score_t scoreThreshold_in,
+                    double thresholdBoostFactor_in,
+                    uint32_t scoresAdjustFrequency_in) noexcept
+            : MatchParams(scores_in, scoreThreshold_in, thresholdBoostFactor_in, scoresAdjustFrequency_in, 0)
         {}
-        MatchParams &setDocIdLimit(docid_t value) {
-            docIdLimit = value;
-            return *this;
-        }
     };
 
     /**
@@ -63,12 +66,10 @@ struct ParallelWeakAndSearch : public SearchIterator
     static SearchIterator::UP createHeapWand(const Terms &terms, const MatchParams &matchParams, RankParams &&rankParams, bool strict);
     static SearchIterator::UP create(const Terms &terms, const MatchParams &matchParams, RankParams &&rankParams, bool strict);
 
-    static SearchIterator::UP create(fef::TermFieldMatchData &tmd,
-                                     const MatchParams &matchParams,
+    static SearchIterator::UP create(fef::TermFieldMatchData &tmd, const MatchParams &matchParams,
                                      const std::vector<int32_t> &weights,
                                      const std::vector<IDirectPostingStore::LookupResult> &dict_entries,
-                                     const IDocidWithWeightPostingStore &attr,
-                                     bool strict);
+                                     const IDocidWithWeightPostingStore &attr, bool strict);
 };
 
 }