Move dependency manager into osmdata

Author: joto

src/osm2pgsql.cpp

@@ -73,7 +73,7 @@ int main(int argc, char *argv[])
             need_dependencies ? new full_dependency_manager_t{middle}
                               : new dependency_manager_t{});
 
-        osmdata_t osmdata{dependency_manager.get(), middle, outputs};
+        osmdata_t osmdata{std::move(dependency_manager), middle, outputs};
 
         fmt::print(stderr, "Using projection SRS {} ({})\n",
                    options.projection->target_srs(),

src/osmdata.cpp

@@ -18,12 +18,12 @@
 #include "output.hpp"
 #include "util.hpp"
 
-osmdata_t::osmdata_t(dependency_manager_t *dependency_manager,
+osmdata_t::osmdata_t(std::unique_ptr<dependency_manager_t> dependency_manager,
                      std::shared_ptr<middle_t> mid,
                      std::vector<std::shared_ptr<output_t>> const &outs)
-: m_dependency_manager(dependency_manager), m_mid(mid), m_outs(outs)
+: m_dependency_manager(std::move(dependency_manager)), m_mid(mid), m_outs(outs)
 {
-    assert(dependency_manager != nullptr);
+    assert(m_dependency_manager);
     assert(m_mid);
     assert(!m_outs.empty());
 

src/osmdata.hpp

@@ -14,7 +14,7 @@ struct slim_middle_t;
 class osmdata_t
 {
 public:
-    osmdata_t(dependency_manager_t *dependency_manager,
+    osmdata_t(std::unique_ptr<dependency_manager_t> dependency_manager,
               std::shared_ptr<middle_t> mid,
               std::vector<std::shared_ptr<output_t>> const &outs);
 
@@ -37,7 +37,7 @@ class osmdata_t
 private:
     slim_middle_t &slim_middle() const noexcept;
 
-    dependency_manager_t *m_dependency_manager;
+    std::unique_ptr<dependency_manager_t> m_dependency_manager;
     std::shared_ptr<middle_t> m_mid;
     std::vector<std::shared_ptr<output_t>> m_outs;
     bool m_with_extra_attrs;

tests/common-import.hpp

@@ -22,12 +22,12 @@
 namespace testing {
 
 inline void parse_file(options_t const &options,
-                       dependency_manager_t *dependency_manager,
+                       std::unique_ptr<dependency_manager_t> dependency_manager,
                        std::shared_ptr<middle_t> const &mid,
                        std::vector<std::shared_ptr<output_t>> const &outs,
                        char const *filename = nullptr)
 {
-    osmdata_t osmdata{dependency_manager, mid, outs};
+    osmdata_t osmdata{std::move(dependency_manager), mid, outs};
 
     osmdata.start();
     parse_osmium_t parser{options.bbox, options.append, &osmdata};
@@ -91,7 +91,7 @@ class import_t
             need_dependencies ? new full_dependency_manager_t{middle}
                               : new dependency_manager_t{});
 
-        osmdata_t osmdata{dependency_manager.get(), middle, outputs};
+        osmdata_t osmdata{std::move(dependency_manager), middle, outputs};
 
         osmdata.start();
 
@@ -112,9 +112,11 @@ class import_t
         auto const outputs =
             output_t::create_outputs(middle->get_query_instance(), options);
 
-        full_dependency_manager_t dependency_manager{middle};
+        auto dependency_manager = std::unique_ptr<dependency_manager_t>(
+            new full_dependency_manager_t{middle});
 
-        parse_file(options, &dependency_manager, middle, outputs, file);
+        parse_file(options, std::move(dependency_manager), middle, outputs,
+                   file);
     }
 
     void run_file_multi_output(options_t options,
@@ -143,10 +145,11 @@ class import_t
             std::make_shared<db_copy_thread_t>(
                 options.database_options.conninfo()));
 
-        full_dependency_manager_t dependency_manager{mid_pgsql};
+        auto dependency_manager = std::unique_ptr<dependency_manager_t>(
+            new full_dependency_manager_t{mid_pgsql});
 
-        parse_file(options, &dependency_manager, mid_pgsql, {out_test},
-                   file);
+        parse_file(options, std::move(dependency_manager), mid_pgsql,
+                   {out_test}, file);
     }
 
     pg::conn_t connect() { return m_db.connect(); }

tests/test-output-multi-point-multi-table.cpp

@@ -45,10 +45,11 @@ TEST_CASE("parse point")
         outputs.push_back(out_test);
     }
 
-    dependency_manager_t dependency_manager{};
+    auto dependency_manager =
+        std::unique_ptr<dependency_manager_t>(new dependency_manager_t{});
 
-    testing::parse_file(options, &dependency_manager, mid_pgsql, outputs,
-                        "liechtenstein-2013-08-03.osm.pbf");
+    testing::parse_file(options, std::move(dependency_manager), mid_pgsql,
+                        outputs, "liechtenstein-2013-08-03.osm.pbf");
 
     auto conn = db.db().connect();
 

tests/test-parse-osmium.cpp

@@ -92,19 +92,29 @@ struct counting_output_t : public output_null_t
     unsigned sum_members = 0;
 };
 
+struct counts_t {
+    std::size_t nodes_changed = 0;
+    std::size_t ways_changed = 0;
+    std::size_t relations_changed = 0;
+};
+
 /**
  * This pseudo-dependency manager is just used for testing. It counts how
  * often the *_changed() member functions are called.
  */
-struct counting_dependency_manager_t : public dependency_manager_t
+class counting_dependency_manager_t : public dependency_manager_t
 {
-    void node_changed(osmid_t) override { ++nodes_changed; }
-    void way_changed(osmid_t) override { ++ways_changed; }
-    void relation_changed(osmid_t) override { ++relations_changed; }
+public:
+    counting_dependency_manager_t(std::shared_ptr<counts_t> counts)
+    : m_counts(std::move(counts))
+    {}
 
-    std::size_t nodes_changed = 0;
-    std::size_t ways_changed = 0;
-    std::size_t relations_changed = 0;
+    void node_changed(osmid_t) override { ++m_counts->nodes_changed; }
+    void way_changed(osmid_t) override { ++m_counts->ways_changed; }
+    void relation_changed(osmid_t) override { ++m_counts->relations_changed; }
+
+private:
+    std::shared_ptr<counts_t> m_counts;
 };
 
 TEST_CASE("parse xml file")
@@ -114,10 +124,12 @@ TEST_CASE("parse xml file")
     auto const middle = std::make_shared<counting_slim_middle_t>();
     std::shared_ptr<output_t> output{new counting_output_t{options}};
 
-    counting_dependency_manager_t dependency_manager;
+    auto counts = std::make_shared<counts_t>();
+    auto dependency_manager = std::unique_ptr<dependency_manager_t>(
+        new counting_dependency_manager_t{counts});
 
-    testing::parse_file(options, &dependency_manager, middle, {output},
-                        "test_multipolygon.osm");
+    testing::parse_file(options, std::move(dependency_manager), middle,
+                        {output}, "test_multipolygon.osm");
 
     auto const *out_test = static_cast<counting_output_t *>(output.get());
     REQUIRE(out_test->sum_ids == 4728);
@@ -141,9 +153,9 @@ TEST_CASE("parse xml file")
     REQUIRE(mid_test->relation.added == 40);
     REQUIRE(mid_test->relation.deleted == 0);
 
-    REQUIRE(dependency_manager.nodes_changed == 0);
-    REQUIRE(dependency_manager.ways_changed == 0);
-    REQUIRE(dependency_manager.relations_changed == 0);
+    REQUIRE(counts->nodes_changed == 0);
+    REQUIRE(counts->ways_changed == 0);
+    REQUIRE(counts->relations_changed == 0);
 }
 
 TEST_CASE("parse diff file")
@@ -153,10 +165,12 @@ TEST_CASE("parse diff file")
     auto const middle = std::make_shared<counting_slim_middle_t>();
     std::shared_ptr<output_t> output{new counting_output_t{options}};
 
-    counting_dependency_manager_t dependency_manager;
+    auto counts = std::make_shared<counts_t>();
+    auto dependency_manager = std::unique_ptr<dependency_manager_t>(
+        new counting_dependency_manager_t{counts});
 
-    testing::parse_file(options, &dependency_manager, middle, {output},
-                        "008-ch.osc.gz");
+    testing::parse_file(options, std::move(dependency_manager), middle,
+                        {output}, "008-ch.osc.gz");
 
     auto const *out_test = static_cast<counting_output_t *>(output.get());
     REQUIRE(out_test->node.added == 0);
@@ -177,9 +191,9 @@ TEST_CASE("parse diff file")
     REQUIRE(mid_test->relation.added == 11);
     REQUIRE(mid_test->relation.deleted == 12);
 
-    REQUIRE(dependency_manager.nodes_changed == 1176);
-    REQUIRE(dependency_manager.ways_changed == 161);
-    REQUIRE(dependency_manager.relations_changed == 11);
+    REQUIRE(counts->nodes_changed == 1176);
+    REQUIRE(counts->ways_changed == 161);
+    REQUIRE(counts->relations_changed == 11);
 }
 
 TEST_CASE("parse xml file with extra args")
@@ -190,10 +204,12 @@ TEST_CASE("parse xml file with extra args")
     auto const middle = std::make_shared<counting_slim_middle_t>();
     std::shared_ptr<output_t> output{new counting_output_t{options}};
 
-    counting_dependency_manager_t dependency_manager;
+    auto counts = std::make_shared<counts_t>();
+    auto dependency_manager = std::unique_ptr<dependency_manager_t>(
+        new counting_dependency_manager_t{counts});
 
-    testing::parse_file(options, &dependency_manager, middle, {output},
-                        "test_multipolygon.osm");
+    testing::parse_file(options, std::move(dependency_manager), middle,
+                        {output}, "test_multipolygon.osm");
 
     auto const *out_test = static_cast<counting_output_t *>(output.get());
     REQUIRE(out_test->sum_ids == 73514);
@@ -217,7 +233,7 @@ TEST_CASE("parse xml file with extra args")
     REQUIRE(mid_test->relation.added == 40);
     REQUIRE(mid_test->relation.deleted == 0);
 
-    REQUIRE(dependency_manager.nodes_changed == 0);
-    REQUIRE(dependency_manager.ways_changed == 0);
-    REQUIRE(dependency_manager.relations_changed == 0);
+    REQUIRE(counts->nodes_changed == 0);
+    REQUIRE(counts->ways_changed == 0);
+    REQUIRE(counts->relations_changed == 0);
 }