From 4ac29fb525ee20f8756344346ab4ff9386004ebd Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Thu, 5 Nov 2020 22:10:30 +0100 Subject: [PATCH] only index larger batches for rank 30 Fixes #2045. --- nominatim/nominatim.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nominatim/nominatim.py b/nominatim/nominatim.py index 0819bb11..b20673d2 100755 --- a/nominatim/nominatim.py +++ b/nominatim/nominatim.py @@ -135,19 +135,19 @@ class Indexer(object): for rank in range(max(1, self.minrank), self.maxrank): self.index(RankRunner(rank)) - if self.maxrank == 30: self.index(RankRunner(0)) self.index(InterpolationRunner(), 20) - - self.index(RankRunner(self.maxrank), 20) + self.index(RankRunner(self.maxrank), 20) + else: + self.index(RankRunner(self.maxrank)) def index(self, obj, batch=1): """ Index a single rank or table. `obj` describes the SQL to use for indexing. `batch` describes the number of objects that should be processed with a single SQL statement """ - log.warning("Starting {}".format(obj.name())) + log.warning("Starting %s (using batch size %s)", obj.name(), batch) cur = self.conn.cursor() cur.execute(obj.sql_count_objects())