Make expire_tiles::from_result a free function

joto · joto · commit ae3f242ded40 · 2022-11-01T15:08:29.000+01:00
The from_result function doesn't know anything about the insides of the
expire_tiles class and doesn't need to know.

And remove some code duplication in the pgsql output.
diff --git a/src/expire-tiles.cpp b/src/expire-tiles.cpp
@@ -230,21 +230,6 @@ int expire_tiles::from_bbox(geom::box_t const &box)
     return 0;
 }
 
-int expire_tiles::from_result(pg_result_t const &result)
-{
-    if (!enabled()) {
-        return -1;
-    }
-
-    auto const num_tuples = result.num_tuples();
-    for (int i = 0; i < num_tuples; ++i) {
-        char const *const wkb = result.get_value(i, 0);
-        from_geometry(ewkb_to_geom(decode_hex(wkb)));
-    }
-
-    return num_tuples;
-}
-
 quadkey_list_t expire_tiles::get_tiles()
 {
     quadkey_list_t tiles;
@@ -293,3 +278,18 @@ std::size_t output_tiles_to_file(quadkey_list_t const &tiles_maxzoom,
 
     return count;
 }
+
+int expire_from_result(expire_tiles *expire, pg_result_t const &result)
+{
+    if (!expire->enabled()) {
+        return -1;
+    }
+
+    auto const num_tuples = result.num_tuples();
+    for (int i = 0; i < num_tuples; ++i) {
+        char const *const wkb = result.get_value(i, 0);
+        expire->from_geometry(ewkb_to_geom(decode_hex(wkb)));
+    }
+
+    return num_tuples;
+}
diff --git a/src/expire-tiles.hpp b/src/expire-tiles.hpp
@@ -36,16 +36,6 @@ class expire_tiles
 
     int from_bbox(geom::box_t const &box);
 
-    /**
-     * Expire tiles based on an osm id.
-     *
-     * \param result Result of a database query into some table returning the
-     *               geometries. (This is usually done using the "get_wkb"
-     *               prepared statement.)
-     * \return The number of tuples in the result or -1 if expire is disabled.
-     */
-    int from_result(pg_result_t const &result);
-
     /**
      * Get tiles as a vector of quadkeys and remove them from the expire_tiles
      * object.
@@ -88,7 +78,19 @@ class expire_tiles
     double m_max_bbox;
     uint32_t m_maxzoom;
     int m_map_width;
-};
+
+}; // class expire_tiles
+
+/**
+ * Expire tiles based on an osm id.
+ *
+ * \param expire Where to mark expired tiles.
+ * \param result Result of a database query into some table returning the
+ *               geometries. (This is usually done using the "get_wkb"
+ *               prepared statement.)
+ * \return The number of tuples in the result or -1 if expire is disabled.
+ */
+int expire_from_result(expire_tiles *expire, pg_result_t const &result);
 
 /**
  * Iterate over tiles and call output function for each tile on all requested
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
@@ -1915,7 +1915,7 @@ void output_flex_t::delete_from_table(table_connection_t *table_connection,
             return;
         }
 
-        m_expire.from_result(result);
+        expire_from_result(&m_expire, result);
     }
 
     table_connection->delete_rows_with(type, id);
diff --git a/src/output-pgsql.cpp b/src/output-pgsql.cpp
@@ -325,11 +325,24 @@ void output_pgsql_t::relation_add(osmium::Relation const &rel)
  * contain the change for that also. */
 void output_pgsql_t::node_delete(osmid_t osm_id)
 {
-    if (m_expire.from_result(m_tables[t_point]->get_wkb(osm_id)) != 0) {
+    auto const results = m_tables[t_point]->get_wkb(osm_id);
+    if (expire_from_result(&m_expire, results) != 0) {
         m_tables[t_point]->delete_row(osm_id);
     }
 }
 
+void output_pgsql_t::delete_from_output_and_expire(osmid_t id)
+{
+    m_tables[t_roads]->delete_row(id);
+
+    for (auto table : {t_line, t_poly}) {
+        auto const results = m_tables[table]->get_wkb(id);
+        if (expire_from_result(&m_expire, results) != 0) {
+            m_tables[table]->delete_row(id);
+        }
+    }
+}
+
 /* Seperated out because we use it elsewhere */
 void output_pgsql_t::pgsql_delete_way_from_output(osmid_t osm_id)
 {
@@ -342,13 +355,7 @@ void output_pgsql_t::pgsql_delete_way_from_output(osmid_t osm_id)
         return;
     }
 
-    m_tables[t_roads]->delete_row(osm_id);
-    if (m_expire.from_result(m_tables[t_line]->get_wkb(osm_id)) != 0) {
-        m_tables[t_line]->delete_row(osm_id);
-    }
-    if (m_expire.from_result(m_tables[t_poly]->get_wkb(osm_id)) != 0) {
-        m_tables[t_poly]->delete_row(osm_id);
-    }
+    delete_from_output_and_expire(osm_id);
 }
 
 void output_pgsql_t::way_delete(osmid_t osm_id)
@@ -359,13 +366,7 @@ void output_pgsql_t::way_delete(osmid_t osm_id)
 /* Relations are identified by using negative IDs */
 void output_pgsql_t::pgsql_delete_relation_from_output(osmid_t osm_id)
 {
-    m_tables[t_roads]->delete_row(-osm_id);
-    if (m_expire.from_result(m_tables[t_line]->get_wkb(-osm_id)) != 0) {
-        m_tables[t_line]->delete_row(-osm_id);
-    }
-    if (m_expire.from_result(m_tables[t_poly]->get_wkb(-osm_id)) != 0) {
-        m_tables[t_poly]->delete_row(-osm_id);
-    }
+    delete_from_output_and_expire(-osm_id);
 }
 
 void output_pgsql_t::relation_delete(osmid_t osm_id)
diff --git a/src/output-pgsql.hpp b/src/output-pgsql.hpp
@@ -79,6 +79,13 @@ class output_pgsql_t : public output_t
     void pgsql_out_way(osmium::Way const &way, taglist_t *tags, bool polygon,
                        bool roads);
     void pgsql_process_relation(osmium::Relation const &rel);
+
+    /**
+     * Delete all objects with specified id from all output tables and mark
+     * their geometries for expire.
+     */
+    void delete_from_output_and_expire(osmid_t id);
+
     void pgsql_delete_way_from_output(osmid_t osm_id);
     void pgsql_delete_relation_from_output(osmid_t osm_id);
 

Original file line number	Diff line number	Diff line change
`@@ -1915,7 +1915,7 @@ void output_flex_t::delete_from_table(table_connection_t *table_connection,`
`1915`	`1915`	`return;`
`1916`	`1916`	`}`
`1917`	`1917`
`1918`		`- m_expire.from_result(result);`
	`1918`	`+ expire_from_result(&m_expire, result);`
`1919`	`1919`	`}`
`1920`	`1920`
`1921`	`1921`	`table_connection->delete_rows_with(type, id);`