Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

fingerprint .ramIndex / tree nodes

Browse Source
This commit is contained in:
Pepijn Schoen 2017-04-07 16:51:00 +02:00 committed by Patrick Niklaus
parent 8da96f8d94
commit 85ec50552d
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/util/static_rtree.hpp
View File

@ -334,7 +334,7 @@ class StaticRTree
// open tree file // open tree file
storage::io::FileWriter tree_node_file(tree_node_filename, storage::io::FileWriter tree_node_file(tree_node_filename,
storage::io::FileWriter::HasNoFingerprint); storage::io::FileWriter::GenerateFingerprint);
std::uint64_t size_of_tree = m_search_tree.size(); std::uint64_t size_of_tree = m_search_tree.size();
BOOST_ASSERT_MSG(0 < size_of_tree, "tree empty"); BOOST_ASSERT_MSG(0 < size_of_tree, "tree empty");
@ -351,7 +351,7 @@ class StaticRTree
: m_coordinate_list(coordinate_list) : m_coordinate_list(coordinate_list)
{ {
storage::io::FileReader tree_node_file(node_file, storage::io::FileReader tree_node_file(node_file,
storage::io::FileReader::HasNoFingerprint); storage::io::FileReader::VerifyFingerprint);
const auto tree_size = tree_node_file.ReadElementCount64(); const auto tree_size = tree_node_file.ReadElementCount64();

2
src/benchmarks/static_rtree.cpp
View File

@ -32,7 +32,7 @@ using BenchStaticRTree = util::StaticRTree<RTreeLeaf, storage::Ownership::Contai
std::vector<util::Coordinate> loadCoordinates(const boost::filesystem::path &nodes_file) std::vector<util::Coordinate> loadCoordinates(const boost::filesystem::path &nodes_file)
{ {
storage::io::FileReader nodes_path_file_reader(nodes_file, storage::io::FileReader nodes_path_file_reader(nodes_file,
storage::io::FileReader::HasNoFingerprint); storage::io::FileReader::VerifyFingerprint);
extractor::QueryNode current_node; extractor::QueryNode current_node;
unsigned coordinate_count = nodes_path_file_reader.ReadElementCount32(); unsigned coordinate_count = nodes_path_file_reader.ReadElementCount32();

4
src/storage/storage.cpp
View File

@ -272,7 +272,7 @@ void Storage::PopulateLayout(DataLayout &layout)
// load rsearch tree size // load rsearch tree size
{ {
io::FileReader tree_node_file(config.ram_index_path, io::FileReader::HasNoFingerprint); io::FileReader tree_node_file(config.ram_index_path, io::FileReader::VerifyFingerprint);
const auto tree_size = tree_node_file.ReadElementCount64(); const auto tree_size = tree_node_file.ReadElementCount64();
layout.SetBlockSize<RTreeNode>(DataLayout::R_SEARCH_TREE, tree_size); layout.SetBlockSize<RTreeNode>(DataLayout::R_SEARCH_TREE, tree_size);
@ -731,7 +731,7 @@ void Storage::PopulateData(const DataLayout &layout, char *memory_ptr)
// store search tree portion of rtree // store search tree portion of rtree
{ {
io::FileReader tree_node_file(config.ram_index_path, io::FileReader::HasNoFingerprint); io::FileReader tree_node_file(config.ram_index_path, io::FileReader::VerifyFingerprint);
// perform this read so that we're at the right stream position for the next // perform this read so that we're at the right stream position for the next
// read. // read.
tree_node_file.Skip<std::uint64_t>(1); tree_node_file.Skip<std::uint64_t>(1);