From 2337cc653b679c9873344cc7278410a714a94a23 Mon Sep 17 00:00:00 2001 From: Marc Tobias Date: Mon, 19 Jun 2023 18:43:17 +0200 Subject: [PATCH] check-database on frozen db shouldnt recommend indexing --- nominatim/tools/check_database.py | 7 +++++++ test/python/tools/test_check_database.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/nominatim/tools/check_database.py b/nominatim/tools/check_database.py index 437775db..b1cfce57 100644 --- a/nominatim/tools/check_database.py +++ b/nominatim/tools/check_database.py @@ -15,6 +15,7 @@ from nominatim.config import Configuration from nominatim.db.connection import connect, Connection from nominatim.errors import UsageError from nominatim.tokenizer import factory as tokenizer_factory +from nominatim.tools import freeze CHECKLIST = [] @@ -223,6 +224,12 @@ def check_indexing(conn: Connection, _: Configuration) -> CheckResult: if cnt == 0: return CheckState.OK + if freeze.is_frozen(conn): + index_cmd="""\ + Database is marked frozen, it cannot be updated. + Low counts of unindexed places are fine.""" + return CheckState.WARN, dict(count=cnt, index_cmd=index_cmd) + if conn.index_exists('idx_placex_rank_search'): # Likely just an interrupted update. index_cmd = 'nominatim index' diff --git a/test/python/tools/test_check_database.py b/test/python/tools/test_check_database.py index d5f7088a..4dd536b6 100644 --- a/test/python/tools/test_check_database.py +++ b/test/python/tools/test_check_database.py @@ -76,7 +76,7 @@ def test_check_indexing_good(table_factory, temp_db_conn, def_config): def test_check_indexing_bad(table_factory, temp_db_conn, def_config): table_factory('placex', 'place_id int, indexed_status smallint', content=((1, 0), (2, 2))) - assert chkdb.check_indexing(temp_db_conn, def_config) == chkdb.CheckState.FAIL + assert chkdb.check_indexing(temp_db_conn, def_config) == chkdb.CheckState.WARN def test_check_database_indexes_bad(temp_db_conn, def_config): -- 2.39.5