hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-12 05:44:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

indexer: fetch extra place data asynchronously

Browse Source 
The indexer now fetches any extra data besides the place_id
asynchronously while processing the places from the last batch.
This also means that more places are now fetched at once.
This commit is contained in:
Sarah Hoffmann
2021-04-30 16:17:28 +02:00
parent 6ce6f62b8e
commit 20891abe1c
2 changed files with 96 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
nominatim/indexer/runners.py
View File

@@ -28,7 +28,8 @@ class AbstractPlacexRunner:
""".format(','.join(["(%s, %s::hstore, %s::jsonb)"] * num_places))
def get_place_details(self, worker, ids):
@staticmethod
def get_place_details(worker, ids):
worker.perform("""SELECT place_id, (placex_prepare_update(placex)).*
FROM placex WHERE place_id IN %s""",
(tuple((p[0] for p in ids)), ))
@@ -103,12 +104,19 @@ class InterpolationRunner:
@staticmethod
def sql_get_objects():
return """SELECT place_id, get_interpolation_address(address, osm_id) as address
return """SELECT place_id
FROM location_property_osmline
WHERE indexed_status > 0
ORDER BY geometry_sector"""
@staticmethod
def get_place_details(worker, ids):
worker.perform("""SELECT place_id, get_interpolation_address(address, osm_id) as address
FROM location_property_osmline WHERE place_id IN %s""",
(tuple((p[0] for p in ids)), ))
@staticmethod
@functools.lru_cache(maxsize=1)
def _index_sql(num_places):