From fa0d6036f342358218ef7950d6695e078c25f552 Mon Sep 17 00:00:00 2001 From: Maxim Pimenov Date: Wed, 8 Feb 2017 17:45:39 +0300 Subject: [PATCH] Review fixes. --- base/base_tests/stl_helpers_test.cpp | 24 ++++++++++++++++++++++++ base/mem_trie.hpp | 18 ------------------ base/stl_helpers.hpp | 26 ++++++++++++++++++++++++++ indexer/categories_holder.cpp | 9 +++------ indexer/categories_holder.hpp | 14 +++++++++----- 5 files changed, 62 insertions(+), 29 deletions(-) diff --git a/base/base_tests/stl_helpers_test.cpp b/base/base_tests/stl_helpers_test.cpp index 029df6af98..71462cfbaf 100644 --- a/base/base_tests/stl_helpers_test.cpp +++ b/base/base_tests/stl_helpers_test.cpp @@ -125,4 +125,28 @@ UNIT_TEST(SortUnique_VectorTest) TestSortUnique(); TestSortUnique(); } + +UNIT_TEST(IgnoreFirstArgument) +{ + { + int s = 0; + auto f1 = [&](int a, int b) { s += a + b; }; + auto f2 = [&](int a, int b) { s -= a + b; }; + auto f3 = my::MakeIgnoreFirstArgument(f2); + + f1(2, 3); + TEST_EQUAL(s, 5, ()); + f3(1, 2, 3); + TEST_EQUAL(s, 0, ()); + } + + { + auto f1 = [](int a, int b) -> int { return a + b; }; + auto f2 = my::MakeIgnoreFirstArgument(f1); + + auto const x = f1(2, 3); + auto const y = f2("ignored", 2, 3); + TEST_EQUAL(x, y, ()); + } +} } // namespace diff --git a/base/mem_trie.hpp b/base/mem_trie.hpp index 354675663d..fdd35af365 100644 --- a/base/mem_trie.hpp +++ b/base/mem_trie.hpp @@ -59,16 +59,6 @@ public: ForEachInNode(*root, prefix, std::forward(toDo)); } - // Calls |toDo| for each value in the node that is reachable - // by |prefix| from the trie root. Does nothing if such node does - // not exist. - template - void ForEachValueInNode(String const & prefix, ToDo && toDo) const - { - if (auto const * root = MoveTo(prefix)) - ForEachValueInNode(*root, std::forward(toDo)); - } - // Calls |toDo| for each key-value pair in a subtree that is // reachable by |prefix| from the trie root. Does nothing if such // subtree does not exist. @@ -136,14 +126,6 @@ private: toDo(prefix, value); } - // Calls |toDo| for each value in |node|. - template - void ForEachValueInNode(Node const & node, ToDo && toDo) const - { - for (auto const & value : node.m_values) - toDo(value); - } - // Calls |toDo| for each key-value pair in subtree where |node| is a // root of the subtree. |prefix| is a path from the trie root to the // |node|. diff --git a/base/stl_helpers.hpp b/base/stl_helpers.hpp index 2130dd03d7..5ee22b6897 100644 --- a/base/stl_helpers.hpp +++ b/base/stl_helpers.hpp @@ -2,6 +2,7 @@ #include #include +#include #include #include @@ -137,4 +138,29 @@ typename std::underlying_type::type Key(T value) { return static_cast::type>(value); } + +// Use this if you want to make a functor whose first +// argument is ignored and the rest are forwarded to |fn|. +template +class IgnoreFirstArgument +{ +public: + template + IgnoreFirstArgument(Gn && gn) : m_fn(std::forward(gn)) {} + + template + typename std::result_of::type operator()(Arg && arg, Args &&... args) + { + return m_fn(std::forward(args)...); + } + +private: + Fn m_fn; +}; + +template +IgnoreFirstArgument MakeIgnoreFirstArgument(Fn && fn) +{ + return IgnoreFirstArgument(std::forward(fn)); +} } // namespace my diff --git a/indexer/categories_holder.cpp b/indexer/categories_holder.cpp index ad2564f0ee..382d21f7f9 100644 --- a/indexer/categories_holder.cpp +++ b/indexer/categories_holder.cpp @@ -201,7 +201,7 @@ void CategoriesHolder::AddCategory(Category & cat, vector & types) for (auto const & synonym : p->m_synonyms) { auto const locale = synonym.m_locale; - ASSERT(locale != kUnsupportedLocaleCode, ()); + ASSERT_NOT_EQUAL(locale, kUnsupportedLocaleCode, ()); auto const uniName = search::NormalizeAndSimplifyString(synonym.m_name); @@ -214,11 +214,8 @@ void CategoriesHolder::AddCategory(Category & cat, vector & types) continue; for (uint32_t const t : types) { - if (m_name2type.find(locale) == m_name2type.end()) - m_name2type[locale] = make_unique(); - - auto * trie = m_name2type[locale].get(); - trie->Add(token, t); + auto it = m_name2type.emplace(locale, make_unique()).first; + it->second->Add(token, t); } } } diff --git a/indexer/categories_holder.hpp b/indexer/categories_holder.hpp index 0edb91906d..ba40e43460 100644 --- a/indexer/categories_holder.hpp +++ b/indexer/categories_holder.hpp @@ -1,5 +1,7 @@ #pragma once + #include "base/mem_trie.hpp" +#include "base/stl_helpers.hpp" #include "base/string_utils.hpp" #include "std/deque.hpp" @@ -52,7 +54,10 @@ private: using Trie = my::MemTrie; Type2CategoryCont m_type2cat; + + // Maps locale and category token to the list of corresponding types. map> m_name2type; + GroupTranslations m_groupTranslations; public: @@ -70,7 +75,7 @@ public: template void ForEachCategory(ToDo && toDo) const { - for (auto & p : m_type2cat) + for (auto const & p : m_type2cat) toDo(*p.second); } @@ -84,10 +89,9 @@ public: template void ForEachName(ToDo && toDo) const { - for (auto & p : m_type2cat) + for (auto const & p : m_type2cat) { - shared_ptr cat = p.second; - for (auto const & synonym : cat->m_synonyms) + for (auto const & synonym : p.second->m_synonyms) toDo(synonym); } } @@ -108,7 +112,7 @@ public: auto const it = m_name2type.find(locale); if (it == m_name2type.end()) return; - it->second->ForEachValueInNode(name, forward(toDo)); + it->second->ForEachInNode(name, my::MakeIgnoreFirstArgument(forward(toDo))); } inline GroupTranslations const & GetGroupTranslations() const { return m_groupTranslations; }