summaryrefslogtreecommitdiffstats
path: root/searchcore
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@online.no>2022-04-03 20:36:49 +0200
committerTor Egge <Tor.Egge@online.no>2022-04-03 20:36:49 +0200
commitb1e3641dc5826ca99558ea51a918542f14568b57 (patch)
tree148151548e6e6a0de9cd9a3399b1f50a8c990b62 /searchcore
parent35c74d9abcfa7abb0cc12c1b47d26bac6f24f997 (diff)
Remove outdated andnot optimization.
Diffstat (limited to 'searchcore')
-rw-r--r--searchcore/src/vespa/searchcore/proton/matching/match_thread.cpp18
1 files changed, 1 insertions, 17 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/matching/match_thread.cpp b/searchcore/src/vespa/searchcore/proton/matching/match_thread.cpp
index ac408cfb2de..f1243665636 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/match_thread.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/match_thread.cpp
@@ -18,7 +18,6 @@ LOG_SETUP(".proton.matching.match_thread");
namespace proton::matching {
-using search::queryeval::OptimizedAndNotForBlackListing;
using search::queryeval::SearchIterator;
using search::fef::MatchData;
using search::fef::RankProgram;
@@ -48,17 +47,6 @@ struct SimpleStrategy {
}
};
-// seek_next maps to OptimizedAndNotForBlackListing::seekFast
-struct FastBlackListingStrategy {
- static bool can_use(bool do_rank, bool do_limit, SearchIterator &search) {
- return (!do_rank && !do_limit &&
- (dynamic_cast<OptimizedAndNotForBlackListing *>(&search) != nullptr));
- }
- static uint32_t seek_next(SearchIterator &search, uint32_t docid) {
- return static_cast<OptimizedAndNotForBlackListing &>(search).seekFast(docid);
- }
-};
-
LazyValue get_score_feature(const RankProgram &rankProgram) {
FeatureResolver resolver(rankProgram.get_seeds());
assert(resolver.num_features() == 1u);
@@ -222,11 +210,7 @@ template <bool do_rank, bool do_limit, bool do_share, bool use_rank_drop_limit>
void
MatchThread::match_loop_helper_rank_limit_share_drop(MatchTools &tools, HitCollector &hits)
{
- if (FastBlackListingStrategy::can_use(do_rank, do_limit, tools.search())) {
- match_loop<FastBlackListingStrategy, do_rank, do_limit, do_share, use_rank_drop_limit>(tools, hits);
- } else {
- match_loop<SimpleStrategy, do_rank, do_limit, do_share, use_rank_drop_limit>(tools, hits);
- }
+ match_loop<SimpleStrategy, do_rank, do_limit, do_share, use_rank_drop_limit>(tools, hits);
}
template <bool do_rank, bool do_limit, bool do_share>