X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/bc7f6209d83dcc161f093ce9907991facabb3491..051f3720ce142b7bc70c4d7e30f28cf9db106d88:/nominatim/tools/database_import.py diff --git a/nominatim/tools/database_import.py b/nominatim/tools/database_import.py index fa60abf2..f6ebe90d 100644 --- a/nominatim/tools/database_import.py +++ b/nominatim/tools/database_import.py @@ -95,7 +95,7 @@ def import_osm_data(osm_files: Union[Path, Sequence[Path]], if not options['flatnode_file'] and options['osm2pgsql_cache'] == 0: # Make some educated guesses about cache size based on the size # of the import file and the available memory. - mem = psutil.virtual_memory() # type: ignore[no-untyped-call] + mem = psutil.virtual_memory() fsize = 0 if isinstance(osm_files, list): for fname in osm_files: @@ -225,7 +225,8 @@ def load_data(dsn: str, threads: int) -> None: cur.execute('ANALYSE') -def create_search_indices(conn: Connection, config: Configuration, drop: bool = False) -> None: +def create_search_indices(conn: Connection, config: Configuration, + drop: bool = False, threads: int = 1) -> None: """ Create tables that have explicit partitioning. """ @@ -243,4 +244,5 @@ def create_search_indices(conn: Connection, config: Configuration, drop: bool = sql = SQLPreprocessor(conn, config) - sql.run_sql_file(conn, 'indices.sql', drop=drop) + sql.run_parallel_sql_file(config.get_libpq_dsn(), + 'indices.sql', min(8, threads), drop=drop)