Remove dependency on options_t from node_persistent_cache

Author: joto

src/middle-pgsql.cpp

@@ -775,7 +775,8 @@ middle_pgsql_t::middle_pgsql_t(options_t const *options)
   m_db_copy(m_copy_thread)
 {
     if (!options->flat_node_file.empty()) {
-        m_persistent_cache.reset(new node_persistent_cache{options});
+        m_persistent_cache.reset(new node_persistent_cache{
+            options->flat_node_file, options->droptemp});
     }
 
     log_debug("Mid: pgsql, cache={}", options->cache);

src/middle-pgsql.hpp

@@ -15,6 +15,7 @@
 #include "middle.hpp"
 #include "node-persistent-cache.hpp"
 #include "node-ram-cache.hpp"
+#include "options.hpp"
 #include "pgsql.hpp"
 
 class middle_query_pgsql_t : public middle_query_t

src/node-persistent-cache.cpp

@@ -2,7 +2,6 @@
 
 #include "logging.hpp"
 #include "node-persistent-cache.hpp"
-#include "options.hpp"
 
 #include <cassert>
 
@@ -17,12 +16,12 @@ osmium::Location node_persistent_cache::get(osmid_t id) const noexcept
         static_cast<osmium::unsigned_object_id_type>(id));
 }
 
-node_persistent_cache::node_persistent_cache(const options_t *options)
+node_persistent_cache::node_persistent_cache(std::string const &file_name, bool remove_file)
 {
-    assert(!options->flat_node_file.empty());
+    assert(!file_name.empty());
 
-    m_fname = options->flat_node_file.c_str();
-    m_remove_file = options->droptemp;
+    m_fname = file_name.c_str();
+    m_remove_file = remove_file;
     log_debug("Mid: loading persistent node cache from {}", m_fname);
 
     // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg, hicpp-signed-bitwise)

src/node-persistent-cache.hpp

@@ -8,12 +8,10 @@
 
 #include "osmtypes.hpp"
 
-class options_t;
-
 class node_persistent_cache
 {
 public:
-    node_persistent_cache(options_t const *options);
+    node_persistent_cache(std::string const &file_name, bool remove_file);
     ~node_persistent_cache() noexcept;
 
     void set(osmid_t id, osmium::Location location);

tests/test-persistent-cache.cpp

@@ -32,7 +32,7 @@ TEST_CASE("Persistent cache", "[NoDB]")
 
     // create a new cache
     {
-        node_persistent_cache cache{&options};
+        node_persistent_cache cache{options.flat_node_file, false};
 
         // write in order
         write_and_read_location(cache, 10, 10.01, -45.3);
@@ -55,7 +55,7 @@ TEST_CASE("Persistent cache", "[NoDB]")
 
     // reopen the cache
     {
-        node_persistent_cache cache{&options};
+        node_persistent_cache cache{options.flat_node_file, false};
 
         // read all previously written locations
         read_location(cache, 10, 10.01, -45.3);