From 757a861cd4961108fd45dacfe81fa3ea8159d82b Mon Sep 17 00:00:00 2001 From: Viktor Govako Date: Tue, 31 Aug 2021 21:09:09 +0300 Subject: [PATCH] [downloader] Added current data version to meta-server request. Signed-off-by: Viktor Govako --- storage/map_files_downloader.cpp | 5 ++--- storage/map_files_downloader.hpp | 5 ++++- storage/storage.cpp | 7 +++++++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/storage/map_files_downloader.cpp b/storage/map_files_downloader.cpp index 1687b7c7e7..b890e4858c 100644 --- a/storage/map_files_downloader.cpp +++ b/storage/map_files_downloader.cpp @@ -147,15 +147,14 @@ std::vector MapFilesDownloader::MakeUrlList(std::string const & rel // static MapFilesDownloader::ServersList MapFilesDownloader::LoadServersList() { - auto constexpr kTimeoutInSeconds = 10.0; - std::string const metaServerUrl = GetPlatform().MetaServerUrl(); std::string httpResult; if (!metaServerUrl.empty()) { platform::HttpClient request(metaServerUrl); - request.SetTimeout(kTimeoutInSeconds); + request.SetRawHeader("X-OM-DataVersion", std::to_string(m_dataVersion)); + request.SetTimeout(10.0); // timeout in seconds request.RunHttpRequest(httpResult); } diff --git a/storage/map_files_downloader.hpp b/storage/map_files_downloader.hpp index 568fa3c524..6587170623 100644 --- a/storage/map_files_downloader.hpp +++ b/storage/map_files_downloader.hpp @@ -58,13 +58,14 @@ public: void SetServersList(ServersList const & serversList); void SetDownloadingPolicy(DownloadingPolicy * policy); + void SetDataVersion(int64_t version) { m_dataVersion = version; } protected: bool IsDownloadingAllowed() const; std::vector MakeUrlList(std::string const & relativeUrl); // Synchronously loads list of servers by http client. - static ServersList LoadServersList(); + ServersList LoadServersList(); private: /** @@ -84,6 +85,8 @@ private: std::unique_ptr m_fileRequest; ServersList m_serversList; + int64_t m_dataVersion = 0; + /// Used as guard for m_serversList assign. std::atomic_bool m_isServersListRequested = false; diff --git a/storage/storage.cpp b/storage/storage.cpp index ed2e835b6d..4efb2247a7 100644 --- a/storage/storage.cpp +++ b/storage/storage.cpp @@ -134,6 +134,8 @@ Storage::Storage(string const & pathToCountriesFile /* = COUNTRIES_FILE */, SetLocale(languages::GetCurrentTwine()); LoadCountriesFile(pathToCountriesFile); CalcMaxMwmSizeBytes(); + + m_downloader->SetDataVersion(m_currentVersion); } Storage::Storage(string const & referenceCountriesTxtJsonForTesting, @@ -147,6 +149,8 @@ Storage::Storage(string const & referenceCountriesTxtJsonForTesting, m_countryNameSynonyms, m_mwmTopCityGeoIds, m_mwmTopCountryGeoIds); CHECK_LESS_OR_EQUAL(0, m_currentVersion, ("Can't load test countries file")); CalcMaxMwmSizeBytes(); + + m_downloader->SetDataVersion(m_currentVersion); } void Storage::Init(UpdateCallback didDownload, DeleteCallback willDelete) @@ -814,6 +818,7 @@ void Storage::SetEnabledIntegrityValidationForTesting(bool enabled) void Storage::SetCurrentDataVersionForTesting(int64_t currentVersion) { m_currentVersion = currentVersion; + m_downloader->SetDataVersion(m_currentVersion); } void Storage::SetDownloadingServersForTesting(vector const & downloadingUrls) @@ -1028,6 +1033,8 @@ void Storage::ApplyCountries(std::string const & countriesBuffer, Storage & stor } m_currentVersion = storage.m_currentVersion; + m_downloader->SetDataVersion(m_currentVersion); + m_countries = std::move(storage.m_countries); m_affiliations = std::move(storage.m_affiliations); m_countryNameSynonyms = std::move(storage.m_countryNameSynonyms);