From 623d13b3f84503f14ea3d47a0998d30a5c8d79dc Mon Sep 17 00:00:00 2001 From: tatiana-yan Date: Mon, 10 Dec 2018 17:50:36 +0300 Subject: [PATCH] [search] Do not limit ranker batch size for categorial requests. --- search/processor.cpp | 1 + search/ranker.cpp | 5 ++++- search/ranker.hpp | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/search/processor.cpp b/search/processor.cpp index bde8954509..73a9122a02 100644 --- a/search/processor.cpp +++ b/search/processor.cpp @@ -598,6 +598,7 @@ void Processor::InitRanker(Geocoder::Params const & geocoderParams, params.m_categoryLocales = GetCategoryLocales(); params.m_accuratePivotCenter = GetPivotPoint(viewportSearch); params.m_viewportSearch = viewportSearch; + params.m_categorialRequest = geocoderParams.IsCategorialRequest(); m_ranker.Init(params, geocoderParams); } diff --git a/search/ranker.cpp b/search/ranker.cpp index ca447d884b..3d3c4106dd 100644 --- a/search/ranker.cpp +++ b/search/ranker.cpp @@ -533,8 +533,11 @@ void Ranker::UpdateResults(bool lastUpdate) size_t i = 0; for (; i < m_tentativeResults.size(); ++i) { - if (!lastUpdate && i >= m_params.m_batchSize && !m_params.m_viewportSearch) + if (!lastUpdate && i >= m_params.m_batchSize && !m_params.m_viewportSearch && + !m_params.m_categorialRequest) + { break; + } if (!lastUpdate) BailIfCancelled(); diff --git a/search/ranker.hpp b/search/ranker.hpp index bc3bf241ec..f825bf22b5 100644 --- a/search/ranker.hpp +++ b/search/ranker.hpp @@ -56,6 +56,7 @@ public: bool m_needAddress = false; bool m_needHighlighting = false; bool m_viewportSearch = false; + bool m_categorialRequest = false; std::string m_query; QueryTokens m_tokens;