From a61f656529cca2ce016fdbfb2ca53b7a487d73a7 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Sat, 9 Dec 2023 23:01:08 +0100 Subject: Revert "relative estimate" --- .../lid_allocator/lid_allocator_test.cpp | 23 ++++------------------ .../proton/documentmetastore/lid_allocator.cpp | 4 ---- 2 files changed, 4 insertions(+), 23 deletions(-) (limited to 'searchcore') diff --git a/searchcore/src/tests/proton/documentmetastore/lid_allocator/lid_allocator_test.cpp b/searchcore/src/tests/proton/documentmetastore/lid_allocator/lid_allocator_test.cpp index e136e491f05..b2fa8675835 100644 --- a/searchcore/src/tests/proton/documentmetastore/lid_allocator/lid_allocator_test.cpp +++ b/searchcore/src/tests/proton/documentmetastore/lid_allocator/lid_allocator_test.cpp @@ -102,15 +102,10 @@ protected: } return result; } - - Blueprint::UP make_whitelist_blueprint(uint32_t docid_limit) { + + SimpleResult get_active_lids_in_search_iterator(uint32_t docid_limit, bool filter) { auto blueprint = _allocator.createWhiteListBlueprint(); blueprint->setDocIdLimit(docid_limit); - return blueprint; - } - - SimpleResult get_active_lids_in_search_iterator(uint32_t docid_limit, bool filter) { - auto blueprint = make_whitelist_blueprint(docid_limit); std::unique_ptr iterator; MatchData md(MatchData::params()); if (filter) { @@ -124,7 +119,8 @@ protected: } Trinary filter_search_iterator_matches_any(uint32_t docid_limit) { - auto blueprint = make_whitelist_blueprint(docid_limit); + auto blueprint = _allocator.createWhiteListBlueprint(); + blueprint->setDocIdLimit(docid_limit); auto iterator = blueprint->createFilterSearch(true, Blueprint::FilterConstraint::UPPER_BOUND); return iterator->matches_any(); } @@ -174,17 +170,6 @@ TEST_F(LidAllocatorTest, filter_search_iterator_matches_all_when_all_lids_are_ac EXPECT_EQ(SimpleResult({1, 2, 3, 4}), get_active_lids_in_search_iterator(6, false)); } -TEST_F(LidAllocatorTest, whitelist_blueprint_can_maximize_relative_estimate) -{ - register_lids({ 1, 2, 3, 4 }); - activate_lids({ 1, 2, 3, 4 }, true); - // the number of hits are overestimated based on the number of - // documents that could be active (100 in this test fixture) - EXPECT_EQ(make_whitelist_blueprint(1000)->estimate(), 0.1); - EXPECT_EQ(make_whitelist_blueprint(200)->estimate(), 0.5); - EXPECT_EQ(make_whitelist_blueprint(5)->estimate(), 1.0); -} - class LidAllocatorPerformanceTest : public LidAllocatorTest, public testing::WithParamInterface { diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_allocator.cpp b/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_allocator.cpp index 9e9199bc8ba..95e4eac437c 100644 --- a/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_allocator.cpp +++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_allocator.cpp @@ -222,10 +222,6 @@ public: setEstimate(HitEstimate(_activeLids.size(), false)); } - double calculate_relative_estimate() const final { - return abs_to_rel_est(getState().estimate().estHits, get_docid_limit()); - } - bool isWhiteList() const noexcept final { return true; } SearchIterator::UP createFilterSearch(bool strict, FilterConstraint) const override { -- cgit v1.2.3