Merge remote-tracking branch 'upstream/master'

[nominatim.git] / utils / update.php

diff --git a/utils/update.php b/utils/update.php
index 395f964dd9a4b3c5a6e023125d6a4929168f5c62..a561aaa3656cc88ebf9099027bda7c63412425c4 100755 (executable)
--- a/utils/update.php
+++ b/utils/update.php
@@ -253,6 +253,13 @@
 
        if ($aResult['deduplicate'])
        {
 
        if ($aResult['deduplicate'])
        {

+
+               $pgver = (float) CONST_Postgresql_Version;
+                if ($pgver < 9.3) {
+                       echo "ERROR: deduplicate is only currently supported in postgresql 9.3";
+                       exit;
+               }
+

                 $oDB =& getDB();
                 $sSQL = 'select partition from country_name order by country_code';
                 $aPartitions = $oDB->getCol($sSQL);
                 $oDB =& getDB();
                 $sSQL = 'select partition from country_name order by country_code';
                 $aPartitions = $oDB->getCol($sSQL);


@@ -275,15 +282,15 @@
                                var_dump($aTokenSet, $sSQL);
                                exit;
                        }
                                var_dump($aTokenSet, $sSQL);
                                exit;
                        }

-                       
+

                        $aKeep = array_shift($aTokenSet);
                        $iKeepID = $aKeep['word_id'];
 
                        foreach($aTokenSet as $aRemove)
                        {
                                $sSQL = "update search_name set";
                        $aKeep = array_shift($aTokenSet);
                        $iKeepID = $aKeep['word_id'];
 
                        foreach($aTokenSet as $aRemove)
                        {
                                $sSQL = "update search_name set";

-                               $sSQL .= " name_vector = (name_vector - ".$aRemove['word_id'].")+".$iKeepID.",";
-                               $sSQL .= " nameaddress_vector = (nameaddress_vector - ".$aRemove['word_id'].")+".$iKeepID;
+                               $sSQL .= " name_vector = array_replace(name_vector,".$aRemove['word_id'].",".$iKeepID."),";
+                               $sSQL .= " nameaddress_vector = array_replace(nameaddress_vector,".$aRemove['word_id'].",".$iKeepID.")";

                                $sSQL .= " where name_vector @> ARRAY[".$aRemove['word_id']."]";
                                $x = $oDB->query($sSQL);
                                if (PEAR::isError($x))
                                $sSQL .= " where name_vector @> ARRAY[".$aRemove['word_id']."]";
                                $x = $oDB->query($sSQL);
                                if (PEAR::isError($x))


@@ -293,7 +300,7 @@
                                }
 
                                $sSQL = "update search_name set";
                                }
 
                                $sSQL = "update search_name set";

-                               $sSQL .= " nameaddress_vector = (nameaddress_vector - ".$aRemove['word_id'].")+".$iKeepID;
+                               $sSQL .= " nameaddress_vector = array_replace(nameaddress_vector,".$aRemove['word_id'].",".$iKeepID.")";

                                $sSQL .= " where nameaddress_vector @> ARRAY[".$aRemove['word_id']."]";
                                $x = $oDB->query($sSQL);
                                if (PEAR::isError($x))
                                $sSQL .= " where nameaddress_vector @> ARRAY[".$aRemove['word_id']."]";
                                $x = $oDB->query($sSQL);
                                if (PEAR::isError($x))


@@ -303,7 +310,7 @@
                                }
 
                                $sSQL = "update location_area_country set";
                                }
 
                                $sSQL = "update location_area_country set";

-                               $sSQL .= " keywords = (keywords - ".$aRemove['word_id'].")+".$iKeepID;
+                               $sSQL .= " keywords = array_replace(keywords,".$aRemove['word_id'].",".$iKeepID.")";

                                $sSQL .= " where keywords @> ARRAY[".$aRemove['word_id']."]";
                                $x = $oDB->query($sSQL);
                                if (PEAR::isError($x))
                                $sSQL .= " where keywords @> ARRAY[".$aRemove['word_id']."]";
                                $x = $oDB->query($sSQL);
                                if (PEAR::isError($x))


@@ -315,8 +322,7 @@
                                foreach ($aPartitions as $sPartition)
                                {
                                        $sSQL = "update search_name_".$sPartition." set";
                                foreach ($aPartitions as $sPartition)
                                {
                                        $sSQL = "update search_name_".$sPartition." set";

-                                       $sSQL .= " name_vector = (name_vector - ".$aRemove['word_id'].")+".$iKeepID.",";
-                                       $sSQL .= " nameaddress_vector = (nameaddress_vector - ".$aRemove['word_id'].")+".$iKeepID;
+                                       $sSQL .= " name_vector = array_replace(name_vector,".$aRemove['word_id'].",".$iKeepID.")";

                                        $sSQL .= " where name_vector @> ARRAY[".$aRemove['word_id']."]";
                                        $x = $oDB->query($sSQL);
                                        if (PEAR::isError($x))
                                        $sSQL .= " where name_vector @> ARRAY[".$aRemove['word_id']."]";
                                        $x = $oDB->query($sSQL);
                                        if (PEAR::isError($x))


@@ -325,18 +331,8 @@
                                                exit;
                                        }
 
                                                exit;
                                        }
 

-                                       $sSQL = "update search_name_".$sPartition." set";
-                                       $sSQL .= " nameaddress_vector = (nameaddress_vector - ".$aRemove['word_id'].")+".$iKeepID;
-                                       $sSQL .= " where nameaddress_vector @> ARRAY[".$aRemove['word_id']."]";
-                                       $x = $oDB->query($sSQL);
-                                       if (PEAR::isError($x))
-                                       {
-                                               var_dump($x);
-                                               exit;
-                                       }
-

                                        $sSQL = "update location_area_country set";
                                        $sSQL = "update location_area_country set";

-                                       $sSQL .= " keywords = (keywords - ".$aRemove['word_id'].")+".$iKeepID;
+                                       $sSQL .= " keywords = array_replace(keywords,".$aRemove['word_id'].",".$iKeepID.")";

                                        $sSQL .= " where keywords @> ARRAY[".$aRemove['word_id']."]";
                                        $x = $oDB->query($sSQL);
                                        if (PEAR::isError($x))
                                        $sSQL .= " where keywords @> ARRAY[".$aRemove['word_id']."]";
                                        $x = $oDB->query($sSQL);
                                        if (PEAR::isError($x))


@@ -465,7 +461,7 @@
                        // Index file
                        if (!isset($aResult['index-instances']))
                        {
                        // Index file
                        if (!isset($aResult['index-instances']))
                        {

-                               if (getLoadAverage() < 18)
+                               if (getLoadAverage() < 24)

                                        $iIndexInstances = 2;
                                else
                                        $iIndexInstances = 1;
                                        $iIndexInstances = 2;
                                else
                                        $iIndexInstances = 1;