diff options
| author | Anatoly Serdtcev <serdtcev@maps.me> | 2019-01-25 19:49:19 +0300 |
|---|---|---|
| committer | Anatoly Serdtcev <serdtcev@maps.me> | 2019-01-31 14:15:44 +0300 |
| commit | 6f6c7a4d25b8b5b984e44e59a16174949cc059c4 (patch) | |
| tree | a4c71c3d95710969e6c74249669a3ae7c74d5fa6 /geocoder | |
| parent | 28ba5721273e5998b45cddb4066ed8a7ae5aadbb (diff) | |
[geocoder] Fix for review
Diffstat (limited to 'geocoder')
| -rw-r--r-- | geocoder/hierarchy_reader.cpp | 7 | ||||
| -rw-r--r-- | geocoder/hierarchy_reader.hpp | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/geocoder/hierarchy_reader.cpp b/geocoder/hierarchy_reader.cpp index 3f8cdd5e0e..4dadc9be7b 100644 --- a/geocoder/hierarchy_reader.cpp +++ b/geocoder/hierarchy_reader.cpp @@ -153,9 +153,10 @@ void HierarchyReader::DeserializeEntryMap(vector<string> const & linesBuffer, in if (entry.m_type == Type::Count) continue; - ++stats.m_numLoaded; - if (stats.m_numLoaded % kLogBatch == 0) - LOG(LINFO, ("Read", (stats.m_numLoaded / kLogBatch) * kLogBatch, "entries")); + auto numLoaded = stats.m_numLoaded.fetch_add(1) + 1; + + if (numLoaded % kLogBatch == 0) + LOG(LINFO, ("Read", numLoaded, "entries")); entries.emplace(osmId, move(entry)); } diff --git a/geocoder/hierarchy_reader.hpp b/geocoder/hierarchy_reader.hpp index 70b21badb4..0d55aaf464 100644 --- a/geocoder/hierarchy_reader.hpp +++ b/geocoder/hierarchy_reader.hpp @@ -31,6 +31,7 @@ private: void DeserializeEntryMap(std::vector<std::string> const & linesBuffer, int const bufferSize, std::multimap<base::GeoObjectId, Entry> & entries, ParsingStats & stats); + std::vector<Entry> MergeEntries(std::vector<std::multimap<base::GeoObjectId, Entry>> & entryParts); boost::iostreams::filtering_istream m_fileStream; |