Add _t suffix to class node_persistent_cache

Author: joto

src/middle-pgsql.cpp

@@ -987,7 +987,7 @@ void middle_pgsql_t::after_relations()
 middle_query_pgsql_t::middle_query_pgsql_t(
     connection_params_t const &connection_params,
     std::shared_ptr<node_locations_t> cache,
-    std::shared_ptr<node_persistent_cache> persistent_cache,
+    std::shared_ptr<node_persistent_cache_t> persistent_cache,
     middle_pgsql_options const &options)
 : m_db_connection(connection_params, "middle.query"), m_cache(std::move(cache)),
   m_persistent_cache(std::move(persistent_cache)), m_store_options(options)
@@ -1249,7 +1249,7 @@ middle_pgsql_t::middle_pgsql_t(std::shared_ptr<thread_pool_t> thread_pool,
         m_store_options.untagged_nodes = true;
     } else {
         m_store_options.use_flat_node_file = true;
-        m_persistent_cache = std::make_shared<node_persistent_cache>(
+        m_persistent_cache = std::make_shared<node_persistent_cache_t>(
             options->flat_node_file, !options->append, options->droptemp);
     }
 

src/middle-pgsql.hpp

@@ -30,7 +30,7 @@
 #include "pgsql.hpp"
 
 class node_locations_t;
-class node_persistent_cache;
+class node_persistent_cache_t;
 
 struct middle_pgsql_options
 {
@@ -53,7 +53,7 @@ class middle_query_pgsql_t : public middle_query_t
     middle_query_pgsql_t(
         connection_params_t const &connection_params,
         std::shared_ptr<node_locations_t> cache,
-        std::shared_ptr<node_persistent_cache> persistent_cache,
+        std::shared_ptr<node_persistent_cache_t> persistent_cache,
         middle_pgsql_options const &options);
 
     osmium::Location get_node_location(osmid_t id) const override;
@@ -81,7 +81,7 @@ class middle_query_pgsql_t : public middle_query_t
 
     pg_conn_t m_db_connection;
     std::shared_ptr<node_locations_t> m_cache;
-    std::shared_ptr<node_persistent_cache> m_persistent_cache;
+    std::shared_ptr<node_persistent_cache_t> m_persistent_cache;
 
     middle_pgsql_options m_store_options;
 };
@@ -185,7 +185,7 @@ struct middle_pgsql_t : public middle_t
     options_t const *m_options;
 
     std::shared_ptr<node_locations_t> m_cache;
-    std::shared_ptr<node_persistent_cache> m_persistent_cache;
+    std::shared_ptr<node_persistent_cache_t> m_persistent_cache;
 
     pg_conn_t m_db_connection;
 

src/middle-ram.cpp

@@ -79,7 +79,7 @@ middle_ram_t::middle_ram_t(std::shared_ptr<thread_pool_t> thread_pool,
     }
 
     if (!options->flat_node_file.empty()) {
-        m_persistent_cache = std::make_shared<node_persistent_cache>(
+        m_persistent_cache = std::make_shared<node_persistent_cache_t>(
             options->flat_node_file, !options->append, options->droptemp);
     }
 }

src/middle-ram.hpp

@@ -25,7 +25,7 @@
 #include <string>
 #include <utility>
 
-class node_persistent_cache;
+class node_persistent_cache_t;
 class thread_pool_t;
 
 /**
@@ -130,7 +130,7 @@ class middle_ram_t : public middle_t, public middle_query_t
     middle_ram_options m_store_options;
 
     /// File cache
-    std::shared_ptr<node_persistent_cache> m_persistent_cache;
+    std::shared_ptr<node_persistent_cache_t> m_persistent_cache;
 
 }; // class middle_ram_t
 

src/node-persistent-cache.cpp

@@ -17,19 +17,20 @@
 #include <system_error>
 #include <utility>
 
-void node_persistent_cache::set(osmid_t id, osmium::Location location)
+void node_persistent_cache_t::set(osmid_t id, osmium::Location location)
 {
     m_index->set(static_cast<osmium::unsigned_object_id_type>(id), location);
 }
 
-osmium::Location node_persistent_cache::get(osmid_t id) const noexcept
+osmium::Location node_persistent_cache_t::get(osmid_t id) const noexcept
 {
     return m_index->get_noexcept(
         static_cast<osmium::unsigned_object_id_type>(id));
 }
 
-node_persistent_cache::node_persistent_cache(std::string file_name,
-                                             bool create_file, bool remove_file)
+node_persistent_cache_t::node_persistent_cache_t(std::string file_name,
+                                                 bool create_file,
+                                                 bool remove_file)
 : m_file_name(std::move(file_name)), m_remove_file(remove_file)
 {
     assert(!m_file_name.empty());
@@ -65,7 +66,7 @@ node_persistent_cache::node_persistent_cache(std::string file_name,
     }
 }
 
-node_persistent_cache::~node_persistent_cache() noexcept
+node_persistent_cache_t::~node_persistent_cache_t() noexcept
 {
     m_index.reset();
     if (m_fd >= 0) {

src/node-persistent-cache.hpp

@@ -18,18 +18,19 @@
 
 #include "osmtypes.hpp"
 
-class node_persistent_cache
+class node_persistent_cache_t
 {
 public:
-    node_persistent_cache(std::string file_name, bool create_file,
-                          bool remove_file);
-    ~node_persistent_cache() noexcept;
+    node_persistent_cache_t(std::string file_name, bool create_file,
+                            bool remove_file);
+    ~node_persistent_cache_t() noexcept;
 
-    node_persistent_cache(node_persistent_cache const &) = delete;
-    node_persistent_cache &operator=(node_persistent_cache const &) = delete;
+    node_persistent_cache_t(node_persistent_cache_t const &) = delete;
+    node_persistent_cache_t &
+    operator=(node_persistent_cache_t const &) = delete;
 
-    node_persistent_cache(node_persistent_cache &&) = delete;
-    node_persistent_cache &operator=(node_persistent_cache &&) = delete;
+    node_persistent_cache_t(node_persistent_cache_t &&) = delete;
+    node_persistent_cache_t &operator=(node_persistent_cache_t &&) = delete;
 
     void set(osmid_t id, osmium::Location location);
     osmium::Location get(osmid_t id) const noexcept;
@@ -49,6 +50,6 @@ class node_persistent_cache
     int m_fd = -1;
     std::unique_ptr<index_t> m_index;
     bool m_remove_file;
-};
+}; // class node_persistent_cache_t
 
 #endif // OSM2PGSQL_NODE_PERSISTENT_CACHE_HPP

tests/test-persistent-cache.cpp

@@ -15,20 +15,20 @@
 
 namespace {
 
-void write_and_read_location(node_persistent_cache *cache, osmid_t id, double x,
-                             double y)
+void write_and_read_location(node_persistent_cache_t *cache, osmid_t id,
+                             double x, double y)
 {
     cache->set(id, osmium::Location{x, y});
     REQUIRE(osmium::Location(x, y) == cache->get(id));
 }
 
-void read_location(node_persistent_cache const &cache, osmid_t id, double x,
+void read_location(node_persistent_cache_t const &cache, osmid_t id, double x,
                    double y)
 {
     REQUIRE(osmium::Location(x, y) == cache.get(id));
 }
 
-void delete_location(node_persistent_cache *cache, osmid_t id)
+void delete_location(node_persistent_cache_t *cache, osmid_t id)
 {
     cache->set(id, osmium::Location{});
     REQUIRE(osmium::Location{} == cache->get(id));
@@ -43,7 +43,7 @@ TEST_CASE("Persistent cache", "[NoDB]")
 
     // create a new cache
     {
-        node_persistent_cache cache{flat_node_file, true, false};
+        node_persistent_cache_t cache{flat_node_file, true, false};
 
         // write in order
         write_and_read_location(&cache, 10, 10.01, -45.3);
@@ -66,7 +66,7 @@ TEST_CASE("Persistent cache", "[NoDB]")
 
     // reopen the cache
     {
-        node_persistent_cache cache{flat_node_file, false, false};
+        node_persistent_cache_t cache{flat_node_file, false, false};
 
         // read all previously written locations
         read_location(cache, 10, 10.01, -45.3);
@@ -115,5 +115,5 @@ TEST_CASE("Opening non-existent persistent cache should fail in append mode",
         "test_middle_flat.nonexistent.flat.nodes.bin";
     testing::cleanup::file_t const flatnode_cleaner{flat_node_file};
 
-    REQUIRE_THROWS(node_persistent_cache(flat_node_file, false, false));
+    REQUIRE_THROWS(node_persistent_cache_t(flat_node_file, false, false));
 }