hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-16 15:47:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2856 from t-tomek/patch-1

Browse Source 
Update DB.php
This commit is contained in:
Sarah Hoffmann
2023-01-03 10:58:50 +01:00
committed by GitHub
parent 860c6ecbcc 151b3c4021
commit 90b29aa808
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib-php/DB.php
View File

@@ -38,23 +38,25 @@ class DB
// https://secure.php.net/manual/en/ref.pdo-pgsql.connection.php // https://secure.php.net/manual/en/ref.pdo-pgsql.connection.php
try { try {
$conn = new \PDO($this->sDSN, null, null, $aConnOptions); $this->connection = new \PDO($this->sDSN, null, null, $aConnOptions);
} catch (\PDOException $e) { } catch (\PDOException $e) {
$sMsg = 'Failed to establish database connection:' . $e->getMessage(); $sMsg = 'Failed to establish database connection:' . $e->getMessage();
throw new \Nominatim\DatabaseError($sMsg, 500, null, $e->getMessage()); throw new \Nominatim\DatabaseError($sMsg, 500, null, $e->getMessage());
} }
$conn->exec("SET DateStyle TO 'sql,european'"); $this->connection->exec("SET DateStyle TO 'sql,european'");
$conn->exec("SET client_encoding TO 'utf-8'"); $this->connection->exec("SET client_encoding TO 'utf-8'");
// Disable JIT and parallel workers. They interfere badly with search SQL. // Disable JIT and parallel workers. They interfere badly with search SQL.
$conn->exec("UPDATE pg_settings SET setting = -1 WHERE name = 'jit_above_cost'"); $this->connection->exec('SET max_parallel_workers_per_gather TO 0');
$conn->exec("UPDATE pg_settings SET setting = 0 WHERE name = 'max_parallel_workers_per_gather'"); if ($this->getPostgresVersion() >= 11) {
$this->connection->exec('SET jit_above_cost TO -1');
}
$iMaxExecution = ini_get('max_execution_time'); $iMaxExecution = ini_get('max_execution_time');
if ($iMaxExecution > 0) { if ($iMaxExecution > 0) {
$conn->setAttribute(\PDO::ATTR_TIMEOUT, $iMaxExecution); // seconds $this->connection->setAttribute(\PDO::ATTR_TIMEOUT, $iMaxExecution); // seconds
} }
$this->connection = $conn;
return true; return true;
} }