X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/45c1e7582f87d2c5ec7cc2a06bb0b2c74939cf85..98cb868ec119fca6eeec9145afe79bb9a621b4a4:/utils/update.php?ds=sidebyside

diff --git a/utils/update.php b/utils/update.php
index 8dd1dfc3..a561aaa3 100755
--- a/utils/update.php
+++ b/utils/update.php
@@ -47,7 +47,6 @@
 		showUsage($aCMDOptions, true, 'Select either import of hourly or daily');
 	}
 
-	if (!isset($aResult['index-instances'])) $aResult['index-instances'] = 1;
 	if (!isset($aResult['index-rank'])) $aResult['index-rank'] = 0;
 
 /*
@@ -254,6 +253,13 @@
 
 	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);
@@ -276,15 +282,15 @@
 				var_dump($aTokenSet, $sSQL);
 				exit;
 			}
-			
+
 			$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))
@@ -294,7 +300,7 @@
 				}
 
 				$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))
@@ -304,7 +310,7 @@
 				}
 
 				$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))
@@ -316,8 +322,7 @@
 				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))
@@ -326,18 +331,8 @@
 						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 .= " 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))
@@ -361,6 +356,7 @@
 
 	if ($aResult['index'])
 	{
+		if (!isset($aResult['index-instances'])) $aResult['index-instances'] = 1;
 		passthru(CONST_BasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'].' -t '.$aResult['index-instances'].' -r '.$aResult['index-rank']);
 	}
 
@@ -378,7 +374,7 @@
 		$sCMDDownload = $sOsmosisCMD.' --read-replication-interval workingDirectory='.$sOsmosisConfigDirectory.' --simplify-change --write-xml-change '.$sImportFile;
 		$sCMDCheckReplicationLag = $sOsmosisCMD.' -q --read-replication-lag workingDirectory='.$sOsmosisConfigDirectory;
 		$sCMDImport = $sOsm2pgsqlCmd.' '.$sImportFile;
-		$sCMDIndex = $sBasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'].' -t '.$aResult['index-instances'];
+		$sCMDIndex = $sBasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'];
 		if (!$aResult['no-npi']) {
 			$sCMDIndex .= '-F ';
 		}
@@ -463,7 +459,16 @@
 			$sBatchEnd = getosmosistimestamp($sOsmosisConfigDirectory);
 
 			// Index file
-			$sThisIndexCmd = $sCMDIndex;
+			if (!isset($aResult['index-instances']))
+			{
+				if (getLoadAverage() < 24)
+					$iIndexInstances = 2;
+				else
+					$iIndexInstances = 1;
+			} else
+				$iIndexInstances = $aResult['index-instances'];
+
+			$sThisIndexCmd = $sCMDIndex.' -t '.$iIndexInstances;
 			$fCMDStartTime = time();
 
 			if (!$aResult['no-npi'])