diff --git a/nominatim/indexer/indexer.py b/nominatim/indexer/indexer.py index 094d1279..6e0ed60f 100644 --- a/nominatim/indexer/indexer.py +++ b/nominatim/indexer/indexer.py @@ -104,7 +104,7 @@ class Indexer: LOG.warning("Starting indexing boundaries using %s threads", len(self.threads)) - for rank in range(max(minrank, 5), min(maxrank, 26)): + for rank in range(max(minrank, 4), min(maxrank, 26)): self.index(BoundaryRunner(rank)) def index_by_rank(self, minrank, maxrank): diff --git a/test/python/test_indexing.py b/test/python/test_indexing.py new file mode 100644 index 00000000..e1a3a4d0 --- /dev/null +++ b/test/python/test_indexing.py @@ -0,0 +1,207 @@ +""" +Tests for running the indexing. +""" +import itertools +import psycopg2 +import pytest + +from nominatim.indexer.indexer import Indexer + +class IndexerTestDB: + + def __init__(self, name): + self.name = name + self.conn = None + self.placex_id = itertools.count(100000) + self.osmline_id = itertools.count(500000) + + def setup(self): + with psycopg2.connect(database='postgres') as conn: + conn.set_isolation_level(0) + with conn.cursor() as cur: + cur.execute('DROP DATABASE IF EXISTS {}'.format(self.name)) + cur.execute('CREATE DATABASE {}'.format(self.name)) + self.conn = psycopg2.connect(database=self.name) + self.conn.set_isolation_level(0) + with self.conn.cursor() as cur: + cur.execute("""CREATE TABLE placex (place_id BIGINT, + class TEXT, + type TEXT, + rank_address SMALLINT, + rank_search SMALLINT, + indexed_status SMALLINT, + indexed_date TIMESTAMP, + partition SMALLINT, + admin_level SMALLINT, + geometry_sector INTEGER)""") + cur.execute("""CREATE TABLE location_property_osmline ( + place_id BIGINT, + indexed_status SMALLINT, + indexed_date TIMESTAMP, + geometry_sector INTEGER)""") + cur.execute("""CREATE OR REPLACE FUNCTION date_update() RETURNS TRIGGER + AS $$ + BEGIN + IF NEW.indexed_status = 0 and OLD.indexed_status != 0 THEN + NEW.indexed_date = now(); + END IF; + RETURN NEW; + END; $$ LANGUAGE plpgsql;""") + cur.execute("""CREATE TRIGGER placex_update BEFORE UPDATE ON placex + FOR EACH ROW EXECUTE PROCEDURE date_update()""") + cur.execute("""CREATE TRIGGER osmline_update BEFORE UPDATE ON location_property_osmline + FOR EACH ROW EXECUTE PROCEDURE date_update()""") + + + def drop(self): + if self.conn: + self.conn.close() + self.conn = None + with psycopg2.connect(database='postgres') as conn: + conn.set_isolation_level(0) + with conn.cursor() as cur: + cur.execute('DROP DATABASE IF EXISTS {}'.format(self.name)) + + def scalar(self, query): + with self.conn.cursor() as cur: + cur.execute(query) + return cur.fetchone()[0] + + def add_place(self, cls='place', typ='locality', + rank_search=30, rank_address=30, sector=20): + next_id = next(self.placex_id) + with self.conn.cursor() as cur: + cur.execute("""INSERT INTO placex + (place_id, class, type, rank_search, rank_address, + indexed_status, geometry_sector) + VALUES (%s, %s, %s, %s, %s, 1, %s)""", + (next_id, cls, typ, rank_search, rank_address, sector)) + return next_id + + def add_admin(self, **kwargs): + kwargs['cls'] = 'boundary' + kwargs['typ'] = 'administrative' + return self.add_place(**kwargs) + + def add_osmline(self, sector=20): + next_id = next(self.osmline_id) + with self.conn.cursor() as cur: + cur.execute("""INSERT INTO location_property_osmline + (place_id, indexed_status, geometry_sector) + VALUES (%s, 1, %s)""", + (next_id, sector)) + return next_id + + def placex_unindexed(self): + return self.scalar('SELECT count(*) from placex where indexed_status > 0') + + def osmline_unindexed(self): + return self.scalar('SELECT count(*) from location_property_osmline where indexed_status > 0') + + +@pytest.fixture +def test_db(): + db = IndexerTestDB('test_nominatim_python_unittest') + db.setup() + yield db + db.drop() + + +@pytest.mark.parametrize("threads", [1, 15]) +def test_index_full(test_db, threads): + for rank in range(31): + test_db.add_place(rank_address=rank, rank_search=rank) + test_db.add_osmline() + + assert 31 == test_db.placex_unindexed() + assert 1 == test_db.osmline_unindexed() + + idx = Indexer('dbname=test_nominatim_python_unittest', threads) + idx.index_by_rank(0, 30) + + assert 0 == test_db.placex_unindexed() + assert 0 == test_db.osmline_unindexed() + + assert 0 == test_db.scalar("""SELECT count(*) from placex + WHERE indexed_status = 0 and indexed_date is null""") + # ranks come in order of rank address + assert 0 == test_db.scalar(""" + SELECT count(*) FROM placex p WHERE rank_address > 0 + AND indexed_date >= (SELECT min(indexed_date) FROM placex o + WHERE p.rank_address < o.rank_address)""") + # placex rank < 30 objects come before interpolations + assert 0 == test_db.scalar( + """SELECT count(*) FROM placex WHERE rank_address < 30 + AND indexed_date > (SELECT min(indexed_date) FROM location_property_osmline)""") + # placex rank = 30 objects come after interpolations + assert 0 == test_db.scalar( + """SELECT count(*) FROM placex WHERE rank_address = 30 + AND indexed_date < (SELECT max(indexed_date) FROM location_property_osmline)""") + # rank 0 comes after rank 29 and before rank 30 + assert 0 == test_db.scalar( + """SELECT count(*) FROM placex WHERE rank_address < 30 + AND indexed_date > (SELECT min(indexed_date) FROM placex WHERE rank_address = 0)""") + assert 0 == test_db.scalar( + """SELECT count(*) FROM placex WHERE rank_address = 30 + AND indexed_date < (SELECT max(indexed_date) FROM placex WHERE rank_address = 0)""") + + +@pytest.mark.parametrize("threads", [1, 15]) +def test_index_partial_without_30(test_db, threads): + for rank in range(31): + test_db.add_place(rank_address=rank, rank_search=rank) + test_db.add_osmline() + + assert 31 == test_db.placex_unindexed() + assert 1 == test_db.osmline_unindexed() + + idx = Indexer('dbname=test_nominatim_python_unittest', threads) + idx.index_by_rank(4, 15) + + assert 19 == test_db.placex_unindexed() + assert 1 == test_db.osmline_unindexed() + + assert 0 == test_db.scalar(""" + SELECT count(*) FROM placex + WHERE indexed_status = 0 AND not rank_address between 4 and 15""") + + +@pytest.mark.parametrize("threads", [1, 15]) +def test_index_partial_with_30(test_db, threads): + for rank in range(31): + test_db.add_place(rank_address=rank, rank_search=rank) + test_db.add_osmline() + + assert 31 == test_db.placex_unindexed() + assert 1 == test_db.osmline_unindexed() + + idx = Indexer('dbname=test_nominatim_python_unittest', threads) + idx.index_by_rank(28, 30) + + assert 27 == test_db.placex_unindexed() + assert 0 == test_db.osmline_unindexed() + + assert 0 == test_db.scalar(""" + SELECT count(*) FROM placex + WHERE indexed_status = 0 AND rank_address between 1 and 27""") + +@pytest.mark.parametrize("threads", [1, 15]) +def test_index_boundaries(test_db, threads): + for rank in range(4, 10): + test_db.add_admin(rank_address=rank, rank_search=rank) + for rank in range(31): + test_db.add_place(rank_address=rank, rank_search=rank) + test_db.add_osmline() + + assert 37 == test_db.placex_unindexed() + assert 1 == test_db.osmline_unindexed() + + idx = Indexer('dbname=test_nominatim_python_unittest', threads) + idx.index_boundaries(0, 30) + + assert 31 == test_db.placex_unindexed() + assert 1 == test_db.osmline_unindexed() + + assert 0 == test_db.scalar(""" + SELECT count(*) FROM placex + WHERE indexed_status = 0 AND class != 'boundary'""")