port index creation to python

[nominatim.git] / nominatim / clicmd / admin.py

diff --git a/nominatim/clicmd/admin.py b/nominatim/clicmd/admin.py
index 040b92327ebe0d6cef743b21bf8a8c57b7eac691..fd9382ebb4ed5704f1d538c4c9527ba673d103d8 100644 (file)
--- a/nominatim/clicmd/admin.py
+++ b/nominatim/clicmd/admin.py
@@ -1,13 +1,18 @@
 """
 Implementation of the 'admin' subcommand.
 """
 """
 Implementation of the 'admin' subcommand.
 """

+import logging
+

 from ..tools.exec_utils import run_legacy_script
 from ..tools.exec_utils import run_legacy_script

+from ..db.connection import connect

 
 # Do not repeat documentation of subcommand classes.
 # pylint: disable=C0111
 # Using non-top-level imports to avoid eventually unused imports.
 # pylint: disable=E0012,C0415
 
 
 # Do not repeat documentation of subcommand classes.
 # pylint: disable=C0111
 # Using non-top-level imports to avoid eventually unused imports.
 # pylint: disable=E0012,C0415
 

+LOG = logging.getLogger()
+

 class AdminFuncs:
     """\
     Analyse and maintain the database.
 class AdminFuncs:
     """\
     Analyse and maintain the database.


@@ -20,6 +25,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.')
                            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',
         group = parser.add_argument_group('Arguments for cache warming')
         group.add_argument('--search-only', action='store_const', dest='target',
                            const='search',


@@ -27,6 +34,12 @@ class AdminFuncs:
         group.add_argument('--reverse-only', action='store_const', dest='target',
                            const='reverse',
                            help="Only pre-warm tables for reverse queries")
         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):
 
     @staticmethod
     def run(args):


@@ -34,13 +47,22 @@ class AdminFuncs:
             AdminFuncs._warm(args)
 
         if args.check_database:
             AdminFuncs._warm(args)
 
         if args.check_database:

-            run_legacy_script('check_import_finished.php', nominatim_env=args)
+            LOG.warning('Checking database')
+            from ..tools import check_database
+            return check_database.check_database(args.config)
+
+        if args.analyse_indexing:
+            LOG.warning('Analysing performance of indexing function')
+            from ..tools import admin
+            with connect(args.config.get_libpq_dsn()) as conn:
+                admin.analyse_indexing(conn, osm_id=args.osm_id, place_id=args.place_id)

 
         return 0
 
 
     @staticmethod
     def _warm(args):
 
         return 0
 
 
     @staticmethod
     def _warm(args):

+        LOG.warning('Warming database caches')

         params = ['warm.php']
         if args.target == 'reverse':
             params.append('--reverse-only')
         params = ['warm.php']
         if args.target == 'reverse':
             params.append('--reverse-only')