X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/0add25e33500110a36458a0bb3fa292d408d2b85..1f0796778754d8df0dfab9dd01302e26a397f064:/src/nominatim_db/db/sql_preprocessor.py diff --git a/src/nominatim_db/db/sql_preprocessor.py b/src/nominatim_db/db/sql_preprocessor.py index 25faead4..85dbaabc 100644 --- a/src/nominatim_db/db/sql_preprocessor.py +++ b/src/nominatim_db/db/sql_preprocessor.py @@ -15,6 +15,7 @@ from .connection import Connection, server_version_tuple, postgis_version_tuple from ..config import Configuration from ..db.query_pool import QueryPool + def _get_partitions(conn: Connection) -> Set[int]: """ Get the set of partitions currently in use. """ @@ -35,6 +36,7 @@ def _get_tables(conn: Connection) -> Set[str]: return set((row[0] for row in list(cur))) + def _get_middle_db_format(conn: Connection, tables: Set[str]) -> str: """ Returns the version of the slim middle tables. """ @@ -73,9 +75,10 @@ def _setup_postgresql_features(conn: Connection) -> Dict[str, Any]: ps3 = postgis_version >= (3, 0) return { 'has_index_non_key_column': pg11plus, - 'spgist_geom' : 'SPGIST' if pg11plus and ps3 else 'GIST' + 'spgist_geom': 'SPGIST' if pg11plus and ps3 else 'GIST' } + class SQLPreprocessor: """ A environment for preprocessing SQL files from the lib-sql directory. @@ -102,7 +105,6 @@ class SQLPreprocessor: self.env.globals['db'] = db_info self.env.globals['postgres'] = _setup_postgresql_features(conn) - def run_string(self, conn: Connection, template: str, **kwargs: Any) -> None: """ Execute the given SQL template string on the connection. The keyword arguments may supply additional parameters @@ -114,7 +116,6 @@ class SQLPreprocessor: cur.execute(sql) conn.commit() - def run_sql_file(self, conn: Connection, name: str, **kwargs: Any) -> None: """ Execute the given SQL file on the connection. The keyword arguments may supply additional parameters for preprocessing. @@ -125,7 +126,6 @@ class SQLPreprocessor: cur.execute(sql) conn.commit() - async def run_parallel_sql_file(self, dsn: str, name: str, num_threads: int = 1, **kwargs: Any) -> None: """ Execute the given SQL files using parallel asynchronous connections.