From 0d8c0de484edb86b8cb8217b32f55fb85f6321c7 Mon Sep 17 00:00:00 2001 From: Yuri Gorshenin Date: Mon, 7 Sep 2015 16:09:01 +0300 Subject: [PATCH] Removed references to TrieValue::m_rank. --- indexer/index.cpp | 15 ++++- indexer/mwm_set.hpp | 1 - map/benchmark_tool/benchmark_tool.pro | 2 +- map/mwm_tests/mwm_tests.pro | 2 +- search/retrieval.cpp | 29 ++++++++- search/retrieval.hpp | 9 +++ .../retrieval_test.cpp | 4 ++ .../search_integration_tests.pro | 1 + search/search_query.cpp | 60 +++++++++++++++---- search/search_query.hpp | 13 +++- search/search_tests/search_tests.pro | 2 +- storage/storage_tests/storage_tests.pro | 2 +- 12 files changed, 119 insertions(+), 21 deletions(-) diff --git a/indexer/index.cpp b/indexer/index.cpp index ecda41c2c7..901db047bc 100644 --- a/indexer/index.cpp +++ b/indexer/index.cpp @@ -2,6 +2,8 @@ #include "platform/local_country_file_utils.hpp" +#include "indexer/rank_table.hpp" + #include "coding/file_name_utils.hpp" #include "coding/internal/file_data.hpp" @@ -63,7 +65,18 @@ unique_ptr Index::CreateInfo(platform::LocalCountryFile const & localFi unique_ptr Index::CreateValue(MwmInfo & info) const { - unique_ptr p(new MwmValue(info.GetLocalFile())); + // Create a section with rank table if it does not exist. + platform::LocalCountryFile const & localFile = info.GetLocalFile(); + try + { + search::RankTableBuilder::CreateIfNotExists(localFile); + } + catch (Reader::OpenException const & e) + { + LOG(LWARNING, ("Can't create rank table for:", localFile, ":", e.Msg())); + } + + unique_ptr p(new MwmValue(localFile)); p->SetTable(dynamic_cast(info)); ASSERT(p->GetHeader().IsMWMSuitable(), ()); return unique_ptr(move(p)); diff --git a/indexer/mwm_set.hpp b/indexer/mwm_set.hpp index 45a44914e9..9c5c4770b1 100644 --- a/indexer/mwm_set.hpp +++ b/indexer/mwm_set.hpp @@ -218,7 +218,6 @@ public: } protected: - /// @return True when file format version was successfully read to MwmInfo. virtual unique_ptr CreateInfo(platform::LocalCountryFile const & localFile) const = 0; virtual unique_ptr CreateValue(MwmInfo & info) const = 0; diff --git a/map/benchmark_tool/benchmark_tool.pro b/map/benchmark_tool/benchmark_tool.pro index e5d593e024..9c322998ce 100644 --- a/map/benchmark_tool/benchmark_tool.pro +++ b/map/benchmark_tool/benchmark_tool.pro @@ -7,7 +7,7 @@ TEMPLATE = app ROOT_DIR = ../.. -DEPENDENCIES = map indexer platform geometry coding base gflags protobuf tomcrypt +DEPENDENCIES = map indexer platform geometry coding base gflags protobuf tomcrypt succinct include($$ROOT_DIR/common.pri) diff --git a/map/mwm_tests/mwm_tests.pro b/map/mwm_tests/mwm_tests.pro index 4fd5902a4e..7235e38829 100644 --- a/map/mwm_tests/mwm_tests.pro +++ b/map/mwm_tests/mwm_tests.pro @@ -7,7 +7,7 @@ TEMPLATE = app ROOT_DIR = ../.. DEPENDENCIES = map search storage indexer platform geometry coding base \ - freetype fribidi expat protobuf tomcrypt jansson + freetype fribidi expat protobuf tomcrypt jansson succinct include($$ROOT_DIR/common.pri) diff --git a/search/retrieval.cpp b/search/retrieval.cpp index 9a020cc2f8..bffed86a9d 100644 --- a/search/retrieval.cpp +++ b/search/retrieval.cpp @@ -9,6 +9,7 @@ #include "coding/reader_wrapper.hpp" +#include "base/assert.hpp" #include "base/logging.hpp" #include "std/algorithm.hpp" @@ -358,15 +359,16 @@ bool Retrieval::RetrieveForScale(double scale, Callback & callback) bucket.m_intersectsWithViewport = true; if (bucket.m_addressFeatures.empty()) - bucket.m_finished = true; + FinishBucket(bucket, callback); } ASSERT_LESS_OR_EQUAL(bucket.m_featuresReported, bucket.m_addressFeatures.size(), ()); if (bucket.m_featuresReported == bucket.m_addressFeatures.size()) { + // All features were reported for the bucket, mark it as + // finished and move to the next bucket. ASSERT(bucket.m_intersectsWithViewport, ()); - // All features were reported for the bucket. - bucket.m_finished = true; + FinishBucket(bucket, callback); continue; } @@ -376,11 +378,32 @@ bool Retrieval::RetrieveForScale(double scale, Callback & callback) }; if (!bucket.m_strategy->Retrieve(scale, *this /* cancellable */, wrapper)) return false; + + if (viewport.IsRectInside(bucket.m_bounds)) + { + ASSERT(bucket.m_intersectsWithViewport, ()); + // Viewport completely covers the bucket, mark it as finished + // and move to the next bucket. Note that "viewport covers the + // bucket" is not the same as "all features from the bucket were + // reported", because of scale parameter. Search index reports + // all matching features, but geometry index can skip features + // from more detailed scales. + FinishBucket(bucket, callback); + continue; + } } return true; } +void Retrieval::FinishBucket(Bucket & bucket, Callback & callback) +{ + if (bucket.m_finished) + return; + bucket.m_finished = true; + callback.OnMwmProcessed(bucket.m_handle.GetId()); +} + bool Retrieval::Finished() const { for (auto const & bucket : m_buckets) diff --git a/search/retrieval.hpp b/search/retrieval.hpp index b9942d325d..a5232c8aa0 100644 --- a/search/retrieval.hpp +++ b/search/retrieval.hpp @@ -30,6 +30,12 @@ public: // reporting disjoint sets of features. virtual void OnFeaturesRetrieved(MwmSet::MwmId const & id, double scale, vector const & featureIds) = 0; + + // Called when all matching features for an mwm were retrieved and + // reported. Cliens may assume that this method is called no more + // than once for |id| and after that call there won't be any calls + // of OnFeaturesRetrieved() for |id|. + virtual void OnMwmProcessed(MwmSet::MwmId const & id) {} }; // This class wraps a set of retrieval's limits like number of @@ -131,6 +137,9 @@ private: // non-decreasing. WARN_UNUSED_RESULT bool RetrieveForScale(double scale, Callback & callback); + // Marks bucket as finished and invokes callback. + void FinishBucket(Bucket & bucket, Callback & callback); + // Returns true when all buckets are marked as finished. bool Finished() const; diff --git a/search/search_integration_tests/retrieval_test.cpp b/search/search_integration_tests/retrieval_test.cpp index 5c6d8a36a8..5c5ccc1113 100644 --- a/search/search_integration_tests/retrieval_test.cpp +++ b/search/search_integration_tests/retrieval_test.cpp @@ -47,6 +47,8 @@ public: m_offsets.insert(m_offsets.end(), offsets.begin(), offsets.end()); } + void OnMwmProcessed(MwmSet::MwmId const & /* id */) override {} + bool WasTriggered() const { return m_triggered; } vector & Offsets() { return m_offsets; } @@ -74,6 +76,8 @@ public: m_numFeatures += offsets.size(); } + void OnMwmProcessed(MwmSet::MwmId const & /* id */) override {} + uint64_t GetNumMwms() const { return m_retrieved.size(); } uint64_t GetNumFeatures() const { return m_numFeatures; } diff --git a/search/search_integration_tests/search_integration_tests.pro b/search/search_integration_tests/search_integration_tests.pro index 7a14f554e2..c6e1eae1c1 100644 --- a/search/search_integration_tests/search_integration_tests.pro +++ b/search/search_integration_tests/search_integration_tests.pro @@ -6,6 +6,7 @@ CONFIG -= app_bundle TEMPLATE = app ROOT_DIR = ../.. + DEPENDENCIES = generator_tests_support generator routing search search_tests_support storage stats_client indexer \ platform geometry coding base tess2 protobuf tomcrypt jansson diff --git a/search/search_query.cpp b/search/search_query.cpp index 54b1ce2e0e..ac56b60e84 100644 --- a/search/search_query.cpp +++ b/search/search_query.cpp @@ -157,18 +157,47 @@ void RemoveDuplicatingLinear(vector & indV) } } // namespace -Query::RetrievalCallback::RetrievalCallback(Query & query, ViewportID viewportId) - : m_query(query), m_viewportId(viewportId) +Query::RetrievalCallback::RetrievalCallback(Index & index, Query & query, ViewportID viewportId) + : m_index(index), m_query(query), m_viewportId(viewportId) { } void Query::RetrievalCallback::OnFeaturesRetrieved(MwmSet::MwmId const & id, double scale, vector const & featureIds) { + auto const * table = LoadTable(id); + + if (!table) + { + LOG(LWARNING, ("Can't get rank table for:", id)); + for (auto const & featureId : featureIds) + m_query.AddPreResult1(id, featureId, 0 /* rank */, scale, m_viewportId); + return; + } + for (auto const & featureId : featureIds) - m_query.AddPreResult1(id, featureId, 0 /* rank */, scale, m_viewportId); + m_query.AddPreResult1(id, featureId, table->Get(featureId), scale, m_viewportId); } +void Query::RetrievalCallback::OnMwmProcessed(MwmSet::MwmId const & id) { UnloadTable(id); } + +RankTable const * Query::RetrievalCallback::LoadTable(MwmSet::MwmId const & id) +{ + auto const it = m_rankTables.find(id); + if (it != m_rankTables.end()) + return it->second.get(); + + MwmSet::MwmHandle handle = m_index.GetMwmHandleById(id); + ASSERT(handle.IsAlive(), ("Handle should already be held by a retrieval algorithm.")); + + auto newTable = RankTable::Load(handle.GetValue()->m_cont); + auto const * table = newTable.get(); + m_rankTables[id] = move(newTable); + return table; +} + +void Query::RetrievalCallback::UnloadTable(MwmSet::MwmId const & id) { m_rankTables.erase(id); } + Query::Query(Index & index, CategoriesHolder const & categories, vector const & suggests, storage::CountryInfoGetter const & infoGetter) : m_index(index) @@ -1314,6 +1343,7 @@ class DoFindLocality vector m_localities[3]; FeaturesVector m_vector; + unique_ptr m_table; size_t m_index; ///< index of processing token int8_t m_lang; @@ -1404,7 +1434,10 @@ class DoFindLocality public: DoFindLocality(Query & q, MwmValue const * pMwm, int8_t lang) - : m_query(q), m_vector(pMwm->m_cont, pMwm->GetHeader(), pMwm->m_table), m_lang(lang) + : m_query(q) + , m_vector(pMwm->m_cont, pMwm->GetHeader(), pMwm->m_table) + , m_table(RankTable::Load(pMwm->m_cont)) + , m_lang(lang) { m_arrEn[0] = q.GetLanguage(LANG_EN); m_arrEn[1] = q.GetLanguage(LANG_INTERNATIONAL); @@ -1445,7 +1478,17 @@ public: ASSERT_LESS(type, ARRAY_SIZE(m_localities), ()); m2::PointD const center = feature::GetCenter(f, FeatureType::WORST_GEOMETRY); - m_localities[type].emplace_back(type, v.m_featureId, center, v.m_rank); + uint8_t rank = 0; + if (m_table.get()) + { + ASSERT_LESS(v.m_featureId, m_table->Size(), ()); + rank = m_table->Get(v.m_featureId); + } + else + { + LOG(LWARNING, ("Can't get ranks table for locality search.")); + } + m_localities[type].emplace_back(type, v.m_featureId, center, rank); Locality & loc = m_localities[type].back(); loc.m_radius = GetRadiusByPopulation(GetPopulation(f)); @@ -1620,11 +1663,8 @@ void Query::SearchInMwms(TMWMVector const & mwmsInfo, SearchQueryParams const & viewport = &m_viewport[CURRENT_V]; } - SearchQueryParams p = params; - p.m_scale = GetQueryIndexScale(*viewport); - m_retrieval.Init(m_index, mwmsInfo, *viewport, p, limits); - - RetrievalCallback callback(*this, viewportId); + m_retrieval.Init(m_index, mwmsInfo, *viewport, params, limits); + RetrievalCallback callback(m_index, *this, viewportId); m_retrieval.Go(callback); } diff --git a/search/search_query.hpp b/search/search_query.hpp index 056327d9fa..9eb28aaba1 100644 --- a/search/search_query.hpp +++ b/search/search_query.hpp @@ -5,8 +5,9 @@ #include "suggest.hpp" #include "indexer/ftypes_matcher.hpp" +#include "indexer/index.hpp" +#include "indexer/rank_table.hpp" #include "indexer/search_trie.hpp" -#include "indexer/index.hpp" // for Index::MwmHandle #include "geometry/rect2d.hpp" @@ -122,15 +123,23 @@ private: class RetrievalCallback : public Retrieval::Callback { public: - RetrievalCallback(Query & query, ViewportID id); + RetrievalCallback(Index & index, Query & query, ViewportID id); // Retrieval::Callback overrides: void OnFeaturesRetrieved(MwmSet::MwmId const & id, double scale, vector const & featureIds) override; + void OnMwmProcessed(MwmSet::MwmId const & id) override; + private: + RankTable const * LoadTable(MwmSet::MwmId const & id); + + void UnloadTable(MwmSet::MwmId const & id); + + Index & m_index; Query & m_query; ViewportID m_viewportId; + map> m_rankTables; }; friend class impl::FeatureLoader; diff --git a/search/search_tests/search_tests.pro b/search/search_tests/search_tests.pro index fe1a781c77..6e3d046df2 100644 --- a/search/search_tests/search_tests.pro +++ b/search/search_tests/search_tests.pro @@ -6,7 +6,7 @@ CONFIG -= app_bundle TEMPLATE = app ROOT_DIR = ../.. -DEPENDENCIES = search indexer platform geometry coding base protobuf tomcrypt +DEPENDENCIES = search indexer platform geometry coding base protobuf tomcrypt succinct include($$ROOT_DIR/common.pri) diff --git a/storage/storage_tests/storage_tests.pro b/storage/storage_tests/storage_tests.pro index b2fe16d81b..cf06b52f20 100644 --- a/storage/storage_tests/storage_tests.pro +++ b/storage/storage_tests/storage_tests.pro @@ -6,7 +6,7 @@ CONFIG -= app_bundle TEMPLATE = app ROOT_DIR = ../.. -DEPENDENCIES = storage indexer platform_tests_support platform geometry coding base jansson tomcrypt stats_client +DEPENDENCIES = storage indexer platform_tests_support platform geometry coding base jansson tomcrypt stats_client succinct include($$ROOT_DIR/common.pri)