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

Re-use priority queue in StaticRTree

Browse Source
This commit is contained in:
Siarhei Fedartsou 2024-06-21 21:45:10 +02:00
parent e8da3d9231
commit a74fe05854
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
include/util/static_rtree.hpp
View File

@ -2,6 +2,7 @@
#define STATIC_RTREE_HPP #define STATIC_RTREE_HPP
#include "storage/tar_fwd.hpp" #include "storage/tar_fwd.hpp"
#include "osrm/coordinate.hpp"
#include "util/bearing.hpp" #include "util/bearing.hpp"
#include "util/coordinate_calculation.hpp" #include "util/coordinate_calculation.hpp"
#include "util/deallocating_vector.hpp" #include "util/deallocating_vector.hpp"
@ -15,8 +16,6 @@
#include "util/vector_view.hpp" #include "util/vector_view.hpp"
#include "util/web_mercator.hpp" #include "util/web_mercator.hpp"
#include "osrm/coordinate.hpp"
#include "storage/shared_memory_ownership.hpp" #include "storage/shared_memory_ownership.hpp"
#include <boost/assert.hpp> #include <boost/assert.hpp>
@ -554,14 +553,21 @@ class StaticRTree
auto projected_coordinate = web_mercator::fromWGS84(input_coordinate); auto projected_coordinate = web_mercator::fromWGS84(input_coordinate);
Coordinate fixed_projected_coordinate{projected_coordinate}; Coordinate fixed_projected_coordinate{projected_coordinate};
// we use std::vector<QueryCandidate> with std::push_heap/std::pop_heap instead of
// std::priority_queue to be able to re-use allocated memory: std::priority_queue does not
// have `clear` method
static thread_local std::vector<QueryCandidate> traversal_queue;
traversal_queue.clear();
// initialize queue with root element // initialize queue with root element
std::priority_queue<QueryCandidate> traversal_queue; traversal_queue.emplace_back(QueryCandidate{0, TreeIndex{}});
traversal_queue.push(QueryCandidate{0, TreeIndex{}}); std::push_heap(traversal_queue.begin(), traversal_queue.end());
while (!traversal_queue.empty()) while (!traversal_queue.empty())
{ {
QueryCandidate current_query_node = traversal_queue.top(); QueryCandidate current_query_node = traversal_queue.front();
traversal_queue.pop(); std::pop_heap(traversal_queue.begin(), traversal_queue.end());
traversal_queue.pop_back();
const TreeIndex &current_tree_index = current_query_node.tree_index; const TreeIndex &current_tree_index = current_query_node.tree_index;
if (!current_query_node.is_segment()) if (!current_query_node.is_segment())
@ -710,10 +716,12 @@ class StaticRTree
// distance must be non-negative // distance must be non-negative
BOOST_ASSERT(0. <= squared_distance); BOOST_ASSERT(0. <= squared_distance);
BOOST_ASSERT(i < std::numeric_limits<std::uint32_t>::max()); BOOST_ASSERT(i < std::numeric_limits<std::uint32_t>::max());
traversal_queue.push(QueryCandidate{squared_distance,
leaf_id, traversal_queue.emplace_back(QueryCandidate{squared_distance,
static_cast<std::uint32_t>(i), leaf_id,
Coordinate{projected_nearest}}); static_cast<std::uint32_t>(i),
Coordinate{projected_nearest}});
std::push_heap(traversal_queue.begin(), traversal_queue.end());
} }
} }
@ -742,9 +750,10 @@ class StaticRTree
child.minimum_bounding_rectangle.GetMinSquaredDist( child.minimum_bounding_rectangle.GetMinSquaredDist(
fixed_projected_input_coordinate); fixed_projected_input_coordinate);
traversal_queue.push(QueryCandidate{ traversal_queue.emplace_back(QueryCandidate{
squared_lower_bound_to_element, squared_lower_bound_to_element,
TreeIndex(parent.level + 1, child_index - m_tree_level_starts[parent.level + 1])}); TreeIndex(parent.level + 1, child_index - m_tree_level_starts[parent.level + 1])});
std::push_heap(traversal_queue.begin(), traversal_queue.end());
} }
} }