Merge pull request #1155 from joto/refactor-dependency-tracking-step3

Refactor dependency tracking step3

Author: lonvia

src/middle-pgsql.cpp

@@ -438,7 +438,7 @@ void middle_pgsql_t::way_delete(osmid_t osm_id)
     m_db_copy.delete_object(osm_id);
 }
 
-void middle_pgsql_t::iterate_ways(middle_t::pending_processor &pf)
+void middle_pgsql_t::iterate_ways(pending_processor &pf)
 {
     // enqueue the jobs
     osmid_t id;

src/middle-pgsql.hpp

@@ -80,7 +80,7 @@ struct middle_pgsql_t : public slim_middle_t
 
     void flush() override;
 
-    void iterate_ways(middle_t::pending_processor &pf) override;
+    void iterate_ways(pending_processor &pf) override;
     void iterate_relations(pending_processor &pf) override;
 
     bool has_pending() const override;

src/middle-ram.cpp

@@ -7,14 +7,11 @@
  * emit the final geometry-enabled output formats
 */
 
-#include <stdexcept>
-
 #include <cassert>
-#include <cstdio>
+#include <memory>
 
 #include <osmium/builder/attr.hpp>
 
-#include "id-tracker.hpp"
 #include "middle-ram.hpp"
 #include "node-ram-cache.hpp"
 #include "options.hpp"
@@ -64,38 +61,8 @@ size_t middle_ram_t::nodes_get_list(osmium::WayNodeList *nodes) const
     return count;
 }
 
-void middle_ram_t::iterate_relations(pending_processor &pf)
-{
-    //TODO: just dont do anything
-
-    //let the outputs enqueue everything they have the non slim middle
-    //has nothing of its own to enqueue as it doesnt have pending anything
-    pf.enqueue_relations(id_tracker::max());
-
-    //let the threads process the relations
-    pf.process_relations();
-}
-
-void middle_ram_t::iterate_ways(middle_t::pending_processor &pf)
-{
-    //let the outputs enqueue everything they have the non slim middle
-    //has nothing of its own to enqueue as it doesnt have pending anything
-    pf.enqueue_ways(id_tracker::max());
-
-    //let the threads process the ways
-    pf.process_ways();
-}
-
-void middle_ram_t::release_relations() { m_rels.clear(); }
-
-void middle_ram_t::release_ways() { m_ways.clear(); }
-
 bool middle_ram_t::way_get(osmid_t id, osmium::memory::Buffer &buffer) const
 {
-    if (m_simulate_ways_deleted) {
-        return false;
-    }
-
     auto const *ele = m_ways.get(id);
 
     if (!ele) {
@@ -143,46 +110,26 @@ bool middle_ram_t::relation_get(osmid_t id,
     return true;
 }
 
-void middle_ram_t::analyze()
-{ /* No need */
-}
-
-void middle_ram_t::start() {}
-
 void middle_ram_t::stop(osmium::thread::Pool &)
 {
-    m_cache.reset(nullptr);
-
-    release_ways();
-    release_relations();
+    m_cache.reset();
+    m_ways.clear();
+    m_rels.clear();
 }
 
-void middle_ram_t::commit() {}
-
 middle_ram_t::middle_ram_t(options_t const *options)
 : m_ways(), m_rels(),
   m_cache(new node_ram_cache{options->alloc_chunkwise, options->cache}),
-  m_extra_attributes(options->extra_attributes), m_simulate_ways_deleted(false)
+  m_extra_attributes(options->extra_attributes)
 {}
 
-middle_ram_t::~middle_ram_t()
-{
-    //instance.reset();
-}
-
 idlist_t middle_ram_t::relations_using_way(osmid_t) const
 {
-    // this function shouldn't be called - relations_using_way is only used in
-    // slim mode, and a middle_ram_t shouldn't be constructed if the slim mode
-    // option is set.
-    throw std::runtime_error{
-        "middle_ram_t::relations_using_way is unimplemented, and "
-        "should not have been called. This is probably a bug, please "
-        "report it at https://github.com/openstreetmap/osm2pgsql/issues"};
+    assert(false && "Should only be called in slim mode");
+    return {};
 }
 
-std::shared_ptr<middle_query_t>
-middle_ram_t::get_query_instance()
+std::shared_ptr<middle_query_t> middle_ram_t::get_query_instance()
 {
     return shared_from_this();
 }

src/middle-ram.hpp

@@ -92,12 +92,12 @@ class elem_cache_t
 struct middle_ram_t : public middle_t, public middle_query_t
 {
     middle_ram_t(options_t const *options);
-    virtual ~middle_ram_t();
+    virtual ~middle_ram_t() noexcept = default;
 
-    void start() override;
+    void start() override {}
     void stop(osmium::thread::Pool &pool) override;
-    void analyze(void) override;
-    void commit(void) override;
+    void analyze() override {}
+    void commit() override {}
 
     void node_set(osmium::Node const &node) override;
     size_t nodes_get_list(osmium::WayNodeList *nodes) const override;
@@ -115,17 +115,14 @@ struct middle_ram_t : public middle_t, public middle_query_t
 
     idlist_t relations_using_way(osmid_t way_id) const override;
 
-    void iterate_ways(middle_t::pending_processor &pf) override;
-    void iterate_relations(pending_processor &pf) override;
+    void iterate_ways(pending_processor &) override {}
+    void iterate_relations(pending_processor &) override {}
 
     bool has_pending() const override { return false; }
 
     std::shared_ptr<middle_query_t> get_query_instance() override;
 
 private:
-    void release_ways();
-    void release_relations();
-
     struct ramWay
     {
         taglist_t tags;
@@ -159,13 +156,6 @@ struct middle_ram_t : public middle_t, public middle_query_t
 
     std::unique_ptr<node_ram_cache> m_cache;
     bool m_extra_attributes;
-
-    /* the previous behaviour of iterate_ways was to delete all ways as they
-     * were being iterated. this doesn't work now that the output handles its
-     * own "done" status and output-specific "pending" status. however, the
-     * tests depend on the behaviour that ways will be unavailable once
-     * iterate_ways is complete, so this flag emulates that. */
-    bool m_simulate_ways_deleted;
 };
 
 #endif // OSM2PGSQL_MIDDLE_RAM_HPP

src/osmdata.cpp

@@ -409,23 +409,14 @@ void osmdata_t::stop() const
     // should be the same for all outputs
     auto const *opts = m_outs[0]->get_options();
 
-    // are there any objects left pending?
-    if (m_mid->has_pending()) {
-        //threaded pending processing
+    // In append mode there might be dependent objects pending that we
+    // need to process.
+    if (opts->append && m_mid->has_pending()) {
         pending_threaded_processor ptp(m_mid, m_outs, opts->num_procs,
                                        opts->append);
 
-        if (!m_outs.empty()) {
-            //This stage takes ways which were processed earlier, but might be
-            //involved in a multipolygon relation. They could also be ways that
-            //were modified in diff processing.
-            m_mid->iterate_ways(ptp);
-
-            //This is like pending ways, except there aren't pending relations
-            //on import, only on update.
-            //TODO: Can we skip this on import?
-            m_mid->iterate_relations(ptp);
-        }
+        m_mid->iterate_ways(ptp);
+        m_mid->iterate_relations(ptp);
     }
 
     for (auto &out : m_outs) {