[indexer] United all tries-by-locale into one trie.

1 files changed, 4 insertions, 5 deletions

diff --git a/indexer/categories_holder.cpp b/indexer/categories_holder.cpp
index 382d21f7f9..f4ef385381 100644
--- a/indexer/categories_holder.cpp
+++ b/indexer/categories_holder.cpp
@@ -203,6 +203,8 @@ void CategoriesHolder::AddCategory(Category & cat, vector<uint32_t> & types)
       auto const locale = synonym.m_locale;
       ASSERT_NOT_EQUAL(locale, kUnsupportedLocaleCode, ());
 
+      auto const localePrefix = String(1, static_cast<strings::UniChar>(locale));
+
       auto const uniName = search::NormalizeAndSimplifyString(synonym.m_name);
 
       vector<String> tokens;
@@ -213,10 +215,7 @@ void CategoriesHolder::AddCategory(Category & cat, vector<uint32_t> & types)
         if (!ValidKeyToken(token))
           continue;
         for (uint32_t const t : types)
-        {
-          auto it = m_name2type.emplace(locale, make_unique<Trie>()).first;
-          it->second->Add(token, t);
-        }
+          m_name2type->Add(localePrefix + token, t);
       }
     }
   }
@@ -243,7 +242,7 @@ bool CategoriesHolder::ValidKeyToken(String const & s)
 void CategoriesHolder::LoadFromStream(istream & s)
 {
   m_type2cat.clear();
-  m_name2type.clear();
+  m_name2type = make_unique<Trie>();
   m_groupTranslations.clear();
 
   State state = EParseTypes;