hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-16 15:47:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

ignore failure to get replication date

Browse Source
This commit is contained in:
Sarah Hoffmann
2021-02-14 12:17:30 +01:00
parent 6a7e0d652b
commit fbe7be760b
3 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
nominatim/db/status.py
View File

@@ -40,13 +40,19 @@ def compute_database_date(conn):
def set_status(conn, date, seq=None, indexed=True): def set_status(conn, date, seq=None, indexed=True):
""" Replace the current status with the given status. """ Replace the current status with the given status. If date is `None`
then only sequence and indexed will be updated as given. Otherwise
the whole status is replaced.
""" """
assert date.tzinfo == dt.timezone.utc assert date is None or date.tzinfo == dt.timezone.utc
with conn.cursor() as cur: with conn.cursor() as cur:
cur.execute("TRUNCATE TABLE import_status") if date is None:
cur.execute("""INSERT INTO import_status (lastimportdate, sequence_id, indexed) cur.execute("UPDATE import_status set sequence_id = %s, indexed = %s",
VALUES (%s, %s, %s)""", (date, seq, indexed)) (seq, indexed))
else:
cur.execute("TRUNCATE TABLE import_status")
cur.execute("""INSERT INTO import_status (lastimportdate, sequence_id, indexed)
VALUES (%s, %s, %s)""", (date, seq, indexed))
conn.commit() conn.commit()

3
nominatim/tools/replication.py
View File

@@ -119,6 +119,7 @@ def update(conn, options):
# Write the current status to the file # Write the current status to the file
endstate = repl.get_state_info(endseq) endstate = repl.get_state_info(endseq)
status.set_status(conn, endstate.timestamp, seq=endseq, indexed=False) status.set_status(conn, endstate.timestamp if endstate else None,
seq=endseq, indexed=False)
return UpdateState.UP_TO_DATE return UpdateState.UP_TO_DATE

15
test/python/test_db_status.py
View File

@@ -65,7 +65,6 @@ def test_set_status_filled_table(status_table, temp_db_conn, temp_db_cursor):
assert 1 == temp_db_cursor.scalar("SELECT count(*) FROM import_status") assert 1 == temp_db_cursor.scalar("SELECT count(*) FROM import_status")
date = dt.datetime.fromordinal(1000100).replace(tzinfo=dt.timezone.utc) date = dt.datetime.fromordinal(1000100).replace(tzinfo=dt.timezone.utc)
nominatim.db.status.set_status(temp_db_conn, date=date, seq=456, indexed=False) nominatim.db.status.set_status(temp_db_conn, date=date, seq=456, indexed=False)
@@ -75,6 +74,20 @@ def test_set_status_filled_table(status_table, temp_db_conn, temp_db_cursor):
assert temp_db_cursor.fetchone() == [date, 456, False] assert temp_db_cursor.fetchone() == [date, 456, False]
def test_set_status_missing_date(status_table, temp_db_conn, temp_db_cursor):
date = dt.datetime.fromordinal(1000000).replace(tzinfo=dt.timezone.utc)
nominatim.db.status.set_status(temp_db_conn, date=date)
assert 1 == temp_db_cursor.scalar("SELECT count(*) FROM import_status")
nominatim.db.status.set_status(temp_db_conn, date=None, seq=456, indexed=False)
temp_db_cursor.execute("SELECT * FROM import_status")
assert temp_db_cursor.rowcount == 1
assert temp_db_cursor.fetchone() == [date, 456, False]
def test_get_status_empty_table(status_table, temp_db_conn): def test_get_status_empty_table(status_table, temp_db_conn):
assert nominatim.db.status.get_status(temp_db_conn) == (None, None, None) assert nominatim.db.status.get_status(temp_db_conn) == (None, None, None)