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

[search] Use unique temporary file names for index generation.

Browse source
This commit is contained in:
vng 2011-12-14 19:35:27 +03:00 • committed by Alex Zolotarev
parent e45aca3e8d
commit 0337dd8cb4
3 changed files with 35 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
generator/generator_tool/generator_tool.cpp
View file

@ -197,19 +197,17 @@ int main(int argc, char ** argv)
if (FLAGS_generate_index)
{
LOG(LINFO, ("Generating index for ", datFile));
if (!indexer::BuildIndexFromDatFile(datFile, FLAGS_intermediate_data_path + country))
{
LOG(LCRITICAL, ("Error generating index."));
}
}
if (FLAGS_generate_search_index)
{
LOG(LINFO, ("Generating search index for ", datFile));
if (!indexer::BuildSearchIndexFromDatFile(datFile))
{
if (!indexer::BuildSearchIndexFromDatFile(country + DATA_FILE_EXTENSION))
LOG(LCRITICAL, ("Error generating search index."));
}
}
}

50
indexer/search_index_builder.cpp
View file

@ -93,31 +93,37 @@ struct MaxValueCalc
} // unnamed namespace
void indexer::BuildSearchIndex(FeaturesVector const & featuresVector, Writer & writer)
void indexer::BuildSearchIndex(FeaturesVector const & featuresVector, Writer & writer,
string const & tmpFilePath)
{
StringsFile names;
string const tmpFile = GetPlatform().WritablePathForFile("search_index_1.tmp");
{
FileWriter writer(tmpFile);
names.OpenForWrite(&writer);
featuresVector.ForEachOffset(FeatureInserter(names));
StringsFile names;
{
FileWriter writer(tmpFilePath);
names.OpenForWrite(&writer);
featuresVector.ForEachOffset(FeatureInserter(names));
}
names.OpenForRead(new FileReader(tmpFilePath));
names.SortStrings();
trie::Build(writer, names.Begin(), names.End(),
trie::builder::MaxValueEdgeBuilder<MaxValueCalc>());
// at this point all readers should be dead
}
names.OpenForRead(new FileReader(tmpFile));
names.SortStrings();
trie::Build(writer, names.Begin(), names.End(),
trie::builder::MaxValueEdgeBuilder<MaxValueCalc>());
FileWriter::DeleteFileX(tmpFile);
FileWriter::DeleteFileX(tmpFilePath);
}
bool indexer::BuildSearchIndexFromDatFile(string const & datFile)
bool indexer::BuildSearchIndexFromDatFile(string const & fName)
{
try
{
string const tmpFile = GetPlatform().WritablePathForFile("search_index_2.tmp");
Platform & pl = GetPlatform();
string const datFile = pl.WritablePathForFile(fName);
string const tmpFile = pl.WritablePathForFile(fName + ".search_index_2.tmp");
{
FilesContainerR readCont(datFile);
@ -128,13 +134,15 @@ bool indexer::BuildSearchIndexFromDatFile(string const & datFile)
FeaturesVector featuresVector(readCont, header);
FileWriter writer(tmpFile);
BuildSearchIndex(featuresVector, writer);
BuildSearchIndex(featuresVector, writer, pl.WritablePathForFile(fName + ".search_index_1.tmp"));
}
// Write to container in reversed order.
FilesContainerW writeCont(datFile, FileWriter::OP_WRITE_EXISTING);
FileWriter writer = writeCont.GetWriter(SEARCH_INDEX_FILE_TAG);
rw_ops::Reverse(FileReader(tmpFile), writer);
{
// Write to container in reversed order.
FilesContainerW writeCont(datFile, FileWriter::OP_WRITE_EXISTING);
FileWriter writer = writeCont.GetWriter(SEARCH_INDEX_FILE_TAG);
rw_ops::Reverse(FileReader(tmpFile), writer);
}
FileWriter::DeleteFileX(tmpFile);
}

7
indexer/search_index_builder.hpp
View file

@ -6,8 +6,7 @@ class Writer;
namespace indexer
{
void BuildSearchIndex(FeaturesVector const & featuresVector, Writer & writer);
bool BuildSearchIndexFromDatFile(string const & datFile);
void BuildSearchIndex(FeaturesVector const & featuresVector, Writer & writer,
string const & tmpFilePath);
bool BuildSearchIndexFromDatFile(string const & fName);
} // namespace indexer