X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/05e44fad072454584426f8a75976ec12a07910ef..002c94211724e5c47471ff2475b7226f3c87b353:/utils/setup.php

diff --git a/utils/setup.php b/utils/setup.php
index 90474fcf..a5466432 100755
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -26,6 +26,7 @@
 		array('create-tables', '', 0, 1, 0, 0, 'bool', 'Create main tables'),
 		array('create-partition-tables', '', 0, 1, 0, 0, 'bool', 'Create required partition tables'),
 		array('create-partition-functions', '', 0, 1, 0, 0, 'bool', 'Create required partition triggers'),
+		array('no-partitions', '', 0, 1, 0, 0, 'bool', "Do not partition search indices (speeds up import of single country extracts)"),
 		array('import-wikipedia-articles', '', 0, 1, 0, 0, 'bool', 'Import wikipedia article dump'),
 		array('load-data', '', 0, 1, 0, 0, 'bool', 'Copy data to live tables from import table'),
 		array('disable-token-precalc', '', 0, 1, 0, 0, 'bool', 'Disable name precalculation (EXPERT)'),
@@ -124,7 +125,17 @@
 			pgsqlRunScript('CREATE EXTENSION hstore');
 		}
 
-		pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/postgis.sql');
+		$fPostgisVersion = (float) CONST_Postgis_Version;
+		if ($fPostgisVersion < 2.0) {
+			pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/postgis.sql');
+			pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/spatial_ref_sys.sql');
+		} else {
+			pgsqlRunScript('CREATE EXTENSION postgis');
+		}
+		if ($fPostgisVersion < 2.1) {
+			// Function was renamed in 2.1 and throws an annoying deprecation warning
+			pgsqlRunScript('ALTER FUNCTION st_line_interpolate_point(geometry, double precision) RENAME TO ST_LineInterpolatePoint');
+		}
 		$sVersionString = $oDB->getOne('select postgis_full_version()');
 		preg_match('#POSTGIS="([0-9]+)[.]([0-9]+)[.]([0-9]+)( r([0-9]+))?"#', $sVersionString, $aMatches);
 		if (CONST_Postgis_Version != $aMatches[1].'.'.$aMatches[2])
@@ -133,7 +144,6 @@
 			exit;
 		}
 
-		pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/spatial_ref_sys.sql');
 		pgsqlRunScriptFile(CONST_BasePath.'/data/country_name.sql');
 		pgsqlRunScriptFile(CONST_BasePath.'/data/country_naturalearthdata.sql');
 		pgsqlRunScriptFile(CONST_BasePath.'/data/country_osm_grid.sql');
@@ -141,6 +151,11 @@
 		pgsqlRunScriptFile(CONST_BasePath.'/data/us_statecounty.sql');
 		pgsqlRunScriptFile(CONST_BasePath.'/data/us_state.sql');
 		pgsqlRunScriptFile(CONST_BasePath.'/data/us_postcode.sql');
+
+		if ($aCMDResult['no-partitions'])
+		{
+			pgsqlRunScript('update country_name set partition = 0');
+		}
 	}
 
 	if ($aCMDResult['import-data'] || $aCMDResult['all'])
@@ -161,7 +176,7 @@
 		}
 		$osm2pgsql .= ' --tablespace-slim-index ssd --tablespace-main-index ssd --tablespace-main-data ssd --tablespace-slim-data data';
 		$osm2pgsql .= ' -lsc -O gazetteer --hstore';
-		$osm2pgsql .= ' -C 16000';
+		$osm2pgsql .= ' -C 18000';
 		$osm2pgsql .= ' -P '.$aDSNInfo['port'];
 		$osm2pgsql .= ' -d '.$aDSNInfo['database'].' '.$aCMDResult['osm-file'];
 		passthruCheckReturn($osm2pgsql);
@@ -233,13 +248,13 @@
 		echo "Partition Tables\n";
 		$bDidSomething = true;
 		$oDB =& getDB();
-		$sSQL = 'select partition from country_name order by country_code';
+		$sSQL = 'select distinct partition from country_name';
 		$aPartitions = $oDB->getCol($sSQL);
 		if (PEAR::isError($aPartitions))
 		{
 			fail($aPartitions->getMessage());
 		}
-		$aPartitions[] = 0;
+		if (!$aCMDResult['no-partitions']) $aPartitions[] = 0;
 
 		$sTemplate = file_get_contents(CONST_BasePath.'/sql/partition-tables.src.sql');
 		preg_match_all('#^-- start(.*?)^-- end#ms', $sTemplate, $aMatches, PREG_SET_ORDER);
@@ -262,13 +277,13 @@
 		echo "Partition Functions\n";
 		$bDidSomething = true;
 		$oDB =& getDB();
-		$sSQL = 'select partition from country_name order by country_code';
+		$sSQL = 'select distinct partition from country_name';
 		$aPartitions = $oDB->getCol($sSQL);
 		if (PEAR::isError($aPartitions))
 		{
 			fail($aPartitions->getMessage());
 		}
-		$aPartitions[] = 0;
+		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);
@@ -338,13 +353,13 @@
 		if (!pg_query($oDB->connection, 'CREATE SEQUENCE seq_place start 100000')) fail(pg_last_error($oDB->connection));
 		echo '.';
 
-		$sSQL = 'select partition from country_name order by country_code';
+		$sSQL = 'select distinct partition from country_name';
 		$aPartitions = $oDB->getCol($sSQL);
 		if (PEAR::isError($aPartitions))
 		{
 			fail($aPartitions->getMessage());
 		}
-		$aPartitions[] = 0;
+		if (!$aCMDResult['no-partitions']) $aPartitions[] = 0;
 		foreach($aPartitions as $sPartition)
 		{
 			if (!pg_query($oDB->connection, 'TRUNCATE location_road_'.$sPartition)) fail(pg_last_error($oDB->connection));
@@ -597,13 +612,13 @@
 		echo "Search indices\n";
 		$bDidSomething = true;
 		$oDB =& getDB();
-		$sSQL = 'select partition from country_name order by country_code';
+		$sSQL = 'select distinct partition from country_name';
 		$aPartitions = $oDB->getCol($sSQL);
 		if (PEAR::isError($aPartitions))
 		{
 			fail($aPartitions->getMessage());
 		}
-		$aPartitions[] = 0;
+		if (!$aCMDResult['no-partitions']) $aPartitions[] = 0;
 
 		$sTemplate = file_get_contents(CONST_BasePath.'/sql/indices.src.sql');
 		preg_match_all('#^-- start(.*?)^-- end#ms', $sTemplate, $aMatches, PREG_SET_ORDER);