X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/bf182ba2dc5fda3b249bf192a8c488e564576fd7..71b3aa9cca3f9a3fd6a5f8e0e51c0b99463d7e66:/utils/update.php?ds=sidebyside diff --git a/utils/update.php b/utils/update.php index 533b48d6..cc275463 100755 --- a/utils/update.php +++ b/utils/update.php @@ -54,15 +54,13 @@ // Lock to prevent multiple copies running if (exec('/bin/ps uww | grep '.basename(__FILE__).' | grep -v /dev/null | grep -v grep -c', $aOutput2, $iResult) > 1) { - echo "Copy already running\n"; - exit; + fail("Copy already running\n"); } if (!isset($aResult['max-load'])) $aResult['max-load'] = 1.9; if (!isset($aResult['max-blocking'])) $aResult['max-blocking'] = 3; if (getBlockingProcesses() > $aResult['max-blocking']) { - echo "Too many blocking processes for import\n"; - exit; + fail("Too many blocking processes for import\n"); } */ @@ -74,6 +72,7 @@ $oDB =& getDB(); $aDSNInfo = DB::parseDSN(CONST_Database_DSN); + if (!isset($aDSNInfo['port']) || !$aDSNInfo['port']) $aDSNInfo['port'] = 5432; // cache memory to be used by osm2pgsql, should not be more than the available memory $iCacheMemory = (isset($aResult['osm2pgsql-cache'])?$aResult['osm2pgsql-cache']:2000); @@ -82,7 +81,7 @@ $iCacheMemory = getCacheMemoryMB(); echo "WARNING: resetting cache memory to $iCacheMemory\n"; } - $sOsm2pgsqlCmd = CONST_Osm2pgsql_Binary.' -klas -C '.$iCacheMemory.' -O gazetteer -d '.$aDSNInfo['database']; + $sOsm2pgsqlCmd = CONST_Osm2pgsql_Binary.' -klas --number-processes 1 -C '.$iCacheMemory.' -O gazetteer -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port']; if (!is_null(CONST_Osm2pgsql_Flatnode_File)) { $sOsm2pgsqlCmd .= ' --flat-nodes '.CONST_Osm2pgsql_Flatnode_File; @@ -119,8 +118,7 @@ $sNextFile = $aResult['import-diff']; if (!file_exists($sNextFile)) { - echo "Cannot open $sNextFile\n"; - exit; + fail("Cannot open $sNextFile\n"); } // Don't update the import status - we don't know what this file contains $sUpdateSQL = 'update import_status set lastimportdate = now() where false'; @@ -136,8 +134,7 @@ if ($iErrorLevel) { - echo "Error from osm2pgsql, $iErrorLevel\n"; - exit; + fail("Error from osm2pgsql, $iErrorLevel\n"); } // Move the date onwards @@ -204,8 +201,7 @@ exec($sCMD, $sJunk, $iErrorLevel); if ($iErrorLevel) { - echo "Error converting osm to osc, osmosis returned: $iErrorLevel\n"; - exit; + fail("Error converting osm to osc, osmosis returned: $iErrorLevel\n"); } } else @@ -220,8 +216,7 @@ $hProc = proc_open($sCMD, $aSpec, $aPipes); if (!is_resource($hProc)) { - echo "Error converting osm to osc, osmosis failed\n"; - exit; + fail("Error converting osm to osc, osmosis failed\n"); } fwrite($aPipes[0], $sModifyXMLstr); fclose($aPipes[0]); @@ -236,7 +231,7 @@ echo "Error converting osm to osc, osmosis returned: $iError\n"; echo $sOut; echo $sErrors; - exit; + exit(-1); } } @@ -246,13 +241,18 @@ exec($sCMD, $sJunk, $iErrorLevel); if ($iErrorLevel) { - echo "osm2pgsql exited with error level $iErrorLevel\n"; - exit; + fail("osm2pgsql exited with error level $iErrorLevel\n"); } } if ($aResult['deduplicate']) { + + $pgver = (float) CONST_Postgresql_Version; + if ($pgver < 9.3) { + fail("ERROR: deduplicate is only currently supported in postgresql 9.3"); + } + $oDB =& getDB(); $sSQL = 'select partition from country_name order by country_code'; $aPartitions = $oDB->getCol($sSQL); @@ -273,76 +273,65 @@ if (PEAR::isError($aTokenSet)) { var_dump($aTokenSet, $sSQL); - exit; + exit(1); } - + $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)) { var_dump($x); - exit; + exit(1); } $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)) { var_dump($x); - exit; + exit(1); } $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)) { var_dump($x); - exit; + exit(1); } 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)) { var_dump($x); - 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; + exit(1); } $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)) { var_dump($x); - exit; + exit(1); } } @@ -351,7 +340,7 @@ if (PEAR::isError($x)) { var_dump($x); - exit; + exit(1); } } @@ -360,15 +349,14 @@ if ($aResult['index']) { - passthru(CONST_BasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -t '.$aResult['index-instances'].' -r '.$aResult['index-rank']); + passthru(CONST_BasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'].' -t '.$aResult['index-instances'].' -r '.$aResult['index-rank']); } if ($aResult['import-osmosis'] || $aResult['import-osmosis-all']) { if (strpos(CONST_Replication_Url, 'download.geofabrik.de') !== false && CONST_Replication_Update_Interval < 86400) { - echo "Error: Update interval too low for download.geofabrik.de. Please check install documentation (http://wiki.openstreetmap.org/wiki/Nominatim/Installation#Updates)\n"; - exit; + fail("Error: Update interval too low for download.geofabrik.de. Please check install documentation (http://wiki.openstreetmap.org/wiki/Nominatim/Installation#Updates)\n"); } $sImportFile = CONST_BasePath.'/data/osmosischange.osc'; @@ -377,7 +365,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'].' -t '.$aResult['index-instances']; + $sCMDIndex = $sBasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'].' -t '.$aResult['index-instances']; if (!$aResult['no-npi']) { $sCMDIndex .= '-F '; } @@ -417,8 +405,9 @@ exec($sCMDCheckReplicationLag, $aReplicationLag, $iErrorLevel); } // There are new replication files - use osmosis to download the file - echo "\nReplication Delay is ".$aReplicationLag[0]."\n"; + echo "\n".date('Y-m-d H:i:s')." Replication Delay is ".$aReplicationLag[0]."\n"; } + $fStartTime = time(); $fCMDStartTime = time(); echo $sCMDDownload."\n"; exec($sCMDDownload, $sJunk, $iErrorLevel); @@ -431,9 +420,10 @@ } $iFileSize = filesize($sImportFile); $sBatchEnd = getosmosistimestamp($sOsmosisConfigDirectory); - echo "Completed for $sBatchEnd in ".round((time()-$fCMDStartTime)/60,2)." minutes\n"; $sSQL = "INSERT INTO import_osmosis_log values ('$sBatchEnd',$iFileSize,'".date('Y-m-d H:i:s',$fCMDStartTime)."','".date('Y-m-d H:i:s')."','osmosis')"; + var_Dump($sSQL); $oDB->query($sSQL); + echo date('Y-m-d H:i:s')." Completed osmosis step for $sBatchEnd in ".round((time()-$fCMDStartTime)/60,2)." minutes\n"; } $iFileSize = filesize($sImportFile); @@ -448,10 +438,10 @@ echo "Error: $iErrorLevel\n"; exit($iErrorLevel); } - echo "Completed for $sBatchEnd in ".round((time()-$fCMDStartTime)/60,2)." minutes\n"; $sSQL = "INSERT INTO import_osmosis_log values ('$sBatchEnd',$iFileSize,'".date('Y-m-d H:i:s',$fCMDStartTime)."','".date('Y-m-d H:i:s')."','osm2pgsql')"; var_Dump($sSQL); $oDB->query($sSQL); + echo date('Y-m-d H:i:s')." Completed osm2pgsql step for $sBatchEnd in ".round((time()-$fCMDStartTime)/60,2)." minutes\n"; // Archive for debug? unlink($sImportFile); @@ -461,10 +451,10 @@ // Index file $sThisIndexCmd = $sCMDIndex; + $fCMDStartTime = time(); if (!$aResult['no-npi']) { - $fCMDStartTime = time(); $iFileID = $oDB->getOne('select nextval(\'file\')'); if (PEAR::isError($iFileID)) { @@ -518,16 +508,17 @@ } } - echo "Completed for $sBatchEnd in ".round((time()-$fCMDStartTime)/60,2)." minutes\n"; $sSQL = "INSERT INTO import_osmosis_log values ('$sBatchEnd',$iFileSize,'".date('Y-m-d H:i:s',$fCMDStartTime)."','".date('Y-m-d H:i:s')."','index')"; + var_Dump($sSQL); $oDB->query($sSQL); + echo date('Y-m-d H:i:s')." Completed index step for $sBatchEnd in ".round((time()-$fCMDStartTime)/60,2)." minutes\n"; $sSQL = "update import_status set lastimportdate = '$sBatchEnd'"; $oDB->query($sSQL); $fDuration = time() - $fStartTime; - echo "Completed for $sBatchEnd in ".round($fDuration/60,2)."\n"; - if (!$aResult['import-osmosis-all']) exit; + echo date('Y-m-d H:i:s')." Completed all for $sBatchEnd in ".round($fDuration/60,2)." minutes\n"; + if (!$aResult['import-osmosis-all']) exit(0); if ( CONST_Replication_Update_Interval > 60 ) { @@ -537,7 +528,7 @@ { $iSleep = max(0,CONST_Replication_Update_Interval-$fDuration); } - echo "Sleeping $iSleep seconds\n"; + echo date('Y-m-d H:i:s')." Sleeping $iSleep seconds\n"; sleep($iSleep); } @@ -549,7 +540,7 @@ if (PEAR::isError($iNPIID)) { var_dump($iNPIID); - exit; + exit(1); } $sConfigDirectory = CONST_BasePath.'/settings'; $sCMDImportTemplate = $sBasePath.'/nominatim/nominatim -d gazetteer -P 5433 -I -T '.$sBasePath.'/nominatim/partitionedtags.def -F '; @@ -580,8 +571,7 @@ exec($sCMDImport, $sJunk, $iErrorLevel); if ($iErrorLevel) { - echo "Error: $iErrorLevel\n"; - exit; + fail("Error: $iErrorLevel\n"); } $sBatchEnd = $iNPIID; echo "Completed for $sBatchEnd in ".round((time()-$fCMDStartTime)/60,2)." minutes\n";