Merge pull request #499 from mtmail/travis-ci

[nominatim.git] / utils / setup.php

diff --git a/utils/setup.php b/utils/setup.php
index caaf0f9126141dba717782a8804cdfa03becc712..992034c77943cbbe94e5603894cc73722b13a5a4 100755 (executable)
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -37,7 +37,6 @@
                array('index', '', 0, 1, 0, 0, 'bool', 'Index the data'),
                array('index-noanalyse', '', 0, 1, 0, 0, 'bool', 'Do not perform analyse operations during index (EXPERT)'),
                array('create-search-indices', '', 0, 1, 0, 0, 'bool', 'Create additional indices required for search and update'),
                array('index', '', 0, 1, 0, 0, 'bool', 'Index the data'),
                array('index-noanalyse', '', 0, 1, 0, 0, 'bool', 'Do not perform analyse operations during index (EXPERT)'),
                array('create-search-indices', '', 0, 1, 0, 0, 'bool', 'Create additional indices required for search and update'),

-               array('create-website', '', 0, 1, 1, 1, 'realpath', 'Create symlinks to setup web directory'),

                array('drop', '', 0, 1, 0, 0, 'bool', 'Drop tables needed for updates, making the database readonly (EXPERIMENTAL)'),
        );
        getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
                array('drop', '', 0, 1, 0, 0, 'bool', 'Drop tables needed for updates, making the database readonly (EXPERIMENTAL)'),
        );
        getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);


@@ -94,7 +93,7 @@
        {
                echo "Create DB\n";
                $bDidSomething = true;
        {
                echo "Create DB\n";
                $bDidSomething = true;

-               $oDB =& DB::connect(CONST_Database_DSN, false);
+               $oDB = DB::connect(CONST_Database_DSN, false);

                if (!PEAR::isError($oDB))
                {
                        fail('database already exists ('.CONST_Database_DSN.')');
                if (!PEAR::isError($oDB))
                {
                        fail('database already exists ('.CONST_Database_DSN.')');


@@ -124,11 +123,8 @@
                // For extratags and namedetails the hstore_to_json converter is
                // needed which is only available from Postgresql 9.3+. For older
                // versions add a dummy function that returns nothing.
                // For extratags and namedetails the hstore_to_json converter is
                // needed which is only available from Postgresql 9.3+. For older
                // versions add a dummy function that returns nothing.

-               $iNumFunc = $oDB->getOne("select count(*) from pg_proc where proname = 'hstore_to_json'");
-               if (PEAR::isError($iNumFunc))
-               {
-                       fail("Cannot query stored procedures.", $iNumFunc);
-               }
+               $iNumFunc = chksql($oDB->getOne("select count(*) from pg_proc where proname = 'hstore_to_json'"));
+

                if ($iNumFunc == 0)
                {
                        pgsqlRunScript("create function hstore_to_json(dummy hstore) returns text AS 'select null::text' language sql immutable");
                if ($iNumFunc == 0)
                {
                        pgsqlRunScript("create function hstore_to_json(dummy hstore) returns text AS 'select null::text' language sql immutable");


@@ -205,11 +201,10 @@
                passthruCheckReturn($osm2pgsql);
 
                $oDB =& getDB();
                passthruCheckReturn($osm2pgsql);
 
                $oDB =& getDB();

-               $x = $oDB->getRow('select * from place limit 1');
-               if (PEAR::isError($x)) {
-                       fail($x->getMessage());
+               if (!chksql($oDB->getRow('select * from place limit 1')))
+               {
+                       fail('No Data');

                }
                }

-               if (!$x) fail('No Data');

        }
 
        if ($aCMDResult['create-functions'] || $aCMDResult['all'])
        }
 
        if ($aCMDResult['create-functions'] || $aCMDResult['all'])


@@ -250,14 +245,6 @@
        {
                echo "Partition Tables\n";
                $bDidSomething = true;
        {
                echo "Partition Tables\n";
                $bDidSomething = true;

-               $oDB =& getDB();
-               $sSQL = 'select distinct partition from country_name';
-               $aPartitions = $oDB->getCol($sSQL);
-               if (PEAR::isError($aPartitions))
-               {
-                       fail($aPartitions->getMessage());
-               }
-               if (!$aCMDResult['no-partitions']) $aPartitions[] = 0;

 
                $sTemplate = file_get_contents(CONST_BasePath.'/sql/partition-tables.src.sql');
                $sTemplate = replace_tablespace('{ts:address-data}',
 
                $sTemplate = file_get_contents(CONST_BasePath.'/sql/partition-tables.src.sql');
                $sTemplate = replace_tablespace('{ts:address-data}',


@@ -272,18 +259,8 @@
                                                CONST_Tablespace_Aux_Data, $sTemplate);
                $sTemplate = replace_tablespace('{ts:aux-index}',
                                                CONST_Tablespace_Aux_Index, $sTemplate);
                                                CONST_Tablespace_Aux_Data, $sTemplate);
                $sTemplate = replace_tablespace('{ts:aux-index}',
                                                CONST_Tablespace_Aux_Index, $sTemplate);

-               preg_match_all('#^-- start(.*?)^-- end#ms', $sTemplate, $aMatches, PREG_SET_ORDER);
-               foreach($aMatches as $aMatch)
-               {
-                       $sResult = '';
-                       foreach($aPartitions as $sPartitionName)
-                       {
-                               $sResult .= str_replace('-partition-', $sPartitionName, $aMatch[1]);
-                       }
-                       $sTemplate = str_replace($aMatch[0], $sResult, $sTemplate);
-               }

 
 

-               pgsqlRunScript($sTemplate);
+               pgsqlRunPartitionScript($sTemplate);

        }
 
 
        }
 
 


@@ -291,28 +268,10 @@
        {
                echo "Partition Functions\n";
                $bDidSomething = true;
        {
                echo "Partition Functions\n";
                $bDidSomething = true;

-               $oDB =& getDB();
-               $sSQL = 'select distinct partition from country_name';
-               $aPartitions = $oDB->getCol($sSQL);
-               if (PEAR::isError($aPartitions))
-               {
-                       fail($aPartitions->getMessage());
-               }
-               if (!$aCMDResult['no-partitions']) $aPartitions[] = 0;

 
                $sTemplate = file_get_contents(CONST_BasePath.'/sql/partition-functions.src.sql');
 
                $sTemplate = file_get_contents(CONST_BasePath.'/sql/partition-functions.src.sql');

-               preg_match_all('#^-- start(.*?)^-- end#ms', $sTemplate, $aMatches, PREG_SET_ORDER);
-               foreach($aMatches as $aMatch)
-               {
-                       $sResult = '';
-                       foreach($aPartitions as $sPartitionName)
-                       {
-                               $sResult .= str_replace('-partition-', $sPartitionName, $aMatch[1]);
-                       }
-                       $sTemplate = str_replace($aMatch[0], $sResult, $sTemplate);
-               }

 
 

-               pgsqlRunScript($sTemplate);
+               pgsqlRunPartitionScript($sTemplate);

        }
 
        if ($aCMDResult['import-wikipedia-articles'] || $aCMDResult['all'])
        }
 
        if ($aCMDResult['import-wikipedia-articles'] || $aCMDResult['all'])


@@ -371,11 +330,7 @@
                echo '.';
 
                $sSQL = 'select distinct partition from country_name';
                echo '.';
 
                $sSQL = 'select distinct partition from country_name';

-               $aPartitions = $oDB->getCol($sSQL);
-               if (PEAR::isError($aPartitions))
-               {
-                       fail($aPartitions->getMessage());
-               }
+               $aPartitions = chksql($oDB->getCol($sSQL));

                if (!$aCMDResult['no-partitions']) $aPartitions[] = 0;
                foreach($aPartitions as $sPartition)
                {
                if (!$aCMDResult['no-partitions']) $aPartitions[] = 0;
                foreach($aPartitions as $sPartition)
                {


@@ -396,70 +351,37 @@
 
                echo "Load Data\n";
                $aDBInstances = array();
 
                echo "Load Data\n";
                $aDBInstances = array();

-        
-        $aQueriesPlacex = array();
-        $aQueriesOsmline = array();
-        // the query is divided into parcels, so that the work between the processes, i.e. the DBInstances, will be evenly distributed
-        $iNumberOfParcels = 100;
-        for($i = 0; $i < $iNumberOfParcels; $i++)
-        {
-                       $sSQL = 'insert into placex (osm_type, osm_id, class, type, name, admin_level, ';
-                       $sSQL .= 'housenumber, street, addr_place, isin, postcode, country_code, extratags, ';
-                       $sSQL .= 'geometry) select * from place where osm_id % '.$iNumberOfParcels.' = '.$i.' and not ';
-                       $sSQL .= '(class=\'place\' and type=\'houses\' and osm_type=\'W\' and ST_GeometryType(geometry) = \'ST_LineString\');';
-                       array_push($aQueriesPlacex, $sSQL);
-                       $sSQL = 'select insert_osmline (osm_id, housenumber, street, addr_place, postcode, country_code, ';
-                       $sSQL .= 'geometry) from place where osm_id % '.$iNumberOfParcels.' = '.$i.' and ';
-                       $sSQL .= 'class=\'place\' and type=\'houses\' and osm_type=\'W\' and ST_GeometryType(geometry) = \'ST_LineString\'';
-                       array_push($aQueriesOsmline, $sSQL);
-               }
-        
-               for($i = 0; $i < $iInstances; $i++)
+               $iLoadThreads = max(1, $iInstances - 1);
+               for($i = 0; $i < $iLoadThreads; $i++)

                {
                        $aDBInstances[$i] =& getDB(true);
                {
                        $aDBInstances[$i] =& getDB(true);

-               }
-               // now execute the query blocks, in the first round for placex, then for osmline, 
-               // because insert_osmline depends on the placex table
-               echo 'Inserting from place to placex.';
-               $aQueries = $aQueriesPlacex;
-               for($j = 0; $j < 2; $j++)
-               {
-                       $bAnyBusy = true;
-                       while($bAnyBusy)
-                       {
-                               $bAnyBusy = false;
-
-                               for($i = 0; $i < $iInstances; $i++)
-                               {
-                                       if (pg_connection_busy($aDBInstances[$i]->connection)) 
-                                       {
-                                               $bAnyBusy = true;
-                                       }
-                                       else if (count($aQueries) > 0)
-                                       {
-                                               $query = array_pop($aQueries);
-                                               if (!pg_send_query($aDBInstances[$i]->connection, $query))
-                                               {
-                                                       fail(pg_last_error($oDB->connection));
-                                               }
-                                               else
-                                               {
-                                                       pg_get_result($aDBInstances[$i]->connection);
-                                                       $bAnyBusy = true;
-                                               }
-                                       }
-                               }
-                               sleep(1);
-                               echo '.';
-                       }
-                       echo "\n";
-                       if ($j == 0)  //for the second round with osmline
+                       $sSQL = 'insert into placex (osm_type, osm_id, class, type, name, admin_level, ';
+                       $sSQL .= 'housenumber, street, addr_place, isin, postcode, country_code, extratags, ';
+                       $sSQL .= 'geometry) select * from place where osm_id % '.$iLoadThreads.' = '.$i;
+                       $sSQL .= " and not (class='place' and type='houses' and osm_type='W' and ST_GeometryType(geometry) = 'ST_LineString')";
+                       if ($aCMDResult['verbose']) echo "$sSQL\n";
+                       if (!pg_send_query($aDBInstances[$i]->connection, $sSQL)) fail(pg_last_error($oDB->connection));
+               }
+               // last thread for interpolation lines
+               $aDBInstances[$iLoadThreads] =& getDB(true);
+               $sSQL = 'select insert_osmline (osm_id, housenumber, street, addr_place, postcode, country_code, ';
+               $sSQL .= 'geometry) from place where ';
+               $sSQL .= "class='place' and type='houses' and osm_type='W' and ST_GeometryType(geometry) = 'ST_LineString'";
+               if ($aCMDResult['verbose']) echo "$sSQL\n";
+               if (!pg_send_query($aDBInstances[$i]->connection, $sSQL)) fail(pg_last_error($oDB->connection));
+
+               $bAnyBusy = true;
+               while($bAnyBusy)
+               {
+                       $bAnyBusy = false;
+                       for($i = 0; $i <= $iLoadThreads; $i++)

                        {
                        {

-                               echo 'Inserting from place to osmline.';
-                               $aQueries = $aQueriesOsmline;
+                               if (pg_connection_busy($aDBInstances[$i]->connection)) $bAnyBusy = true;

                        }
                        }

+                       sleep(1);
+                       echo '.';

                }
                }

-               
+               echo "\n";

                echo "Reanalysing database...\n";
                pgsqlRunScript('ANALYSE');
        }
                echo "Reanalysing database...\n";
                pgsqlRunScript('ANALYSE');
        }


@@ -678,37 +600,6 @@
                pgsqlRunScript($sTemplate);
        }
 
                pgsqlRunScript($sTemplate);
        }
 

-       if (isset($aCMDResult['create-website']))
-       {
-               $bDidSomething = true;
-               $sTargetDir = $aCMDResult['create-website'];
-               if (!is_dir($sTargetDir))
-               {
-                       echo "You must create the website directory before calling this function.\n";
-                       fail("Target directory does not exist.");
-               }
-
-               @symlink(CONST_InstallPath.'/website/details.php', $sTargetDir.'/details.php');
-               @symlink(CONST_InstallPath.'/website/reverse.php', $sTargetDir.'/reverse.php');
-               @symlink(CONST_InstallPath.'/website/search.php', $sTargetDir.'/search.php');
-               @symlink(CONST_InstallPath.'/website/search.php', $sTargetDir.'/index.php');
-               @symlink(CONST_InstallPath.'/website/lookup.php', $sTargetDir.'/lookup.php');
-               @symlink(CONST_InstallPath.'/website/deletable.php', $sTargetDir.'/deletable.php');
-               @symlink(CONST_InstallPath.'/website/polygons.php', $sTargetDir.'/polygons.php');
-               @symlink(CONST_InstallPath.'/website/status.php', $sTargetDir.'/status.php');
-               @symlink(CONST_BasePath.'/website/images', $sTargetDir.'/images');
-               @symlink(CONST_BasePath.'/website/js', $sTargetDir.'/js');
-               @symlink(CONST_BasePath.'/website/css', $sTargetDir.'/css');
-               echo "Symlinks created\n";
-
-               $sTestFile = @file_get_contents(CONST_Website_BaseURL.'js/tiles.js');
-               if (!$sTestFile)
-               {
-                       echo "\nWARNING: Unable to access the website at ".CONST_Website_BaseURL."\n";
-                       echo "You may want to update settings/local.php with @define('CONST_Website_BaseURL', 'http://[HOST]/[PATH]/');\n";
-               }
-       }
-

        if ($aCMDResult['drop'])
        {
                // The implementation is potentially a bit dangerous because it uses
        if ($aCMDResult['drop'])
        {
                // The implementation is potentially a bit dangerous because it uses


@@ -738,11 +629,8 @@
 
                $oDB =& getDB();
                $aDropTables = array();
 
                $oDB =& getDB();
                $aDropTables = array();

-               $aHaveTables = $oDB->getCol("SELECT tablename FROM pg_tables WHERE schemaname='public'");
-               if (PEAR::isError($aHaveTables))
-               {
-                       fail($aPartitions->getMessage());
-               }
+               $aHaveTables = chksql($oDB->getCol("SELECT tablename FROM pg_tables WHERE schemaname='public'"));
+

                foreach($aHaveTables as $sTable)
                {
                        $bFound = false;
                foreach($aHaveTables as $sTable)
                {
                        $bFound = false;


@@ -871,6 +759,29 @@
                }
        }
 
                }
        }
 

+       function pgsqlRunPartitionScript($sTemplate)
+       {
+               global $aCMDResult;
+               $oDB =& getDB();
+
+               $sSQL = 'select distinct partition from country_name';
+               $aPartitions = chksql($oDB->getCol($sSQL));
+               if (!$aCMDResult['no-partitions']) $aPartitions[] = 0;
+
+               preg_match_all('#^-- start(.*?)^-- end#ms', $sTemplate, $aMatches, PREG_SET_ORDER);
+               foreach($aMatches as $aMatch)
+               {
+                       $sResult = '';
+                       foreach($aPartitions as $sPartitionName)
+                       {
+                               $sResult .= str_replace('-partition-', $sPartitionName, $aMatch[1]);
+                       }
+                       $sTemplate = str_replace($aMatch[0], $sResult, $sTemplate);
+               }
+
+               pgsqlRunScript($sTemplate);
+       }
+

        function pgsqlRunRestoreData($sDumpFile)
        {
                // Convert database DSN to psql parameters
        function pgsqlRunRestoreData($sDumpFile)
        {
                // Convert database DSN to psql parameters