require_once(CONST_BasePath.'/lib/init-cmd.php');
ini_set('memory_limit', '800M');
+# (long-opt, short-opt, min-occurs, max-occurs, num-arguments, num-arguments, type, help)
+
$aCMDOptions
= array(
'Create and setup nominatim search system',
array('osm-file', '', 0, 1, 1, 1, 'realpath', 'File to import'),
array('threads', '', 0, 1, 1, 1, 'int', 'Number of threads (where possible)'),
+ array('module-path', '', 0, 1, 1, 1, 'string', 'Directory on Postgres server containing Nominatim module'),
array('all', '', 0, 1, 0, 0, 'bool', 'Do the complete process'),
}
}
+// by default, use all but one processor, but never more than 15.
+$iInstances = isset($aCMDResult['threads'])
+ ? $aCMDResult['threads']
+ : (min(16, getProcessorCount()) - 1);
-// This is a pretty hard core default - the number of processors in the box - 1
-$iInstances = isset($aCMDResult['threads'])?$aCMDResult['threads']:(getProcessorCount()-1);
if ($iInstances < 1) {
$iInstances = 1;
warn("resetting threads to $iInstances");
}
-if ($iInstances > getProcessorCount()) {
- $iInstances = getProcessorCount();
- warn("resetting threads to $iInstances");
-}
// Assume we can steal all the cache memory in the box (unless told otherwise)
if (isset($aCMDResult['osm2pgsql-cache'])) {
$iCacheMemory = getCacheMemoryMB();
}
+$sModulePath = CONST_InstallPath . '/module';
+if (isset($aCMDResult['module-path'])) {
+ $sModulePath = $aCMDResult['module-path'];
+ echo 'module path: ' . $sModulePath . '\n';
+}
+
$aDSNInfo = DB::parseDSN(CONST_Database_DSN);
if (!isset($aDSNInfo['port']) || !$aDSNInfo['port']) $aDSNInfo['port'] = 5432;
if (!PEAR::isError($oDB)) {
fail('database already exists ('.CONST_Database_DSN.')');
}
- passthruCheckReturn('createdb -E UTF-8 -p '.$aDSNInfo['port'].' '.$aDSNInfo['database']);
+
+ $sCreateDBCmd = 'createdb -E UTF-8 -p '.$aDSNInfo['port'].' '.$aDSNInfo['database'];
+ if (isset($aDSNInfo['username']) && $aDSNInfo['username']) {
+ $sCreateDBCmd .= ' -U ' . $aDSNInfo['username'];
+ }
+ if (isset($aDSNInfo['hostspec']) && $aDSNInfo['hostspec']) {
+ $sCreateDBCmd .= ' -h ' . $aDSNInfo['hostspec'];
+ }
+
+ $aProcEnv = null;
+ if (isset($aDSNInfo['password']) && $aDSNInfo['password']) {
+ $aProcEnv = array_merge(array('PGPASSWORD' => $aDSNInfo['password']), $_ENV);
+ }
+
+ $result = runWithEnv($sCreateDBCmd, $aProcEnv);
+ if ($result != 0) fail('Error executing external command: '.$sCreateDBCmd);
}
if ($aCMDResult['setup-db'] || $aCMDResult['all']) {
// Try accessing the C module, so we know early if something is wrong
// and can simply error out.
$sSQL = "CREATE FUNCTION nominatim_test_import_func(text) RETURNS text AS '";
- $sSQL .= CONST_InstallPath."/module/nominatim.so', 'transliteration' LANGUAGE c IMMUTABLE STRICT";
+ $sSQL .= $sModulePath."/nominatim.so', 'transliteration' LANGUAGE c IMMUTABLE STRICT";
$sSQL .= ';DROP FUNCTION nominatim_test_import_func(text);';
$oResult = $oDB->query($sSQL);
if (!file_exists(CONST_ExtraDataPath.'/country_osm_grid.sql.gz')) {
echo 'Error: you need to download the country_osm_grid first:';
- echo "\n wget -O ".CONST_ExtraDataPath."/country_osm_grid.sql.gz http://www.nominatim.org/data/country_grid.sql.gz\n";
+ echo "\n wget -O ".CONST_ExtraDataPath."/country_osm_grid.sql.gz https://www.nominatim.org/data/country_grid.sql.gz\n";
exit(1);
}
// is only defined in the subsequently called create_tables.
// Create dummies here that will be overwritten by the proper
// versions in create-tables.
- pgsqlRunScript('CREATE TABLE place_boundingbox ()');
- pgsqlRunScript('create type wikipedia_article_match as ()');
+ pgsqlRunScript('CREATE TABLE IF NOT EXISTS place_boundingbox ()');
+ pgsqlRunScript('CREATE TYPE wikipedia_article_match AS ()', false);
}
if ($aCMDResult['import-data'] || $aCMDResult['all']) {
fail("osm2pgsql not found in '$osm2pgsql'");
}
- if (!is_null(CONST_Osm2pgsql_Flatnode_File)) {
+ if (!is_null(CONST_Osm2pgsql_Flatnode_File) && CONST_Osm2pgsql_Flatnode_File) {
$osm2pgsql .= ' --flat-nodes '.CONST_Osm2pgsql_Flatnode_File;
}
if (CONST_Tablespace_Osm2pgsql_Data)
$osm2pgsql .= ' -lsc -O gazetteer --hstore --number-processes 1';
$osm2pgsql .= ' -C '.$iCacheMemory;
$osm2pgsql .= ' -P '.$aDSNInfo['port'];
+ if (isset($aDSNInfo['username']) && $aDSNInfo['username']) {
+ $osm2pgsql .= ' -U ' . $aDSNInfo['username'];
+ }
+ if (isset($aDSNInfo['hostspec']) && $aDSNInfo['hostspec']) {
+ $osm2pgsql .= ' -H ' . $aDSNInfo['hostspec'];
+ }
+
+ $aProcEnv = null;
+ if (isset($aDSNInfo['password']) && $aDSNInfo['password']) {
+ $aProcEnv = array_merge(array('PGPASSWORD' => $aDSNInfo['password']), $_ENV);
+ }
+
$osm2pgsql .= ' -d '.$aDSNInfo['database'].' '.$aCMDResult['osm-file'];
- passthruCheckReturn($osm2pgsql);
+ runWithEnv($osm2pgsql, $aProcEnv);
$oDB =& getDB();
if (!$aCMDResult['ignore-errors'] && !chksql($oDB->getRow('select * from place limit 1'))) {
if ($aCMDResult['create-functions'] || $aCMDResult['all']) {
info('Create Functions');
$bDidSomething = true;
- if (!file_exists(CONST_InstallPath.'/module/nominatim.so')) {
- fail('nominatim module not built');
- }
create_sql_functions($aCMDResult);
}
fail(pg_last_error($aDBInstances[$iLoadThreads]->connection));
}
- $bAnyBusy = true;
- while ($bAnyBusy) {
- $bAnyBusy = false;
- for ($i = 0; $i <= $iLoadThreads; $i++) {
- if (pg_connection_busy($aDBInstances[$i]->connection)) $bAnyBusy = true;
+ $bFailed = false;
+ for ($i = 0; $i <= $iLoadThreads; $i++) {
+ while (($hPGresult = pg_get_result($aDBInstances[$i]->connection)) !== false) {
+ $resultStatus = pg_result_status($hPGresult);
+ // PGSQL_EMPTY_QUERY, PGSQL_COMMAND_OK, PGSQL_TUPLES_OK,
+ // PGSQL_COPY_OUT, PGSQL_COPY_IN, PGSQL_BAD_RESPONSE,
+ // PGSQL_NONFATAL_ERROR and PGSQL_FATAL_ERROR
+ echo 'Query result ' . $i . ' is: ' . $resultStatus . "\n";
+ if ($resultStatus != PGSQL_COMMAND_OK && $resultStatus != PGSQL_TUPLES_OK) {
+ $resultError = pg_result_error($hPGresult);
+ echo '-- error text ' . $i . ': ' . $resultError . "\n";
+ $bFailed = true;
+ }
}
- sleep(1);
- echo '.';
+ }
+ if ($bFailed) {
+ fail('SQL errors loading placex and/or location_property_osmline tables');
}
echo "\n";
info('Reanalysing database');
$bDidSomething = true;
$sOutputFile = '';
$sBaseCmd = CONST_InstallPath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'].' -t '.$iInstances.$sOutputFile;
+ if (isset($aDSNInfo['hostspec']) && $aDSNInfo['hostspec']) {
+ $sBaseCmd .= ' -H ' . $aDSNInfo['hostspec'];
+ }
+ if (isset($aDSNInfo['username']) && $aDSNInfo['username']) {
+ $sBaseCmd .= ' -U ' . $aDSNInfo['username'];
+ }
+ $aProcEnv = null;
+ if (isset($aDSNInfo['password']) && $aDSNInfo['password']) {
+ $aProcEnv = array_merge(array('PGPASSWORD' => $aDSNInfo['password']), $_ENV);
+ }
+
info('Index ranks 0 - 4');
- passthruCheckReturn($sBaseCmd.' -R 4');
+ $iStatus = runWithEnv($sBaseCmd.' -R 4', $aProcEnv);
+ if ($iStatus != 0) {
+ fail('error status ' . $iStatus . ' running nominatim!');
+ }
if (!$aCMDResult['index-noanalyse']) pgsqlRunScript('ANALYSE');
info('Index ranks 5 - 25');
- passthruCheckReturn($sBaseCmd.' -r 5 -R 25');
+ $iStatus = runWithEnv($sBaseCmd.' -r 5 -R 25', $aProcEnv);
+ if ($iStatus != 0) {
+ fail('error status ' . $iStatus . ' running nominatim!');
+ }
if (!$aCMDResult['index-noanalyse']) pgsqlRunScript('ANALYSE');
info('Index ranks 26 - 30');
- passthruCheckReturn($sBaseCmd.' -r 26');
+ $iStatus = runWithEnv($sBaseCmd.' -r 26', $aProcEnv);
+ if ($iStatus != 0) {
+ fail('error status ' . $iStatus . ' running nominatim!');
+ }
info('Index postcodes');
$oDB =& getDB();
$bDidSomething = true;
$sTemplate = file_get_contents(CONST_BasePath.'/sql/indices.src.sql');
+ $sTemplate = str_replace('{www-user}', CONST_Database_Web_User, $sTemplate);
$sTemplate = replace_tablespace(
'{ts:address-index}',
CONST_Tablespace_Address_Index,
'import_polygon_*',
'import_status',
'place_addressline',
+ 'location_postcode',
'location_property*',
'placex',
'search_name',
'word',
'query_log',
'new_query_log',
- 'gb_postcode',
'spatial_ref_sys',
'country_name',
'place_classtype_*'
// been deleted already by CASCADE
}
- if (!is_null(CONST_Osm2pgsql_Flatnode_File)) {
+ if (!is_null(CONST_Osm2pgsql_Flatnode_File) && CONST_Osm2pgsql_Flatnode_File) {
if ($aCMDResult['verbose']) echo 'deleting '.CONST_Osm2pgsql_Flatnode_File."\n";
unlink(CONST_Osm2pgsql_Flatnode_File);
}
if (!$aCMDResult['verbose']) {
$sCMD .= ' -q';
}
+ if (isset($aDSNInfo['hostspec']) && $aDSNInfo['hostspec']) {
+ $sCMD .= ' -h ' . $aDSNInfo['hostspec'];
+ }
+ if (isset($aDSNInfo['username']) && $aDSNInfo['username']) {
+ $sCMD .= ' -U ' . $aDSNInfo['username'];
+ }
+ $aProcEnv = null;
+ if (isset($aDSNInfo['password']) && $aDSNInfo['password']) {
+ $aProcEnv = array_merge(array('PGPASSWORD' => $aDSNInfo['password']), $_ENV);
+ }
$ahGzipPipes = null;
if (preg_match('/\\.gz$/', $sFilename)) {
2 => array('file', '/dev/null', 'a')
);
$ahPipes = null;
- $hProcess = proc_open($sCMD, $aDescriptors, $ahPipes);
+ $hProcess = proc_open($sCMD, $aDescriptors, $ahPipes, null, $aProcEnv);
if (!is_resource($hProcess)) fail('unable to start pgsql');
-
// TODO: error checking
while (!feof($ahPipes[1])) {
echo fread($ahPipes[1], 4096);
$aDSNInfo = DB::parseDSN(CONST_Database_DSN);
if (!isset($aDSNInfo['port']) || !$aDSNInfo['port']) $aDSNInfo['port'] = 5432;
$sCMD = 'pg_restore -p '.$aDSNInfo['port'].' -d '.$aDSNInfo['database'].' -Fc --clean '.$sDumpFile;
-
- $aDescriptors = array(
- 0 => array('pipe', 'r'),
- 1 => array('pipe', 'w'),
- 2 => array('file', '/dev/null', 'a')
- );
- $ahPipes = null;
- $hProcess = proc_open($sCMD, $aDescriptors, $ahPipes);
- if (!is_resource($hProcess)) fail('unable to start pg_restore');
-
- fclose($ahPipes[0]);
-
- // TODO: error checking
- while (!feof($ahPipes[1])) {
- echo fread($ahPipes[1], 4096);
+ if (isset($aDSNInfo['hostspec']) && $aDSNInfo['hostspec']) {
+ $sCMD .= ' -h ' . $aDSNInfo['hostspec'];
+ }
+ if (isset($aDSNInfo['username']) && $aDSNInfo['username']) {
+ $sCMD .= ' -U ' . $aDSNInfo['username'];
+ }
+ $aProcEnv = null;
+ if (isset($aDSNInfo['password']) && $aDSNInfo['password']) {
+ $aProcEnv = array_merge(array('PGPASSWORD' => $aDSNInfo['password']), $_ENV);
}
- fclose($ahPipes[1]);
- $iReturn = proc_close($hProcess);
+ $iReturn = runWithEnv($sCMD, $aProcEnv);
}
-function passthruCheckReturn($cmd)
+function passthruCheckReturn($sCmd)
{
- $result = -1;
- passthru($cmd, $result);
- if ($result != 0) fail('Error executing external command: '.$cmd);
+ $iResult = -1;
+ passthru($sCmd, $iResult);
}
function replace_tablespace($sTemplate, $sTablespace, $sSql)
function create_sql_functions($aCMDResult)
{
+ global $sModulePath;
$sTemplate = file_get_contents(CONST_BasePath.'/sql/functions.sql');
- $sTemplate = str_replace('{modulepath}', CONST_InstallPath.'/module', $sTemplate);
+ $sTemplate = str_replace('{modulepath}', $sModulePath, $sTemplate);
if ($aCMDResult['enable-diff-updates']) {
$sTemplate = str_replace('RETURN NEW; -- %DIFFUPDATES%', '--', $sTemplate);
}
projects / nominatim.git / blobdiff