From 3bf57e6d2a705645a84645191d2d548696f9095d Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Tue, 27 Apr 2021 10:14:26 +0200 Subject: [PATCH] do not check for extra housenumber index for reverse-only Also adds a database check for reverse only import to the CI. --- .github/workflows/ci-tests.yml | 8 ++++++-- nominatim/tools/check_database.py | 3 +++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 51ab377b..fa0b35dc 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -146,7 +146,7 @@ jobs: run: nominatim special-phrases --import-from-wiki working-directory: data-env - - name: Check import + - name: Check full import run: nominatim admin --check-database working-directory: data-env @@ -161,7 +161,11 @@ jobs: working-directory: data-env - name: Run reverse-only import - run : nominatim import --osm-file ../monaco-latest.osm.pbf --reverse-only + run : nominatim import --osm-file ../monaco-latest.osm.pbf --reverse-only --no-updates working-directory: data-env env: NOMINATIM_DATABASE_DSN: pgsql:dbname=reverse + + - name: Check reverse import + run: nominatim admin --check-database + working-directory: data-env diff --git a/nominatim/tools/check_database.py b/nominatim/tools/check_database.py index d8ab08cc..98a3aa3a 100644 --- a/nominatim/tools/check_database.py +++ b/nominatim/tools/check_database.py @@ -94,6 +94,9 @@ def _get_indexes(conn): indexes.extend(('idx_search_name_nameaddress_vector', 'idx_search_name_name_vector', 'idx_search_name_centroid')) + if conn.server_version_tuple() >= (11, 0, 0): + indexes.extend(('idx_placex_housenumber', + 'idx_osmline_parent_osm_id_with_hnr')) if conn.table_exists('place'): indexes.extend(('idx_placex_pendingsector', 'idx_location_area_country_place_id', -- 2.45.1