From 67a326d6259d6c59668b446e7b4ec201d763a146 Mon Sep 17 00:00:00 2001 From: Yuri Gorshenin Date: Thu, 19 Oct 2017 15:23:49 +0300 Subject: [PATCH] [pysearch] Get rid of Storage. --- search/pysearch/CMakeLists.txt | 12 ++++++----- search/pysearch/bindings.cpp | 37 ++++++++++++---------------------- storage/country.cpp | 18 ++++++++++++++--- storage/country.hpp | 24 +++++++++++++--------- storage/storage.cpp | 8 +++----- 5 files changed, 53 insertions(+), 46 deletions(-) diff --git a/search/pysearch/CMakeLists.txt b/search/pysearch/CMakeLists.txt index 432e01eb9a..8719049beb 100644 --- a/search/pysearch/CMakeLists.txt +++ b/search/pysearch/CMakeLists.txt @@ -18,16 +18,18 @@ omim_link_libraries( editor geometry platform + mwm_diff coding base - opening_hours - succinct - pugixml - protobuf + bsdiff + icu jansson oauthcpp + opening_hours + protobuf + pugixml stats_client - icu + succinct ${PYTHON_LIBRARIES} ${Boost_LIBRARIES} ${LIBZ} diff --git a/search/pysearch/bindings.cpp b/search/pysearch/bindings.cpp index bf596a044c..8234192b5e 100644 --- a/search/pysearch/bindings.cpp +++ b/search/pysearch/bindings.cpp @@ -5,9 +5,8 @@ #include "indexer/classificator_loader.hpp" +#include "storage/country.hpp" #include "storage/country_info_getter.hpp" -#include "storage/index.hpp" -#include "storage/storage.hpp" #include "platform/local_country_file.hpp" #include "platform/local_country_file_utils.hpp" @@ -18,7 +17,8 @@ #include "geometry/mercator.hpp" #include "geometry/rect2d.hpp" -#include "base/logging.hpp" +#include "base/assert.hpp" +#include "base/stl_add.hpp" #include @@ -30,24 +30,11 @@ #include "defines.hpp" +using namespace std; + namespace { -// TODO (@y, @m): following code is quite similar to -// features_collector_tool and search_quality_tool. Need to replace -// both tools by python scripts that use this library. - -void DidDownload(storage::TCountryId const & /* countryId */, - shared_ptr const & /* localFile */) -{ -} - -bool WillDelete(storage::TCountryId const & /* countryId */, - shared_ptr const & /* localFile */) -{ - return false; -} - -unique_ptr g_storage; +unique_ptr g_affiliations; void Init(string const & resource_path, string const & mwm_path) { @@ -66,8 +53,10 @@ void Init(string const & resource_path, string const & mwm_path) classificator::Load(); - g_storage = make_unique(countriesFile, mwm_path); - g_storage->Init(&DidDownload, &WillDelete); + g_affiliations = my::make_unique(); + storage::TCountryTree countries; + auto const rv = storage::LoadCountriesFromFile(countriesFile, countries, *g_affiliations); + CHECK(rv != -1, ("Can't load countries from:", countriesFile)); } struct Mercator @@ -152,13 +141,13 @@ struct SearchEngineProxy { SearchEngineProxy() { - CHECK(g_storage.get() != nullptr, ("init() was not called.")); + CHECK(g_affiliations.get(), ("init() was not called.")); auto & platform = GetPlatform(); auto infoGetter = storage::CountryInfoReader::CreateCountryInfoReader(platform); - infoGetter->InitAffiliationsInfo(&g_storage->GetAffiliations()); + infoGetter->InitAffiliationsInfo(&*g_affiliations); m_engine = make_shared( - move(infoGetter), make_unique(), search::Engine::Params{}); + move(infoGetter), my::make_unique(), search::Engine::Params{}); vector mwms; platform::FindAllLocalMapsAndCleanup(numeric_limits::max() /* the latest version */, diff --git a/storage/country.cpp b/storage/country.cpp index b7a9a7a9d1..4109846690 100644 --- a/storage/country.cpp +++ b/storage/country.cpp @@ -3,13 +3,16 @@ #include "platform/mwm_version.hpp" #include "platform/platform.hpp" +#include "coding/reader.hpp" + #include "base/logging.hpp" #include "base/stl_helpers.hpp" #include "3party/jansson/myjansson.hpp" -#include "std/utility.hpp" +#include +using namespace std; using platform::CountryFile; namespace storage @@ -294,8 +297,9 @@ bool LoadCountriesTwoComponentMwmsImpl(string const & jsonBuffer, } } -int64_t LoadCountries(string const & jsonBuffer, TCountryTree & countries, - TMappingAffiliations & affiliations, TMappingOldMwm * mapping /* = nullptr */) +int64_t LoadCountriesFromBuffer(string const & jsonBuffer, TCountryTree & countries, + TMappingAffiliations & affiliations, + TMappingOldMwm * mapping /* = nullptr */) { countries.Clear(); affiliations.clear(); @@ -331,6 +335,14 @@ int64_t LoadCountries(string const & jsonBuffer, TCountryTree & countries, return version; } +int64_t LoadCountriesFromFile(string const & path, TCountryTree & countries, + TMappingAffiliations & affiliations, TMappingOldMwm * mapping) +{ + string json; + ReaderPtr(GetPlatform().GetReader(path)).ReadAsString(json); + return LoadCountriesFromBuffer(json, countries, affiliations, mapping); +} + void LoadCountryFile2CountryInfo(string const & jsonBuffer, map & id2info, bool & isSingleMwm) { diff --git a/storage/country.hpp b/storage/country.hpp index b17d4dcb25..aca94f91a4 100644 --- a/storage/country.hpp +++ b/storage/country.hpp @@ -13,9 +13,11 @@ #include "geometry/rect2d.hpp" -#include "std/unordered_map.hpp" -#include "std/string.hpp" -#include "std/vector.hpp" +#include +#include +#include +#include +#include namespace update { @@ -24,9 +26,9 @@ class SizeUpdater; namespace storage { -using TMappingOldMwm = map; +using TMappingOldMwm = std::map; /// Map from key affiliation words into MWM IDs (file names). -using TMappingAffiliations = unordered_map>; +using TMappingAffiliations = std::unordered_map>; /// This class keeps all the information about a country in country tree (TCountryTree). /// It is guaranteed that every node represent a unique region has a unique |m_name| in country @@ -81,9 +83,13 @@ using TCountryTree = CountryTree; using TCountryTreeNode = TCountryTree::Node; /// @return version of country file or -1 if error was encountered -int64_t LoadCountries(string const & jsonBuffer, TCountryTree & countries, - TMappingAffiliations & affiliations, TMappingOldMwm * mapping = nullptr); +int64_t LoadCountriesFromBuffer(std::string const & buffer, TCountryTree & countries, + TMappingAffiliations & affiliations, + TMappingOldMwm * mapping = nullptr); +int64_t LoadCountriesFromFile(std::string const & path, TCountryTree & countries, + TMappingAffiliations & affiliations, + TMappingOldMwm * mapping = nullptr); -void LoadCountryFile2CountryInfo(string const & jsonBuffer, map & id2info, - bool & isSingleMwm); +void LoadCountryFile2CountryInfo(std::string const & jsonBuffer, + map & id2info, bool & isSingleMwm); } // namespace storage diff --git a/storage/storage.cpp b/storage/storage.cpp index 8c2aa0b662..2b85888e42 100644 --- a/storage/storage.cpp +++ b/storage/storage.cpp @@ -12,7 +12,6 @@ #include "coding/file_name_utils.hpp" #include "coding/internal/file_data.hpp" -#include "coding/reader.hpp" #include "coding/url_encode.hpp" #include "base/exception.hpp" @@ -119,7 +118,7 @@ Storage::Storage(string const & referenceCountriesTxtJsonForTesting, , m_maxMwmSizeBytes(0) { m_currentVersion = - LoadCountries(referenceCountriesTxtJsonForTesting, m_countries, m_affiliations); + LoadCountriesFromBuffer(referenceCountriesTxtJsonForTesting, m_countries, m_affiliations); CHECK_LESS_OR_EQUAL(0, m_currentVersion, ("Can't load test countries file")); CalMaxMwmSizeBytes(); } @@ -664,9 +663,8 @@ void Storage::LoadCountriesFile(string const & pathToCountriesFile, string const if (m_countries.IsEmpty()) { - string json; - ReaderPtr(GetPlatform().GetReader(pathToCountriesFile)).ReadAsString(json); - m_currentVersion = LoadCountries(json, m_countries, m_affiliations, mapping); + m_currentVersion = LoadCountriesFromFile(pathToCountriesFile, m_countries, + m_affiliations, mapping); LOG_SHORT(LINFO, ("Loaded countries list for version:", m_currentVersion)); if (m_currentVersion < 0) LOG(LERROR, ("Can't load countries file", pathToCountriesFile));