kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Verbose logging on index calculation + reducing ram space consumption for routing index builder

Browse source
This commit is contained in:
Lev Dragunov 2015-03-19 12:40:30 +03:00 • committed by Alex Zolotarev
parent ba3a0e7ff1
commit ce26920dac
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
indexer/features_offsets_table.cpp
View file

@ -6,6 +6,7 @@
#include "../coding/internal/file_data.hpp"
#include "../platform/platform.hpp"
#include "../base/assert.hpp"
#include "../base/logging.hpp"
#include "../base/scope_guard.hpp"
#include "../std/string.hpp"
@ -61,6 +62,8 @@ namespace feature
if (GetPlatform().GetFileSizeByFullPath(fileName,size))
return Load(fileName);
LOG(LINFO, ("Features offsets table is absent! Creating a new one."));
if (!mwmFileContainer.IsExist(HEADER_FILE_TAG))
return unique_ptr<FeaturesOffsetsTable>();
@ -79,6 +82,7 @@ namespace feature
void FeaturesOffsetsTable::Save(string const & fileName)
{
LOG(LINFO, ("Saving features offsets table to ", fileName));
string const fileNameTmp = fileName + EXTENSION_TMP;
succinct::mapper::freeze(m_table, fileNameTmp.c_str());
my::RenameFileX(fileNameTmp, fileName);

6
routing/osrm2feature_map.cpp
View file

@ -328,6 +328,7 @@ void OsrmFtSegMappingBuilder::Save(FilesContainerW & cont) const
void OsrmFtSegBackwardIndex::Save(string const & nodesFileName, string const & bitsFileName)
{
{
LOG(LINFO, ("Saving routing nodes index to ", nodesFileName));
string const nodesFileNameTmp = nodesFileName + EXTENSION_TMP;
FileWriter nodesFile(nodesFileNameTmp);
WriteVarUint(nodesFile, static_cast<uint32_t>(m_nodeIds.size()));
@ -338,6 +339,7 @@ void OsrmFtSegBackwardIndex::Save(string const & nodesFileName, string const & b
my::RenameFileX(nodesFileNameTmp, nodesFileName);
}
{
LOG(LINFO, ("Saving features routing bits to ", bitsFileName));
string const bitsFileNameTmp = bitsFileName + EXTENSION_TMP;
succinct::mapper::freeze(m_rankIndex, bitsFileNameTmp.c_str());
my::RenameFileX(bitsFileNameTmp, bitsFileName);
@ -389,6 +391,7 @@ void OsrmFtSegBackwardIndex::Construct(OsrmFtSegMapping & mapping, const uint32_
if (Load(bitsFileName, nodesFileName))
return;
LOG(LINFO, ("Backward routing index is absent! Creating new one."));
mapping.Map(routingFile);
// Generate temporary index to speedup processing
@ -405,6 +408,7 @@ void OsrmFtSegBackwardIndex::Construct(OsrmFtSegMapping & mapping, const uint32_
}
mapping.Unmap();
LOG(LINFO, ("Temporary index constructed"));
// Create final index
vector<bool> inIndex(m_table->size(), false);
@ -422,6 +426,8 @@ void OsrmFtSegBackwardIndex::Construct(OsrmFtSegMapping & mapping, const uint32_
node = (it.first++)->second;
nodeIds.emplace_back(nodesList);
}
// Cleaning index because we have no free space on old devices.
temporaryBackwardIndex.erase(fid);
}
// Pack and save index