Remove stage 2 processing of relations

We currently have no use case for processing relations again in stage 2
and two-stage-processing is difficult enough without having to think
about how relations in relations are handled, especially when updates
are involved.

This commit removes tracking of relation ids for stage 2, i.e. the
Lua function mark_relation() and all the internal processing behind it
is removed. This functionality can be added back in later, when we
have some more experience with stage 2 processing.

Author: joto

docs/flex.md

@@ -37,8 +37,6 @@ The following functions are defined:
   more control than the more convenient other functions.
 * `osm2pgsql.mark_way(id)`: Mark the OSM way with the specified id. This way
   will be processed (again) in stage 2.
-* `osm2pgsql.mark_relation(id)`: Mark the OSM relation with the specified id.
-  This relation will be processed (again) in stage 2.
 
 You are expected to define one or more of the following functions:
 
@@ -226,10 +224,9 @@ a default transformation. These are the defaults:
 
 ## Stages
 
-Osm2pgsql processes the data in up to two stages. You can mark ways or
-relations in stage 1 for processing in stage 2 by calling
-`osm2pgsql.mark_way(id)` or `osm2pgsql.mark_relation(id)`, respectively. If you
-don't mark any objects, nothing will be done in stage 2.
+Osm2pgsql processes the data in up to two stages. You can mark ways in stage 1
+for processing in stage 2 by calling `osm2pgsql.mark_way(id)`. If you don't
+mark any ways, nothing will be done in stage 2.
 
 You can look at `osm2pgsql.stage` to see in which stage you are.
 

src/init.lua

@@ -33,10 +33,6 @@ function osm2pgsql.mark_way(id)
     return osm2pgsql.mark('w', id)
 end
 
-function osm2pgsql.mark_relation(id)
-    return osm2pgsql.mark('r', id)
-end
-
 function osm2pgsql.clamp(value, low, high)
     return math.min(math.max(value, low), high)
 end

src/output-flex.cpp

@@ -519,8 +519,6 @@ int output_flex_t::app_mark()
 
     if (type_name[0] == 'w') {
         m_stage2_ways_tracker->mark(id);
-    } else if (type_name[0] == 'r') {
-        m_stage2_rels_tracker->mark(id);
     }
 
     return 0;
@@ -821,10 +819,6 @@ int output_flex_t::table_add_row()
             throw std::runtime_error{
                 "Trying to add relation to table '{}'"_format(table.name())};
         }
-        if (m_in_stage2) {
-            delete_from_table(&table_connection, osmium::item_type::relation,
-                              m_context_relation->id());
-        }
         add_row(&table_connection, *m_context_relation);
     } else {
         throw std::runtime_error{"The add_row() function can only be called "
@@ -1214,7 +1208,7 @@ output_flex_t::clone(std::shared_ptr<middle_query_t> const &mid,
     return std::make_shared<output_flex_t>(
         mid, *get_options(), copy_thread, true, m_lua_state, m_process_node,
         m_process_way, m_process_relation, m_tables,
-        m_stage2_ways_tracker, m_stage2_rels_tracker);
+        m_stage2_ways_tracker);
 }
 
 output_flex_t::output_flex_t(
@@ -1224,11 +1218,9 @@ output_flex_t::output_flex_t(
     prepared_lua_function_t process_way,
     prepared_lua_function_t process_relation,
     std::shared_ptr<std::vector<flex_table_t>> tables,
-    std::shared_ptr<id_tracker> ways_tracker,
-    std::shared_ptr<id_tracker> rels_tracker)
+    std::shared_ptr<id_tracker> ways_tracker)
 : output_t(mid, o), m_tables(std::move(tables)),
-  m_stage2_ways_tracker(std::move(ways_tracker)),
-  m_stage2_rels_tracker(std::move(rels_tracker)), m_copy_thread(copy_thread),
+  m_stage2_ways_tracker(std::move(ways_tracker)), m_copy_thread(copy_thread),
   m_lua_state(std::move(lua_state)), m_builder(o.projection),
   m_expire(o.expire_tiles_zoom, o.expire_tiles_max_bbox, o.projection),
   m_buffer(32768, osmium::memory::Buffer::auto_grow::yes),
@@ -1333,11 +1325,8 @@ void output_flex_t::init_lua(std::string const &filename)
 
 void output_flex_t::stage2_proc()
 {
-    bool const has_marked_ways = !m_stage2_ways_tracker->empty();
-    bool const has_marked_rels = !m_stage2_rels_tracker->empty();
-
-    if (!has_marked_ways && !has_marked_rels) {
-        fmt::print(stderr, "Skipping stage 2 (no marked objects).\n");
+    if (m_stage2_ways_tracker->empty()) {
+        fmt::print(stderr, "Skipping stage 2 (no marked ways).\n");
         return;
     }
 
@@ -1349,10 +1338,7 @@ void output_flex_t::stage2_proc()
         util::timer_t timer;
 
         for (auto &table : m_table_connections) {
-            if ((has_marked_ways &&
-                 table.table().matches_type(osmium::item_type::way)) ||
-                (has_marked_rels &&
-                 table.table().matches_type(osmium::item_type::relation))) {
+            if (table.table().matches_type(osmium::item_type::way)) {
                 fmt::print(stderr, "  Creating id index on table '{}'...\n",
                            table.table().name());
                 table.create_id_index();
@@ -1385,19 +1371,6 @@ void output_flex_t::stage2_proc()
         auto &way = m_buffer.get<osmium::Way>(0);
         way_add(&way);
     }
-
-    fmt::print(stderr,
-               "Entering stage 2 processing of {} relations...\n"_format(
-                   m_stage2_rels_tracker->size()));
-
-    while (id_tracker::is_valid((id = m_stage2_rels_tracker->pop_mark()))) {
-        m_rels_buffer.clear();
-        if (!m_mid->relation_get(id, m_rels_buffer)) {
-            continue;
-        }
-        auto const &relation = m_rels_buffer.get<osmium::Relation>(0);
-        relation_add(relation);
-    }
 }
 
 void output_flex_t::merge_expire_trees(output_t *other)

src/output-flex.hpp

@@ -69,8 +69,6 @@ class output_flex_t : public output_t
                   std::shared_ptr<std::vector<flex_table_t>> tables =
                       std::make_shared<std::vector<flex_table_t>>(),
                   std::shared_ptr<id_tracker> ways_tracker =
-                      std::make_shared<id_tracker>(),
-                  std::shared_ptr<id_tracker> rels_tracker =
                       std::make_shared<id_tracker>());
 
     output_flex_t(output_flex_t const &) = delete;
@@ -167,7 +165,6 @@ class output_flex_t : public output_t
     std::vector<table_connection_t> m_table_connections;
 
     std::shared_ptr<id_tracker> m_stage2_ways_tracker;
-    std::shared_ptr<id_tracker> m_stage2_rels_tracker;
 
     std::shared_ptr<db_copy_thread_t> m_copy_thread;