Skip to content

Add max_tiles_per_run setting for tile generalizers #2450

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lonvia merged 2 commits into from
Feb 4, 2026
+26 −6
Merged

Add max_tiles_per_run setting for tile generalizers #2450

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47442e5
Fix: Delete to be expired tiles at the same time as reading them
joto Jan 31, 2026
e6c0986
Add max_tiles_per_run setting for tile generalizers
joto Jan 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 26 additions & 6 deletions src/gen/osm2pgsql-gen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,11 +171,30 @@ tile_extent get_extent_from_db(pg_conn_t const &db_connection,
}

void get_tiles_from_table(pg_conn_t const &connection, std::string const &table,
uint32_t zoom,
uint32_t zoom, int64_t max_tiles_per_run,
std::vector<std::pair<uint32_t, uint32_t>> *tiles)
{
auto const result = connection.exec(
R"(SELECT x, y FROM "{}" WHERE zoom = {})", table, zoom);
std::string query;
if (max_tiles_per_run == 0) {
query = fmt::format(
R"(DELETE FROM "{}" WHERE zoom = {} RETURNING x, y)", table, zoom);
} else {
query = fmt::format(R"(
WITH to_delete AS (
SELECT t.ctid FROM "{0}" AS t
WHERE zoom = {1}
ORDER BY first
FOR UPDATE
LIMIT {2}
)
DELETE FROM "{0}" AS et
USING to_delete AS del
WHERE et.ctid = del.ctid
RETURNING x, y;)",
table, zoom, max_tiles_per_run);
}

auto const result = connection.exec(query);

tiles->reserve(result.num_tuples());

Expand Down Expand Up @@ -473,11 +492,12 @@ class genproc_t
std::vector<std::pair<uint32_t, uint32_t>> tile_list;
if (m_append) {
auto const table = params.get_string("expire_list");
auto const max_tiles_per_run =
params.get_int64("max_tiles_per_run", 0);
log_debug("Running generalizer for expire list from table '{}'...",
table);
get_tiles_from_table(db_connection, table, zoom, &tile_list);
log_debug("Truncating table '{}'...", table);
db_connection.exec("TRUNCATE {}", table);
get_tiles_from_table(db_connection, table, zoom, max_tiles_per_run,
&tile_list);
} else {
auto const extent =
get_extent_from_db(db_connection, m_dbschema, params, zoom);
Expand Down