Merge pull request #1906 from joto/prep-expire2

Small changes in expire code

Author: lonvia

src/expire-tiles.cpp

@@ -264,20 +264,20 @@ void expire_tiles::merge_and_destroy(expire_tiles *other)
     }
 }
 
-std::size_t output_tiles_to_file(quadkey_list_t const &tiles_maxzoom,
-                                 char const *filename, uint32_t minzoom,
-                                 uint32_t maxzoom)
+std::size_t output_tiles_to_file(quadkey_list_t const &tiles_at_maxzoom,
+                                 uint32_t minzoom, uint32_t maxzoom,
+                                 std::string_view filename)
 {
-    FILE *outfile = std::fopen(filename, "a");
+    FILE *outfile = std::fopen(filename.data(), "a");
     if (outfile == nullptr) {
         log_warn("Failed to open expired tiles file ({}).  Tile expiry "
                  "list will not be written!",
                  std::strerror(errno));
         return 0;
     }
 
-    auto const count =
-        for_each_tile(tiles_maxzoom, minzoom, maxzoom, [&](tile_t const &tile) {
+    auto const count = for_each_tile(
+        tiles_at_maxzoom, minzoom, maxzoom, [&](tile_t const &tile) {
             fmt::print(outfile, "{}/{}/{}\n", tile.zoom(), tile.x(), tile.y());
         });
 

src/expire-tiles.hpp

@@ -11,6 +11,7 @@
  */
 
 #include <memory>
+#include <string_view>
 #include <unordered_set>
 #include <utility>
 #include <vector>
@@ -116,23 +117,23 @@ int expire_from_result(expire_tiles *expire, pg_result_t const &result);
  *
  * \tparam OUTPUT Class with operator() taking a tile_t argument
  *
- * \param tiles The list of tiles at maximum zoom level
+ * \param tiles_at_maxzoom The list of tiles at maximum zoom level
  * \param minzoom Minimum zoom level
  * \param maxzoom Maximum zoom level
  * \param output Output function
  */
 template <class OUTPUT>
-std::size_t for_each_tile(quadkey_list_t const &tiles, uint32_t minzoom,
-                          uint32_t maxzoom, OUTPUT &&output)
+std::size_t for_each_tile(quadkey_list_t const &tiles_at_maxzoom,
+                          uint32_t minzoom, uint32_t maxzoom, OUTPUT &&output)
 {
     assert(minzoom <= maxzoom);
 
     if (minzoom == maxzoom) {
-        for (auto const quadkey : tiles) {
+        for (auto const quadkey : tiles_at_maxzoom) {
             std::forward<OUTPUT>(output)(
                 tile_t::from_quadkey(quadkey, maxzoom));
         }
-        return tiles.size();
+        return tiles_at_maxzoom.size();
     }
 
     /**
@@ -141,7 +142,7 @@ std::size_t for_each_tile(quadkey_list_t const &tiles, uint32_t minzoom,
      */
     quadkey_t last_quadkey{};
     std::size_t count = 0;
-    for (auto const quadkey : tiles) {
+    for (auto const quadkey : tiles_at_maxzoom) {
         for (uint32_t dz = 0; dz <= maxzoom - minzoom; ++dz) {
             auto const qt_current = quadkey.down(dz);
             /**
@@ -164,13 +165,13 @@ std::size_t for_each_tile(quadkey_list_t const &tiles, uint32_t minzoom,
 /**
  * Write the list of tiles to a file.
  *
- * \param tiles The list of tiles at maximum zoom level
- * \param filename Name of the file
+ * \param tiles_at_maxzoom The list of tiles at maximum zoom level
  * \param minzoom Minimum zoom level
  * \param maxzoom Maximum zoom level
+ * \param filename Name of the file
  */
-std::size_t output_tiles_to_file(quadkey_list_t const &tiles,
-                                 char const *filename, uint32_t minzoom,
-                                 uint32_t maxzoom);
+std::size_t output_tiles_to_file(quadkey_list_t const &tiles_at_maxzoom,
+                                 uint32_t minzoom, uint32_t maxzoom,
+                                 std::string_view filename);
 
 #endif // OSM2PGSQL_EXPIRE_TILES_HPP

src/output-flex.cpp

@@ -1274,9 +1274,9 @@ void output_flex_t::stop()
 
     if (get_options()->expire_tiles_zoom_min > 0) {
         auto const count = output_tiles_to_file(
-            m_expire.get_tiles(), get_options()->expire_tiles_filename.c_str(),
-            get_options()->expire_tiles_zoom_min,
-            get_options()->expire_tiles_zoom);
+            m_expire.get_tiles(), get_options()->expire_tiles_zoom_min,
+            get_options()->expire_tiles_zoom,
+            get_options()->expire_tiles_filename);
         log_info("Wrote {} entries to expired tiles list", count);
     }
 }

src/output-pgsql.cpp

@@ -147,9 +147,9 @@ void output_pgsql_t::stop()
 
     if (get_options()->expire_tiles_zoom_min > 0) {
         auto const count = output_tiles_to_file(
-            m_expire.get_tiles(), get_options()->expire_tiles_filename.c_str(),
-            get_options()->expire_tiles_zoom_min,
-            get_options()->expire_tiles_zoom);
+            m_expire.get_tiles(), get_options()->expire_tiles_zoom_min,
+            get_options()->expire_tiles_zoom,
+            get_options()->expire_tiles_filename);
         log_info("Wrote {} entries to expired tiles list", count);
     }
 }