Remove now unused rels_pending_tracker from outputs

Author: joto

src/output-flex.cpp

@@ -1034,45 +1034,10 @@ void output_flex_t::pending_way(osmid_t id, int exists)
 void output_flex_t::enqueue_relations(pending_queue_t &job_queue, osmid_t id,
                                       std::size_t output_id, std::size_t &added)
 {
-    if (!m_has_process_relation) {
-        return;
-    }
-
-    osmid_t const prev = m_rels_pending_tracker.last_returned();
-    if (id_tracker::is_valid(prev) && prev >= id) {
-        if (prev > id) {
-            job_queue.emplace(id, output_id);
-        }
-        // already done the job
-        return;
-    }
-
-    //make sure we get the one passed in
     if (id_tracker::is_valid(id)) {
         job_queue.emplace(id, output_id);
         ++added;
     }
-
-    //grab the first one or bail if its not valid
-    osmid_t popped = m_rels_pending_tracker.pop_mark();
-    if (!id_tracker::is_valid(popped)) {
-        return;
-    }
-
-    //get all the ones up to the id that was passed in
-    while (popped < id) {
-        job_queue.emplace(popped, output_id);
-        ++added;
-        popped = m_rels_pending_tracker.pop_mark();
-    }
-
-    //make sure to get this one as well and move to the next
-    if (popped > id) {
-        if (id_tracker::is_valid(popped)) {
-            job_queue.emplace(popped, output_id);
-            ++added;
-        }
-    }
 }
 
 void output_flex_t::pending_relation(osmid_t id, int exists)
@@ -1371,7 +1336,7 @@ void output_flex_t::init_lua(std::string const &filename)
 
 bool output_flex_t::has_pending() const
 {
-    return !m_rels_pending_tracker.empty();
+    return false;
 }
 
 void output_flex_t::stage2_proc()
@@ -1443,16 +1408,8 @@ void output_flex_t::stage2_proc()
     }
 }
 
-void output_flex_t::merge_pending_relations(output_t *other)
+void output_flex_t::merge_pending_relations(output_t *)
 {
-    auto *opgsql = dynamic_cast<output_flex_t *>(other);
-    if (opgsql) {
-        osmid_t id;
-        while (id_tracker::is_valid(
-            (id = opgsql->m_rels_pending_tracker.pop_mark()))) {
-            m_rels_pending_tracker.mark(id);
-        }
-    }
 }
 
 void output_flex_t::merge_expire_trees(output_t *other)

src/output-flex.hpp

@@ -137,8 +137,6 @@ class output_flex_t : public output_t
     std::shared_ptr<std::vector<flex_table_t>> m_tables;
     std::vector<table_connection_t> m_table_connections;
 
-    id_tracker m_rels_pending_tracker;
-
     std::shared_ptr<id_tracker> m_stage2_ways_tracker;
     std::shared_ptr<id_tracker> m_stage2_rels_tracker;
 

src/output-multi.cpp

@@ -67,7 +67,7 @@ void output_multi_t::start()
 
 bool output_multi_t::has_pending() const
 {
-    return !rels_pending_tracker.empty();
+    return false;
 }
 
 void output_multi_t::pending_way(osmid_t id, int exists)
@@ -83,40 +83,9 @@ 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)
 {
-    osmid_t const prev = rels_pending_tracker.last_returned();
-    if (id_tracker::is_valid(prev) && prev >= id) {
-        if (prev > id) {
-            job_queue.push(pending_job_t(id, output_id));
-        }
-        // already done the job
-        return;
-    }
-
-    //make sure we get the one passed in
     if (id_tracker::is_valid(id)) {
-        job_queue.push(pending_job_t(id, output_id));
-        ++added;
-    }
-
-    //grab the first one or bail if its not valid
-    osmid_t popped = rels_pending_tracker.pop_mark();
-    if (!id_tracker::is_valid(popped)) {
-        return;
-    }
-
-    //get all the ones up to the id that was passed in
-    while (popped < id) {
-        job_queue.push(pending_job_t(popped, output_id));
+        job_queue.emplace(id, output_id);
         ++added;
-        popped = rels_pending_tracker.pop_mark();
-    }
-
-    //make sure to get this one as well and move to the next
-    if (popped > id) {
-        if (id_tracker::is_valid(popped)) {
-            job_queue.push(pending_job_t(popped, output_id));
-            ++added;
-        }
     }
 }
 
@@ -366,17 +335,8 @@ void output_multi_t::delete_from_output(osmid_t id)
     }
 }
 
-void output_multi_t::merge_pending_relations(output_t *other)
+void output_multi_t::merge_pending_relations(output_t *)
 {
-    auto *const omulti = dynamic_cast<output_multi_t *>(other);
-
-    if (omulti) {
-        osmid_t id;
-        while (id_tracker::is_valid(
-            (id = omulti->rels_pending_tracker.pop_mark()))) {
-            rels_pending_tracker.mark(id);
-        }
-    }
 }
 
 void output_multi_t::merge_expire_trees(output_t *other)

src/output-multi.hpp

@@ -85,7 +85,6 @@ class output_multi_t : public output_t
     std::shared_ptr<reprojection> m_proj;
     osmium::item_type const m_osm_type;
     std::unique_ptr<table_t> m_table;
-    id_tracker rels_pending_tracker;
     expire_tiles m_expire;
     relation_helper m_relation_helper;
     osmium::memory::Buffer buffer;

src/output-pgsql.cpp

@@ -93,41 +93,10 @@ 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)
 {
-    osmid_t const prev = rels_pending_tracker.last_returned();
-    if (id_tracker::is_valid(prev) && prev >= id) {
-        if (prev > id) {
-            job_queue.push(pending_job_t(id, output_id));
-        }
-        // already done the job
-        return;
-    }
-
-    //make sure we get the one passed in
     if (id_tracker::is_valid(id)) {
-        job_queue.push(pending_job_t(id, output_id));
+        job_queue.emplace(id, output_id);
         ++added;
     }
-
-    //grab the first one or bail if its not valid
-    osmid_t popped = rels_pending_tracker.pop_mark();
-    if (!id_tracker::is_valid(popped)) {
-        return;
-    }
-
-    //get all the ones up to the id that was passed in
-    while (popped < id) {
-        job_queue.push(pending_job_t(popped, output_id));
-        ++added;
-        popped = rels_pending_tracker.pop_mark();
-    }
-
-    //make sure to get this one as well and move to the next
-    if (popped > id) {
-        if (id_tracker::is_valid(popped)) {
-            job_queue.push(pending_job_t(popped, output_id));
-            ++added;
-        }
-    }
 }
 
 void output_pgsql_t::pending_relation(osmid_t id, int exists)
@@ -458,19 +427,11 @@ output_pgsql_t::~output_pgsql_t() = default;
 
 bool output_pgsql_t::has_pending() const
 {
-    return !rels_pending_tracker.empty();
+    return false;
 }
 
-void output_pgsql_t::merge_pending_relations(output_t *other)
+void output_pgsql_t::merge_pending_relations(output_t *)
 {
-    auto *const opgsql = dynamic_cast<output_pgsql_t *>(other);
-    if (opgsql) {
-        osmid_t id;
-        while (id_tracker::is_valid(
-            (id = opgsql->rels_pending_tracker.pop_mark()))) {
-            rels_pending_tracker.mark(id);
-        }
-    }
 }
 
 void output_pgsql_t::merge_expire_trees(output_t *other)

src/output-pgsql.hpp

@@ -86,7 +86,6 @@ class output_pgsql_t : public output_t
     geom::osmium_builder_t m_builder;
     expire_tiles expire;
 
-    id_tracker rels_pending_tracker;
     osmium::memory::Buffer buffer;
     osmium::memory::Buffer rels_buffer;
 };