Merge remote-tracking branch 'upstream/master'

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

diff --git a/nominatim/clicmd/admin.py b/nominatim/clicmd/admin.py
index 8d34f3869be62e6e0b29f08141a40553d77269a9..03d7ca8a73e8c55a63f9571dca302f2a4bceff0c 100644 (file)
--- a/nominatim/clicmd/admin.py
+++ b/nominatim/clicmd/admin.py
@@ -1,6 +1,8 @@
 """
 Implementation of the 'admin' subcommand.
 """
 """
 Implementation of the 'admin' subcommand.
 """

+import logging
+

 from ..tools.exec_utils import run_legacy_script
 from ..db.connection import connect
 
 from ..tools.exec_utils import run_legacy_script
 from ..db.connection import connect
 


@@ -9,6 +11,8 @@ from ..db.connection import connect
 # Using non-top-level imports to avoid eventually unused imports.
 # pylint: disable=E0012,C0415
 
 # 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.


@@ -16,13 +20,16 @@ class AdminFuncs:
 
     @staticmethod
     def add_args(parser):
 
     @staticmethod
     def add_args(parser):

-        group = parser.add_argument_group('Admin task arguments')
-        group.add_argument('--warm', action='store_true',
-                           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('Admin tasks')
+        objs = group.add_mutually_exclusive_group(required=True)
+        objs.add_argument('--warm', action='store_true',
+                          help='Warm database caches for search and reverse queries.')
+        objs.add_argument('--check-database', action='store_true',
+                          help='Check that the database is complete and operational.')
+        objs.add_argument('--migrate', action='store_true',
+                          help='Migrate the database to a new software version.')
+        objs.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',


@@ -39,23 +46,32 @@ class AdminFuncs:
 
     @staticmethod
     def run(args):
 
     @staticmethod
     def run(args):

-        from ..tools import admin

         if args.warm:
         if args.warm:

-            AdminFuncs._warm(args)
+            return AdminFuncs._warm(args)

 
         if args.check_database:
 
         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:
 
         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()
+            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
+
+        if args.migrate:
+            LOG.warning('Checking for necessary database migrations')
+            from ..tools import migration
+            return migration.migrate(args.config, args)

 
 

-        return 0
+        return 1

 
 
     @staticmethod
     def _warm(args):
 
 
     @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')