mirror of
https://github.com/osm-search/Nominatim.git
synced 2024-11-25 19:35:02 +03:00
Merge pull request #2264 from darkshredder/tiger-data-tests
Fix: Error if last statements is wrong and improved tests in tiger data import
This commit is contained in:
commit
cf69daaafb
@ -61,6 +61,20 @@ def handle_threaded_sql_statements(sel, file):
|
||||
except Exception as exc: # pylint: disable=broad-except
|
||||
LOG.info('Wrong SQL statement: %s', exc)
|
||||
|
||||
def handle_unregister_connection_pool(sel, place_threads):
|
||||
""" Handles unregistering pool of connections
|
||||
"""
|
||||
|
||||
while place_threads > 0:
|
||||
for key, _ in sel.select(1):
|
||||
conn = key.data
|
||||
sel.unregister(conn)
|
||||
try:
|
||||
conn.wait()
|
||||
except Exception as exc: # pylint: disable=broad-except
|
||||
LOG.info('Wrong SQL statement: %s', exc)
|
||||
conn.close()
|
||||
place_threads -= 1
|
||||
|
||||
def add_tiger_data(dsn, data_dir, threads, config, sqllib_dir):
|
||||
""" Import tiger data from directory or tar file
|
||||
@ -95,13 +109,7 @@ def add_tiger_data(dsn, data_dir, threads, config, sqllib_dir):
|
||||
handle_threaded_sql_statements(sel, file)
|
||||
|
||||
# Unregistering pool of database connections
|
||||
while place_threads > 0:
|
||||
for key, _ in sel.select(1):
|
||||
conn = key.data
|
||||
sel.unregister(conn)
|
||||
conn.wait()
|
||||
conn.close()
|
||||
place_threads -= 1
|
||||
handle_unregister_connection_pool(sel, place_threads)
|
||||
|
||||
if tar:
|
||||
tar.close()
|
||||
|
@ -16,11 +16,24 @@ def test_add_tiger_data(dsn, src_dir, def_config, tmp_path, sql_preprocessor,
|
||||
temp_db_cursor.execute('CREATE EXTENSION postgis')
|
||||
temp_db_cursor.execute('CREATE TABLE place (id INT)')
|
||||
sqlfile = tmp_path / '1010.sql'
|
||||
sqlfile.write_text("""INSERT INTO place values (1)""")
|
||||
sqlfile.write_text("""INSERT INTO place values (1);
|
||||
INSERT INTO non_existant_table values (1);""")
|
||||
tiger_data.add_tiger_data(dsn, str(tmp_path), threads, def_config, src_dir / 'lib-sql')
|
||||
|
||||
assert temp_db_cursor.table_rows('place') == 1
|
||||
|
||||
@pytest.mark.parametrize("threads", (1, 5))
|
||||
def test_add_tiger_data_bad_file(dsn, src_dir, def_config, tmp_path, sql_preprocessor,
|
||||
temp_db_cursor, threads, temp_db):
|
||||
temp_db_cursor.execute('CREATE EXTENSION hstore')
|
||||
temp_db_cursor.execute('CREATE EXTENSION postgis')
|
||||
temp_db_cursor.execute('CREATE TABLE place (id INT)')
|
||||
sqlfile = tmp_path / '1010.txt'
|
||||
sqlfile.write_text("""Random text""")
|
||||
tiger_data.add_tiger_data(dsn, str(tmp_path), threads, def_config, src_dir / 'lib-sql')
|
||||
|
||||
assert temp_db_cursor.table_rows('place') == 0
|
||||
|
||||
@pytest.mark.parametrize("threads", (1, 5))
|
||||
def test_add_tiger_data_tarfile(dsn, src_dir, def_config, tmp_path,
|
||||
temp_db_cursor, threads, temp_db, sql_preprocessor):
|
||||
@ -28,10 +41,26 @@ def test_add_tiger_data_tarfile(dsn, src_dir, def_config, tmp_path,
|
||||
temp_db_cursor.execute('CREATE EXTENSION postgis')
|
||||
temp_db_cursor.execute('CREATE TABLE place (id INT)')
|
||||
sqlfile = tmp_path / '1010.sql'
|
||||
sqlfile.write_text("""INSERT INTO place values (1)""")
|
||||
sqlfile.write_text("""INSERT INTO place values (1);
|
||||
INSERT INTO non_existant_table values (1);""")
|
||||
tar = tarfile.open("sample.tar.gz", "w:gz")
|
||||
tar.add(sqlfile)
|
||||
tar.close()
|
||||
tiger_data.add_tiger_data(dsn, str(src_dir / 'sample.tar.gz'), threads, def_config, src_dir / 'lib-sql')
|
||||
|
||||
assert temp_db_cursor.table_rows('place') == 1
|
||||
assert temp_db_cursor.table_rows('place') == 1
|
||||
|
||||
@pytest.mark.parametrize("threads", (1, 5))
|
||||
def test_add_tiger_data_bad_tarfile(dsn, src_dir, def_config, tmp_path,
|
||||
temp_db_cursor, threads, temp_db, sql_preprocessor):
|
||||
temp_db_cursor.execute('CREATE EXTENSION hstore')
|
||||
temp_db_cursor.execute('CREATE EXTENSION postgis')
|
||||
temp_db_cursor.execute('CREATE TABLE place (id INT)')
|
||||
sqlfile = tmp_path / '1010.txt'
|
||||
sqlfile.write_text("""Random text""")
|
||||
tar = tarfile.open("sample.tar.gz", "w:gz")
|
||||
tar.add(sqlfile)
|
||||
tar.close()
|
||||
tiger_data.add_tiger_data(dsn, str(src_dir / 'sample.tar.gz'), threads, def_config, src_dir / 'lib-sql')
|
||||
|
||||
assert temp_db_cursor.table_rows('place') == 0
|
Loading…
Reference in New Issue
Block a user