hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-11 21:34:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

make index() function private

Browse Source
This commit is contained in:
Sarah Hoffmann
2021-04-19 18:00:28 +02:00
parent 18705b3f18
commit 6430371d7d
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
nominatim/indexer/indexer.py
View File

@@ -82,7 +82,7 @@ class Indexer:
try: try:
for rank in range(max(minrank, 4), min(maxrank, 26)): for rank in range(max(minrank, 4), min(maxrank, 26)):
self.index(runners.BoundaryRunner(rank)) self._index(runners.BoundaryRunner(rank))
finally: finally:
self._close_connections() self._close_connections()
@@ -101,14 +101,14 @@ class Indexer:
try: try:
for rank in range(max(1, minrank), maxrank): for rank in range(max(1, minrank), maxrank):
self.index(runners.RankRunner(rank)) self._index(runners.RankRunner(rank))
if maxrank == 30: if maxrank == 30:
self.index(runners.RankRunner(0)) self._index(runners.RankRunner(0))
self.index(runners.InterpolationRunner(), 20) self._index(runners.InterpolationRunner(), 20)
self.index(runners.RankRunner(30), 20) self._index(runners.RankRunner(30), 20)
else: else:
self.index(runners.RankRunner(maxrank)) self._index(runners.RankRunner(maxrank))
finally: finally:
self._close_connections() self._close_connections()
@@ -121,7 +121,7 @@ class Indexer:
self._setup_connections() self._setup_connections()
try: try:
self.index(runners.PostcodeRunner(), 20) self._index(runners.PostcodeRunner(), 20)
finally: finally:
self._close_connections() self._close_connections()
@@ -138,26 +138,26 @@ class Indexer:
finally: finally:
conn.close() conn.close()
def index(self, obj, batch=1): def _index(self, runner, batch=1):
""" Index a single rank or table. `obj` describes the SQL to use """ Index a single rank or table. `runner` describes the SQL to use
for indexing. `batch` describes the number of objects that for indexing. `batch` describes the number of objects that
should be processed with a single SQL statement should be processed with a single SQL statement
""" """
LOG.warning("Starting %s (using batch size %s)", obj.name(), batch) LOG.warning("Starting %s (using batch size %s)", runner.name(), batch)
cur = self.conn.cursor() cur = self.conn.cursor()
cur.execute(obj.sql_count_objects()) cur.execute(runner.sql_count_objects())
total_tuples = cur.fetchone()[0] total_tuples = cur.fetchone()[0]
LOG.debug("Total number of rows: %i", total_tuples) LOG.debug("Total number of rows: %i", total_tuples)
cur.close() cur.close()
progress = ProgressLogger(obj.name(), total_tuples) progress = ProgressLogger(runner.name(), total_tuples)
if total_tuples > 0: if total_tuples > 0:
cur = self.conn.cursor(name='places') cur = self.conn.cursor(name='places')
cur.execute(obj.sql_get_objects()) cur.execute(runner.sql_get_objects())
next_thread = self.find_free_thread() next_thread = self.find_free_thread()
while True: while True:
@@ -168,7 +168,7 @@ class Indexer:
LOG.debug("Processing places: %s", str(places)) LOG.debug("Processing places: %s", str(places))
thread = next(next_thread) thread = next(next_thread)
thread.perform(obj.sql_index_place(places)) thread.perform(runner.sql_index_place(places))
progress.add(len(places)) progress.add(len(places))
cur.close() cur.close()