X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/496a0f1384594aad954f7abcf124e8da86c4b3a1..e0ead17ad93bd34fde9ccdf3844d7c608dc7c12a:/utils/update.php?ds=sidebyside diff --git a/utils/update.php b/utils/update.php index 972a6fdf..006a4774 100755 --- a/utils/update.php +++ b/utils/update.php @@ -7,7 +7,7 @@ ini_set('memory_limit', '800M'); $aCMDOptions = array( - "Import / update / index osm data", + 'Import / update / index osm data', array('help', 'h', 0, 1, 0, 0, false, 'Show Help'), array('quiet', 'q', 0, 1, 0, 0, 'bool', 'Quiet output'), array('verbose', 'v', 0, 1, 0, 0, 'bool', 'Verbose output'), @@ -15,10 +15,9 @@ $aCMDOptions array('init-updates', '', 0, 1, 0, 0, 'bool', 'Set up database for updating'), array('import-osmosis', '', 0, 1, 0, 0, 'bool', 'Import updates once'), array('import-osmosis-all', '', 0, 1, 0, 0, 'bool', 'Import updates forever'), - array('no-npi', '', 0, 1, 0, 0, 'bool', '(obsolate)'), array('no-index', '', 0, 1, 0, 0, 'bool', 'Do not index the new data'), - array('import-all', '', 0, 1, 0, 0, 'bool', 'Import all available files'), + array('calculate-postcodes', '', 0, 1, 0, 0, 'bool', 'Update postcode centroid table'), array('import-file', '', 0, 1, 1, 1, 'realpath', 'Re-import data from an OSM file'), array('import-diff', '', 0, 1, 1, 1, 'realpath', 'Import a diff (osc) file from local file system'), @@ -34,6 +33,7 @@ $aCMDOptions array('index-instances', '', 0, 1, 1, 1, 'int', 'Number of indexing instances (threads)'), array('deduplicate', '', 0, 1, 0, 0, 'bool', 'Deduplicate tokens'), + array('no-npi', '', 0, 1, 0, 0, 'bool', '(obsolete)'), ); getCmdOpt($_SERVER['argv'], $aCMDOptions, $aResult, true, true); @@ -60,6 +60,13 @@ if (!is_null(CONST_Osm2pgsql_Flatnode_File)) { } if ($aResult['init-updates']) { + // sanity check that the replication URL is correct + $sBaseState = file_get_contents(CONST_Replication_Url.'/state.txt'); + if ($sBaseState === false) { + echo "\nCannot find state.txt file at the configured replication URL.\n"; + echo "Does the URL point to a directory containing OSM update data?\n\n"; + fail('replication URL not reachable.'); + } $sSetup = CONST_InstallPath.'/utils/setup.php'; $iRet = -1; passthru($sSetup.' --create-functions --enable-diff-updates', $iRet); @@ -68,22 +75,24 @@ if ($aResult['init-updates']) { } $sDatabaseDate = getDatabaseDate($oDB); - $sWindBack = strftime('%Y-%m-%dT%H:%M:%SZ', - strtotime($sDatabaseDate) - (3*60*60)); + if ($sDatabaseDate === false) { + fail('Cannot determine date of database.'); + } + $sWindBack = strftime('%Y-%m-%dT%H:%M:%SZ', strtotime($sDatabaseDate) - (3*60*60)); // get the appropriate state id $aOutput = 0; - exec(CONST_Pyosmium_Binary.' -D '.$sWindBack.' --server '.CONST_Replication_Url, - $aOutput, $iRet); - if ($iRet != 0) { + $sCmd = CONST_Pyosmium_Binary.' -D '.$sWindBack.' --server '.CONST_Replication_Url; + exec($sCmd, $aOutput, $iRet); + if ($iRet != 0 || $aOutput[0] == 'None') { fail('Error running pyosmium tools'); } pg_query($oDB->connection, 'TRUNCATE import_status'); $sSQL = "INSERT INTO import_status (lastimportdate, sequence_id, indexed) VALUES('"; - $sSQL .= $sDatabaseDate."',".$aOutput[0].", true)"; + $sSQL .= $sDatabaseDate."',".$aOutput[0].', true)'; if (!pg_query($oDB->connection, $sSQL)) { - fail("Could not enter sequence into database."); + fail('Could not enter sequence into database.'); } echo "Done. Database updates will start at sequence $aOutput[0] ($sWindBack)\n"; @@ -92,6 +101,7 @@ if ($aResult['init-updates']) { if (isset($aResult['import-diff']) || isset($aResult['import-file'])) { // import diffs and files directly (e.g. from osmosis --rri) $sNextFile = isset($aResult['import-diff']) ? $aResult['import-diff'] : $aResult['import-file']; + if (!file_exists($sNextFile)) { fail("Cannot open $sNextFile\n"); } @@ -108,6 +118,12 @@ if (isset($aResult['import-diff']) || isset($aResult['import-file'])) { // Don't update the import status - we don't know what this file contains } +if ($aResult['calculate-postcodes']) { + info('Update postcodes centroids'); + $sTemplate = file_get_contents(CONST_BasePath.'/sql/update-postcodes.sql'); + runSQLScript($sTemplate, true, true); +} + $sTemporaryFile = CONST_BasePath.'/data/osmosischange.osc'; $bHaveDiff = false; $bUseOSMApi = isset($aResult['import-from-main-api']) && $aResult['import-from-main-api']; @@ -155,7 +171,7 @@ if ($aResult['deduplicate']) { $oDB =& getDB(); if (getPostgresVersion($oDB) < 9.3) { - fail("ERROR: deduplicate is only currently supported in postgresql 9.3"); + fail('ERROR: deduplicate is only currently supported in postgresql 9.3'); } $sSQL = 'select partition from country_name order by country_code'; @@ -164,7 +180,7 @@ if ($aResult['deduplicate']) { // we don't care about empty search_name_* partitions, they can't contain mentions of duplicates foreach ($aPartitions as $i => $sPartition) { - $sSQL = "select count(*) from search_name_".$sPartition; + $sSQL = 'select count(*) from search_name_'.$sPartition; $nEntries = chksql($oDB->getOne($sSQL)); if ($nEntries == 0) { unset($aPartitions[$i]); @@ -172,14 +188,14 @@ if ($aResult['deduplicate']) { } $sSQL = "select word_token,count(*) from word where substr(word_token, 1, 1) = ' '"; - $sSQL .= " and class is null and type is null and country_code is null"; - $sSQL .= " group by word_token having count(*) > 1 order by word_token"; + $sSQL .= ' and class is null and type is null and country_code is null'; + $sSQL .= ' group by word_token having count(*) > 1 order by word_token'; $aDuplicateTokens = chksql($oDB->getAll($sSQL)); foreach ($aDuplicateTokens as $aToken) { if (trim($aToken['word_token']) == '' || trim($aToken['word_token']) == '-') continue; - echo "Deduping ".$aToken['word_token']."\n"; - $sSQL = "select word_id,"; - $sSQL .= " (select count(*) from search_name where nameaddress_vector @> ARRAY[word_id]) as num"; + echo 'Deduping '.$aToken['word_token']."\n"; + $sSQL = 'select word_id,'; + $sSQL .= ' (select count(*) from search_name where nameaddress_vector @> ARRAY[word_id]) as num'; $sSQL .= " from word where word_token = '".$aToken['word_token']; $sSQL .= "' and class is null and type is null and country_code is null order by num desc"; $aTokenSet = chksql($oDB->getAll($sSQL)); @@ -188,35 +204,35 @@ if ($aResult['deduplicate']) { $iKeepID = $aKeep['word_id']; foreach ($aTokenSet as $aRemove) { - $sSQL = "update search_name set"; - $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']."]"; + $sSQL = 'update search_name set'; + $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'].']'; chksql($oDB->query($sSQL)); - $sSQL = "update search_name set"; - $sSQL .= " nameaddress_vector = array_replace(nameaddress_vector,".$aRemove['word_id'].",".$iKeepID.")"; - $sSQL .= " where nameaddress_vector @> ARRAY[".$aRemove['word_id']."]"; + $sSQL = 'update search_name set'; + $sSQL .= ' nameaddress_vector = array_replace(nameaddress_vector,'.$aRemove['word_id'].','.$iKeepID.')'; + $sSQL .= ' where nameaddress_vector @> ARRAY['.$aRemove['word_id'].']'; chksql($oDB->query($sSQL)); - $sSQL = "update location_area_country set"; - $sSQL .= " keywords = array_replace(keywords,".$aRemove['word_id'].",".$iKeepID.")"; - $sSQL .= " where keywords @> ARRAY[".$aRemove['word_id']."]"; + $sSQL = 'update location_area_country set'; + $sSQL .= ' keywords = array_replace(keywords,'.$aRemove['word_id'].','.$iKeepID.')'; + $sSQL .= ' where keywords @> ARRAY['.$aRemove['word_id'].']'; chksql($oDB->query($sSQL)); foreach ($aPartitions as $sPartition) { - $sSQL = "update search_name_".$sPartition." set"; - $sSQL .= " name_vector = array_replace(name_vector,".$aRemove['word_id'].",".$iKeepID.")"; - $sSQL .= " where name_vector @> ARRAY[".$aRemove['word_id']."]"; + $sSQL = 'update search_name_'.$sPartition.' set'; + $sSQL .= ' name_vector = array_replace(name_vector,'.$aRemove['word_id'].','.$iKeepID.')'; + $sSQL .= ' where name_vector @> ARRAY['.$aRemove['word_id'].']'; chksql($oDB->query($sSQL)); - $sSQL = "update location_area_country set"; - $sSQL .= " keywords = array_replace(keywords,".$aRemove['word_id'].",".$iKeepID.")"; - $sSQL .= " where keywords @> ARRAY[".$aRemove['word_id']."]"; + $sSQL = 'update location_area_country set'; + $sSQL .= ' keywords = array_replace(keywords,'.$aRemove['word_id'].','.$iKeepID.')'; + $sSQL .= ' where keywords @> ARRAY['.$aRemove['word_id'].']'; chksql($oDB->query($sSQL)); } - $sSQL = "delete from word where word_id = ".$aRemove['word_id']; + $sSQL = 'delete from word where word_id = '.$aRemove['word_id']; chksql($oDB->query($sSQL)); } } @@ -239,9 +255,7 @@ if ($aResult['import-osmosis'] || $aResult['import-osmosis-all']) { while (true) { $fStartTime = time(); - $iFileSize = 1001; - - $aLastState = chksql($oDB->getRow('SELECT * FROM import_status')); + $aLastState = chksql($oDB->getRow('SELECT *, EXTRACT (EPOCH FROM lastimportdate) as unix_ts FROM import_status')); if (!$aLastState['sequence_id']) { echo "Updates not set up. Please run ./utils/update.php --init-updates.\n"; @@ -255,7 +269,7 @@ if ($aResult['import-osmosis'] || $aResult['import-osmosis-all']) { if ($aLastState['indexed'] == 't') { // Sleep if the update interval has not yet been reached. - $fNextUpdate = $aLastState['lastimportdate'] + CONST_Replication_Update_Interval; + $fNextUpdate = $aLastState['unix_ts'] + CONST_Replication_Update_Interval; if ($fNextUpdate > $fStartTime) { $iSleepTime = $fNextUpdate - $fStartTime; echo "Waiting for next update for $iSleepTime sec."; @@ -263,18 +277,18 @@ if ($aResult['import-osmosis'] || $aResult['import-osmosis-all']) { } // Download the next batch of changes. - unlink($sImportFile); do { $fCMDStartTime = time(); - $iNextSeq = (int) $aLastState['sequence_id'] + 1; + $iNextSeq = (int) $aLastState['sequence_id']; unset($aOutput); echo "$sCMDDownload -I $iNextSeq\n"; + unlink($sImportFile); exec($sCMDDownload.' -I '.$iNextSeq, $aOutput, $iResult); if ($iResult == 3) { echo 'No new updates. Sleeping for '.CONST_Replication_Recheck_Interval." sec.\n"; sleep(CONST_Replication_Recheck_Interval); - } else if ($iResult != 0) { + } elseif ($iResult != 0) { echo 'ERROR: updates failed.'; exit($iResult); } else { @@ -282,6 +296,23 @@ if ($aResult['import-osmosis'] || $aResult['import-osmosis-all']) { } } while ($iResult); + // get the newest object from the diff file + $sBatchEnd = 0; + $iRet = 0; + exec(CONST_BasePath.'/utils/osm_file_date.py '.$sImportFile, $sBatchEnd, $iRet); + if ($iRet == 5) { + echo "Diff file is empty. skipping import.\n"; + if (!$aResult['import-osmosis-all']) { + exit(0); + } else { + continue; + } + } + if ($iRet != 0) { + fail('Error getting date from diff file.'); + } + $sBatchEnd = $sBatchEnd[0]; + // Import the file $fCMDStartTime = time(); echo $sCMDImport."\n"; @@ -294,8 +325,11 @@ if ($aResult['import-osmosis'] || $aResult['import-osmosis-all']) { // write the update logs $iFileSize = filesize($sImportFile); - $sBatchEnd = getDatabaseDate($oDB); - $sSQL = "INSERT INTO import_osmosis_log (batchend, batchseq, batchsize, starttime, endtime, event) values ('$sBatchEnd',$iEndSequence,$iFileSize,'".date('Y-m-d H:i:s', $fCMDStartTime)."','".date('Y-m-d H:i:s')."','import')"; + $sSQL = 'INSERT INTO import_osmosis_log'; + $sSQL .= '(batchend, batchseq, batchsize, starttime, endtime, event)'; + $sSQL .= " values ('$sBatchEnd',$iEndSequence,$iFileSize,'"; + $sSQL .= date('Y-m-d H:i:s', $fCMDStartTime)."','"; + $sSQL .= date('Y-m-d H:i:s')."','import')"; var_Dump($sSQL); chksql($oDB->query($sSQL)); @@ -318,12 +352,16 @@ if ($aResult['import-osmosis'] || $aResult['import-osmosis-all']) { exit($iErrorLevel); } - $sSQL = "INSERT INTO import_osmosis_log (batchend, batchseq, batchsize, starttime, endtime, event) values ('$sBatchEnd',$iEndSequence,$iFileSize,'".date('Y-m-d H:i:s', $fCMDStartTime)."','".date('Y-m-d H:i:s')."','index')"; + $sSQL = 'INSERT INTO import_osmosis_log'; + $sSQL .= '(batchend, batchseq, batchsize, starttime, endtime, event)'; + $sSQL .= " values ('$sBatchEnd',$iEndSequence,$iFileSize,'"; + $sSQL .= date('Y-m-d H:i:s', $fCMDStartTime)."','"; + $sSQL .= 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 indexed = true"; + $sSQL = 'update import_status set indexed = true'; $oDB->query($sSQL); } @@ -332,4 +370,3 @@ if ($aResult['import-osmosis'] || $aResult['import-osmosis-all']) { if (!$aResult['import-osmosis-all']) exit(0); } } -