From 2aea4ca36c0ee895b9777fe3716fe036d001065b Mon Sep 17 00:00:00 2001 From: Maxim Pimenov Date: Tue, 3 Sep 2019 14:02:14 +0300 Subject: [PATCH] [search] [bookmarks] Added a method to reset the bookmarks engine. --- map/map_tests/search_api_tests.cpp | 3 +++ map/search_api.cpp | 6 ++++++ map/search_api.hpp | 7 +++++++ search/bookmarks/processor.cpp | 10 ++++++++++ search/bookmarks/processor.hpp | 2 ++ search/engine.cpp | 7 +++++++ search/engine.hpp | 3 +++ search/processor.cpp | 5 +++++ search/processor.hpp | 2 ++ search/search_tests/bookmarks_processor_tests.cpp | 3 +++ 10 files changed, 48 insertions(+) diff --git a/map/map_tests/search_api_tests.cpp b/map/map_tests/search_api_tests.cpp index 29edb3612d..cfdc0e3e58 100644 --- a/map/map_tests/search_api_tests.cpp +++ b/map/map_tests/search_api_tests.cpp @@ -202,5 +202,8 @@ UNIT_CLASS_TEST(SearchAPITest, BookmarksSearch) m_api.OnBookmarksAttached(groupInfos); } runTest(query, kml::MarkGroupId(11), vector({2, 1})); + + m_api.ResetBookmarksEngine(); + runTest(query, kml::MarkGroupId(11), {}); } } // namespace diff --git a/map/search_api.cpp b/map/search_api.cpp index 9b541f5157..77c4461aae 100644 --- a/map/search_api.cpp +++ b/map/search_api.cpp @@ -423,6 +423,12 @@ unordered_set const & SearchAPI::GetIndexableGroups() const return m_indexableGroups; } +void SearchAPI::ResetBookmarksEngine() +{ + m_indexableGroups.clear(); + m_engine.ResetBookmarks(); +} + void SearchAPI::OnBookmarksCreated(vector const & marks) { vector data; diff --git a/map/search_api.hpp b/map/search_api.hpp index deb8c697af..ad5468e45d 100644 --- a/map/search_api.hpp +++ b/map/search_api.hpp @@ -161,6 +161,13 @@ public: bool IsIndexingOfBookmarkGroupEnabled(kml::MarkGroupId const & groupId); std::unordered_set const & GetIndexableGroups() const; + // Returns the bookmarks search to its default, pre-launch state. + // This includes dropping all bookmark data for created bookmarks (efficiently + // calling OnBookmarksDeleted with all known bookmarks as an argument), + // clearing the bookmark search index, and resetting all parameters to + // their default values. + void ResetBookmarksEngine(); + void OnBookmarksCreated(std::vector const & marks); void OnBookmarksUpdated(std::vector const & marks); void OnBookmarksDeleted(std::vector const & marks); diff --git a/search/bookmarks/processor.cpp b/search/bookmarks/processor.cpp index deae87d0f5..a81f830c40 100644 --- a/search/bookmarks/processor.cpp +++ b/search/bookmarks/processor.cpp @@ -78,6 +78,16 @@ Processor::Processor(Emitter & emitter, base::Cancellable const & cancellable) { } +void Processor::Reset() +{ + m_index = {}; + m_docs.clear(); + m_indexDescriptions = false; + m_indexableGroups.clear(); + m_idToGroup.clear(); + m_bookmarksInGroup.clear(); +} + void Processor::EnableIndexingOfDescriptions(bool enable) { m_indexDescriptions = enable; } void Processor::EnableIndexingOfBookmarkGroup(GroupId const & groupId, bool enable) diff --git a/search/bookmarks/processor.hpp b/search/bookmarks/processor.hpp index 9eb3ebab15..4c6c88d808 100644 --- a/search/bookmarks/processor.hpp +++ b/search/bookmarks/processor.hpp @@ -43,6 +43,8 @@ public: Processor(Emitter & emitter, base::Cancellable const & cancellable); ~Processor() override = default; + void Reset(); + // By default, only bookmark names are indexed. This method // should be used to enable or disable indexing bookmarks // by their descriptions. diff --git a/search/engine.cpp b/search/engine.cpp index a629bd15cd..996af5cf2d 100644 --- a/search/engine.cpp +++ b/search/engine.cpp @@ -172,6 +172,13 @@ void Engine::EnableIndexingOfBookmarkGroup(bookmarks::GroupId const & groupId, b }); } +void Engine::ResetBookmarks() +{ + PostMessage(Message::TYPE_BROADCAST, [](Processor & processor) { + processor.ResetBookmarks(); + }); +} + void Engine::OnBookmarksCreated(vector> const & marks) { PostMessage(Message::TYPE_BROADCAST, diff --git a/search/engine.hpp b/search/engine.hpp index d4f6d448f3..d49e09f9db 100644 --- a/search/engine.hpp +++ b/search/engine.hpp @@ -111,6 +111,9 @@ public: void EnableIndexingOfBookmarksDescriptions(bool enable); void EnableIndexingOfBookmarkGroup(bookmarks::GroupId const & groupId, bool enable); + // Clears all bookmarks data and caches for all processors. + void ResetBookmarks(); + void OnBookmarksCreated(std::vector> const & marks); void OnBookmarksUpdated(std::vector> const & marks); void OnBookmarksDeleted(std::vector const & marks); diff --git a/search/processor.cpp b/search/processor.cpp index 3d9ba5e6a9..8764ab4520 100644 --- a/search/processor.cpp +++ b/search/processor.cpp @@ -334,6 +334,11 @@ void Processor::EnableIndexingOfBookmarkGroup(bookmarks::GroupId const & groupId m_bookmarksProcessor.EnableIndexingOfBookmarkGroup(groupId, enable); } +void Processor::ResetBookmarks() +{ + m_bookmarksProcessor.Reset(); +} + void Processor::OnBookmarksCreated(vector> const & marks) { for (auto const & idDoc : marks) diff --git a/search/processor.hpp b/search/processor.hpp index d41ac288e5..4b86e0a2f9 100644 --- a/search/processor.hpp +++ b/search/processor.hpp @@ -97,6 +97,8 @@ public: void EnableIndexingOfBookmarksDescriptions(bool enable); void EnableIndexingOfBookmarkGroup(bookmarks::GroupId const & groupId, bool enable); + void ResetBookmarks(); + void OnBookmarksCreated(std::vector> const & marks); void OnBookmarksUpdated(std::vector> const & marks); void OnBookmarksDeleted(std::vector const & marks); diff --git a/search/search_tests/bookmarks_processor_tests.cpp b/search/search_tests/bookmarks_processor_tests.cpp index 257180d1df..2690918b15 100644 --- a/search/search_tests/bookmarks_processor_tests.cpp +++ b/search/search_tests/bookmarks_processor_tests.cpp @@ -132,6 +132,9 @@ UNIT_CLASS_TEST(BookmarksProcessorTest, Smoke) "N Hotel" /* customName */, "Clean establishment with a reasonable price" /* description */)); TEST_EQUAL(Search("place", GroupId{0}), Ids({18}), ()); + + GetProcessor().Reset(); + TEST_EQUAL(Search("place", GroupId{0}), Ids{}, ()); } UNIT_CLASS_TEST(BookmarksProcessorTest, IndexDescriptions)