From: Sarah Hoffmann Date: Thu, 6 Jan 2022 08:03:13 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Tag: deploy~133 X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/c4f22a42eba499ed1854c5967b2e3932fe9b3896?hp=fc038261b9fe7f7d89a4000496185e72ac100a2a Merge remote-tracking branch 'upstream/master' --- diff --git a/AUTHORS b/AUTHORS index fc28bf2e..e52785d3 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,15 +1,15 @@ Nominatim was written by: - Brian Quinion - Sarah Hoffmann - Marc Tobias Metten +* Brian Quinion +* Sarah Hoffmann +* Marc Tobias Metten - markigail - gemo1011 - IrlJidel - Frederik Ramm +* markigail +* AntoJvlt +* gemo1011 +* darkshredder and many more. -For a full list of contributors see +For a full list of contributors see the Git logs or visit https://github.com/openstreetmap/Nominatim/graphs/contributors diff --git a/lib-php/AddressDetails.php b/lib-php/AddressDetails.php index 91e3d89f..1bd475ad 100644 --- a/lib-php/AddressDetails.php +++ b/lib-php/AddressDetails.php @@ -1,4 +1,12 @@ exec("SET DateStyle TO 'sql,european'"); $conn->exec("SET client_encoding TO 'utf-8'"); + // Disable JIT and parallel workers. They interfere badly with search SQL. + $conn->exec("UPDATE pg_settings SET setting = -1 WHERE name = 'jit_above_cost'"); + $conn->exec("UPDATE pg_settings SET setting = 0 WHERE name = 'max_parallel_workers_per_gather'"); $iMaxExecution = ini_get('max_execution_time'); if ($iMaxExecution > 0) { $conn->setAttribute(\PDO::ATTR_TIMEOUT, $iMaxExecution); // seconds diff --git a/lib-php/DatabaseError.php b/lib-php/DatabaseError.php index ec428de1..68f1efe6 100644 --- a/lib-php/DatabaseError.php +++ b/lib-php/DatabaseError.php @@ -1,4 +1,12 @@ getGroupedSearches($aSearches, $aPhrases, $oValidTokens); - foreach ($aGroupedSearches as $aSearches) { + foreach ($aReverseGroupedSearches as $aSearches) { foreach ($aSearches as $aSearch) { - if (!isset($aReverseGroupedSearches[$aSearch->getRank()])) { - $aReverseGroupedSearches[$aSearch->getRank()] = array(); + if (!isset($aGroupedSearches[$aSearch->getRank()])) { + $aGroupedSearches[$aSearch->getRank()] = array(); } - $aReverseGroupedSearches[$aSearch->getRank()][] = $aSearch; + $aGroupedSearches[$aSearch->getRank()][] = $aSearch; } } - $aGroupedSearches = $aReverseGroupedSearches; ksort($aGroupedSearches); } } else { diff --git a/lib-php/ParameterParser.php b/lib-php/ParameterParser.php index d4068aa3..dd637722 100644 --- a/lib-php/ParameterParser.php +++ b/lib-php/ParameterParser.php @@ -1,4 +1,12 @@ $exception->getCode(), 'message' => $exception->getMessage() diff --git a/lib-php/template/search-batch-json.php b/lib-php/template/search-batch-json.php index cc017564..cbf25c87 100644 --- a/lib-php/template/search-batch-json.php +++ b/lib-php/template/search-batch-json.php @@ -1,4 +1,12 @@ $aPointDetails) { diff --git a/lib-php/template/search-geojson.php b/lib-php/template/search-geojson.php index c0ca625c..f517142f 100644 --- a/lib-php/template/search-geojson.php +++ b/lib-php/template/search-geojson.php @@ -1,4 +1,12 @@ $aPointDetails) { diff --git a/lib-php/template/search-json.php b/lib-php/template/search-json.php index 6f729c29..3f9e0a57 100644 --- a/lib-php/template/search-json.php +++ b/lib-php/template/search-json.php @@ -1,4 +1,12 @@ $aPointDetails) { diff --git a/lib-php/template/search-xml.php b/lib-php/template/search-xml.php index 59b352ca..8dda65e2 100644 --- a/lib-php/template/search-xml.php +++ b/lib-php/template/search-xml.php @@ -1,4 +1,12 @@