Merge remote-tracking branch 'upstream/master'

[nominatim.git] / utils / update.php

diff --git a/utils/update.php b/utils/update.php
index fd6acdbbfd69d0497655cb7d1bd240c379ade4fa..a561aaa3656cc88ebf9099027bda7c63412425c4 100755 (executable)
--- a/utils/update.php
+++ b/utils/update.php
@@ -47,7 +47,6 @@
                showUsage($aCMDOptions, true, 'Select either import of hourly or daily');
        }
 
                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;
 
 /*
        if (!isset($aResult['index-rank'])) $aResult['index-rank'] = 0;
 
 /*


@@ -74,6 +73,7 @@
        $oDB =& getDB();
 
        $aDSNInfo = DB::parseDSN(CONST_Database_DSN);
        $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);
 
        // 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 +82,7 @@
                $iCacheMemory = getCacheMemoryMB();
                echo "WARNING: resetting cache memory to $iCacheMemory\n";
        }
                $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 -C '.$iCacheMemory.' -O gazetteer -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'];

        if (!is_null(CONST_Osm2pgsql_Flatnode_File))
        {
                $sOsm2pgsqlCmd .= ' --flat-nodes '.CONST_Osm2pgsql_Flatnode_File;
        if (!is_null(CONST_Osm2pgsql_Flatnode_File))
        {
                $sOsm2pgsqlCmd .= ' --flat-nodes '.CONST_Osm2pgsql_Flatnode_File;


@@ -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))


@@ -360,7 +356,8 @@
 
        if ($aResult['index'])
        {
 
        if ($aResult['index'])
        {

-               passthru(CONST_BasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -t '.$aResult['index-instances'].' -r '.$aResult['index-rank']);
+               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']);

        }
 
        if ($aResult['import-osmosis'] || $aResult['import-osmosis-all'])
        }
 
        if ($aResult['import-osmosis'] || $aResult['import-osmosis-all'])


@@ -370,7 +367,6 @@
                        echo "Error: Update interval too low for download.geofabrik.de.  Please check install documentation (http://wiki.openstreetmap.org/wiki/Nominatim/Installation#Updates)\n";
                        exit;
                }
                        echo "Error: Update interval too low for download.geofabrik.de.  Please check install documentation (http://wiki.openstreetmap.org/wiki/Nominatim/Installation#Updates)\n";
                        exit;
                }

-exit;

 
                $sImportFile = CONST_BasePath.'/data/osmosischange.osc';
                $sOsmosisCMD = CONST_Osmosis_Binary;
 
                $sImportFile = CONST_BasePath.'/data/osmosischange.osc';
                $sOsmosisCMD = CONST_Osmosis_Binary;


@@ -378,7 +374,7 @@ exit;
                $sCMDDownload = $sOsmosisCMD.' --read-replication-interval workingDirectory='.$sOsmosisConfigDirectory.' --simplify-change --write-xml-change '.$sImportFile;
                $sCMDCheckReplicationLag = $sOsmosisCMD.' -q --read-replication-lag workingDirectory='.$sOsmosisConfigDirectory;
                $sCMDImport = $sOsm2pgsqlCmd.' '.$sImportFile;
                $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'];

                if (!$aResult['no-npi']) {
                        $sCMDIndex .= '-F ';
                }
                if (!$aResult['no-npi']) {
                        $sCMDIndex .= '-F ';
                }


@@ -418,8 +414,9 @@ exit;
                                                        exec($sCMDCheckReplicationLag, $aReplicationLag, $iErrorLevel); 
                                                }
                                                // There are new replication files - use osmosis to download the file
                                                        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);
                                        $fCMDStartTime = time();
                                        echo $sCMDDownload."\n";
                                        exec($sCMDDownload, $sJunk, $iErrorLevel);


@@ -432,9 +429,10 @@ exit;
                                        }
                                        $iFileSize = filesize($sImportFile);
                                        $sBatchEnd = getosmosistimestamp($sOsmosisConfigDirectory);
                                        }
                                        $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')";
                                        $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);
                                        $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);
                                }
 
                                $iFileSize = filesize($sImportFile);


@@ -447,12 +445,12 @@ exit;
                                if ($iErrorLevel)
                                {
                                        echo "Error: $iErrorLevel\n";
                                if ($iErrorLevel)
                                {
                                        echo "Error: $iErrorLevel\n";

-                                       exit;
+                                       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);
                                $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);
 
                                // Archive for debug?
                                unlink($sImportFile);


@@ -461,16 +459,25 @@ exit;
                        $sBatchEnd = getosmosistimestamp($sOsmosisConfigDirectory);
 
                        // Index file
                        $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'])
                        {
 
                        if (!$aResult['no-npi'])
                        {

-                               $fCMDStartTime = time();

                                $iFileID = $oDB->getOne('select nextval(\'file\')');
                                if (PEAR::isError($iFileID))
                                {
                                        echo $iFileID->getMessage()."\n";
                                $iFileID = $oDB->getOne('select nextval(\'file\')');
                                if (PEAR::isError($iFileID))
                                {
                                        echo $iFileID->getMessage()."\n";

-                                       exit;
+                                       exit(-1);

                                } 
                                $sFileDir = CONST_BasePath.'/export/diff/';
                                $sFileDir .= str_pad(floor($iFileID/1000000), 3, '0', STR_PAD_LEFT);
                                } 
                                $sFileDir = CONST_BasePath.'/export/diff/';
                                $sFileDir .= str_pad(floor($iFileID/1000000), 3, '0', STR_PAD_LEFT);


@@ -496,7 +503,7 @@ exit;
                                if ($iErrorLevel)
                                {
                                        echo "Error: $iErrorLevel\n";
                                if ($iErrorLevel)
                                {
                                        echo "Error: $iErrorLevel\n";

-                                       exit;
+                                       exit($iErrorLevel);

                                }
 
                                if (!$aResult['no-npi'])
                                }
 
                                if (!$aResult['no-npi'])


@@ -511,7 +518,7 @@ exit;
                                        if ($iErrorLevel)
                                        {
                                                echo "Error: $iErrorLevel\n";
                                        if ($iErrorLevel)
                                        {
                                                echo "Error: $iErrorLevel\n";

-                                               exit;
+                                               exit($iErrorLevel);

                                        }
 
                                        rename($sFileDir.'/'.str_pad($iFileID % 1000, 3, '0', STR_PAD_LEFT).".npi.out.bz2",
                                        }
 
                                        rename($sFileDir.'/'.str_pad($iFileID % 1000, 3, '0', STR_PAD_LEFT).".npi.out.bz2",


@@ -519,26 +526,27 @@ exit;
                                }
                        }
 
                                }
                        }
 

-                       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')";
                        $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);
                        $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;
 
                        $sSQL = "update import_status set lastimportdate = '$sBatchEnd'";
                        $oDB->query($sSQL);
 
                        $fDuration = time() - $fStartTime;

-                       echo "Completed for $sBatchEnd in ".round($fDuration/60,2)."\n";
+                       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;
 
                        if ( CONST_Replication_Update_Interval > 60 )
                        {
                        if (!$aResult['import-osmosis-all']) exit;
 
                        if ( CONST_Replication_Update_Interval > 60 )
                        {

-                               $iSleep = round(CONST_Replication_Update_Interval*0.8);
+                               $iSleep = max(0,(strtotime($sBatchEnd)+CONST_Replication_Update_Interval-time()));

                        }
                        else
                        {
                                $iSleep = max(0,CONST_Replication_Update_Interval-$fDuration);
                        }
                        }
                        else
                        {
                                $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);
                }
 
                        sleep($iSleep);
                }