Remove unused ways_pending/done_tracker from pgsql/flex outputs

Author: joto

src/output-flex.cpp

@@ -1005,44 +1005,10 @@ void output_flex_t::call_process_function(int index,
 void output_flex_t::enqueue_ways(pending_queue_t &job_queue, osmid_t id,
                                  std::size_t output_id, std::size_t &added)
 {
-    osmid_t const prev = m_ways_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 (!m_ways_done_tracker->is_marked(id) && id_tracker::is_valid(id)) {
-        job_queue.push(pending_job_t(id, output_id));
+    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_ways_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) {
-        if (!m_ways_done_tracker->is_marked(popped)) {
-            job_queue.push(pending_job_t(popped, output_id));
-            ++added;
-        }
-        popped = m_ways_pending_tracker.pop_mark();
-    }
-
-    //make sure to get this one as well and move to the next
-    if (popped > id) {
-        if (!m_ways_done_tracker->is_marked(popped) &&
-            id_tracker::is_valid(popped)) {
-            job_queue.push(pending_job_t(popped, output_id));
-            ++added;
-        }
-    }
 }
 
 void output_flex_t::pending_way(osmid_t id, int exists)
@@ -1292,7 +1258,6 @@ output_flex_t::output_flex_t(
     std::shared_ptr<id_tracker> ways_tracker,
     std::shared_ptr<id_tracker> rels_tracker)
 : output_t(mid, o), m_tables(std::move(tables)),
-  m_ways_done_tracker(new id_tracker{}),
   m_stage2_ways_tracker(std::move(ways_tracker)),
   m_stage2_rels_tracker(std::move(rels_tracker)), m_copy_thread(copy_thread),
   m_lua_state(std::move(lua_state)), m_builder(o.projection),
@@ -1414,7 +1379,7 @@ void output_flex_t::init_lua(std::string const &filename)
 
 bool output_flex_t::has_pending() const
 {
-    return !m_ways_pending_tracker.empty() || !m_rels_pending_tracker.empty();
+    return !m_rels_pending_tracker.empty();
 }
 
 void output_flex_t::stage2_proc()

src/output-flex.hpp

@@ -139,9 +139,7 @@ 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_ways_pending_tracker;
     id_tracker m_rels_pending_tracker;
-    std::shared_ptr<id_tracker> m_ways_done_tracker;
 
     std::shared_ptr<id_tracker> m_stage2_ways_tracker;
     std::shared_ptr<id_tracker> m_stage2_rels_tracker;

src/output-pgsql.cpp

@@ -69,44 +69,10 @@ void output_pgsql_t::pgsql_out_way(osmium::Way const &way, taglist_t *tags,
 void output_pgsql_t::enqueue_ways(pending_queue_t &job_queue, osmid_t id,
                                   size_t output_id, size_t &added)
 {
-    osmid_t const prev = ways_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 (!ways_done_tracker->is_marked(id) && id_tracker::is_valid(id)) {
-        job_queue.push(pending_job_t(id, output_id));
+    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 = ways_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) {
-        if (!ways_done_tracker->is_marked(popped)) {
-            job_queue.push(pending_job_t(popped, output_id));
-            ++added;
-        }
-        popped = ways_pending_tracker.pop_mark();
-    }
-
-    //make sure to get this one as well and move to the next
-    if (popped > id) {
-        if (!ways_done_tracker->is_marked(popped) &&
-            id_tracker::is_valid(popped)) {
-            job_queue.push(pending_job_t(popped, output_id));
-            ++added;
-        }
-    }
 }
 
 void output_pgsql_t::pending_way(osmid_t id, int exists)
@@ -436,7 +402,6 @@ output_pgsql_t::output_pgsql_t(
     std::shared_ptr<db_copy_thread_t> const &copy_thread)
 : output_t(mid, o), m_builder(o.projection),
   expire(o.expire_tiles_zoom, o.expire_tiles_max_bbox, o.projection),
-  ways_done_tracker(new id_tracker{}),
   buffer(32768, osmium::memory::Buffer::auto_grow::yes),
   rels_buffer(1024, osmium::memory::Buffer::auto_grow::yes)
 {
@@ -495,9 +460,6 @@ output_pgsql_t::output_pgsql_t(
   m_builder(m_options.projection),
   expire(m_options.expire_tiles_zoom, m_options.expire_tiles_max_bbox,
          m_options.projection),
-  //NOTE: we need to know which ways were used by relations so each thread
-  //must have a copy of the original marked done ways, its read only so its ok
-  ways_done_tracker(other->ways_done_tracker),
   buffer(1024, osmium::memory::Buffer::auto_grow::yes),
   rels_buffer(1024, osmium::memory::Buffer::auto_grow::yes)
 {
@@ -512,7 +474,7 @@ output_pgsql_t::~output_pgsql_t() = default;
 
 bool output_pgsql_t::has_pending() const
 {
-    return !ways_pending_tracker.empty() || !rels_pending_tracker.empty();
+    return !rels_pending_tracker.empty();
 }
 
 void output_pgsql_t::merge_pending_relations(output_t *other)

src/output-pgsql.hpp

@@ -88,8 +88,7 @@ class output_pgsql_t : public output_t
     geom::osmium_builder_t m_builder;
     expire_tiles expire;
 
-    id_tracker ways_pending_tracker, rels_pending_tracker;
-    std::shared_ptr<id_tracker> ways_done_tracker;
+    id_tracker rels_pending_tracker;
     osmium::memory::Buffer buffer;
     osmium::memory::Buffer rels_buffer;
 };