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

integrate analyse of indexing into nominatim tool

Browse Source
This commit is contained in:
Sarah Hoffmann
2021-02-08 22:21:57 +01:00
parent 0cbf98c020
commit d81e152804
6 changed files with 149 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
nominatim/clicmd/admin.py
View File

@@ -2,6 +2,7 @@
Implementation of the 'admin' subcommand.
"""
from ..tools.exec_utils import run_legacy_script
from ..db.connection import connect
# Do not repeat documentation of subcommand classes.
# pylint: disable=C0111
@@ -20,6 +21,8 @@ class AdminFuncs:
help='Warm database caches for search and reverse queries.')
group.add_argument('--check-database', action='store_true',
help='Check that the database is complete and operational.')
group.add_argument('--analyse-indexing', action='store_true',
help='Print performance analysis of the indexing process.')
group = parser.add_argument_group('Arguments for cache warming')
group.add_argument('--search-only', action='store_const', dest='target',
const='search',
@@ -27,15 +30,27 @@ class AdminFuncs:
group.add_argument('--reverse-only', action='store_const', dest='target',
const='reverse',
help="Only pre-warm tables for reverse queries")
group = parser.add_argument_group('Arguments for index anaysis')
mgroup = group.add_mutually_exclusive_group()
mgroup.add_argument('--osm-id', type=str,
help='Analyse indexing of the given OSM object')
mgroup.add_argument('--place-id', type=int,
help='Analyse indexing of the given Nominatim object')
@staticmethod
def run(args):
from ..tools import admin
if args.warm:
AdminFuncs._warm(args)
if args.check_database:
run_legacy_script('check_import_finished.php', nominatim_env=args)
if args.analyse_indexing:
conn = connect(args.config.get_libpq_dsn())
admin.analyse_indexing(conn, osm_id=args.osm_id, place_id=args.place_id)
conn.close()
return 0

49
nominatim/tools/admin.py Normal file
View File

@@ -0,0 +1,49 @@
"""
Functions for database analysis and maintenance.
"""
import logging
from ..errors import UsageError
LOG = logging.getLogger()
def analyse_indexing(conn, osm_id=None, place_id=None):
""" Analyse indexing of a single Nominatim object.
"""
with conn.cursor() as cur:
if osm_id:
osm_type = osm_id[0].upper()
if osm_type not in 'NWR' or not osm_id[1:].isdigit():
LOG.fatal('OSM ID must be of form <N|W|R><id>. Got: %s', osm_id)
raise UsageError("OSM ID parameter badly formatted")
cur.execute('SELECT place_id FROM placex WHERE osm_type = %s AND osm_id = %s',
(osm_type, osm_id[1:]))
if cur.rowcount < 1:
LOG.fatal("OSM object %s not found in database.", osm_id)
raise UsageError("OSM object not found")
place_id = cur.fetchone()[0]
if place_id is None:
LOG.fatal("No OSM object given to index.")
raise UsageError("OSM object not found")
cur.execute("update placex set indexed_status = 2 where place_id = %s",
(place_id, ))
cur.execute("""SET auto_explain.log_min_duration = '0';
SET auto_explain.log_analyze = 'true';
SET auto_explain.log_nested_statements = 'true';
LOAD 'auto_explain';
SET client_min_messages = LOG;
SET log_min_messages = FATAL""")
cur.execute("update placex set indexed_status = 0 where place_id = %s",
(place_id, ))
# we do not want to keep the results
conn.rollback()
for msg in conn.notices:
print(msg)