From 39b22c8fd38b246f638e91e2ee0839e032cdb0f8 Mon Sep 17 00:00:00 2001 From: Valery Mironov <32071355+MBkkt@users.noreply.github.com> Date: Thu, 30 Nov 2023 19:30:12 +0100 Subject: [PATCH] WIP --- core/search/min_match_disjunction.hpp | 4 +- core/search/ngram_similarity_query.cpp | 6 +- tests/search/boolean_filter_tests.cpp | 310 ++++++++++--------------- 3 files changed, 124 insertions(+), 196 deletions(-) diff --git a/core/search/min_match_disjunction.hpp b/core/search/min_match_disjunction.hpp index a7eb407d6..3edcc2241 100644 --- a/core/search/min_match_disjunction.hpp +++ b/core/search/min_match_disjunction.hpp @@ -212,7 +212,7 @@ class MinMatchDisjunction : public doc_iterator, // greater than required min_match. All matched iterators points // to current matched document after this call. // Returns total matched iterators count. - size_t MatchCount() { + size_t match_count() { PushValidToLead(); return lead_; } @@ -233,7 +233,7 @@ class MinMatchDisjunction : public doc_iterator, // score lead iterators std::memset(res, 0, static_cast(self).byte_size()); - std::for_each(self.lead(), self.heap_.end(), [&self, res](size_t it) { + std::for_each(self.Lead(), self.heap_.end(), [&self, res](size_t it) { IRS_ASSERT(it < self.itrs_.size()); if (auto& score = *self.itrs_[it].score; !score.IsDefault()) { auto& merger = static_cast(self); diff --git a/core/search/ngram_similarity_query.cpp b/core/search/ngram_similarity_query.cpp index 4f8083988..85d5249b3 100644 --- a/core/search/ngram_similarity_query.cpp +++ b/core/search/ngram_similarity_query.cpp @@ -117,7 +117,7 @@ class NGramApprox : public Conjunction, NoopAggregator> { }(std::move(itrs))}, match_count_{min_match_count} {} - size_t MatchCount() const noexcept { return match_count_; } + size_t match_count() const noexcept { return match_count_; } private: size_t match_count_; @@ -493,7 +493,7 @@ class NGramSimilarityDocIterator : public doc_iterator, private score_ctx { bool next() final { while (approx_.next()) { - if (checker_.Check(approx_.MatchCount(), value())) { + if (checker_.Check(approx_.match_count(), value())) { return true; } } @@ -513,7 +513,7 @@ class NGramSimilarityDocIterator : public doc_iterator, private score_ctx { const auto doc_id = approx_.seek(target); if (doc_limits::eof(doc_id) || - checker_.Check(approx_.MatchCount(), doc->value)) { + checker_.Check(approx_.match_count(), doc->value)) { return doc_id; } diff --git a/tests/search/boolean_filter_tests.cpp b/tests/search/boolean_filter_tests.cpp index 9444378f0..1de2c8621 100644 --- a/tests/search/boolean_filter_tests.cpp +++ b/tests/search/boolean_filter_tests.cpp @@ -12439,8 +12439,7 @@ TEST(disjunction_test, scored_seek_next) { // ---------------------------------------------------------------------------- TEST(min_match_disjunction_test, next) { - using disjunction = - irs::min_match_disjunction; + using disjunction = irs::MinMatchDisjunction; // single dataset { std::vector> docs{ @@ -12451,9 +12450,8 @@ TEST(min_match_disjunction_test, next) { const size_t min_match_count = 0; std::vector result; { - disjunction it( - detail::execute_all(docs), - min_match_count); + disjunction it(detail::execute_all>(docs), + min_match_count); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); ASSERT_EQ(irs::doc_limits::invalid(), it.value()); @@ -12470,9 +12468,8 @@ TEST(min_match_disjunction_test, next) { const size_t min_match_count = 1; std::vector result; { - disjunction it( - detail::execute_all(docs), - min_match_count); + disjunction it(detail::execute_all>(docs), + min_match_count); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); ASSERT_EQ(irs::doc_limits::invalid(), it.value()); @@ -12490,9 +12487,8 @@ TEST(min_match_disjunction_test, next) { std::vector expected{}; std::vector result; { - disjunction it( - detail::execute_all(docs), - min_match_count); + disjunction it(detail::execute_all>(docs), + min_match_count); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); ASSERT_EQ(irs::doc_limits::invalid(), it.value()); @@ -12510,9 +12506,8 @@ TEST(min_match_disjunction_test, next) { std::vector expected{}; std::vector result; { - disjunction it{ - detail::execute_all(docs), - min_match_count}; + disjunction it{detail::execute_all>(docs), + min_match_count}; auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); ASSERT_EQ(irs::doc_limits::invalid(), it.value()); @@ -12530,9 +12525,8 @@ TEST(min_match_disjunction_test, next) { std::vector expected{}; std::vector result; { - disjunction it{ - detail::execute_all(docs), - min_match_count}; + disjunction it{detail::execute_all>(docs), + min_match_count}; auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); @@ -12561,9 +12555,8 @@ TEST(min_match_disjunction_test, next) { std::vector expected = detail::union_all(docs); std::vector result; { - disjunction it{ - detail::execute_all(docs), - min_match_count}; + disjunction it{detail::execute_all>(docs), + min_match_count}; auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); ASSERT_EQ(irs::doc_limits::invalid(), it.value()); @@ -12581,9 +12574,8 @@ TEST(min_match_disjunction_test, next) { std::vector expected = detail::union_all(docs); std::vector result; { - disjunction it{ - detail::execute_all(docs), - min_match_count}; + disjunction it{detail::execute_all>(docs), + min_match_count}; auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); ASSERT_EQ(irs::doc_limits::invalid(), it.value()); @@ -12601,9 +12593,8 @@ TEST(min_match_disjunction_test, next) { std::vector expected{7}; std::vector result; { - disjunction it{ - detail::execute_all(docs), - min_match_count}; + disjunction it{detail::execute_all>(docs), + min_match_count}; auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); ASSERT_EQ(irs::doc_limits::invalid(), it.value()); @@ -12621,9 +12612,8 @@ TEST(min_match_disjunction_test, next) { std::vector expected; std::vector result; { - disjunction it( - detail::execute_all(docs), - min_match_count); + disjunction it(detail::execute_all>(docs), + min_match_count); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); ASSERT_EQ(irs::doc_limits::invalid(), it.value()); @@ -12642,9 +12632,8 @@ TEST(min_match_disjunction_test, next) { std::vector expected; std::vector result; { - disjunction it( - detail::execute_all(docs), - min_match_count); + disjunction it(detail::execute_all>(docs), + min_match_count); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); ASSERT_EQ(irs::doc_limits::invalid(), it.value()); @@ -12663,9 +12652,8 @@ TEST(min_match_disjunction_test, next) { std::vector expected{}; std::vector result; { - disjunction it( - detail::execute_all(docs), - min_match_count); + disjunction it(detail::execute_all>(docs), + min_match_count); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); ASSERT_EQ(irs::doc_limits::invalid(), it.value()); @@ -12684,9 +12672,8 @@ TEST(min_match_disjunction_test, next) { std::vector expected{}; std::vector result; { - disjunction it( - detail::execute_all(docs), - min_match_count); + disjunction it(detail::execute_all>(docs), + min_match_count); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); ASSERT_EQ(irs::doc_limits::invalid(), it.value()); @@ -12715,9 +12702,8 @@ TEST(min_match_disjunction_test, next) { 9, 11, 12, 13, 29, 45}; std::vector result; { - disjunction it( - detail::execute_all(docs), - min_match_count); + disjunction it(detail::execute_all>(docs), + min_match_count); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); ASSERT_EQ(irs::doc_limits::invalid(), it.value()); @@ -12736,9 +12722,8 @@ TEST(min_match_disjunction_test, next) { 9, 11, 12, 13, 29, 45}; std::vector result; { - disjunction it( - detail::execute_all(docs), - min_match_count); + disjunction it(detail::execute_all>(docs), + min_match_count); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); ASSERT_EQ(irs::doc_limits::invalid(), it.value()); @@ -12756,9 +12741,8 @@ TEST(min_match_disjunction_test, next) { std::vector expected{1, 2, 5, 6, 29}; std::vector result; { - disjunction it( - detail::execute_all(docs), - min_match_count); + disjunction it(detail::execute_all>(docs), + min_match_count); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); ASSERT_EQ(irs::doc_limits::invalid(), it.value()); @@ -12776,9 +12760,8 @@ TEST(min_match_disjunction_test, next) { std::vector expected{1, 5}; std::vector result; { - disjunction it( - detail::execute_all(docs), - min_match_count); + disjunction it(detail::execute_all>(docs), + min_match_count); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); ASSERT_EQ(irs::doc_limits::invalid(), it.value()); @@ -12797,9 +12780,8 @@ TEST(min_match_disjunction_test, next) { std::vector expected{1, 5}; std::vector result; { - disjunction it( - detail::execute_all(docs), - min_match_count); + disjunction it(detail::execute_all>(docs), + min_match_count); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); ASSERT_EQ(irs::doc_limits::invalid(), it.value()); @@ -12818,9 +12800,8 @@ TEST(min_match_disjunction_test, next) { std::vector expected{1, 5}; std::vector result; { - disjunction it( - detail::execute_all(docs), - min_match_count); + disjunction it(detail::execute_all>(docs), + min_match_count); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); ASSERT_EQ(irs::doc_limits::invalid(), it.value()); @@ -12839,9 +12820,8 @@ TEST(min_match_disjunction_test, next) { std::vector expected{1, 5}; std::vector result; { - disjunction it( - detail::execute_all(docs), - min_match_count); + disjunction it(detail::execute_all>(docs), + min_match_count); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); ASSERT_EQ(irs::doc_limits::invalid(), it.value()); @@ -12869,9 +12849,8 @@ TEST(min_match_disjunction_test, next) { const size_t min_match_count = 0; std::vector result; { - disjunction it( - detail::execute_all(docs), - min_match_count); + disjunction it(detail::execute_all>(docs), + min_match_count); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); ASSERT_EQ(irs::doc_limits::invalid(), it.value()); @@ -12889,9 +12868,8 @@ TEST(min_match_disjunction_test, next) { const size_t min_match_count = 1; std::vector result; { - disjunction it( - detail::execute_all(docs), - min_match_count); + disjunction it(detail::execute_all>(docs), + min_match_count); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); ASSERT_EQ(irs::doc_limits::invalid(), it.value()); @@ -12908,9 +12886,8 @@ TEST(min_match_disjunction_test, next) { const size_t min_match_count = 2; std::vector result; { - disjunction it( - detail::execute_all(docs), - min_match_count); + disjunction it(detail::execute_all>(docs), + min_match_count); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); ASSERT_EQ(irs::doc_limits::invalid(), it.value()); @@ -12927,9 +12904,8 @@ TEST(min_match_disjunction_test, next) { const size_t min_match_count = 3; std::vector result; { - disjunction it( - detail::execute_all(docs), - min_match_count); + disjunction it(detail::execute_all>(docs), + min_match_count); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); ASSERT_EQ(irs::doc_limits::invalid(), it.value()); @@ -12947,9 +12923,8 @@ TEST(min_match_disjunction_test, next) { const size_t min_match_count = 4; std::vector result; { - disjunction it( - detail::execute_all(docs), - min_match_count); + disjunction it(detail::execute_all>(docs), + min_match_count); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); ASSERT_EQ(irs::doc_limits::invalid(), it.value()); @@ -12967,9 +12942,8 @@ TEST(min_match_disjunction_test, next) { const size_t min_match_count = 5; std::vector result; { - disjunction it( - detail::execute_all(docs), - min_match_count); + disjunction it(detail::execute_all>(docs), + min_match_count); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); ASSERT_EQ(irs::doc_limits::invalid(), it.value()); @@ -12987,9 +12961,8 @@ TEST(min_match_disjunction_test, next) { const size_t min_match_count = std::numeric_limits::max(); std::vector result; { - disjunction it( - detail::execute_all(docs), - min_match_count); + disjunction it(detail::execute_all>(docs), + min_match_count); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); ASSERT_EQ(irs::doc_limits::invalid(), it.value()); @@ -13013,8 +12986,7 @@ TEST(min_match_disjunction_test, next) { { std::vector result; { - disjunction it( - detail::execute_all(docs), 0U); + disjunction it(detail::execute_all>(docs), 0U); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); ASSERT_EQ(irs::doc_limits::invalid(), it.value()); @@ -13030,8 +13002,7 @@ TEST(min_match_disjunction_test, next) { { std::vector result; { - disjunction it( - detail::execute_all(docs), 1U); + disjunction it(detail::execute_all>(docs), 1U); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); ASSERT_EQ(irs::doc_limits::invalid(), it.value()); @@ -13047,9 +13018,8 @@ TEST(min_match_disjunction_test, next) { { std::vector result; { - disjunction it( - detail::execute_all(docs), - std::numeric_limits::max()); + disjunction it(detail::execute_all>(docs), + std::numeric_limits::max()); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); ASSERT_EQ(irs::doc_limits::invalid(), it.value()); @@ -13066,8 +13036,7 @@ TEST(min_match_disjunction_test, next) { } TEST(min_match_disjunction_test, seek) { - using disjunction = - irs::min_match_disjunction; + using disjunction = irs::MinMatchDisjunction; // simple case { @@ -13088,9 +13057,8 @@ TEST(min_match_disjunction_test, seek) { {45, 45}, {57, irs::doc_limits::eof()}}; - disjunction it( - detail::execute_all(docs), - min_match_count); + disjunction it(detail::execute_all>(docs), + min_match_count); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); for (const auto& target : expected) { @@ -13112,9 +13080,8 @@ TEST(min_match_disjunction_test, seek) { {45, 45}, {57, irs::doc_limits::eof()}}; - disjunction it( - detail::execute_all(docs), - min_match_count); + disjunction it(detail::execute_all>(docs), + min_match_count); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); for (const auto& target : expected) { @@ -13134,9 +13101,8 @@ TEST(min_match_disjunction_test, seek) { {29, 29}, {45, irs::doc_limits::eof()}}; - disjunction it( - detail::execute_all(docs), - min_match_count); + disjunction it(detail::execute_all>(docs), + min_match_count); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); for (const auto& target : expected) { @@ -13152,9 +13118,8 @@ TEST(min_match_disjunction_test, seek) { {1, 1}, {6, irs::doc_limits::eof()}}; - disjunction it( - detail::execute_all(docs), - min_match_count); + disjunction it(detail::execute_all>(docs), + min_match_count); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); for (const auto& target : expected) { @@ -13170,9 +13135,8 @@ TEST(min_match_disjunction_test, seek) { {1, 1}, {6, irs::doc_limits::eof()}}; - disjunction it( - detail::execute_all(docs), - min_match_count); + disjunction it(detail::execute_all>(docs), + min_match_count); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); for (const auto& target : expected) { @@ -13205,9 +13169,8 @@ TEST(min_match_disjunction_test, seek) { {513, 1025}, {2001, irs::doc_limits::eof()}}; - disjunction it( - detail::execute_all(docs), - min_match_count); + disjunction it(detail::execute_all>(docs), + min_match_count); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); for (const auto& target : expected) { @@ -13230,9 +13193,8 @@ TEST(min_match_disjunction_test, seek) { {513, 1025}, {2001, irs::doc_limits::eof()}}; - disjunction it( - detail::execute_all(docs), - min_match_count); + disjunction it(detail::execute_all>(docs), + min_match_count); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); for (const auto& target : expected) { @@ -13252,9 +13214,8 @@ TEST(min_match_disjunction_test, seek) { {101, 101}, {513, irs::doc_limits::eof()}}; - disjunction it( - detail::execute_all(docs), - min_match_count); + disjunction it(detail::execute_all>(docs), + min_match_count); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); for (const auto& target : expected) { @@ -13270,9 +13231,8 @@ TEST(min_match_disjunction_test, seek) { {1, 1}, {6, irs::doc_limits::eof()}}; - disjunction it( - detail::execute_all(docs), - min_match_count); + disjunction it(detail::execute_all>(docs), + min_match_count); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); for (const auto& target : expected) { @@ -13289,9 +13249,8 @@ TEST(min_match_disjunction_test, seek) { {1, irs::doc_limits::eof()}, {6, irs::doc_limits::eof()}}; - disjunction it( - detail::execute_all(docs), - min_match_count); + disjunction it(detail::execute_all>(docs), + min_match_count); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); for (const auto& target : expected) { @@ -13311,8 +13270,7 @@ TEST(min_match_disjunction_test, seek) { {irs::doc_limits::invalid(), irs::doc_limits::eof()}}; { - disjunction it( - detail::execute_all(docs), 0U); + disjunction it(detail::execute_all>(docs), 0U); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); for (const auto& target : expected) { @@ -13321,8 +13279,7 @@ TEST(min_match_disjunction_test, seek) { } { - disjunction it( - detail::execute_all(docs), 1U); + disjunction it(detail::execute_all>(docs), 1U); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); for (const auto& target : expected) { @@ -13331,9 +13288,8 @@ TEST(min_match_disjunction_test, seek) { } { - disjunction it( - detail::execute_all(docs), - std::numeric_limits::max()); + disjunction it(detail::execute_all>(docs), + std::numeric_limits::max()); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); for (const auto& target : expected) { @@ -13362,8 +13318,7 @@ TEST(min_match_disjunction_test, seek) { {57, irs::doc_limits::eof()}}; { - disjunction it( - detail::execute_all(docs), 0U); + disjunction it(detail::execute_all>(docs), 0U); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); for (const auto& target : expected) { @@ -13372,8 +13327,7 @@ TEST(min_match_disjunction_test, seek) { } { - disjunction it( - detail::execute_all(docs), 1U); + disjunction it(detail::execute_all>(docs), 1U); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); for (const auto& target : expected) { @@ -13382,8 +13336,7 @@ TEST(min_match_disjunction_test, seek) { } { - disjunction it( - detail::execute_all(docs), 2U); + disjunction it(detail::execute_all>(docs), 2U); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); for (const auto& target : expected) { @@ -13392,9 +13345,8 @@ TEST(min_match_disjunction_test, seek) { } { - disjunction it( - detail::execute_all(docs), - std::numeric_limits::max()); + disjunction it(detail::execute_all>(docs), + std::numeric_limits::max()); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); for (const auto& target : expected) { @@ -13424,8 +13376,7 @@ TEST(min_match_disjunction_test, seek) { {1201, irs::doc_limits::eof()}}; { - disjunction it( - detail::execute_all(docs), 0U); + disjunction it(detail::execute_all>(docs), 0U); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); for (const auto& target : expected) { @@ -13434,8 +13385,7 @@ TEST(min_match_disjunction_test, seek) { } { - disjunction it( - detail::execute_all(docs), 1U); + disjunction it(detail::execute_all>(docs), 1U); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); for (const auto& target : expected) { @@ -13452,8 +13402,7 @@ TEST(min_match_disjunction_test, seek) { {12, irs::doc_limits::eof()}}; { - disjunction it( - detail::execute_all(docs), 2U); + disjunction it(detail::execute_all>(docs), 2U); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); for (const auto& target : expected) { @@ -13470,8 +13419,7 @@ TEST(min_match_disjunction_test, seek) { }; { - disjunction it( - detail::execute_all(docs), 3U); + disjunction it(detail::execute_all>(docs), 3U); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); for (const auto& target : expected) { @@ -13489,8 +13437,7 @@ TEST(min_match_disjunction_test, seek) { }; { - disjunction it( - detail::execute_all(docs), 5U); + disjunction it(detail::execute_all>(docs), 5U); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); for (const auto& target : expected) { @@ -13499,9 +13446,8 @@ TEST(min_match_disjunction_test, seek) { } { - disjunction it( - detail::execute_all(docs), - std::numeric_limits::max()); + disjunction it(detail::execute_all>(docs), + std::numeric_limits::max()); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); for (const auto& target : expected) { @@ -13513,15 +13459,13 @@ TEST(min_match_disjunction_test, seek) { } TEST(min_match_disjunction_test, seek_next) { - using disjunction = - irs::min_match_disjunction; + using disjunction = irs::MinMatchDisjunction; { std::vector> docs{ {1, 2, 5, 7, 9, 11, 45}, {1, 5, 6, 12, 29}, {1, 5, 6, 9, 29}}; - disjunction it( - detail::execute_all(docs), 2U); + disjunction it(detail::execute_all>(docs), 2U); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); @@ -13557,15 +13501,13 @@ TEST(min_match_disjunction_test, seek_next) { } TEST(min_match_disjunction_test, match_count) { - using disjunction = - irs::min_match_disjunction; + using disjunction = irs::MinMatchDisjunction; { std::vector> docs{ {1, 3}, {1, 2, 3, 4}, {1, 3, 4}, {1, 3, 4}}; - disjunction it( - detail::execute_all(docs), 1U); + disjunction it(detail::execute_all>(docs), 1U); auto* doc = irs::get(it); ASSERT_TRUE(bool(doc)); @@ -13605,9 +13547,8 @@ TEST(min_match_disjunction_test, scored_seek_next) { auto it_ptr = irs::ResoveMergeType( irs::ScoreMergeType::kMax, 0, [&](A&& aggregator) -> irs::doc_iterator::ptr { - using disjunction = - irs::min_match_disjunction; - using adapter = typename disjunction::cost_iterator_adapter; + using disjunction = irs::MinMatchDisjunction; + using adapter = typename irs::CostAdapter<>; auto res = detail::execute_all(docs); @@ -13615,8 +13556,7 @@ TEST(min_match_disjunction_test, scored_seek_next) { std::move(aggregator)); }); - using ExpectedType = - irs::min_match_disjunction; + using ExpectedType = irs::MinMatchDisjunction; ASSERT_NE(nullptr, dynamic_cast(it_ptr.get())); auto& it = dynamic_cast(*it_ptr); @@ -13663,9 +13603,8 @@ TEST(min_match_disjunction_test, scored_seek_next) { auto it_ptr = irs::ResoveMergeType( irs::ScoreMergeType::kSum, 1, [&](A&& aggregator) -> irs::doc_iterator::ptr { - using disjunction = - irs::min_match_disjunction; - using adapter = typename disjunction::cost_iterator_adapter; + using disjunction = irs::MinMatchDisjunction; + using adapter = typename irs::CostAdapter<>; auto res = detail::execute_all(docs); @@ -13674,8 +13613,7 @@ TEST(min_match_disjunction_test, scored_seek_next) { }); using ExpectedType = - irs::min_match_disjunction>; + irs::MinMatchDisjunction>; ASSERT_NE(nullptr, dynamic_cast(it_ptr.get())); auto& it = dynamic_cast(*it_ptr); @@ -13735,9 +13673,8 @@ TEST(min_match_disjunction_test, scored_seek_next) { auto it_ptr = irs::ResoveMergeType( irs::ScoreMergeType::kMax, 1, [&](A&& aggregator) -> irs::doc_iterator::ptr { - using disjunction = - irs::min_match_disjunction; - using adapter = typename disjunction::cost_iterator_adapter; + using disjunction = irs::MinMatchDisjunction; + using adapter = typename irs::CostAdapter<>; auto res = detail::execute_all(docs); @@ -13746,8 +13683,7 @@ TEST(min_match_disjunction_test, scored_seek_next) { }); using ExpectedType = - irs::min_match_disjunction>; + irs::MinMatchDisjunction>; ASSERT_NE(nullptr, dynamic_cast(it_ptr.get())); auto& it = dynamic_cast(*it_ptr); @@ -13806,9 +13742,8 @@ TEST(min_match_disjunction_test, scored_seek_next) { auto it_ptr = irs::ResoveMergeType( irs::ScoreMergeType::kSum, 1, [&](A&& aggregator) -> irs::doc_iterator::ptr { - using disjunction = - irs::min_match_disjunction; - using adapter = typename disjunction::cost_iterator_adapter; + using disjunction = irs::MinMatchDisjunction; + using adapter = typename irs::CostAdapter<>; auto res = detail::execute_all(docs); @@ -13817,8 +13752,7 @@ TEST(min_match_disjunction_test, scored_seek_next) { }); using ExpectedType = - irs::min_match_disjunction>; + irs::MinMatchDisjunction>; ASSERT_NE(nullptr, dynamic_cast(it_ptr.get())); auto& it = dynamic_cast(*it_ptr); @@ -13880,9 +13814,8 @@ TEST(min_match_disjunction_test, scored_seek_next) { auto it_ptr = irs::ResoveMergeType( irs::ScoreMergeType::kMax, 1, [&](A&& aggregator) -> irs::doc_iterator::ptr { - using disjunction = - irs::min_match_disjunction; - using adapter = typename disjunction::cost_iterator_adapter; + using disjunction = irs::MinMatchDisjunction; + using adapter = typename irs::CostAdapter<>; auto res = detail::execute_all(docs); @@ -13891,8 +13824,7 @@ TEST(min_match_disjunction_test, scored_seek_next) { }); using ExpectedType = - irs::min_match_disjunction>; + irs::MinMatchDisjunction>; ASSERT_NE(nullptr, dynamic_cast(it_ptr.get())); auto& it = dynamic_cast(*it_ptr); @@ -13948,9 +13880,8 @@ TEST(min_match_disjunction_test, scored_seek_next) { auto it_ptr = irs::ResoveMergeType( irs::ScoreMergeType::kSum, 1, [&](A&& aggregator) -> irs::doc_iterator::ptr { - using disjunction = - irs::min_match_disjunction; - using adapter = typename disjunction::cost_iterator_adapter; + using disjunction = irs::MinMatchDisjunction; + using adapter = typename irs::CostAdapter<>; auto res = detail::execute_all(docs); @@ -13959,8 +13890,7 @@ TEST(min_match_disjunction_test, scored_seek_next) { }); using ExpectedType = - irs::min_match_disjunction>; + irs::MinMatchDisjunction>; ASSERT_NE(nullptr, dynamic_cast(it_ptr.get())); auto& it = dynamic_cast(*it_ptr); @@ -14016,9 +13946,8 @@ TEST(min_match_disjunction_test, scored_seek_next) { auto it_ptr = irs::ResoveMergeType( irs::ScoreMergeType::kMax, 1, [&](A&& aggregator) -> irs::doc_iterator::ptr { - using disjunction = - irs::min_match_disjunction; - using adapter = typename disjunction::cost_iterator_adapter; + using disjunction = irs::MinMatchDisjunction; + using adapter = typename irs::CostAdapter<>; auto res = detail::execute_all(docs); @@ -14027,8 +13956,7 @@ TEST(min_match_disjunction_test, scored_seek_next) { }); using ExpectedType = - irs::min_match_disjunction>; + irs::MinMatchDisjunction>; ASSERT_NE(nullptr, dynamic_cast(it_ptr.get())); auto& it = dynamic_cast(*it_ptr);