Merge pull request #1996 from joto/single-query-dependencies

Middle: Get dependencies with single queries

Author: lonvia

src/dependency-manager.cpp

@@ -15,27 +15,89 @@
 
 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.set(way_id);
+    m_changed_nodes.set(id);
+}
+
+void full_dependency_manager_t::way_changed(osmid_t id)
+{
+    m_changed_ways.set(id);
+}
+
+void full_dependency_manager_t::relation_changed(osmid_t id)
+{
+    m_changed_relations.set(id);
+}
+
+void full_dependency_manager_t::after_nodes()
+{
+    if (m_changed_nodes.empty()) {
+        return;
     }
 
-    for (auto const rel_id : m_object_store->get_rels_by_node(id)) {
-        m_rels_pending_tracker.set(rel_id);
+    m_object_store->get_node_parents(m_changed_nodes, &m_ways_pending_tracker,
+                                     &m_rels_pending_tracker);
+    m_changed_nodes.clear();
+}
+
+static osmium::index::IdSetSmall<osmid_t>
+set_diff(osmium::index::IdSetSmall<osmid_t> const &set,
+         osmium::index::IdSetSmall<osmid_t> const &to_be_removed)
+{
+    osmium::index::IdSetSmall<osmid_t> new_set;
+
+    for (auto const id : set) {
+        if (!to_be_removed.get_binary_search(id)) {
+            new_set.set(id);
+        }
     }
+
+    return new_set;
 }
 
-void full_dependency_manager_t::way_changed(osmid_t id)
+void full_dependency_manager_t::after_ways()
 {
-    if (m_ways_pending_tracker.get(id)) {
+    if (!m_changed_ways.empty()) {
+        if (!m_ways_pending_tracker.empty()) {
+            // Remove ids from changed ways in the input data from
+            // m_ways_pending_tracker, because they have already been processed.
+            m_ways_pending_tracker =
+                set_diff(m_ways_pending_tracker, m_changed_ways);
+
+            // Add the list of pending way ids to the list of changed ways,
+            // because we need the parents for them, too.
+            m_changed_ways.merge_sorted(m_ways_pending_tracker);
+        }
+
+        m_object_store->get_way_parents(m_changed_ways,
+                                        &m_rels_pending_tracker);
+
+        m_changed_ways.clear();
         return;
     }
 
-    for (auto const rel_id : m_object_store->get_rels_by_way(id)) {
-        m_rels_pending_tracker.set(rel_id);
+    if (!m_ways_pending_tracker.empty()) {
+        m_object_store->get_way_parents(m_ways_pending_tracker,
+                                        &m_rels_pending_tracker);
     }
 }
 
+void full_dependency_manager_t::after_relations()
+{
+    // Remove ids from changed relations in the input data from
+    // m_rels_pending_tracker, because they have already been processed.
+    m_rels_pending_tracker =
+        set_diff(m_rels_pending_tracker, m_changed_relations);
+
+    m_changed_relations.clear();
+}
+
+void full_dependency_manager_t::mark_parent_relations_as_pending(
+    osmium::index::IdSetSmall<osmid_t> const &way_ids)
+{
+    assert(m_rels_pending_tracker.empty());
+    m_object_store->get_way_parents(way_ids, &m_rels_pending_tracker);
+}
+
 bool full_dependency_manager_t::has_pending() const noexcept
 {
     return !m_ways_pending_tracker.empty() || !m_rels_pending_tracker.empty();

src/dependency-manager.hpp

@@ -52,6 +52,17 @@ class dependency_manager_t
      */
     virtual void way_changed(osmid_t) {}
 
+    virtual void relation_changed(osmid_t) {}
+
+    virtual void after_nodes() {}
+    virtual void after_ways() {}
+    virtual void after_relations() {}
+
+    virtual void mark_parent_relations_as_pending(
+        osmium::index::IdSetSmall<osmid_t> const & /*way_ids*/)
+    {
+    }
+
     /// Are there pending objects that need to be processed?
     virtual bool has_pending() const noexcept { return false; }
 
@@ -94,6 +105,14 @@ class full_dependency_manager_t : public dependency_manager_t
 
     void node_changed(osmid_t id) override;
     void way_changed(osmid_t id) override;
+    void relation_changed(osmid_t id) override;
+
+    void after_nodes() override;
+    void after_ways() override;
+    void after_relations() override;
+
+    void mark_parent_relations_as_pending(
+        osmium::index::IdSetSmall<osmid_t> const &ids) override;
 
     bool has_pending() const noexcept override;
 
@@ -112,6 +131,32 @@ class full_dependency_manager_t : public dependency_manager_t
 
     std::shared_ptr<middle_t> m_object_store;
 
+    /**
+     * In append mode all new and changed nodes will be added to this. After
+     * all nodes are read this is used to figure out which parent ways and
+     * relations reference these nodes. Deleted nodes are not stored in here,
+     * because all ways and relations that referenced deleted nodes must be in
+     * the change file, too, and so we don't have to find out which ones they
+     * are.
+     */
+    osmium::index::IdSetSmall<osmid_t> m_changed_nodes;
+
+    /**
+     * In append mode all new and changed ways will be added to this. After
+     * all ways are read this is used to figure out which parent relations
+     * reference these ways. Deleted ways are not stored in here, because all
+     * relations that referenced deleted ways must be in the change file, too,
+     * and so we don't have to find out which ones they are.
+     */
+    osmium::index::IdSetSmall<osmid_t> m_changed_ways;
+
+    /**
+     * In append mode all new and changed relations will be added to this.
+     * This is then used to remove already processed relations from the
+     * pending list.
+     */
+    osmium::index::IdSetSmall<osmid_t> m_changed_relations;
+
     osmium::index::IdSetSmall<osmid_t> m_ways_pending_tracker;
     osmium::index::IdSetSmall<osmid_t> m_rels_pending_tracker;
 };