Remove enqueue_relations() in outputs

The code can easily go into middle.

Author: joto

src/middle-pgsql.cpp

@@ -558,8 +558,6 @@ void middle_pgsql_t::iterate_relations(pending_processor &pf)
     while (id_tracker::is_valid(id = m_rels_pending_tracker->pop_mark())) {
         pf.enqueue_relations(id);
     }
-    // in case we had higher ones than the middle
-    pf.enqueue_relations(id_tracker::max());
 
     //let the threads work on them
     pf.process_relations();

src/osmdata.cpp

@@ -307,7 +307,10 @@ struct pending_threaded_processor : public middle_t::pending_processor
     void enqueue_relations(osmid_t id) override
     {
         for (size_t i = 0; i < outs.size(); ++i) {
-            outs[i]->enqueue_relations(queue, id, i, ids_queued);
+            if (outs[i]->need_forward_dependencies()) {
+                queue.emplace(id, i);
+                ++ids_queued;
+            }
         }
     }
 

src/output-flex.cpp

@@ -1031,15 +1031,6 @@ void output_flex_t::pending_way(osmid_t id, int exists)
     m_buffer.clear();
 }
 
-void output_flex_t::enqueue_relations(pending_queue_t &job_queue, osmid_t id,
-                                      std::size_t output_id, std::size_t &added)
-{
-    if (id_tracker::is_valid(id)) {
-        job_queue.emplace(id, output_id);
-        ++added;
-    }
-}
-
 void output_flex_t::pending_relation(osmid_t id, int exists)
 {
     if (!m_has_process_relation) {

src/output-flex.hpp

@@ -62,9 +62,6 @@ class output_flex_t : public output_t
     void stage2_proc() override;
 
     void pending_way(osmid_t id, int exists) override;
-
-    void enqueue_relations(pending_queue_t &job_queue, osmid_t id,
-                           std::size_t output_id, std::size_t &added) override;
     void pending_relation(osmid_t id, int exists) override;
 
     void node_add(osmium::Node const &node) override;

src/output-gazetteer.hpp

@@ -49,10 +49,6 @@ class output_gazetteer_t : public output_t
     bool need_forward_dependencies() const noexcept override { return false; }
 
     void pending_way(osmid_t, int) override {}
-
-    void enqueue_relations(pending_queue_t &, osmid_t, size_t,
-                           size_t &) override
-    {}
     void pending_relation(osmid_t, int) override {}
 
     void node_add(osmium::Node const &node) override;

src/output-multi.cpp

@@ -75,15 +75,6 @@ void output_multi_t::pending_way(osmid_t id, int exists)
     }
 }
 
-void output_multi_t::enqueue_relations(pending_queue_t &job_queue, osmid_t id,
-                                       size_t output_id, size_t &added)
-{
-    if (id_tracker::is_valid(id)) {
-        job_queue.emplace(id, output_id);
-        ++added;
-    }
-}
-
 void output_multi_t::pending_relation(osmid_t id, int exists)
 {
     // Try to fetch the relation from the DB

src/output-multi.hpp

@@ -47,9 +47,6 @@ class output_multi_t : public output_t
     void commit() override;
 
     void pending_way(osmid_t id, int exists) override;
-
-    void enqueue_relations(pending_queue_t &job_queue, osmid_t id,
-                           size_t output_id, size_t &added) override;
     void pending_relation(osmid_t id, int exists) override;
 
     void node_add(osmium::Node const &node) override;

src/output-null.hpp

@@ -25,11 +25,6 @@ class output_null_t : public output_t
     bool need_forward_dependencies() const noexcept override { return false; }
 
     void pending_way(osmid_t /*id*/, int /*exists*/) override {}
-
-    void enqueue_relations(pending_queue_t & /*job_queue*/, osmid_t /*id*/,
-                           size_t /*output_id*/, size_t & /*added*/) override
-    {}
-
     void pending_relation(osmid_t /*id*/, int /*exists*/) override {}
 
     void node_add(osmium::Node const & /*node*/) override {}

src/output-pgsql.cpp

@@ -90,15 +90,6 @@ void output_pgsql_t::pending_way(osmid_t id, int exists)
     }
 }
 
-void output_pgsql_t::enqueue_relations(pending_queue_t &job_queue, osmid_t id,
-                                       size_t output_id, size_t &added)
-{
-    if (id_tracker::is_valid(id)) {
-        job_queue.emplace(id, output_id);
-        ++added;
-    }
-}
-
 void output_pgsql_t::pending_relation(osmid_t id, int exists)
 {
     // Try to fetch the relation from the DB

src/output-pgsql.hpp

@@ -47,9 +47,6 @@ class output_pgsql_t : public output_t
     void commit() override;
 
     void pending_way(osmid_t id, int exists) override;
-
-    void enqueue_relations(pending_queue_t &job_queue, osmid_t id,
-                           size_t output_id, size_t &added) override;
     void pending_relation(osmid_t id, int exists) override;
 
     void node_add(osmium::Node const &node) override;