diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-06-27 23:51:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-27 23:51:06 +0200 |
commit | 61502c3c2db3e38a2feeb7bf41e029bb5cc22a85 (patch) | |
tree | a07524df444142cc4cee6cb395f97828ca7884f1 | |
parent | cb0443ebad10fa9ebc0314924161a04ed537d641 (diff) | |
parent | fe9d7ea9bcb152e0522e35a4281a759351f03b2c (diff) |
Merge pull request #27552 from vespa-engine/balder/drop-unranked-if-has-rank-score-drop-limit
Avoid double negation to improve readability.
-rw-r--r-- | searchcore/src/vespa/searchcore/proton/matching/matcher.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/matching/matcher.cpp b/searchcore/src/vespa/searchcore/proton/matching/matcher.cpp index 28da6013edb..800d0d0aed8 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/matcher.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/matcher.cpp @@ -86,9 +86,9 @@ private: }; bool -willNotNeedRanking(const SearchRequest & request, const GroupingContext & groupingContext) { - return (!groupingContext.needRanking() && (request.maxhits == 0)) - || (!request.sortSpec.empty() && (request.sortSpec.find("[rank]") == vespalib::string::npos)); +willNeedRanking(const SearchRequest & request, const GroupingContext & groupingContext) { + return (groupingContext.needRanking() || (request.maxhits != 0)) + && (request.sortSpec.empty() || (request.sortSpec.find("[rank]") != vespalib::string::npos)); } SearchReply::UP @@ -244,7 +244,7 @@ Matcher::match(const SearchRequest &request, vespalib::ThreadBundle &threadBundl MatchParams params(searchContext.getDocIdLimit(), heapSize, arraySize, rank_score_drop_limit, request.offset, request.maxhits, !_rankSetup->getSecondPhaseRank().empty(), - !willNotNeedRanking(request, groupingContext)); + willNeedRanking(request, groupingContext)); ResultProcessor rp(attrContext, metaStore, sessionMgr, groupingContext, sessionId, request.sortSpec, params.offset, params.hits); |