X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/b4f0b8b72834d13f093672c144507d589fdd87f8..b03be15442502aa2e52bacff70fb983cf4397d70:/utils/setup.php

diff --git a/utils/setup.php b/utils/setup.php
index 4a2bc64f..caaf0f91 100755
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -217,7 +217,7 @@
 		echo "Functions\n";
 		$bDidSomething = true;
 		if (!file_exists(CONST_InstallPath.'/module/nominatim.so')) fail("nominatim module not built");
-		create_sql_functions();
+		create_sql_functions($aCMDResult);
 	}
 
 	if ($aCMDResult['create-tables'] || $aCMDResult['all'])
@@ -243,7 +243,7 @@
 
 		// re-run the functions
 		echo "Functions\n";
-		create_sql_functions();
+		create_sql_functions($aCMDResult);
 	}
 
 	if ($aCMDResult['create-partition-tables'] || $aCMDResult['all'])
@@ -353,6 +353,8 @@
 		echo '.';
 		if (!pg_query($oDB->connection, 'TRUNCATE placex')) fail(pg_last_error($oDB->connection));
 		echo '.';
+		if (!pg_query($oDB->connection, 'TRUNCATE location_property_osmline')) fail(pg_last_error($oDB->connection));
+		echo '.';
 		if (!pg_query($oDB->connection, 'TRUNCATE place_addressline')) fail(pg_last_error($oDB->connection));
 		echo '.';
 		if (!pg_query($oDB->connection, 'TRUNCATE place_boundingbox')) fail(pg_last_error($oDB->connection));
@@ -394,27 +396,70 @@
 
 		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++)
 		{
 			$aDBInstances[$i] =& getDB(true);
-			$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.' = '.$i;
-			if ($aCMDResult['verbose']) echo "$sSQL\n";
-			if (!pg_send_query($aDBInstances[$i]->connection, $sSQL)) fail(pg_last_error($oDB->connection));
 		}
-		$bAnyBusy = true;
-		while($bAnyBusy)
+		// 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 = false;
-			for($i = 0; $i < $iInstances; $i++)
+			$bAnyBusy = true;
+			while($bAnyBusy)
 			{
-				if (pg_connection_busy($aDBInstances[$i]->connection)) $bAnyBusy = true;
+				$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
+			{
+				echo 'Inserting from place to osmline.';
+				$aQueries = $aQueriesOsmline;
 			}
-			sleep(1);
-			echo '.';
 		}
-		echo "\n";
+		
 		echo "Reanalysing database...\n";
 		pgsqlRunScript('ANALYSE');
 	}
@@ -621,14 +666,6 @@
 	{
 		echo "Search indices\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/indices.src.sql');
 		$sTemplate = replace_tablespace('{ts:address-index}',
@@ -637,16 +674,6 @@
 		                                CONST_Tablespace_Search_Index, $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);
 	}
@@ -918,7 +945,7 @@
 		return $sSql;
 	}
 
-	function create_sql_functions()
+	function create_sql_functions($aCMDResult)
 	{
 		$sTemplate = file_get_contents(CONST_BasePath.'/sql/functions.sql');
 		$sTemplate = str_replace('{modulepath}', CONST_InstallPath.'/module', $sTemplate);