From: Sarah Hoffmann Date: Sun, 6 Jul 2014 19:05:16 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Tag: deploy~528 X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/d6f4448ed33298e563c520fc654fe5d445ff7f57?hp=-c Merge remote-tracking branch 'upstream/master' --- d6f4448ed33298e563c520fc654fe5d445ff7f57 diff --combined sql/functions.sql index 488d340f,dbb624f8..d86f4a9b --- a/sql/functions.sql +++ b/sql/functions.sql @@@ -936,11 -936,6 +936,11 @@@ DECLAR BEGIN --DEBUG: RAISE WARNING '% %',NEW.osm_type,NEW.osm_id; + -- remove operator tag for most places, messes too much with search_name indexes + IF NEW.class not in ('amenity', 'shop') THEN + NEW.name := delete(NEW.name, 'operator'); + END IF; + -- just block these IF NEW.class in ('landuse','natural') and NEW.name is null THEN -- RAISE WARNING 'empty landuse %',NEW.osm_id; @@@ -1379,10 -1374,10 +1379,10 @@@ BEGI IF NEW.osm_type = 'R' and NEW.class = 'waterway' THEN FOR relation IN select * from planet_osm_rels r where r.id = NEW.osm_id LOOP - FOR i IN relation.way_off+1..relation.rel_off LOOP - IF relation.members[2*i] in ('', 'main_stream') THEN + FOR i IN 1..array_upper(relation.members, 1) BY 2 LOOP + IF relation.members[i+1] in ('', 'main_stream') AND substring(relation.members[i],1,1) = 'w' THEN --DEBUG: RAISE WARNING 'waterway parent %, child %/%', NEW.osm_id, i, relation.parts[i]; - FOR location IN SELECT * FROM placex WHERE osm_type = 'W' and osm_id = relation.parts[i] and class = NEW.class and type = NEW.type + FOR location IN SELECT * FROM placex WHERE osm_type = 'W' and osm_id = substring(relation.members[i],2,200)::bigint and class = NEW.class and type = NEW.type LOOP UPDATE placex SET linked_place_id = NEW.place_id WHERE place_id = location.place_id; END LOOP; @@@ -2064,11 -2059,6 +2064,11 @@@ BEGI --DEBUG: RAISE WARNING '%', existingplacex; END IF; + -- remove operator tag for most places, messes too much with search_name indexes + IF NEW.class not in ('amenity', 'shop') THEN + NEW.name := delete(NEW.name, 'operator'); + END IF; + -- Just block these - lots and pointless IF NEW.class in ('landuse','natural') and NEW.name is null THEN -- if the name tag was removed, older versions might still be lurking in the place table @@@ -2259,12 -2249,6 +2259,12 @@@ END IF; + -- refuse to update multiplpoygons with too many objects, too much of a performance hit + IF ST_NumGeometries(NEW.geometry) > 2000 THEN + RAISE WARNING 'Dropping update of % % because of geometry complexity.', NEW.osm_type, NEW.osm_id; + RETURN NULL; + END IF; + IF coalesce(existing.name::text, '') != coalesce(NEW.name::text, '') OR coalesce(existing.extratags::text, '') != coalesce(NEW.extratags::text, '') OR coalesce(existing.housenumber, '') != coalesce(NEW.housenumber, '') diff --combined utils/setup.php index 734f669f,71e7dab5..870d37ec --- a/utils/setup.php +++ b/utils/setup.php @@@ -190,9 -190,8 +190,9 @@@ { $osm2pgsql .= ' --flat-nodes '.CONST_Osm2pgsql_Flatnode_File; } + $osm2pgsql .= ' --tablespace-slim-index ssd --tablespace-main-index ssd --tablespace-main-data ssd --tablespace-slim-data data'; $osm2pgsql .= ' -lsc -O gazetteer --hstore'; - $osm2pgsql .= ' -C '.$iCacheMemory; + $osm2pgsql .= ' -C 18000'; $osm2pgsql .= ' -P '.$aDSNInfo['port']; $osm2pgsql .= ' -d '.$aDSNInfo['database'].' '.$aCMDResult['osm-file']; passthruCheckReturn($osm2pgsql); @@@ -518,7 -517,7 +518,7 @@@ $sSQL .= "select 'P',nextval('seq_postcodes'),'place','postcode',postcode,calculated_country_code,"; $sSQL .= "ST_SetSRID(ST_Point(x,y),4326) as geometry from (select calculated_country_code,postcode,"; $sSQL .= "avg(st_x(st_centroid(geometry))) as x,avg(st_y(st_centroid(geometry))) as y "; - $sSQL .= "from placex where postcode is not null group by calculated_country_code,postcode) as x"; + $sSQL .= "from placex where postcode is not null and calculated_country_code not in ('ie') group by calculated_country_code,postcode) as x"; if (!pg_query($oDB->connection, $sSQL)) fail(pg_last_error($oDB->connection)); $sSQL = "insert into placex (osm_type,osm_id,class,type,postcode,calculated_country_code,geometry) "; @@@ -803,10 -802,6 +803,6 @@@ fclose($ahPipes[1]); $iReturn = proc_close($hProcess); - if ($iReturn > 0) - { - fail("pgsql returned with error code ($iReturn)"); - } } function pgsqlRunDropAndRestore($sDumpFile) @@@ -835,10 -830,6 +831,6 @@@ fclose($ahPipes[1]); $iReturn = proc_close($hProcess); - if ($iReturn > 0) - { - fail("pgsql returned with error code ($iReturn)"); - } } function passthruCheckReturn($cmd) diff --combined utils/update.php index ccf69300,c5fc14a6..a561aaa3 --- a/utils/update.php +++ b/utils/update.php @@@ -47,6 -47,7 +47,6 @@@ showUsage($aCMDOptions, true, 'Select either import of hourly or daily'); } - if (!isset($aResult['index-instances'])) $aResult['index-instances'] = 1; if (!isset($aResult['index-rank'])) $aResult['index-rank'] = 0; /* @@@ -253,6 -254,13 +253,13 @@@ if ($aResult['deduplicate']) { + + $pgver = (float) CONST_Postgresql_Version; + if ($pgver < 9.3) { + echo "ERROR: deduplicate is only currently supported in postgresql 9.3"; + exit; + } + $oDB =& getDB(); $sSQL = 'select partition from country_name order by country_code'; $aPartitions = $oDB->getCol($sSQL); @@@ -275,15 -283,15 +282,15 @@@ var_dump($aTokenSet, $sSQL); exit; } - + $aKeep = array_shift($aTokenSet); $iKeepID = $aKeep['word_id']; foreach($aTokenSet as $aRemove) { $sSQL = "update search_name set"; - $sSQL .= " name_vector = (name_vector - ".$aRemove['word_id'].")+".$iKeepID.","; - $sSQL .= " nameaddress_vector = (nameaddress_vector - ".$aRemove['word_id'].")+".$iKeepID; + $sSQL .= " name_vector = array_replace(name_vector,".$aRemove['word_id'].",".$iKeepID."),"; + $sSQL .= " nameaddress_vector = array_replace(nameaddress_vector,".$aRemove['word_id'].",".$iKeepID.")"; $sSQL .= " where name_vector @> ARRAY[".$aRemove['word_id']."]"; $x = $oDB->query($sSQL); if (PEAR::isError($x)) @@@ -293,7 -301,7 +300,7 @@@ } $sSQL = "update search_name set"; - $sSQL .= " nameaddress_vector = (nameaddress_vector - ".$aRemove['word_id'].")+".$iKeepID; + $sSQL .= " nameaddress_vector = array_replace(nameaddress_vector,".$aRemove['word_id'].",".$iKeepID.")"; $sSQL .= " where nameaddress_vector @> ARRAY[".$aRemove['word_id']."]"; $x = $oDB->query($sSQL); if (PEAR::isError($x)) @@@ -303,7 -311,7 +310,7 @@@ } $sSQL = "update location_area_country set"; - $sSQL .= " keywords = (keywords - ".$aRemove['word_id'].")+".$iKeepID; + $sSQL .= " keywords = array_replace(keywords,".$aRemove['word_id'].",".$iKeepID.")"; $sSQL .= " where keywords @> ARRAY[".$aRemove['word_id']."]"; $x = $oDB->query($sSQL); if (PEAR::isError($x)) @@@ -315,8 -323,7 +322,7 @@@ foreach ($aPartitions as $sPartition) { $sSQL = "update search_name_".$sPartition." set"; - $sSQL .= " name_vector = (name_vector - ".$aRemove['word_id'].")+".$iKeepID.","; - $sSQL .= " nameaddress_vector = (nameaddress_vector - ".$aRemove['word_id'].")+".$iKeepID; + $sSQL .= " name_vector = array_replace(name_vector,".$aRemove['word_id'].",".$iKeepID.")"; $sSQL .= " where name_vector @> ARRAY[".$aRemove['word_id']."]"; $x = $oDB->query($sSQL); if (PEAR::isError($x)) @@@ -325,18 -332,8 +331,8 @@@ exit; } - $sSQL = "update search_name_".$sPartition." set"; - $sSQL .= " nameaddress_vector = (nameaddress_vector - ".$aRemove['word_id'].")+".$iKeepID; - $sSQL .= " where nameaddress_vector @> ARRAY[".$aRemove['word_id']."]"; - $x = $oDB->query($sSQL); - if (PEAR::isError($x)) - { - var_dump($x); - exit; - } - $sSQL = "update location_area_country set"; - $sSQL .= " keywords = (keywords - ".$aRemove['word_id'].")+".$iKeepID; + $sSQL .= " keywords = array_replace(keywords,".$aRemove['word_id'].",".$iKeepID.")"; $sSQL .= " where keywords @> ARRAY[".$aRemove['word_id']."]"; $x = $oDB->query($sSQL); if (PEAR::isError($x)) @@@ -360,7 -357,6 +356,7 @@@ if ($aResult['index']) { + if (!isset($aResult['index-instances'])) $aResult['index-instances'] = 1; passthru(CONST_BasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'].' -t '.$aResult['index-instances'].' -r '.$aResult['index-rank']); } @@@ -378,7 -374,7 +374,7 @@@ $sCMDDownload = $sOsmosisCMD.' --read-replication-interval workingDirectory='.$sOsmosisConfigDirectory.' --simplify-change --write-xml-change '.$sImportFile; $sCMDCheckReplicationLag = $sOsmosisCMD.' -q --read-replication-lag workingDirectory='.$sOsmosisConfigDirectory; $sCMDImport = $sOsm2pgsqlCmd.' '.$sImportFile; - $sCMDIndex = $sBasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'].' -t '.$aResult['index-instances']; + $sCMDIndex = $sBasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port']; if (!$aResult['no-npi']) { $sCMDIndex .= '-F '; } @@@ -463,16 -459,7 +459,16 @@@ $sBatchEnd = getosmosistimestamp($sOsmosisConfigDirectory); // Index file - $sThisIndexCmd = $sCMDIndex; + if (!isset($aResult['index-instances'])) + { + if (getLoadAverage() < 24) + $iIndexInstances = 2; + else + $iIndexInstances = 1; + } else + $iIndexInstances = $aResult['index-instances']; + + $sThisIndexCmd = $sCMDIndex.' -t '.$iIndexInstances; $fCMDStartTime = time(); if (!$aResult['no-npi'])