summaryrefslogtreecommitdiffstats
path: root/searchlib
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2023-04-13 13:42:21 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2023-04-13 13:42:21 +0000
commit3e986463df3b140820277281740ec82574bcbcf4 (patch)
tree8efe8a78ee4f89108a064f3b8c307beda3f0c4ef /searchlib
parent8ce8effad4cb248b4f37fdbf04bb3d88259dc651 (diff)
Use std::make_unique
Diffstat (limited to 'searchlib')
-rw-r--r--searchlib/src/vespa/searchlib/queryeval/wand/parallel_weak_and_search.cpp34
1 files changed, 16 insertions, 18 deletions
diff --git a/searchlib/src/vespa/searchlib/queryeval/wand/parallel_weak_and_search.cpp b/searchlib/src/vespa/searchlib/queryeval/wand/parallel_weak_and_search.cpp
index 292605127fb..1a7e91b2d1a 100644
--- a/searchlib/src/vespa/searchlib/queryeval/wand/parallel_weak_and_search.cpp
+++ b/searchlib/src/vespa/searchlib/queryeval/wand/parallel_weak_and_search.cpp
@@ -136,27 +136,25 @@ createWand(const wand::Terms &terms,
using WandType = ParallelWeakAndSearchImpl<VectorizedIteratorTerms, FutureHeap, PastHeap, IS_STRICT>;
if (should_monitor_wand()) {
wand::Terms termsWithMonitoring = insertMonitoringSearchIterator(terms);
- MonitoringSearchIterator::UP monitoringIterator =
- MonitoringSearchIterator::UP(new MonitoringSearchIterator
- (make_string("PWAND(%u,%" PRId64 "),strict=%u",
- matchParams.scores.getScoresToTrack(),
- matchParams.scoreThreshold,
- IS_STRICT),
- SearchIterator::UP(new WandType(rankParams.rootMatchData,
- VectorizedIteratorTerms(termsWithMonitoring,
- DotProductScorer(),
- matchParams.docIdLimit,
- std::move(rankParams.childrenMatchData)),
- matchParams)),
- false));
+ auto monitoringIterator = std::make_unique<MonitoringSearchIterator>(
+ make_string("PWAND(%u,%" PRId64 "),strict=%u",
+ matchParams.scores.getScoresToTrack(),
+ matchParams.scoreThreshold, IS_STRICT),
+ std::make_unique<WandType>(rankParams.rootMatchData,
+ VectorizedIteratorTerms(termsWithMonitoring,
+ DotProductScorer(),
+ matchParams.docIdLimit,
+ std::move(rankParams.childrenMatchData)),
+ matchParams),
+ false);
return std::make_unique<MonitoringDumpIterator>(std::move(monitoringIterator));
}
return std::make_unique<WandType>(rankParams.rootMatchData,
- VectorizedIteratorTerms(terms,
- DotProductScorer(),
- matchParams.docIdLimit,
- std::move(rankParams.childrenMatchData)),
- matchParams);
+ VectorizedIteratorTerms(terms,
+ DotProductScorer(),
+ matchParams.docIdLimit,
+ std::move(rankParams.childrenMatchData)),
+ matchParams);
}
} // namespace search::queryeval::wand::<unnamed>