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);
{
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.')');
// 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");
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'])
{
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}',
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);
}
{
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');
- 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'])
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)
{
echo "Load Data\n";
$aDBInstances = array();
- for($i = 0; $i < $iInstances; $i++)
+ $iLoadThreads = max(1, $iInstances - 1);
+ for($i = 0; $i < $iLoadThreads; $i++)
{
$aDBInstances[$i] =& getDB(true);
- if( $i < $iInstances-1 )
- {
- $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 % '.$iInstances-1.' = '.$i;
- }
- else
- {
- // last thread for interpolation lines
- $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\'';
- }
+ $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 < $iInstances; $i++)
+ for($i = 0; $i <= $iLoadThreads; $i++)
{
if (pg_connection_busy($aDBInstances[$i]->connection)) $bAnyBusy = true;
}
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
$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;
}
}
+ 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
projects / nominatim.git / blobdiff