Merge pull request #1344 from joto/remove-id-tracker

Remove id-tracker, use libosmiums IdSet instead

Author: lonvia

src/CMakeLists.txt

@@ -6,7 +6,6 @@ set(osm2pgsql_lib_SOURCES
   expire-tiles.cpp
   gazetteer-style.cpp
   geometry-processor.cpp
-  id-tracker.cpp
   input-handler.cpp
   logging.cpp
   middle-pgsql.cpp

src/dependency-manager.cpp

@@ -2,26 +2,29 @@
 #include "dependency-manager.hpp"
 #include "middle.hpp"
 
+#include <algorithm>
+#include <iterator>
+
 void full_dependency_manager_t::node_changed(osmid_t id)
 {
     for (auto const way_id : m_object_store->get_ways_by_node(id)) {
         way_changed(way_id);
-        m_ways_pending_tracker.mark(way_id);
+        m_ways_pending_tracker.set(way_id);
     }
 
     for (auto const rel_id : m_object_store->get_rels_by_node(id)) {
-        m_rels_pending_tracker.mark(rel_id);
+        m_rels_pending_tracker.set(rel_id);
     }
 }
 
 void full_dependency_manager_t::way_changed(osmid_t id)
 {
-    if (m_ways_pending_tracker.is_marked(id)) {
+    if (m_ways_pending_tracker.get(id)) {
         return;
     }
 
     for (auto const rel_id : m_object_store->get_rels_by_way(id)) {
-        m_rels_pending_tracker.mark(rel_id);
+        m_rels_pending_tracker.set(rel_id);
     }
 }
 
@@ -30,15 +33,16 @@ bool full_dependency_manager_t::has_pending() const noexcept
     return !m_ways_pending_tracker.empty() || !m_rels_pending_tracker.empty();
 }
 
-idlist_t full_dependency_manager_t::get_ids(id_tracker &tracker)
+idlist_t full_dependency_manager_t::get_ids(osmium::index::IdSetSmall<osmid_t> &tracker)
 {
+    tracker.sort_unique();
+
     idlist_t list;
     list.reserve(tracker.size());
 
-    osmid_t id;
-    while (id_tracker::is_valid(id = tracker.pop_mark())) {
-        list.push_back(id);
-    }
+    std::copy(tracker.cbegin(), tracker.cend(), std::back_inserter(list));
+
+    tracker.clear();
 
     return list;
 }

src/dependency-manager.hpp

@@ -1,9 +1,10 @@
 #ifndef OSM2PGSQL_DEPENDENCY_MANAGER_HPP
 #define OSM2PGSQL_DEPENDENCY_MANAGER_HPP
 
-#include "id-tracker.hpp"
 #include "osmtypes.hpp"
 
+#include <osmium/index/id_set.hpp>
+
 #include <cassert>
 #include <memory>
 
@@ -97,12 +98,12 @@ class full_dependency_manager_t : public dependency_manager_t
     }
 
 private:
-    static idlist_t get_ids(id_tracker &tracker);
+    static idlist_t get_ids(osmium::index::IdSetSmall<osmid_t> &tracker);
 
     std::shared_ptr<middle_t> m_object_store;
 
-    id_tracker m_ways_pending_tracker;
-    id_tracker m_rels_pending_tracker;
+    osmium::index::IdSetSmall<osmid_t> m_ways_pending_tracker;
+    osmium::index::IdSetSmall<osmid_t> m_rels_pending_tracker;
 };
 
 #endif // OSM2PGSQL_DEPENDENCY_MANAGER_HPP