From dcc24d01d6007b54a27a95b510f1b3ab098f391a Mon Sep 17 00:00:00 2001 From: Yuri Gorshenin Date: Wed, 2 Mar 2016 15:41:02 +0300 Subject: [PATCH] [search] Added an option to disable suggests. --- .../jni/com/mapswithme/maps/SearchEngine.cpp | 1 + .../MWMMapDownloaderViewController.mm | 1 + search/feature_offset_match.hpp | 39 ++++++++++++------- search/params.cpp | 6 ++- search/params.hpp | 18 ++++++--- search/search_engine.cpp | 1 + .../search_query_v2_test.cpp | 27 +++++++++++++ search/search_query.cpp | 5 ++- search/search_query.hpp | 2 + .../test_search_request.cpp | 20 +++++++--- .../test_search_request.hpp | 5 ++- 11 files changed, 96 insertions(+), 29 deletions(-) diff --git a/android/jni/com/mapswithme/maps/SearchEngine.cpp b/android/jni/com/mapswithme/maps/SearchEngine.cpp index 65afe2e1a4..7ecd6f3912 100644 --- a/android/jni/com/mapswithme/maps/SearchEngine.cpp +++ b/android/jni/com/mapswithme/maps/SearchEngine.cpp @@ -187,6 +187,7 @@ extern "C" params.SetInputLocale(ReplaceDeprecatedLanguageCode(jni::ToNativeString(env, lang))); params.SetForceSearch(true); params.SetMode(search::Mode::World); + params.DisableSuggests(); params.m_onResults = bind(&OnResults, _1, timestamp, false /* isMapAndTable */, false /* hasPosition */, 0.0, 0.0); g_framework->NativeFramework()->Search(params); diff --git a/iphone/Maps/Classes/MapDownloader/MWMMapDownloaderViewController.mm b/iphone/Maps/Classes/MapDownloader/MWMMapDownloaderViewController.mm index ff1a655f1b..e7b62706d6 100644 --- a/iphone/Maps/Classes/MapDownloader/MWMMapDownloaderViewController.mm +++ b/iphone/Maps/Classes/MapDownloader/MWMMapDownloaderViewController.mm @@ -134,6 +134,7 @@ using namespace storage; { __weak auto weakSelf = self; m_searchParams.SetMode(search::Mode::World); + m_searchParams.DisableSuggests(); m_searchParams.m_onResults = ^(search::Results const & results) { __strong auto self = weakSelf; diff --git a/search/feature_offset_match.hpp b/search/feature_offset_match.hpp index f4ec91ab1f..cf5fbaefa1 100644 --- a/search/feature_offset_match.hpp +++ b/search/feature_offset_match.hpp @@ -77,29 +77,40 @@ inline shared_ptr>> MoveTrieIteratorToString( namespace { - bool CheckMatchString(strings::UniChar const * rootPrefix, - size_t rootPrefixSize, - strings::UniString & s) +bool CheckMatchString(strings::UniChar const * rootPrefix, size_t rootPrefixSize, + strings::UniString & s, bool prefix) +{ + if (rootPrefixSize == 0) + return true; + + if (prefix && s.size() < rootPrefixSize && + StartsWith(rootPrefix, rootPrefix + rootPrefixSize, s.begin(), s.end())) { - if (rootPrefixSize > 0) - { - if (s.size() < rootPrefixSize || - !StartsWith(s.begin(), s.end(), rootPrefix, rootPrefix + rootPrefixSize)) - return false; - - s = strings::UniString(s.begin() + rootPrefixSize, s.end()); - } - + // In the case of prefix match query may be a prefix of the root + // label string. In this case we continue processing as if the + // string is equal to root label. + s.clear(); return true; } + if (s.size() >= rootPrefixSize && + StartsWith(s.begin(), s.end(), rootPrefix, rootPrefix + rootPrefixSize)) + { + // In both (prefix and not-prefix) cases when string has root label + // as a prefix, we continue processing. + s = strings::UniString(s.begin() + rootPrefixSize, s.end()); + return true; + } + + return false; } +} // namespace template void FullMatchInTrie(trie::Iterator> const & trieRoot, strings::UniChar const * rootPrefix, size_t rootPrefixSize, strings::UniString s, TF & f) { - if (!CheckMatchString(rootPrefix, rootPrefixSize, s)) + if (!CheckMatchString(rootPrefix, rootPrefixSize, s, false /* prefix */)) return; size_t symbolsMatched = 0; @@ -125,7 +136,7 @@ void PrefixMatchInTrie(trie::Iterator> const & trieRoot, strings::UniChar const * rootPrefix, size_t rootPrefixSize, strings::UniString s, TF & f) { - if (!CheckMatchString(rootPrefix, rootPrefixSize, s)) + if (!CheckMatchString(rootPrefix, rootPrefixSize, s, true /* prefix */)) return; using TIterator = trie::Iterator>; diff --git a/search/params.cpp b/search/params.cpp index a374bc81ad..1c751356fb 100644 --- a/search/params.cpp +++ b/search/params.cpp @@ -8,7 +8,11 @@ namespace search { SearchParams::SearchParams() - : m_searchRadiusM(-1.0), m_mode(Mode::Everywhere), m_forceSearch(false), m_validPos(false) + : m_searchRadiusM(-1.0) + , m_mode(Mode::Everywhere) + , m_forceSearch(false) + , m_validPos(false) + , m_suggestsEnabled(true) { } diff --git a/search/params.hpp b/search/params.hpp index e4a4627c8b..4156a05979 100644 --- a/search/params.hpp +++ b/search/params.hpp @@ -31,21 +31,25 @@ namespace search inline Mode GetMode() const { return m_mode; } void SetPosition(double lat, double lon); - bool IsValidPosition() const { return m_validPos; } - bool IsSearchAroundPosition() const + inline bool IsValidPosition() const { return m_validPos; } + inline bool IsSearchAroundPosition() const { return (m_searchRadiusM > 0 && IsValidPosition()); } - void SetSearchRadiusMeters(double radiusM) { m_searchRadiusM = radiusM; } + inline void SetSearchRadiusMeters(double radiusM) { m_searchRadiusM = radiusM; } bool GetSearchRect(m2::RectD & rect) const; /// @param[in] locale can be "fr", "en-US", "ru_RU" etc. - void SetInputLocale(string const & locale) { m_inputLocale = locale; } + inline void SetInputLocale(string const & locale) { m_inputLocale = locale; } + + inline void DisableSuggests() { m_suggestsEnabled = false; } + inline void EnableSuggests() { m_suggestsEnabled = true; } + inline bool SuggestsEnabled() const { return m_suggestsEnabled; } bool IsEqualCommon(SearchParams const & rhs) const; - void Clear() { m_query.clear(); } + inline void Clear() { m_query.clear(); } public: TOnStarted m_onStarted; @@ -61,6 +65,8 @@ namespace search private: double m_searchRadiusM; Mode m_mode; - bool m_forceSearch, m_validPos; + bool m_forceSearch; + bool m_validPos; + bool m_suggestsEnabled; }; } // namespace search diff --git a/search/search_engine.cpp b/search/search_engine.cpp index 2e1b2b4f55..d5faada793 100644 --- a/search/search_engine.cpp +++ b/search/search_engine.cpp @@ -294,6 +294,7 @@ void Engine::DoSearch(SearchParams const & params, m2::RectD const & viewport, processor.SetPosition(viewport.Center()); processor.SetMode(params.GetMode()); + processor.EnableSuggests(params.SuggestsEnabled()); // This flag is needed for consistency with old search algorithm // only. It will be gone when we remove old search code. diff --git a/search/search_integration_tests/search_query_v2_test.cpp b/search/search_integration_tests/search_query_v2_test.cpp index 25a9f8a1f1..01da88ec54 100644 --- a/search/search_integration_tests/search_query_v2_test.cpp +++ b/search/search_integration_tests/search_query_v2_test.cpp @@ -335,3 +335,30 @@ UNIT_CLASS_TEST(SearchQueryV2Test, SearchByName) TEST(ResultsMatch("london", search::Mode::Everywhere, rules), ()); } } + +UNIT_CLASS_TEST(SearchQueryV2Test, DisableSuggests) +{ + TestCity london1(m2::PointD(1, 1), "London", "en", 100 /* rank */); + TestCity london2(m2::PointD(-1, -1), "London", "en", 100 /* rank */); + + auto worldId = BuildMwm("testWorld", feature::DataHeader::world, [&](TestMwmBuilder & builder) + { + builder.Add(london1); + builder.Add(london2); + }); + RegisterCountry("Wonderland", m2::RectD(m2::PointD(-2, -2), m2::PointD(2, 2))); + SetViewport(m2::RectD(m2::PointD(0.5, 0.5), m2::PointD(1.5, 1.5))); + { + search::SearchParams params; + params.m_query = "londo"; + params.m_inputLocale = "en"; + params.SetMode(search::Mode::World); + params.DisableSuggests(); + + TestSearchRequest request(m_engine, params, m_viewport); + request.Wait(); + TRules rules = {ExactMatch(worldId, london1), ExactMatch(worldId, london2)}; + + TEST(MatchResults(m_engine, rules, request.Results()), ()); + } +} diff --git a/search/search_query.cpp b/search/search_query.cpp index eaa610d1db..30410031e5 100644 --- a/search/search_query.cpp +++ b/search/search_query.cpp @@ -204,6 +204,7 @@ Query::Query(Index & index, CategoriesHolder const & categories, vector , m_position(0, 0) , m_mode(Mode::Everywhere) , m_worldSearch(true) + , m_suggestsEnabled(true) , m_keepHouseNumberInQuery(false) { // Results queue's initialization. @@ -916,7 +917,7 @@ void Query::GetSuggestion(string const & name, string & suggest) const template void Query::ProcessSuggestions(vector & vec, Results & res) const { - if (m_prefix.empty()) + if (m_prefix.empty() || !m_suggestsEnabled) return; int added = 0; @@ -1729,7 +1730,7 @@ void Query::SearchInMwms(TMWMVector const & mwmsInfo, SearchQueryParams const & void Query::SuggestStrings(Results & res) { - if (m_prefix.empty()) + if (m_prefix.empty() || !m_suggestsEnabled) return; int8_t arrLocales[3]; int const localesCount = GetCategoryLocales(arrLocales); diff --git a/search/search_query.hpp b/search/search_query.hpp index db9bed9f0d..ea791422c4 100644 --- a/search/search_query.hpp +++ b/search/search_query.hpp @@ -91,6 +91,7 @@ public: inline void SetMode(Mode mode) { m_mode = mode; } inline void SetSearchInWorld(bool b) { m_worldSearch = b; } + inline void EnableSuggests(bool enabled) { m_suggestsEnabled = enabled; } /// Suggestions language code, not the same as we use in mwm data int8_t m_inputLocaleCode, m_currentLocaleCode; @@ -243,6 +244,7 @@ protected: m2::PointD m_position; Mode m_mode; bool m_worldSearch; + bool m_suggestsEnabled; Retrieval m_retrieval; /// @name Get ranking params. diff --git a/search/search_tests_support/test_search_request.cpp b/search/search_tests_support/test_search_request.cpp index f8c1e900fe..1bc224fb1b 100644 --- a/search/search_tests_support/test_search_request.cpp +++ b/search/search_tests_support/test_search_request.cpp @@ -1,6 +1,5 @@ #include "search/search_tests_support/test_search_request.hpp" -#include "search/params.hpp" #include "search/search_tests_support/test_search_engine.hpp" #include "base/logging.hpp" @@ -11,14 +10,19 @@ namespace tests_support { TestSearchRequest::TestSearchRequest(TestSearchEngine & engine, string const & query, string const & locale, Mode mode, m2::RectD const & viewport) - : m_done(false) { - search::SearchParams params; + SearchParams params; params.m_query = query; params.m_inputLocale = locale; - params.m_onStarted = bind(&TestSearchRequest::OnStarted, this); - params.m_onResults = bind(&TestSearchRequest::OnResults, this, _1); params.SetMode(mode); + SetUpCallbacks(params); + engine.Search(params, viewport); +} + +TestSearchRequest::TestSearchRequest(TestSearchEngine & engine, SearchParams params, + m2::RectD const & viewport) +{ + SetUpCallbacks(params); engine.Search(params, viewport); } @@ -45,6 +49,12 @@ vector const & TestSearchRequest::Results() const return m_results; } +void TestSearchRequest::SetUpCallbacks(SearchParams & params) +{ + params.m_onStarted = bind(&TestSearchRequest::OnStarted, this); + params.m_onResults = bind(&TestSearchRequest::OnResults, this, _1); +} + void TestSearchRequest::OnStarted() { lock_guard lock(m_mu); diff --git a/search/search_tests_support/test_search_request.hpp b/search/search_tests_support/test_search_request.hpp index 01b61fcc8f..5ced915705 100644 --- a/search/search_tests_support/test_search_request.hpp +++ b/search/search_tests_support/test_search_request.hpp @@ -27,6 +27,8 @@ public: TestSearchRequest(TestSearchEngine & engine, string const & query, string const & locale, Mode mode, m2::RectD const & viewport); + TestSearchRequest(TestSearchEngine & engine, SearchParams params, m2::RectD const & viewport); + void Wait(); // Call these functions only after call to Wait(). @@ -34,6 +36,7 @@ public: vector const & Results() const; private: + void SetUpCallbacks(SearchParams & params); void OnStarted(); void OnResults(search::Results const & results); @@ -41,7 +44,7 @@ private: mutable mutex m_mu; vector m_results; - bool m_done; + bool m_done = false; my::Timer m_timer; steady_clock::duration m_startTime;