refactor graph_loader (#3333)

Refactors the GraphLoader class to use the safer FileReader wrapper for better error handling.

src/extractor/extractor.cpp

@@ -9,6 +9,7 @@
 #include "extractor/scripting_environment.hpp"
 
 #include "extractor/raster_source.hpp"
+#include "storage/io.hpp"
 #include "util/graph_loader.hpp"
 #include "util/io.hpp"
 #include "util/name_table.hpp"
@@ -399,11 +400,11 @@ void Extractor::FindComponents(unsigned max_edge_id,
   */
 std::shared_ptr<RestrictionMap> Extractor::LoadRestrictionMap()
 {
-    boost::filesystem::ifstream input_stream(config.restriction_file_name,
-                                             std::ios::in | std::ios::binary);
-
+    storage::io::FileReader file_reader(config.restriction_file_name,
+                                        storage::io::FileReader::VerifyFingerprint);
     std::vector<TurnRestriction> restriction_list;
-    util::loadRestrictionsFromFile(input_stream, restriction_list);
+
+    util::loadRestrictionsFromFile(file_reader, restriction_list);
 
     util::SimpleLogger().Write() << " - " << restriction_list.size() << " restrictions.";
 
@@ -418,25 +419,20 @@ Extractor::LoadNodeBasedGraph(std::unordered_set<NodeID> &barriers,
                               std::unordered_set<NodeID> &traffic_signals,
                               std::vector<QueryNode> &internal_to_external_node_map)
 {
-    boost::filesystem::ifstream stream(config.output_file_name, std::ios::binary);
-
-    if (!stream)
-    {
-        throw util::exception("Unable to open " + config.output_file_name +
-                              " trying to read the node based graph");
-    }
+    storage::io::FileReader file_reader(config.output_file_name,
+                                        storage::io::FileReader::VerifyFingerprint);
 
     auto barriers_iter = inserter(barriers, end(barriers));
     auto traffic_signals_iter = inserter(traffic_signals, end(traffic_signals));
 
     NodeID number_of_node_based_nodes = util::loadNodesFromFile(
-        stream, barriers_iter, traffic_signals_iter, internal_to_external_node_map);
+        file_reader, barriers_iter, traffic_signals_iter, internal_to_external_node_map);
 
     util::SimpleLogger().Write() << " - " << barriers.size() << " bollard nodes, "
                                  << traffic_signals.size() << " traffic lights";
 
     std::vector<NodeBasedEdge> edge_list;
-    util::loadEdgesFromFile(stream, edge_list);
+    util::loadEdgesFromFile(file_reader, edge_list);
 
     if (edge_list.empty())
     {

src/tools/components.cpp

@@ -50,24 +50,20 @@ void deleteFileIfExists(const std::string &file_name)
     }
 }
 
-std::size_t loadGraph(const char *path,
+std::size_t loadGraph(const std::string &path,
                       std::vector<extractor::QueryNode> &coordinate_list,
                       std::vector<TarjanEdge> &graph_edge_list)
 {
-    std::ifstream stream(path, std::ifstream::binary);
-    if (!stream)
-    {
-        throw util::exception("Cannot open osrm file");
-    }
+    storage::io::FileReader file_reader(path, storage::io::FileReader::VerifyFingerprint);
 
     // load graph data
     std::vector<extractor::NodeBasedEdge> edge_list;
 
     auto nop = boost::make_function_output_iterator([](auto) {});
 
-    auto number_of_nodes = util::loadNodesFromFile(stream, nop, nop, coordinate_list);
+    auto number_of_nodes = util::loadNodesFromFile(file_reader, nop, nop, coordinate_list);
 
-    util::loadEdgesFromFile(stream, edge_list);
+    util::loadEdgesFromFile(file_reader, edge_list);
 
     // Building an node-based graph
     for (const auto &input_edge : edge_list)
@@ -111,7 +107,8 @@ int main(int argc, char *argv[])
     }
 
     std::vector<osrm::tools::TarjanEdge> graph_edge_list;
-    auto number_of_nodes = osrm::tools::loadGraph(argv[1], coordinate_list, graph_edge_list);
+    auto number_of_nodes =
+        osrm::tools::loadGraph(std::string(argv[1]), coordinate_list, graph_edge_list);
 
     tbb::parallel_sort(graph_edge_list.begin(), graph_edge_list.end());
     const auto graph = std::make_shared<osrm::tools::TarjanGraph>(number_of_nodes, graph_edge_list);