diff options
| -rw-r--r-- | defines.hpp | 2 | ||||
| -rw-r--r-- | indexer/indexer_tests/rank_table_test.cpp | 18 | ||||
| -rw-r--r-- | indexer/rank_table.cpp | 10 | ||||
| -rw-r--r-- | search/geocoder.cpp | 2 | ||||
| -rw-r--r-- | search/locality_finder.cpp | 2 | ||||
| -rw-r--r-- | search/pre_ranker.cpp | 2 | ||||
| -rw-r--r-- | search/rank_table_cache.cpp | 2 |
7 files changed, 19 insertions, 19 deletions
diff --git a/defines.hpp b/defines.hpp index 26c11a403e..156ef54d28 100644 --- a/defines.hpp +++ b/defines.hpp @@ -39,7 +39,7 @@ #define ROUTING_FILE_TAG "routing" #define CROSS_MWM_FILE_TAG "cross_mwm" #define FEATURE_OFFSETS_FILE_TAG "offs" -#define RANKS_FILE_TAG "ranks" +#define SEARCH_RANKS_FILE_TAG "ranks" #define POPULARITY_RANKS_FILE_TAG "popularity_ranks" #define REGION_INFO_FILE_TAG "rgninfo" #define METALINES_FILE_TAG "metalines" diff --git a/indexer/indexer_tests/rank_table_test.cpp b/indexer/indexer_tests/rank_table_test.cpp index 2be200eb2e..1ae83a90ec 100644 --- a/indexer/indexer_tests/rank_table_test.cpp +++ b/indexer/indexer_tests/rank_table_test.cpp @@ -37,7 +37,7 @@ void TestTable(vector<uint8_t> const & ranks, string const & path) // Tries to load table via file read. { FilesContainerR rcont(path); - auto table = search::RankTable::Load(rcont, RANKS_FILE_TAG); + auto table = search::RankTable::Load(rcont, SEARCH_RANKS_FILE_TAG); TEST(table, ()); TestTable(ranks, *table); } @@ -45,7 +45,7 @@ void TestTable(vector<uint8_t> const & ranks, string const & path) // Tries to load table via file mapping. { FilesMappingContainer mcont(path); - auto table = search::RankTable::Load(mcont, RANKS_FILE_TAG); + auto table = search::RankTable::Load(mcont, SEARCH_RANKS_FILE_TAG); TEST(table, ()); TestTable(ranks, *table); } @@ -66,7 +66,7 @@ UNIT_TEST(RankTableBuilder_Smoke) { FilesContainerW wcont(kTestCont); - search::RankTableBuilder::Create(ranks, wcont, RANKS_FILE_TAG); + search::RankTableBuilder::Create(ranks, wcont, SEARCH_RANKS_FILE_TAG); } TestTable(ranks, kTestCont); @@ -94,7 +94,7 @@ UNIT_TEST(RankTableBuilder_EndToEnd) { FilesContainerW wcont(mapPath, FileWriter::OP_WRITE_EXISTING); - search::RankTableBuilder::Create(ranks, wcont, RANKS_FILE_TAG); + search::RankTableBuilder::Create(ranks, wcont, SEARCH_RANKS_FILE_TAG); } FrozenDataSource dataSource; @@ -112,14 +112,14 @@ UNIT_TEST(RankTableBuilder_WrongEndianness) vector<uint8_t> ranks = {0, 1, 2, 3, 4}; { FilesContainerW wcont(kTestFile); - search::RankTableBuilder::Create(ranks, wcont, RANKS_FILE_TAG); + search::RankTableBuilder::Create(ranks, wcont, SEARCH_RANKS_FILE_TAG); } // Load rank table in host endianness. unique_ptr<search::RankTable> table; { FilesContainerR rcont(kTestFile); - table = search::RankTable::Load(rcont, RANKS_FILE_TAG); + table = search::RankTable::Load(rcont, SEARCH_RANKS_FILE_TAG); TEST(table.get(), ()); TestTable(ranks, *table); } @@ -133,13 +133,13 @@ UNIT_TEST(RankTableBuilder_WrongEndianness) } FilesContainerW wcont(kTestFile); - wcont.Write(data, RANKS_FILE_TAG); + wcont.Write(data, SEARCH_RANKS_FILE_TAG); } // Try to load rank table from opposite endianness. { FilesContainerR rcont(kTestFile); - auto table = search::RankTable::Load(rcont, RANKS_FILE_TAG); + auto table = search::RankTable::Load(rcont, SEARCH_RANKS_FILE_TAG); TEST(table.get(), ()); TestTable(ranks, *table); } @@ -147,7 +147,7 @@ UNIT_TEST(RankTableBuilder_WrongEndianness) // It's impossible to map rank table from opposite endianness. { FilesMappingContainer mcont(kTestFile); - auto table = search::RankTable::Load(mcont, RANKS_FILE_TAG); + auto table = search::RankTable::Load(mcont, SEARCH_RANKS_FILE_TAG); TEST(!table.get(), ()); } diff --git a/indexer/rank_table.cpp b/indexer/rank_table.cpp index b275f321c5..e0f2f19d67 100644 --- a/indexer/rank_table.cpp +++ b/indexer/rank_table.cpp @@ -257,9 +257,9 @@ unique_ptr<RankTable> CreateRankTableIfNotExists(FilesContainerR & rcont) { unique_ptr<RankTable> table; - if (rcont.IsExist(RANKS_FILE_TAG)) + if (rcont.IsExist(SEARCH_RANKS_FILE_TAG)) { - switch (CheckEndianness(rcont.GetReader(RANKS_FILE_TAG))) + switch (CheckEndianness(rcont.GetReader(SEARCH_RANKS_FILE_TAG))) { case CheckResult::CorruptedHeader: { @@ -270,7 +270,7 @@ unique_ptr<RankTable> CreateRankTableIfNotExists(FilesContainerR & rcont) { // Try to copy whole serialized data and instantiate table via // reverse mapping. - auto region = GetMemoryRegionForTag(rcont, RANKS_FILE_TAG); + auto region = GetMemoryRegionForTag(rcont, SEARCH_RANKS_FILE_TAG); table = LoadRankTable(move(region)); break; } @@ -339,7 +339,7 @@ bool SearchRankTableBuilder::CreateIfNotExists(platform::LocalCountryFile const } if (table) - SerializeRankTable(*table, mapPath, RANKS_FILE_TAG); + SerializeRankTable(*table, mapPath, SEARCH_RANKS_FILE_TAG); return true; } @@ -362,7 +362,7 @@ bool SearchRankTableBuilder::CreateIfNotExists(string const & mapPath) noexcept } if (table) - SerializeRankTable(*table, mapPath, RANKS_FILE_TAG); + SerializeRankTable(*table, mapPath, SEARCH_RANKS_FILE_TAG); return true; } diff --git a/search/geocoder.cpp b/search/geocoder.cpp index 941e53eb49..b1d0a7cf91 100644 --- a/search/geocoder.cpp +++ b/search/geocoder.cpp @@ -145,7 +145,7 @@ private: { if (m_table) return; - m_table = search::RankTable::Load(m_value.m_cont, RANKS_FILE_TAG); + m_table = search::RankTable::Load(m_value.m_cont, SEARCH_RANKS_FILE_TAG); if (!m_table) m_table = make_unique<search::DummyRankTable>(); } diff --git a/search/locality_finder.cpp b/search/locality_finder.cpp index bbe5c9354e..9da35b437b 100644 --- a/search/locality_finder.cpp +++ b/search/locality_finder.cpp @@ -243,7 +243,7 @@ void LocalityFinder::LoadVicinity(m2::PointD const & p, bool loadCities, bool lo { auto const & value = *handle.GetValue<MwmValue>(); if (!m_ranks) - m_ranks = RankTable::Load(value.m_cont, RANKS_FILE_TAG); + m_ranks = RankTable::Load(value.m_cont, SEARCH_RANKS_FILE_TAG); if (!m_ranks) m_ranks = make_unique<DummyRankTable>(); diff --git a/search/pre_ranker.cpp b/search/pre_ranker.cpp index 6648c59f3b..773ff83320 100644 --- a/search/pre_ranker.cpp +++ b/search/pre_ranker.cpp @@ -87,7 +87,7 @@ void PreRanker::FillMissingFieldsInPreResults() centers.reset(); if (mwmHandle.IsAlive()) { - ranks = RankTable::Load(mwmHandle.GetValue<MwmValue>()->m_cont, RANKS_FILE_TAG); + ranks = RankTable::Load(mwmHandle.GetValue<MwmValue>()->m_cont, SEARCH_RANKS_FILE_TAG); popularityRanks = RankTable::Load(mwmHandle.GetValue<MwmValue>()->m_cont, POPULARITY_RANKS_FILE_TAG); centers = make_unique<LazyCentersTable>(*mwmHandle.GetValue<MwmValue>()); diff --git a/search/rank_table_cache.cpp b/search/rank_table_cache.cpp index 109f16dcc2..7073551410 100644 --- a/search/rank_table_cache.cpp +++ b/search/rank_table_cache.cpp @@ -14,7 +14,7 @@ RankTable const & RankTableCache::Get(DataSource & dataSource, TId const & mwmId return *it->second; TKey handle(dataSource.GetMwmHandleById(mwmId)); - auto table = RankTable::Load(handle.GetValue<MwmValue>()->m_cont, RANKS_FILE_TAG); + auto table = RankTable::Load(handle.GetValue<MwmValue>()->m_cont, SEARCH_RANKS_FILE_TAG); if (!table) table.reset(new DummyRankTable()); |