From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 17 Feb 2021 16:52:59 +0000 (+0100)
Subject: Merge pull request #2173 from lonvia/penality-for-housenumberless-places
X-Git-Tag: v3.7.0~33
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/bd27310c68da663aadef9038ec600793444e786b?hp=7ebcf602acb4cb54bed65ffbfe86aa9ac0172bbf

Merge pull request #2173 from lonvia/penality-for-housenumberless-places

Increase penalty for places without housenumber
---

diff --git a/nominatim/db/connection.py b/nominatim/db/connection.py
index 4d30151d..c7e22c98 100644
--- a/nominatim/db/connection.py
+++ b/nominatim/db/connection.py
@@ -50,6 +50,15 @@ class _Connection(psycopg2.extensions.connection):
                                 WHERE tablename = %s""", (table, ))
             return num == 1
 
+    def server_version_tuple(self):
+        """ Return the server version as a tuple of (major, minor).
+            Converts correctly for pre-10 and post-10 PostgreSQL versions.
+        """
+        version = self.server_version
+        if version < 100000:
+            return (version / 10000, (version % 10000) / 100)
+
+        return (version / 10000, version % 10000)
 
 def connect(dsn):
     """ Open a connection to the database using the specialised connection
diff --git a/nominatim/tools/exec_utils.py b/nominatim/tools/exec_utils.py
index 541a2b08..f373f347 100644
--- a/nominatim/tools/exec_utils.py
+++ b/nominatim/tools/exec_utils.py
@@ -127,6 +127,9 @@ def run_osm2pgsql(options):
         if param in dsn:
             cmd.extend(('--' + param, dsn[param]))
 
+    if options.get('disable_jit', False):
+        env['PGOPTIONS'] = '-c jit=off -c max_parallel_workers_per_gather=0'
+
     cmd.append(str(options['import_file']))
 
     subprocess.run(cmd, cwd=options.get('cwd', '.'), env=env, check=True)
diff --git a/nominatim/tools/replication.py b/nominatim/tools/replication.py
index a3ef84fe..a0a741e8 100644
--- a/nominatim/tools/replication.py
+++ b/nominatim/tools/replication.py
@@ -115,6 +115,7 @@ def update(conn, options):
 
     # 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