Merge pull request #3292 from lonvia/faster-country-search

[nominatim.git] / lib-php / DB.php

diff --git a/lib-php/DB.php b/lib-php/DB.php
index f5fea7f8d8c6eb549f64d3e719cc9621cbc7699a..553d9452e2f524b75d2f12631a18140c34460407 100644 (file)
--- a/lib-php/DB.php
+++ b/lib-php/DB.php
@@ -47,17 +47,14 @@ class DB
         $this->connection->exec("SET DateStyle TO 'sql,european'");
         $this->connection->exec("SET client_encoding TO 'utf-8'");
         // Disable JIT and parallel workers. They interfere badly with search SQL.
         $this->connection->exec("SET DateStyle TO 'sql,european'");
         $this->connection->exec("SET client_encoding TO 'utf-8'");
         // Disable JIT and parallel workers. They interfere badly with search SQL.

-        if ($this->getPostgresVersion() < 11) {
-            $this->connection->exec("UPDATE pg_settings SET setting = -1 WHERE name = 'jit_above_cost'");
-            $this->connection->exec("UPDATE pg_settings SET setting = 0 WHERE name = 'max_parallel_workers_per_gather'");
-        } else {
-            $this->connection->exec("SET jit_above_cost TO -1");
-            $this->connection->exec("SET max_parallel_workers_per_gather TO 0");    
+        $this->connection->exec('SET max_parallel_workers_per_gather TO 0');
+        if ($this->getPostgresVersion() >= 11) {
+            $this->connection->exec('SET jit_above_cost TO -1');

         }
         
         $iMaxExecution = ini_get('max_execution_time');
         if ($iMaxExecution > 0) {
         }
         
         $iMaxExecution = ini_get('max_execution_time');
         if ($iMaxExecution > 0) {

-            $conn->setAttribute(\PDO::ATTR_TIMEOUT, $iMaxExecution); // seconds
+            $this->connection->setAttribute(\PDO::ATTR_TIMEOUT, $iMaxExecution); // seconds

         }
 
         return true;
         }
 
         return true;