From 947050e34ac32537261196256bffc9073c8b85fe Mon Sep 17 00:00:00 2001 From: Michael Bell Date: Sat, 24 Apr 2021 12:25:31 +0100 Subject: [PATCH] Remove redundant loading of .osrm.cell_metrics When using process memory, MLD cell metrics are loaded twice from .osrm.cell_metrics - once when loading static data, and again when loading updatable data. The former appears to be the mistake, as .osrm.cell_metrics is only listed in `GetUpdatableFiles`. --- CHANGELOG.md | 1 + src/storage/storage.cpp | 9 --------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f9007696a3..6e1a6754bb1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ - Misc: - FIXED: Upgrade to @mapbox/node-pre-gyp fix various bugs with Node 12/14 [#5991](https://github.com/Project-OSRM/osrm-backend/pull/5991) - FIXED: `valid` type in documentation examples [#5990](https://github.com/Project-OSRM/osrm-backend/issues/5990) + - FIXED: Remove redundant loading of .osrm.cell_metrics [#6019](https://github.com/Project-OSRM/osrm-backend/issues/6019) - Profile: - FIXED: Add kerb barrier exception to default car profile. [#5999](https://github.com/Project-OSRM/osrm-backend/pull/5999) diff --git a/src/storage/storage.cpp b/src/storage/storage.cpp index 9185d99c0bc..9494285abed 100644 --- a/src/storage/storage.cpp +++ b/src/storage/storage.cpp @@ -489,15 +489,6 @@ void Storage::PopulateStaticData(const SharedDataIndex &index) partitioner::files::readCells(config.GetPath(".osrm.cells"), storage); } - if (boost::filesystem::exists(config.GetPath(".osrm.cell_metrics"))) - { - auto exclude_metrics = make_cell_metric_view(index, "/mld/metrics/" + metric_name); - std::unordered_map> metrics = { - {metric_name, std::move(exclude_metrics)}, - }; - customizer::files::readCellMetrics(config.GetPath(".osrm.cell_metrics"), metrics); - } - // load maneuver overrides { auto views = make_maneuver_overrides_views(index, "/common/maneuver_overrides");