diff --git a/search/search_quality/search_quality_tool/search_quality_tool.cpp b/search/search_quality/search_quality_tool/search_quality_tool.cpp index 1642182c7e..ec1fcec288 100644 --- a/search/search_quality/search_quality_tool/search_quality_tool.cpp +++ b/search/search_quality/search_quality_tool/search_quality_tool.cpp @@ -13,6 +13,7 @@ #include "search/result.hpp" #include "search/search_quality/helpers.hpp" +#include "search/search_query_factory.hpp" #include "search/search_tests_support/test_search_engine.hpp" #include "search/search_tests_support/test_search_request.hpp" #include "search/v2/ranking_info.hpp" @@ -88,17 +89,6 @@ struct CompletenessQuery DECLARE_EXCEPTION(MalformedQueryException, RootException); -class SearchQueryV2Factory : public SearchQueryFactory -{ - // SearchQueryFactory overrides: - unique_ptr BuildSearchQuery(Index & index, CategoriesHolder const & categories, - vector const & suggests, - storage::CountryInfoGetter const & infoGetter) override - { - return make_unique(index, categories, suggests, infoGetter); - } -}; - void DidDownload(TCountryId const & /* countryId */, shared_ptr const & /* localFile */) { @@ -390,7 +380,7 @@ int main(int argc, char * argv[]) Engine::Params params; params.m_locale = FLAGS_locale; params.m_numThreads = FLAGS_num_threads; - TestSearchEngine engine(move(infoGetter), make_unique(), Engine::Params{}); + TestSearchEngine engine(move(infoGetter), make_unique(), Engine::Params{}); vector mwms; if (!FLAGS_mwm_list_path.empty()) diff --git a/search/search_query.cpp b/search/search_query.cpp index 413f575887..81546ae300 100644 --- a/search/search_query.cpp +++ b/search/search_query.cpp @@ -1,7 +1,6 @@ #include "search_query.hpp" #include "search/dummy_rank_table.hpp" -#include "search/feature_offset_match.hpp" #include "search/geometry_utils.hpp" #include "search/indexed_value.hpp" #include "search/latlon_match.hpp" @@ -85,15 +84,6 @@ pair GetLangIndex(int id) return make_pair(g_arrLang1[id], g_arrLang2[id]); } -m2::PointD GetLocalityCenter(Index const & index, MwmSet::MwmId const & id, - Locality const & locality) -{ - Index::FeaturesLoaderGuard loader(index, id); - FeatureType feature; - loader.GetFeatureByIndex(locality.m_featureId, feature); - return feature::GetCenter(feature, FeatureType::WORST_GEOMETRY); -} - ftypes::Type GetLocalityIndex(feature::TypesHolder const & types) { using namespace ftypes; @@ -499,32 +489,6 @@ void Query::SetQuery(string const & query) }); } -void Query::Search(Results & res, size_t resCount) -{ - if (IsCancelled()) - return; - - if (m_tokens.empty()) - SuggestStrings(res); - - LONG_OP(SearchAddress(res)); - LONG_OP(SearchFeatures()); - - // TODO (@y): this code is not working and will gone away. - v2::Geocoder::Params params; - LONG_OP(FlushResults(params, res, false /* allMWMs */, resCount, true /* oldHouseSearch */)); -} - -void Query::SearchViewportPoints(Results & res) -{ - LONG_OP(SearchAddress(res)); - LONG_OP(SearchFeaturesInViewport(CURRENT_V)); - - // TODO (@y): this code is not working and will gone away. - v2::Geocoder::Params params; - FlushViewportResults(params, res, true /* oldHouseSearch */); -} - void Query::FlushViewportResults(v2::Geocoder::Params const & params, Results & res, bool oldHouseSearch) { @@ -1254,452 +1218,6 @@ void Query::InitParams(bool localitySearch, SearchQueryParams & params) params.m_langs.insert(GetLanguage(i)); } -void Query::SearchAddress(Results & res) -{ - // Find World.mwm and do special search there. - TMWMVector mwmsInfo; - m_index.GetMwmsInfo(mwmsInfo); - - for (shared_ptr & info : mwmsInfo) - { - MwmSet::MwmId mwmId(info); - Index::MwmHandle const mwmHandle = m_index.GetMwmHandleById(mwmId); - MwmValue const * pMwm = mwmHandle.GetValue(); - if (pMwm && pMwm->m_cont.IsExist(SEARCH_INDEX_FILE_TAG) && - pMwm->GetHeader().GetType() == TFHeader::world) - { - Locality city; - Region region; - SearchLocality(pMwm, city, region); - - if (city.IsValid()) - { - LOG(LDEBUG, ("Final city-locality = ", city)); - - SearchQueryParams params; - InitParams(false /* localitySearch */, params); - params.EraseTokens(city.m_matchedTokens); - - if (params.CanSuggest()) - SuggestStrings(res); - - if (!params.IsEmpty()) - { - params.ProcessAddressTokens(); - - m2::PointD const cityCenter = GetLocalityCenter(m_index, mwmId, city); - double const cityRadius = city.m_radius; - m2::RectD const rect = - MercatorBounds::RectByCenterXYAndSizeInMeters(cityCenter, cityRadius); - SetViewportByIndex(mwmsInfo, rect, LOCALITY_V, false /* forceUpdate */); - - /// @todo Hack - do not search for address in World.mwm; Do it better in future. - bool const b = m_worldSearch; - m_worldSearch = false; - MY_SCOPE_GUARD(restoreWorldSearch, [&]() { m_worldSearch = b; }); - - // Candidates for search around locality. Initially filled - // with mwms containing city center. - TMWMVector localityMwms; - string const localityFile = m_infoGetter.GetRegionCountryId(cityCenter); - auto localityMismatch = [&localityFile](shared_ptr const & info) - { - return info->GetCountryName() != localityFile; - }; - remove_copy_if(mwmsInfo.begin(), mwmsInfo.end(), back_inserter(localityMwms), - localityMismatch); - SearchFeaturesInViewport(params, localityMwms, LOCALITY_V); - } - else - { - // Add found locality as a result if nothing left to match. - - // TODO (@y): for backward compatibility with old search - // algorithm carefully fill |info| here. - v2::PreRankingInfo info; - info.m_rank = city.m_rank; - - AddPreResult1(mwmId, city.m_featureId, 1.0 /* priority */, info); - } - } - else if (region.IsValid()) - { - LOG(LDEBUG, ("Final region-locality = ", region)); - - SearchQueryParams params; - InitParams(false /* localitySearch */, params); - params.EraseTokens(region.m_matchedTokens); - - if (params.CanSuggest()) - SuggestStrings(res); - - if (!params.IsEmpty()) - { - TMWMVector regionMwms; - auto regionMismatch = [this, ®ion](shared_ptr const & info) - { - return !m_infoGetter.IsBelongToRegions(info->GetCountryName(), region.m_ids); - }; - remove_copy_if(mwmsInfo.begin(), mwmsInfo.end(), back_inserter(regionMwms), - regionMismatch); - SearchInMwms(regionMwms, params, DEFAULT_V); - } - } - - return; - } - } -} - -namespace impl -{ -class DoFindLocality -{ - Query const & m_query; - - /// Index in array equal to Locality::m_type value. - vector m_localities[3]; - - FeaturesVector m_vector; - unique_ptr m_table; - size_t m_index; ///< index of processing token - - int8_t m_lang; - int8_t m_arrEn[3]; - - /// Tanslates country full english name to mwm file name prefix - /// (need when matching correspondent mwm file in CountryInfoGetter::GetMatchedRegions). - //@{ - static bool FeatureName2FileNamePrefix(string & name, char const * prefix, char const * arr[], - size_t n) - { - for (size_t i = 0; i < n; ++i) - if (name.find(arr[i]) == string::npos) - return false; - - name = prefix; - return true; - } - - void AssignEnglishName(FeatureType const & f, Locality & l) - { - // search for name in next order: "en", "int_name", "default" - for (int i = 0; i < 3; ++i) - if (f.GetName(m_arrEn[i], l.m_enName)) - { - // make name lower-case - strings::AsciiToLower(l.m_enName); - - char const * arrUSA[] = {"united", "states", "america"}; - char const * arrUK[] = {"united", "kingdom"}; - - if (!FeatureName2FileNamePrefix(l.m_enName, "usa", arrUSA, ARRAY_SIZE(arrUSA))) - if (!FeatureName2FileNamePrefix(l.m_enName, "uk", arrUK, ARRAY_SIZE(arrUK))) - return; - } - } - //@} - - void AddRegions(int index, vector & regions) const - { - // fill regions vector in priority order - vector const & arr = m_localities[index]; - for (auto i = arr.rbegin(); i != arr.rend(); ++i) - { - // no need to check region with empty english name (can't match for polygon) - if (!i->m_enName.empty() && i->IsSuitable(m_query.m_tokens, m_query.m_prefix)) - { - vector vec; - m_query.m_infoGetter.GetMatchedRegions(i->m_enName, vec); - if (!vec.empty()) - { - regions.push_back(Region()); - Region & r = regions.back(); - - r.m_ids.swap(vec); - r.m_matchedTokens = i->m_matchedTokens; - r.m_enName = i->m_enName; - } - } - } - } - - bool InRegion(Locality const & loc, Region const & r) const - { - // check that locality and region are produced from different tokens - vector dummy; - set_intersection(loc.m_matchedTokens.begin(), loc.m_matchedTokens.end(), - r.m_matchedTokens.begin(), r.m_matchedTokens.end(), back_inserter(dummy)); - - if (dummy.empty()) - { - // check that locality belong to region - return m_query.m_infoGetter.IsBelongToRegions(loc.m_center, r.m_ids); - } - - return false; - } - - class EqualID - { - uint32_t m_id; - - public: - EqualID(uint32_t id) : m_id(id) {} - - bool operator()(Locality const & l) const { return (l.m_featureId == m_id); } - }; - -public: - DoFindLocality(Query & q, MwmValue const * pMwm, int8_t lang) - : m_query(q) - , m_vector(pMwm->m_cont, pMwm->GetHeader(), pMwm->m_table) - , m_table(RankTable::Load(pMwm->m_cont)) - , m_lang(lang) - { - m_arrEn[0] = q.GetLanguage(LANG_EN); - m_arrEn[1] = q.GetLanguage(LANG_INTERNATIONAL); - m_arrEn[2] = q.GetLanguage(LANG_DEFAULT); - } - - void Resize(size_t) {} - - void SwitchTo(size_t ind) { m_index = ind; } - - void operator()(FeatureWithRankAndCenter const & value) { operator()(value.m_featureId); } - - void operator()(FeatureIndexValue const & value) { operator()(value.m_featureId); } - - void operator()(uint32_t const featureId) - { - if (m_query.IsCancelled()) - throw Query::CancelException(); - - // find locality in current results - for (size_t i = 0; i < 3; ++i) - { - auto it = find_if(m_localities[i].begin(), m_localities[i].end(), EqualID(featureId)); - if (it != m_localities[i].end()) - { - it->m_matchedTokens.push_back(m_index); - return; - } - } - - // Load feature. - FeatureType f; - m_vector.GetByIndex(featureId, f); - - using namespace ftypes; - - // Check, if feature is locality. - Type const type = GetLocalityIndex(feature::TypesHolder(f)); - if (type == NONE) - return; - ASSERT_LESS_OR_EQUAL(0, type, ()); - ASSERT_LESS(type, ARRAY_SIZE(m_localities), ()); - - m2::PointD const center = feature::GetCenter(f, FeatureType::WORST_GEOMETRY); - uint8_t rank = 0; - if (m_table.get()) - { - ASSERT_LESS(featureId, m_table->Size(), ()); - rank = m_table->Get(featureId); - } - else - { - LOG(LWARNING, ("Can't get ranks table for locality search.")); - } - m_localities[type].emplace_back(type, featureId, center, rank); - Locality & loc = m_localities[type].back(); - - loc.m_radius = GetRadiusByPopulation(GetPopulation(f)); - // m_lang name should exist if we matched feature in search index for this language. - VERIFY(f.GetName(m_lang, loc.m_name), ()); - loc.m_matchedTokens.push_back(m_index); - AssignEnglishName(f, loc); - } - - void SortLocalities() - { - for (int i = ftypes::COUNTRY; i <= ftypes::CITY; ++i) - sort(m_localities[i].begin(), m_localities[i].end()); - } - - void GetRegions(vector & regions) const - { - // LOG(LDEBUG, ("Countries before processing = ", m_localities[ftypes::COUNTRY])); - // LOG(LDEBUG, ("States before processing = ", m_localities[ftypes::STATE])); - - AddRegions(ftypes::STATE, regions); - AddRegions(ftypes::COUNTRY, regions); - - // LOG(LDEBUG, ("Regions after processing = ", regions)); - } - - void GetBestCity(Locality & res, vector const & regions) - { - size_t const regsCount = regions.size(); - vector & arr = m_localities[ftypes::CITY]; - - // Interate in reverse order from better to generic locality. - for (auto i = arr.rbegin(); i != arr.rend(); ++i) - { - if (!i->IsSuitable(m_query.m_tokens, m_query.m_prefix)) - continue; - - // additional check for locality belongs to region - vector belongs; - for (size_t j = 0; j < regsCount; ++j) - { - if (InRegion(*i, regions[j])) - belongs.push_back(®ions[j]); - } - - for (size_t j = 0; j < belongs.size(); ++j) - { - // splice locality info with region info - i->m_matchedTokens.insert(i->m_matchedTokens.end(), belongs[j]->m_matchedTokens.begin(), - belongs[j]->m_matchedTokens.end()); - // we need to store sorted range of token indexies - sort(i->m_matchedTokens.begin(), i->m_matchedTokens.end()); - - i->m_enName += (", " + belongs[j]->m_enName); - } - - if (res < *i) - i->Swap(res); - - if (regsCount == 0) - return; - } - } -}; - -} // namespace impl - -namespace -{ -template -void SearchLocalityImpl(Query * query, MwmValue const * pMwm, Locality & res1, Region & res2, - SearchQueryParams & params, serial::CodingParams & codingParams) -{ - ModelReaderPtr searchReader = pMwm->m_cont.GetReader(SEARCH_INDEX_FILE_TAG); - - auto const trieRoot = trie::ReadTrie, ValueList>( - SubReaderWrapper(searchReader.GetPtr()), - SingleValueSerializer(codingParams)); - - auto finder = [&](TrieRootPrefix & langRoot, int8_t lang) - { - impl::DoFindLocality doFind(*query, pMwm, lang); - MatchTokensInTrie(params.m_tokens, langRoot, doFind); - - // Last token's prefix is used as a complete token here, to limit number of - // results. - doFind.Resize(params.m_tokens.size() + 1); - doFind.SwitchTo(params.m_tokens.size()); - MatchTokenInTrie(params.m_prefixTokens, langRoot, doFind); - doFind.SortLocalities(); - - // Get regions from STATE and COUNTRY localities - vector regions; - doFind.GetRegions(regions); - - // Get best CITY locality. - Locality loc; - doFind.GetBestCity(loc, regions); - if (res1 < loc) - { - LOG(LDEBUG, ("Better location ", loc, " for language ", lang)); - res1.Swap(loc); - } - - // Get best region. - if (!regions.empty()) - { - sort(regions.begin(), regions.end()); - if (res2 < regions.back()) - res2.Swap(regions.back()); - } - }; - - ForEachLangPrefix(params, *trieRoot, finder); -} -} // namespace - -void Query::SearchLocality(MwmValue const * pMwm, Locality & res1, Region & res2) -{ - SearchQueryParams params; - InitParams(true /* localitySearch */, params); - - auto codingParams = trie::GetCodingParams(pMwm->GetHeader().GetDefCodingParams()); - - version::MwmTraits mwmTraits(pMwm->GetHeader().GetFormat()); - - if (mwmTraits.GetSearchIndexFormat() == - version::MwmTraits::SearchIndexFormat::FeaturesWithRankAndCenter) - { - using TValue = FeatureWithRankAndCenter; - SearchLocalityImpl(this, pMwm, res1, res2, params, codingParams); - } - else if (mwmTraits.GetSearchIndexFormat() == - version::MwmTraits::SearchIndexFormat::CompressedBitVector) - { - using TValue = FeatureIndexValue; - SearchLocalityImpl(this, pMwm, res1, res2, params, codingParams); - } -} - -void Query::SearchFeatures() -{ - TMWMVector mwmsInfo; - m_index.GetMwmsInfo(mwmsInfo); - - SearchQueryParams params; - InitParams(false /* localitySearch */, params); - - SearchInMwms(mwmsInfo, params, CURRENT_V); -} - -void Query::SearchFeaturesInViewport(ViewportID viewportId) -{ - TMWMVector mwmsInfo; - m_index.GetMwmsInfo(mwmsInfo); - - SearchQueryParams params; - InitParams(false /* localitySearch */, params); - - SearchFeaturesInViewport(params, mwmsInfo, viewportId); -} - -void Query::SearchFeaturesInViewport(SearchQueryParams const & params, TMWMVector const & mwmsInfo, - ViewportID viewportId) -{ - m2::RectD const * viewport = nullptr; - if (viewportId == LOCALITY_V) - viewport = &m_viewport[LOCALITY_V]; - else - viewport = &m_viewport[CURRENT_V]; - if (!viewport->IsValid()) - return; - - TMWMVector viewportMwms; - auto viewportMispatch = [&viewport](shared_ptr const & info) - { - return !viewport->IsIntersect(info->m_limitRect); - }; - remove_copy_if(mwmsInfo.begin(), mwmsInfo.end(), back_inserter(viewportMwms), viewportMispatch); - SearchInMwms(viewportMwms, params, viewportId); -} - -void Query::SearchInMwms(TMWMVector const & mwmsInfo, SearchQueryParams const & params, - ViewportID viewportId) -{ - /// @note Old Retrieval logic is obsolete and moved to trash. - /// @todo Move to trash this Query code :) -} - void Query::SuggestStrings(Results & res) { if (m_prefix.empty() || !m_suggestsEnabled) diff --git a/search/search_query.hpp b/search/search_query.hpp index c0233bbb34..8aca5e591d 100644 --- a/search/search_query.hpp +++ b/search/search_query.hpp @@ -105,8 +105,8 @@ public: /// @name Different search functions. //@{ - virtual void Search(Results & res, size_t resCount); - virtual void SearchViewportPoints(Results & res); + virtual void Search(Results & res, size_t resCount) = 0; + virtual void SearchViewportPoints(Results & res) = 0; // Tries to generate a (lat, lon) result from |m_query|. void SearchCoordinates(Results & res) const; @@ -181,23 +181,6 @@ protected: void GetSuggestion(string const & name, string & suggest) const; template void ProcessSuggestions(vector & vec, Results & res) const; - void SearchAddress(Results & res); - - /// Search for best localities by input tokens. - /// @param[in] pMwm MWM file for World - /// @param[out] res1 Best city-locality - /// @param[out] res2 Best region-locality - void SearchLocality(MwmValue const * pMwm, Locality & res1, Region & res2); - - void SearchFeatures(); - void SearchFeaturesInViewport(ViewportID viewportId); - void SearchFeaturesInViewport(SearchQueryParams const & params, TMWMVector const & mwmsInfo, - ViewportID viewportId); - - /// Do search in a set of maps. - void SearchInMwms(TMWMVector const & mwmsInfo, SearchQueryParams const & params, - ViewportID viewportId); - void SuggestStrings(Results & res); void MatchForSuggestionsImpl(strings::UniString const & token, int8_t locale, string const & prolog, Results & res); diff --git a/search/search_tests_support/test_search_engine.cpp b/search/search_tests_support/test_search_engine.cpp index e3615152f1..64c5d541d2 100644 --- a/search/search_tests_support/test_search_engine.cpp +++ b/search/search_tests_support/test_search_engine.cpp @@ -1,72 +1,13 @@ #include "search/search_tests_support/test_search_engine.hpp" -#include "search/search_query.hpp" -#include "search/search_query_factory.hpp" -#include "search/suggest.hpp" - #include "indexer/categories_holder.hpp" -#include "indexer/scales.hpp" - -#include "storage/country_info_getter.hpp" #include "platform/platform.hpp" -#include "defines.hpp" - -#include "std/unique_ptr.hpp" - -namespace -{ -class TestQuery : public search::Query -{ -public: - TestQuery(Index & index, CategoriesHolder const & categories, - vector const & suggests, storage::CountryInfoGetter const & infoGetter) - : search::Query(index, categories, suggests, infoGetter) - { - } - - // search::Query overrides: - int GetQueryIndexScale(m2::RectD const & /* viewport */) const override - { - return scales::GetUpperScale(); - } -}; - -class TestSearchQueryFactory : public ::search::SearchQueryFactory -{ - // search::SearchQueryFactory overrides: - unique_ptr<::search::Query> BuildSearchQuery( - Index & index, CategoriesHolder const & categories, - vector<::search::Suggest> const & suggests, - storage::CountryInfoGetter const & infoGetter) override - { - return make_unique(index, categories, suggests, infoGetter); - } -}; -} // namespace - namespace search { namespace tests_support { -TestSearchEngine::TestSearchEngine(Engine::Params const & params) - : m_platform(GetPlatform()) - , m_infoGetter(storage::CountryInfoReader::CreateCountryInfoReader(m_platform)) - , m_engine(*this, GetDefaultCategories(), *m_infoGetter, make_unique(), - params) -{ -} - -TestSearchEngine::TestSearchEngine(unique_ptr infoGetter, - Engine::Params const & params) - : m_platform(GetPlatform()) - , m_infoGetter(move(infoGetter)) - , m_engine(*this, GetDefaultCategories(), *m_infoGetter, make_unique(), - params) -{ -} - TestSearchEngine::TestSearchEngine(unique_ptr infoGetter, unique_ptr<::search::SearchQueryFactory> factory, Engine::Params const & params) diff --git a/search/search_tests_support/test_search_engine.hpp b/search/search_tests_support/test_search_engine.hpp index ac953375be..3445174c0d 100644 --- a/search/search_tests_support/test_search_engine.hpp +++ b/search/search_tests_support/test_search_engine.hpp @@ -7,6 +7,7 @@ #include "search/search_engine.hpp" #include "std/string.hpp" +#include "std/unique_ptr.hpp" #include "std/weak_ptr.hpp" class Platform; @@ -25,9 +26,6 @@ namespace tests_support class TestSearchEngine : public Index { public: - TestSearchEngine(Engine::Params const & params); - TestSearchEngine(unique_ptr infoGetter, - Engine::Params const & params); TestSearchEngine(unique_ptr infoGetter, unique_ptr factory, Engine::Params const & params); TestSearchEngine(unique_ptr<::search::SearchQueryFactory> factory, Engine::Params const & params);