osm-search/Nominatim
1
1
Fork 0
mirror of https://github.com/osm-search/Nominatim.git synced 2024-09-21 07:58:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

move analyse function into indexinf function

Browse Source
This commit is contained in:
Sarah Hoffmann 2021-04-19 17:34:26 +02:00
parent c6bd2bb7fb
commit 18705b3f18
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
nominatim/indexer/indexer.py
View File

@ -13,12 +13,6 @@ from nominatim.db.async_connection import DBConnection
LOG = logging.getLogger()
def _analyse_db_if(conn, condition):
if condition:
with conn.cursor() as cur:
cur.execute('ANALYSE')
class Indexer:
""" Main indexing routine.
"""
@ -51,26 +45,31 @@ class Indexer:
database will be analysed at the appropriate places to
ensure that database statistics are updated.
"""
conn = psycopg2.connect(self.dsn)
conn.autocommit = True
with psycopg2.connect(self.dsn) as conn:
conn.autocommit = True
if analyse:
def _analyse():
with conn.cursor() as cur:
cur.execute('ANALYSE')
else:
def _analyse():
pass
try:
self.index_by_rank(0, 4)
_analyse_db_if(conn, analyse)
_analyse()
self.index_boundaries(0, 30)
_analyse_db_if(conn, analyse)
_analyse()
self.index_by_rank(5, 25)
_analyse_db_if(conn, analyse)
_analyse()
self.index_by_rank(26, 30)
_analyse_db_if(conn, analyse)
_analyse()
self.index_postcodes()
_analyse_db_if(conn, analyse)
finally:
conn.close()
_analyse()
def index_boundaries(self, minrank, maxrank):