]> git.openstreetmap.org Git - nominatim.git/commitdiff
forgot to index last rank
authorSarah Hoffmann <lonvia@denofr.de>
Wed, 22 Jan 2020 10:18:21 +0000 (11:18 +0100)
committerSarah Hoffmann <lonvia@denofr.de>
Fri, 24 Jan 2020 21:06:30 +0000 (22:06 +0100)
nominatim/nominatim.py

index bbda4d7e28f224757c9ec6e99582e2b0f0f449bd..6d5e4af0afe48ba75dc0191e4a542a2fea2b3f54 100755 (executable)
@@ -146,7 +146,7 @@ class DBConnection(object):
                 return True
         except psycopg2.extensions.TransactionRollbackError as e:
             if e.pgcode == '40P01':
                 return True
         except psycopg2.extensions.TransactionRollbackError as e:
             if e.pgcode == '40P01':
-                log.debug("Deadlock detected, retry.")
+                log.info("Deadlock detected (params = {}), retry.".format(self.current_params))
                 self.cursor.execute(self.current_query, self.current_params)
             else:
                 raise
                 self.cursor.execute(self.current_query, self.current_params)
             else:
                 raise
@@ -175,7 +175,8 @@ class Indexer(object):
 
         if self.maxrank == 30:
             self.index(InterpolationRunner())
 
         if self.maxrank == 30:
             self.index(InterpolationRunner())
-            self.index(RankRunner(30))
+
+        self.index(RankRunner(self.maxrank))
 
     def index(self, obj):
         """ Index a single rank or table. `obj` describes the SQL to use
 
     def index(self, obj):
         """ Index a single rank or table. `obj` describes the SQL to use