X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/9397bf54b89c1ae0b41115673d2f38582cd03ed9..37eeccbf4cd7c25239b78d6c3747fccb1bca519c:/nominatim/indexer/runners.py diff --git a/nominatim/indexer/runners.py b/nominatim/indexer/runners.py index dd6ced38..70536a71 100644 --- a/nominatim/indexer/runners.py +++ b/nominatim/indexer/runners.py @@ -2,35 +2,54 @@ Mix-ins that provide the actual commands for the indexer for various indexing tasks. """ +import functools + +from psycopg2 import sql as pysql + +from nominatim.indexer.place_info import PlaceInfo + # pylint: disable=C0111 +def _mk_valuelist(template, num): + return pysql.SQL(',').join([pysql.SQL(template)] * num) + + class AbstractPlacexRunner: """ Returns SQL commands for indexing of the placex table. """ - SELECT_SQL = 'SELECT place_id, (placex_prepare_update(placex)).* FROM placex' + SELECT_SQL = pysql.SQL('SELECT place_id FROM placex ') + UPDATE_LINE = "(%s, %s::hstore, %s::hstore, %s::int, %s::jsonb)" - def __init__(self, rank): + def __init__(self, rank, analyzer): self.rank = rank - self._sql_terms = 0 - self._cached_index_sql = None + self.analyzer = analyzer + + + @staticmethod + @functools.lru_cache(maxsize=1) + def _index_sql(num_places): + return pysql.SQL( + """ UPDATE placex + SET indexed_status = 0, address = v.addr, token_info = v.ti, + name = v.name, linked_place_id = v.linked_place_id + FROM (VALUES {}) as v(id, name, addr, linked_place_id, ti) + WHERE place_id = v.id + """).format(_mk_valuelist(AbstractPlacexRunner.UPDATE_LINE, num_places)) - def _index_sql(self, num_places): - if num_places != self._sql_terms: - self._cached_index_sql = \ - """ UPDATE placex - SET indexed_status = 0, address = v.addr - FROM (VALUES {}) as v(id, addr) - WHERE place_id = v.id - """.format(','.join(["(%s, %s::hstore)"] * num_places)) - self._sql_terms = num_places - return self._cached_index_sql + @staticmethod + def get_place_details(worker, ids): + worker.perform("""SELECT place_id, (placex_indexing_prepare(placex)).* + FROM placex WHERE place_id IN %s""", + (tuple((p[0] for p in ids)), )) def index_places(self, worker, places): values = [] for place in places: - values.extend((place[x] for x in ('place_id', 'address'))) + for field in ('place_id', 'name', 'address', 'linked_place_id'): + values.append(place[field]) + values.append(PlaceInfo(place).analyze(self.analyzer)) worker.perform(self._index_sql(len(places)), values) @@ -43,14 +62,15 @@ class RankRunner(AbstractPlacexRunner): return "rank {}".format(self.rank) def sql_count_objects(self): - return """SELECT count(*) FROM placex - WHERE rank_address = {} and indexed_status > 0 - """.format(self.rank) + return pysql.SQL("""SELECT count(*) FROM placex + WHERE rank_address = {} and indexed_status > 0 + """).format(pysql.Literal(self.rank)) def sql_get_objects(self): - return """{} WHERE indexed_status > 0 and rank_address = {} - ORDER BY geometry_sector - """.format(self.SELECT_SQL, self.rank) + return self.SELECT_SQL + pysql.SQL( + """WHERE indexed_status > 0 and rank_address = {} + ORDER BY geometry_sector + """).format(pysql.Literal(self.rank)) class BoundaryRunner(AbstractPlacexRunner): @@ -62,17 +82,18 @@ class BoundaryRunner(AbstractPlacexRunner): return "boundaries rank {}".format(self.rank) def sql_count_objects(self): - return """SELECT count(*) FROM placex - WHERE indexed_status > 0 - AND rank_search = {} - AND class = 'boundary' and type = 'administrative' - """.format(self.rank) + return pysql.SQL("""SELECT count(*) FROM placex + WHERE indexed_status > 0 + AND rank_search = {} + AND class = 'boundary' and type = 'administrative' + """).format(pysql.Literal(self.rank)) def sql_get_objects(self): - return """{} WHERE indexed_status > 0 and rank_search = {} - and class = 'boundary' and type = 'administrative' - ORDER BY partition, admin_level - """.format(self.SELECT_SQL, self.rank) + return self.SELECT_SQL + pysql.SQL( + """WHERE indexed_status > 0 and rank_search = {} + and class = 'boundary' and type = 'administrative' + ORDER BY partition, admin_level + """).format(pysql.Literal(self.rank)) class InterpolationRunner: @@ -80,6 +101,10 @@ class InterpolationRunner: location_property_osmline. """ + def __init__(self, analyzer): + self.analyzer = analyzer + + @staticmethod def name(): return "interpolation lines (location_property_osmline)" @@ -91,15 +116,37 @@ class InterpolationRunner: @staticmethod def sql_get_objects(): - return """SELECT place_id FROM location_property_osmline + return """SELECT place_id + FROM location_property_osmline WHERE indexed_status > 0 ORDER BY geometry_sector""" + @staticmethod - def index_places(worker, ids): - worker.perform(""" UPDATE location_property_osmline - SET indexed_status = 0 WHERE place_id IN ({}) - """.format(','.join((str(i[0]) for i in ids)))) + 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): + return pysql.SQL("""UPDATE location_property_osmline + SET indexed_status = 0, address = v.addr, token_info = v.ti + FROM (VALUES {}) as v(id, addr, ti) + WHERE place_id = v.id + """).format(_mk_valuelist("(%s, %s::hstore, %s::jsonb)", num_places)) + + + def index_places(self, worker, places): + values = [] + for place in places: + values.extend((place[x] for x in ('place_id', 'address'))) + values.append(PlaceInfo(place).analyze(self.analyzer)) + + worker.perform(self._index_sql(len(places)), values) + class PostcodeRunner: @@ -122,6 +169,6 @@ class PostcodeRunner: @staticmethod def index_places(worker, ids): - worker.perform(""" UPDATE location_postcode SET indexed_status = 0 - WHERE place_id IN ({}) - """.format(','.join((str(i[0]) for i in ids)))) + worker.perform(pysql.SQL("""UPDATE location_postcode SET indexed_status = 0 + WHERE place_id IN ({})""") + .format(pysql.SQL(',').join((pysql.Literal(i[0]) for i in ids))))