From 21e50e2d5e3f2fca71cc4da012e6d2687ed773a2 Mon Sep 17 00:00:00 2001 From: VladiMihaylenko Date: Wed, 27 Apr 2016 17:07:07 +0300 Subject: [PATCH] [indexer] Added move assignment operator for CategoriesIndex. --- base/mem_trie.hpp | 4 ++ editor/new_feature_categories.cpp | 4 +- editor/new_feature_categories.hpp | 4 ++ indexer/categories_index.cpp | 46 +++++++++---------- indexer/categories_index.hpp | 11 +++-- indexer/indexer_tests/categories_test.cpp | 6 +-- xcode/editor/editor.xcodeproj/project.pbxproj | 4 ++ .../indexer/indexer.xcodeproj/project.pbxproj | 8 ++++ 8 files changed, 54 insertions(+), 33 deletions(-) diff --git a/base/mem_trie.hpp b/base/mem_trie.hpp index 9cdcc29755..7cf7678e11 100644 --- a/base/mem_trie.hpp +++ b/base/mem_trie.hpp @@ -21,6 +21,8 @@ public: other.m_numNodes = 0; } + MemTrie & operator=(MemTrie && other) = default; + // Adds a key-value pair to the trie. void Add(TString const & key, TValue const & value) { @@ -61,6 +63,8 @@ private: Node(Node && other) = default; + Node & operator=(Node && other) = default; + ~Node() { for (auto const & move : m_moves) diff --git a/editor/new_feature_categories.cpp b/editor/new_feature_categories.cpp index 8b235d1db8..90f033a728 100644 --- a/editor/new_feature_categories.cpp +++ b/editor/new_feature_categories.cpp @@ -36,7 +36,7 @@ void NewFeatureCategories::AddLanguage(string const & lang) for (auto const & type : m_types) { m_index.AddCategoryByTypeAndLang(type, langCode); - names.push_back(m_index.GetCategoriesHolder().GetReadableFeatureType(type, langCode)); + names.push_back(m_index.GetCategoriesHolder()->GetReadableFeatureType(type, langCode)); } my::SortUnique(names); m_categoryNames[lang] = names; @@ -50,7 +50,7 @@ vector NewFeatureCategories::Search(string const & query, string const & vector result(resultTypes.size()); for (size_t i = 0; i < result.size(); ++i) - result[i] = m_index.GetCategoriesHolder().GetReadableFeatureType(resultTypes[i], langCode); + result[i] = m_index.GetCategoriesHolder()->GetReadableFeatureType(resultTypes[i], langCode); my::SortUnique(result); return result; } diff --git a/editor/new_feature_categories.hpp b/editor/new_feature_categories.hpp index eb4d45f3c6..66f604dc2e 100644 --- a/editor/new_feature_categories.hpp +++ b/editor/new_feature_categories.hpp @@ -27,6 +27,10 @@ public: { } + NewFeatureCategories() = default; + + NewFeatureCategories & operator=(NewFeatureCategories && other) = default; + // Adds all known synonyms in language |lang| for all categories that // can be applied to a newly added feature. void AddLanguage(string const & lang); diff --git a/indexer/categories_index.cpp b/indexer/categories_index.cpp index 50c698286b..08696151b0 100644 --- a/indexer/categories_index.cpp +++ b/indexer/categories_index.cpp @@ -52,11 +52,11 @@ namespace indexer { void CategoriesIndex::AddCategoryByTypeAndLang(uint32_t type, int8_t lang) { - m_catHolder.ForEachNameByType(type, [&](TCategory::Name const & name) - { - if (name.m_locale == lang) - TokenizeAndAddAllSubstrings(m_trie, name.m_name, type); - }); + m_catHolder->ForEachNameByType(type, [&](TCategory::Name const & name) + { + if (name.m_locale == lang) + TokenizeAndAddAllSubstrings(m_trie, name.m_name, type); + }); } void CategoriesIndex::AddCategoryByTypeAllLangs(uint32_t type) @@ -67,23 +67,23 @@ void CategoriesIndex::AddCategoryByTypeAllLangs(uint32_t type) void CategoriesIndex::AddAllCategoriesInLang(int8_t lang) { - m_catHolder.ForEachTypeAndCategory([&](uint32_t type, TCategory const & cat) - { - for (auto const & name : cat.m_synonyms) - { - if (name.m_locale == lang) - TokenizeAndAddAllSubstrings(m_trie, name.m_name, type); - } - }); + m_catHolder->ForEachTypeAndCategory([&](uint32_t type, TCategory const & cat) + { + for (auto const & name : cat.m_synonyms) + { + if (name.m_locale == lang) + TokenizeAndAddAllSubstrings(m_trie, name.m_name, type); + } + }); } void CategoriesIndex::AddAllCategoriesInAllLangs() { - m_catHolder.ForEachTypeAndCategory([this](uint32_t type, TCategory const & cat) - { - for (auto const & name : cat.m_synonyms) - TokenizeAndAddAllSubstrings(m_trie, name.m_name, type); - }); + m_catHolder->ForEachTypeAndCategory([this](uint32_t type, TCategory const & cat) + { + for (auto const & name : cat.m_synonyms) + TokenizeAndAddAllSubstrings(m_trie, name.m_name, type); + }); } void CategoriesIndex::GetCategories(string const & query, vector & result) const @@ -91,11 +91,11 @@ void CategoriesIndex::GetCategories(string const & query, vector & re vector types; GetAssociatedTypes(query, types); my::SortUnique(types); - m_catHolder.ForEachTypeAndCategory([&](uint32_t type, TCategory const & cat) - { - if (binary_search(types.begin(), types.end(), type)) - result.push_back(cat); - }); + m_catHolder->ForEachTypeAndCategory([&](uint32_t type, TCategory const & cat) + { + if (binary_search(types.begin(), types.end(), type)) + result.push_back(cat); + }); } void CategoriesIndex::GetAssociatedTypes(string const & query, vector & result) const diff --git a/indexer/categories_index.hpp b/indexer/categories_index.hpp index bda1bbb1fc..02ac8d104e 100644 --- a/indexer/categories_index.hpp +++ b/indexer/categories_index.hpp @@ -18,17 +18,18 @@ class CategoriesIndex public: using TCategory = CategoriesHolder::Category; - CategoriesIndex() : m_catHolder(GetDefaultCategories()) {} + CategoriesIndex() : m_catHolder(&GetDefaultCategories()) {} - CategoriesIndex(CategoriesHolder const & catHolder) : m_catHolder(catHolder) {} + CategoriesIndex(CategoriesHolder const * catHolder) : m_catHolder(catHolder) {} CategoriesIndex(CategoriesIndex && other) : m_catHolder(other.m_catHolder), m_trie(move(other.m_trie)) { } - CategoriesHolder const & GetCategoriesHolder() const { return m_catHolder; } + CategoriesIndex & operator=(CategoriesIndex && other) = default; + CategoriesHolder const * GetCategoriesHolder() const { return m_catHolder; } // Adds all categories that match |type|. Only synonyms // in language |lang| are added. See indexer/categories_holder.cpp // for language enumeration. @@ -58,11 +59,11 @@ public: void GetAssociatedTypes(string const & query, vector & result) const; #ifdef DEBUG - inline int GetNumTrieNodes() const { return m_trie.GetNumNodes(); } + inline size_t GetNumTrieNodes() const { return m_trie.GetNumNodes(); } #endif private: - CategoriesHolder const & m_catHolder; + CategoriesHolder const * m_catHolder = nullptr; my::MemTrie m_trie; }; } // namespace indexer diff --git a/indexer/indexer_tests/categories_test.cpp b/indexer/indexer_tests/categories_test.cpp index e1aac7f594..b4fdced850 100644 --- a/indexer/indexer_tests/categories_test.cpp +++ b/indexer/indexer_tests/categories_test.cpp @@ -107,7 +107,7 @@ UNIT_TEST(CategoriesIndex_Smoke) CategoriesHolder holder( make_unique(g_testCategoriesTxt, sizeof(g_testCategoriesTxt) - 1)); - CategoriesIndex index(holder); + CategoriesIndex index(&holder); uint32_t type1 = classif().GetTypeByPath({"amenity", "bench"}); uint32_t type2 = classif().GetTypeByPath({"place", "village"}); @@ -136,7 +136,7 @@ UNIT_TEST(CategoriesIndex_Smoke) index.AddCategoryByTypeAndLang(type2, lang1); testTypes("i", {type1, type2}); - CategoriesIndex fullIndex(holder); + CategoriesIndex fullIndex(&holder); fullIndex.AddCategoryByTypeAllLangs(type1); fullIndex.AddCategoryByTypeAllLangs(type2); vector cats; @@ -167,7 +167,7 @@ UNIT_TEST(CategoriesIndex_MultipleTokens) classificator::Load(); CategoriesHolder holder(make_unique(kCategories, sizeof(kCategories) - 1)); - CategoriesIndex index(holder); + CategoriesIndex index(&holder); index.AddAllCategoriesInAllLangs(); auto testTypes = [&](string const & query, vector const & expected) diff --git a/xcode/editor/editor.xcodeproj/project.pbxproj b/xcode/editor/editor.xcodeproj/project.pbxproj index 0f4d7bad03..0d69e0d5d0 100644 --- a/xcode/editor/editor.xcodeproj/project.pbxproj +++ b/xcode/editor/editor.xcodeproj/project.pbxproj @@ -27,6 +27,7 @@ 34FFB34D1C316A7600BFF6C3 /* server_api.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 34FFB34B1C316A7600BFF6C3 /* server_api.hpp */; }; F60F02EE1C92CBF1003A0AF6 /* editor_notes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F60F02EC1C92CBF1003A0AF6 /* editor_notes.cpp */; }; F60F02EF1C92CBF1003A0AF6 /* editor_notes.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F60F02ED1C92CBF1003A0AF6 /* editor_notes.hpp */; }; + F6DF5F2F1CD0FD6A00A87154 /* new_feature_categories.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6DF5F2E1CD0FD6A00A87154 /* new_feature_categories.cpp */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -52,6 +53,7 @@ 34FFB34B1C316A7600BFF6C3 /* server_api.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = server_api.hpp; sourceTree = ""; }; F60F02EC1C92CBF1003A0AF6 /* editor_notes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = editor_notes.cpp; sourceTree = ""; }; F60F02ED1C92CBF1003A0AF6 /* editor_notes.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = editor_notes.hpp; sourceTree = ""; }; + F6DF5F2E1CD0FD6A00A87154 /* new_feature_categories.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = new_feature_categories.cpp; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -85,6 +87,7 @@ 341138731C15AE02002E3B3E /* Editor */ = { isa = PBXGroup; children = ( + F6DF5F2E1CD0FD6A00A87154 /* new_feature_categories.cpp */, F60F02EC1C92CBF1003A0AF6 /* editor_notes.cpp */, F60F02ED1C92CBF1003A0AF6 /* editor_notes.hpp */, 34527C4F1C89B1770015050E /* editor_config.cpp */, @@ -196,6 +199,7 @@ 34527C511C89B1770015050E /* editor_config.cpp in Sources */, 34FFB34C1C316A7600BFF6C3 /* server_api.cpp in Sources */, F60F02EE1C92CBF1003A0AF6 /* editor_notes.cpp in Sources */, + F6DF5F2F1CD0FD6A00A87154 /* new_feature_categories.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/xcode/indexer/indexer.xcodeproj/project.pbxproj b/xcode/indexer/indexer.xcodeproj/project.pbxproj index f7b59930c3..95c87c4eda 100644 --- a/xcode/indexer/indexer.xcodeproj/project.pbxproj +++ b/xcode/indexer/indexer.xcodeproj/project.pbxproj @@ -152,6 +152,8 @@ 6758AED31BB4413000C26E27 /* drules_selector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6758AECF1BB4413000C26E27 /* drules_selector.cpp */; }; 6758AED41BB4413000C26E27 /* drules_selector.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6758AED01BB4413000C26E27 /* drules_selector.hpp */; }; 67F183731BD4FCF500AB1840 /* map_style.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67F183721BD4FCF500AB1840 /* map_style.cpp */; }; + F6DF5F2D1CD0FC9D00A87154 /* categories_index.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6DF5F2C1CD0FC9D00A87154 /* categories_index.cpp */; }; + F6DF5F311CD0FD9A00A87154 /* categories_index.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F6DF5F301CD0FD9A00A87154 /* categories_index.hpp */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -318,6 +320,8 @@ 6758AECF1BB4413000C26E27 /* drules_selector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = drules_selector.cpp; sourceTree = ""; }; 6758AED01BB4413000C26E27 /* drules_selector.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = drules_selector.hpp; sourceTree = ""; }; 67F183721BD4FCF500AB1840 /* map_style.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = map_style.cpp; sourceTree = ""; }; + F6DF5F2C1CD0FC9D00A87154 /* categories_index.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = categories_index.cpp; sourceTree = ""; }; + F6DF5F301CD0FD9A00A87154 /* categories_index.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = categories_index.hpp; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -437,6 +441,8 @@ 6753409C1A3F53CB00A0A8C3 /* indexer */ = { isa = PBXGroup; children = ( + F6DF5F301CD0FD9A00A87154 /* categories_index.hpp */, + F6DF5F2C1CD0FC9D00A87154 /* categories_index.cpp */, 34583BC11C88552100F94664 /* cuisines.cpp */, 34583BC21C88552100F94664 /* cuisines.hpp */, 34583BC31C88552100F94664 /* editable_map_object.cpp */, @@ -571,6 +577,7 @@ 347F337F1C454242009758CC /* trie_builder.hpp in Headers */, 6753412D1A3F540F00A0A8C3 /* geometry_serialization.hpp in Headers */, 6753414C1A3F540F00A0A8C3 /* tree_structure.hpp in Headers */, + F6DF5F311CD0FD9A00A87154 /* categories_index.hpp in Headers */, 347F337D1C454242009758CC /* succinct_trie_builder.hpp in Headers */, 675341381A3F540F00A0A8C3 /* mwm_set.hpp in Headers */, 670EE56D1B60033A001E8064 /* unique_index.hpp in Headers */, @@ -763,6 +770,7 @@ 670C611A1AB065B100C38A8C /* sort_and_merge_intervals_test.cpp in Sources */, 670C61101AB065B100C38A8C /* features_offsets_table_test.cpp in Sources */, 670C611B1AB065B100C38A8C /* test_polylines.cpp in Sources */, + F6DF5F2D1CD0FC9D00A87154 /* categories_index.cpp in Sources */, 674125131B4C02F100A3E828 /* map_style_reader.cpp in Sources */, 675341141A3F540F00A0A8C3 /* feature_covering.cpp in Sources */, 56C74C1D1C749E4700B71B9F /* categories_holder.cpp in Sources */,