Merge remote-tracking branch 'upstream/master'

[nominatim.git] / nominatim / tools / replication.py

diff --git a/nominatim/tools/replication.py b/nominatim/tools/replication.py
index c7d0d3e5d8e2621d410c8e40bbb9adee1c2b68c8..a0a741e8ff4ae87155ff38853784d1af41b66ce3 100644 (file)
--- a/nominatim/tools/replication.py
+++ b/nominatim/tools/replication.py
@@ -6,13 +6,18 @@ from enum import Enum
 import logging
 import time
 
 import logging
 import time
 

-from osmium.replication.server import ReplicationServer
-from osmium import WriteHandler
-

 from ..db import status
 from .exec_utils import run_osm2pgsql
 from ..errors import UsageError
 
 from ..db import status
 from .exec_utils import run_osm2pgsql
 from ..errors import UsageError
 

+try:
+    from osmium.replication.server import ReplicationServer
+    from osmium import WriteHandler
+except ModuleNotFoundError as exc:
+    logging.getLogger().fatal("pyosmium not installed. Replication functions not available.\n"
+                              "To install pyosmium via pip: pip3 install osmium")
+    raise UsageError("replication tools not available") from exc
+

 LOG = logging.getLogger()
 
 def init_replication(conn, base_url):
 LOG = logging.getLogger()
 
 def init_replication(conn, base_url):


@@ -101,7 +106,7 @@ def update(conn, options):
     repl = ReplicationServer(options['base_url'])
 
     outhandler = WriteHandler(str(options['import_file']))
     repl = ReplicationServer(options['base_url'])
 
     outhandler = WriteHandler(str(options['import_file']))

-    endseq = repl.apply_diffs(outhandler, startseq,
+    endseq = repl.apply_diffs(outhandler, startseq + 1,

                               max_size=options['max_diff_size'] * 1024)
     outhandler.close()
 
                               max_size=options['max_diff_size'] * 1024)
     outhandler.close()
 


@@ -110,10 +115,12 @@ def update(conn, options):
 
     # Consume updates with osm2pgsql.
     options['append'] = True
 
     # Consume updates with osm2pgsql.
     options['append'] = True

+    options['disable_jit'] = conn.server_version_tuple() >= (11, 0)

     run_osm2pgsql(options)
 
     # Write the current status to the file
     endstate = repl.get_state_info(endseq)
     run_osm2pgsql(options)
 
     # Write the current status to the file
     endstate = repl.get_state_info(endseq)

-    status.set_status(conn, endstate.timestamp, seq=endseq, indexed=False)
+    status.set_status(conn, endstate.timestamp if endstate else None,
+                      seq=endseq, indexed=False)

 
     return UpdateState.UP_TO_DATE
 
     return UpdateState.UP_TO_DATE