Skip to content

Make tile expire order configurable #2493

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

Open
joto wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make tile expire order configurable #2493

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 7 additions & 5 deletions src/gen/osm2pgsql-gen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,8 @@ 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, int64_t max_tiles_per_run,
std::string const &order_by, uint32_t zoom,
int64_t max_tiles_per_run,
std::vector<std::pair<uint32_t, uint32_t>> *tiles)
{
std::string query;
Expand All @@ -183,15 +184,15 @@ void get_tiles_from_table(pg_conn_t const &connection, std::string const &table,
WITH to_delete AS (
SELECT t.ctid FROM "{0}" AS t
WHERE zoom = {1}
ORDER BY first
ORDER BY {3}
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);
table, zoom, max_tiles_per_run, order_by);
}

auto const result = connection.exec(query);
Expand Down Expand Up @@ -492,12 +493,13 @@ 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 order_by = params.get_string("order_by", "first");
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, max_tiles_per_run,
&tile_list);
get_tiles_from_table(db_connection, table, order_by, zoom,
max_tiles_per_run, &tile_list);
} else {
auto const extent =
get_extent_from_db(db_connection, m_dbschema, params, zoom);
Expand Down
Loading