prepare 3.5.1 release

update libosmium to 2.15.6
Fixes an issue where osm2pgsql hangs on a particularly complicated multipolygon.
2026-02-14 10:27:57 +00:00 · 2020-06-29 20:54:50 +02:00 · 2020-06-29 20:54:50 +02:00 · 2020-06-28 23:19:49 +02:00 · 2020-06-28 23:19:41 +02:00
4 changed files with 15 additions and 2 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,7 @@ project(nominatim)

 set(NOMINATIM_VERSION_MAJOR 3)
 set(NOMINATIM_VERSION_MINOR 5)
-set(NOMINATIM_VERSION_PATCH 0)
+set(NOMINATIM_VERSION_PATCH 1)

 set(NOMINATIM_VERSION "${NOMINATIM_VERSION_MAJOR}.${NOMINATIM_VERSION_MINOR}.${NOMINATIM_VERSION_PATCH}")

--- a/6
+++ b/6
@@ -1,3 +1,9 @@
+3.5.1
+
+ * disable jit and parallel processing in PostgreSQL for osm2pgsql
+ * update libosmium to 2.15.6 (fixes an issue with processing hanging
+   on large multipolygons)
+
 3.5.0

 * structured select on HTML search page
--- a/2
+++ b/2
--- a/utils/update.php
+++ b/utils/update.php
@@ -55,6 +55,7 @@ date_default_timezone_set('Etc/UTC');

 $oDB = new Nominatim\DB();
 $oDB->connect();
+$fPostgresVersion = $oDB->getPostgresVersion();

 $aDSNInfo = Nominatim\DB::parseDSN(CONST_Database_DSN);
 if (!isset($aDSNInfo['port']) || !$aDSNInfo['port']) $aDSNInfo['port'] = 5432;
@@ -90,6 +91,12 @@ if (isset($aDSNInfo['password']) && $aDSNInfo['password']) {
 if (!is_null(CONST_Osm2pgsql_Flatnode_File) && CONST_Osm2pgsql_Flatnode_File) {
    $oOsm2pgsqlCmd->addParams('--flat-nodes', CONST_Osm2pgsql_Flatnode_File);
 }
+if ($fPostgresVersion >= 11.0) {
+    $oOsm2pgsqlCmd->addEnvPair(
+        'PGOPTIONS',
+        '-c jit=off -c max_parallel_workers_per_gather=0'
+    );
+}


 $oIndexCmd = (new \Nominatim\Shell(CONST_BasePath.'/nominatim/nominatim.py'))
Author	SHA1	Message	Date
Sarah Hoffmann	168c2e222e	prepare 3.5.1 release	2020-06-29 20:54:50 +02:00
Sarah Hoffmann	770f8e31a8	update libosmium to 2.15.6 Fixes an issue where osm2pgsql hangs on a particularly complicated multipolygon.	2020-06-29 20:54:50 +02:00
Sarah Hoffmann	dd55a76d6d	make phpcs happy	2020-06-28 23:19:49 +02:00
Sarah Hoffmann	670cff0d09	disable JIT and parallel processing for osm2pgsql in updates This is known to cause issues because of bad indexing statistics.	2020-06-28 23:19:41 +02:00