hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

explicitly name columns at INSERT

Browse Source
This commit is contained in:
Christian von Roques
2017-04-14 15:50:27 +02:00
parent c80637b05c
commit b6be33cded
6 changed files with 39 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sql/functions.sql
View File

@@ -1246,7 +1246,8 @@ BEGIN
END IF; END IF;
-- Adding ourselves to the list simplifies address calculations later -- Adding ourselves to the list simplifies address calculations later
INSERT INTO place_addressline VALUES (NEW.place_id, NEW.place_id, true, true, 0, NEW.rank_address); INSERT INTO place_addressline (place_id, address_place_id, fromarea, isaddress, distance, cached_rank_address)
VALUES (NEW.place_id, NEW.place_id, true, true, 0, NEW.rank_address);
-- What level are we searching from -- What level are we searching from
search_maxrank := NEW.rank_search; search_maxrank := NEW.rank_search;
@@ -1734,7 +1735,8 @@ BEGIN
IF location.rank_search > 4 THEN IF location.rank_search > 4 THEN
nameaddress_vector := array_merge(nameaddress_vector, location.keywords::integer[]); nameaddress_vector := array_merge(nameaddress_vector, location.keywords::integer[]);
END IF; END IF;
INSERT INTO place_addressline VALUES (NEW.place_id, location.place_id, true, location_isaddress, location.distance, location.rank_address); INSERT INTO place_addressline (place_id, address_place_id, fromarea, isaddress, distance, cached_rank_address)
VALUES (NEW.place_id, location.place_id, true, location_isaddress, location.distance, location.rank_address);
IF location_isaddress THEN IF location_isaddress THEN
@@ -1768,7 +1770,8 @@ BEGIN
IF location.rank_search > 4 THEN IF location.rank_search > 4 THEN
nameaddress_vector := array_merge(nameaddress_vector, location.keywords::integer[]); nameaddress_vector := array_merge(nameaddress_vector, location.keywords::integer[]);
INSERT INTO place_addressline VALUES (NEW.place_id, location.place_id, false, NOT address_havelevel[location.rank_address], location.distance, location.rank_address); INSERT INTO place_addressline (place_id, address_place_id, fromarea, isaddress, distance, cached_rank_address)
VALUES (NEW.place_id, location.place_id, false, NOT address_havelevel[location.rank_address], location.distance, location.rank_address);
address_havelevel[location.rank_address] := true; address_havelevel[location.rank_address] := true;
IF location.rank_address > parent_place_id_rank THEN IF location.rank_address > parent_place_id_rank THEN
@@ -1800,7 +1803,8 @@ BEGIN
-- Add it to the list of search terms -- Add it to the list of search terms
nameaddress_vector := array_merge(nameaddress_vector, location.keywords::integer[]); nameaddress_vector := array_merge(nameaddress_vector, location.keywords::integer[]);
INSERT INTO place_addressline VALUES (NEW.place_id, location.place_id, true, false, location.distance, location.rank_address); INSERT INTO place_addressline (place_id, address_place_id, fromarea, isaddress, distance, cached_rank_address)
VALUES (NEW.place_id, location.place_id, true, false, location.distance, location.rank_address);
END IF; END IF;
@@ -1912,7 +1916,7 @@ BEGIN
IF st_area(OLD.geometry) > 2 and st_isvalid(OLD.geometry) THEN IF st_area(OLD.geometry) > 2 and st_isvalid(OLD.geometry) THEN
SELECT bool_or(not (rank_address = 0 or rank_address > 26)) as ranked FROM placex WHERE osm_type = OLD.osm_type and osm_id = OLD.osm_id and class = OLD.class and type = OLD.type INTO has_rank; SELECT bool_or(not (rank_address = 0 or rank_address > 26)) as ranked FROM placex WHERE osm_type = OLD.osm_type and osm_id = OLD.osm_id and class = OLD.class and type = OLD.type INTO has_rank;
IF has_rank THEN IF has_rank THEN
insert into import_polygon_delete values (OLD.osm_type,OLD.osm_id,OLD.class,OLD.type); insert into import_polygon_delete (osm_type, osm_id, class, type) values (OLD.osm_type,OLD.osm_id,OLD.class,OLD.type);
RETURN NULL; RETURN NULL;
END IF; END IF;
END IF; END IF;
@@ -1948,9 +1952,8 @@ BEGIN
--DEBUG: RAISE WARNING 'place_insert: % % % % %',NEW.osm_type,NEW.osm_id,NEW.class,NEW.type,st_area(NEW.geometry); --DEBUG: RAISE WARNING 'place_insert: % % % % %',NEW.osm_type,NEW.osm_id,NEW.class,NEW.type,st_area(NEW.geometry);
-- filter wrong tupels -- filter wrong tupels
IF ST_IsEmpty(NEW.geometry) OR NOT ST_IsValid(NEW.geometry) OR ST_X(ST_Centroid(NEW.geometry))::text in ('NaN','Infinity','-Infinity') OR ST_Y(ST_Centroid(NEW.geometry))::text in ('NaN','Infinity','-Infinity') THEN IF ST_IsEmpty(NEW.geometry) OR NOT ST_IsValid(NEW.geometry) OR ST_X(ST_Centroid(NEW.geometry))::text in ('NaN','Infinity','-Infinity') OR ST_Y(ST_Centroid(NEW.geometry))::text in ('NaN','Infinity','-Infinity') THEN
INSERT INTO import_polygon_error values (NEW.osm_type, NEW.osm_id, NEW.class, NEW.type, INSERT INTO import_polygon_error (osm_type, osm_id, class, type, name, country_code, updated, errormessage, prevgeometry, newgeometry)
NEW.name, NEW.address->'country', VALUES (NEW.osm_type, NEW.osm_id, NEW.class, NEW.type, NEW.name, NEW.address->'country', now(), ST_IsValidReason(NEW.geometry), null, NEW.geometry);
now(), ST_IsValidReason(NEW.geometry), null, NEW.geometry);
-- RAISE WARNING 'Invalid Geometry: % % % %',NEW.osm_type,NEW.osm_id,NEW.class,NEW.type; -- RAISE WARNING 'Invalid Geometry: % % % %',NEW.osm_type,NEW.osm_id,NEW.class,NEW.type;
RETURN null; RETURN null;
END IF; END IF;
@@ -2039,7 +2042,8 @@ BEGIN
AND ST_GeometryType(NEW.geometry) in ('ST_Polygon','ST_MultiPolygon') AND ST_GeometryType(NEW.geometry) in ('ST_Polygon','ST_MultiPolygon')
AND st_area(NEW.geometry) < st_area(existing.geometry)*0.5 AND st_area(NEW.geometry) < st_area(existing.geometry)*0.5
THEN THEN
INSERT INTO import_polygon_error values (NEW.osm_type, NEW.osm_id, NEW.class, NEW.type, NEW.name, NEW.country_code, now(), INSERT INTO import_polygon_error (osm_type, osm_id, class, type, name, country_code, updated, errormessage, prevgeometry, newgeometry)
VALUES (NEW.osm_type, NEW.osm_id, NEW.class, NEW.type, NEW.name, NEW.country_code, now(),
'Area reduced from '||st_area(existing.geometry)||' to '||st_area(NEW.geometry), existing.geometry, NEW.geometry); 'Area reduced from '||st_area(existing.geometry)||' to '||st_area(NEW.geometry), existing.geometry, NEW.geometry);
RETURN null; RETURN null;
END IF; END IF;

9
sql/loaddata.sql
View File

@@ -6,8 +6,11 @@ TRUNCATE location_area;
DROP SEQUENCE seq_place; DROP SEQUENCE seq_place;
CREATE SEQUENCE seq_place start 100000; CREATE SEQUENCE seq_place start 100000;
insert into placex (osm_type, osm_id, class, type, name, admin_level, housenumber, street, isin, postcode, country_code, extratags, geometry) select * from place where osm_type = 'N'; insert into placex (osm_type, osm_id, class, type, name, admin_level, housenumber, street, isin, postcode, country_code, extratags, geometry)
insert into placex (osm_type, osm_id, class, type, name, admin_level, housenumber, street, isin, postcode, country_code, extratags, geometry) select * from place where osm_type = 'W'; select osm_type, osm_id, class, type, name, admin_level, housenumber, street, isin, postcode, country_code, extratags, geometry from place where osm_type = 'N';
insert into placex (osm_type, osm_id, class, type, name, admin_level, housenumber, street, isin, postcode, country_code, extratags, geometry) select * from place where osm_type = 'R'; insert into placex (osm_type, osm_id, class, type, name, admin_level, housenumber, street, isin, postcode, country_code, extratags, geometry)
select osm_type, osm_id, class, type, name, admin_level, housenumber, street, isin, postcode, country_code, extratags, geometry from place where osm_type = 'W';
insert into placex (osm_type, osm_id, class, type, name, admin_level, housenumber, street, isin, postcode, country_code, extratags, geometry)
select osm_type, osm_id, class, type, name, admin_level, housenumber, street, isin, postcode, country_code, extratags, geometry from place where osm_type = 'R';
--select count(*) from (select create_interpolation(osm_id, housenumber) from placex where indexed=false and class='place' and type='houses') as x; --select count(*) from (select create_interpolation(osm_id, housenumber) from placex where indexed=false and class='place' and type='houses') as x;

21
sql/partition-functions.src.sql
View File

@@ -65,13 +65,15 @@ BEGIN
END IF; END IF;
IF in_rank_search <= 4 THEN IF in_rank_search <= 4 THEN
INSERT INTO location_area_country values (in_partition, in_place_id, in_country_code, in_keywords, in_rank_search, in_rank_address, in_estimate, in_centroid, in_geometry); INSERT INTO location_area_country (partition, place_id, country_code, keywords, rank_search, rank_address, isguess, centroid, geometry)
values (in_partition, in_place_id, in_country_code, in_keywords, in_rank_search, in_rank_address, in_estimate, in_centroid, in_geometry);
RETURN TRUE; RETURN TRUE;
END IF; END IF;
-- start -- start
IF in_partition = -partition- THEN IF in_partition = -partition- THEN
INSERT INTO location_area_large_-partition- values (in_partition, in_place_id, in_country_code, in_keywords, in_rank_search, in_rank_address, in_estimate, in_centroid, in_geometry); INSERT INTO location_area_large_-partition- (partition, place_id, country_code, keywords, rank_search, rank_address, isguess, centroid, geometry)
values (in_partition, in_place_id, in_country_code, in_keywords, in_rank_search, in_rank_address, in_estimate, in_centroid, in_geometry);
RETURN TRUE; RETURN TRUE;
END IF; END IF;
-- end -- end
@@ -203,14 +205,14 @@ DECLARE
BEGIN BEGIN
DELETE FROM search_name WHERE place_id = in_place_id; DELETE FROM search_name WHERE place_id = in_place_id;
INSERT INTO search_name values (in_place_id, in_rank_search, in_rank_address, in_importance, in_country_code, INSERT INTO search_name (place_id, search_rank, address_rank, importance, country_code, name_vector, nameaddress_vector, centroid)
in_name_vector, in_nameaddress_vector, in_centroid); values (in_place_id, in_rank_search, in_rank_address, in_importance, in_country_code, in_name_vector, in_nameaddress_vector, in_centroid);
IF in_rank_search <= 4 THEN IF in_rank_search <= 4 THEN
DELETE FROM search_name_country WHERE place_id = in_place_id; DELETE FROM search_name_country WHERE place_id = in_place_id;
IF in_rank_address > 0 THEN IF in_rank_address > 0 THEN
INSERT INTO search_name_country values (in_place_id, in_rank_search, in_rank_address, INSERT INTO search_name_country (place_id, search_rank, address_rank, name_vector, centroid)
in_name_vector, in_geometry); values (in_place_id, in_rank_search, in_rank_address, in_name_vector, in_geometry);
END IF; END IF;
RETURN TRUE; RETURN TRUE;
END IF; END IF;
@@ -219,8 +221,8 @@ BEGIN
IF in_partition = -partition- THEN IF in_partition = -partition- THEN
DELETE FROM search_name_-partition- values WHERE place_id = in_place_id; DELETE FROM search_name_-partition- values WHERE place_id = in_place_id;
IF in_rank_address > 0 THEN IF in_rank_address > 0 THEN
INSERT INTO search_name_-partition- values (in_place_id, in_rank_search, in_rank_address, INSERT INTO search_name_-partition- (place_id, search_rank, address_rank, name_vector, centroid)
in_name_vector, in_geometry); values (in_place_id, in_rank_search, in_rank_address, in_name_vector, in_geometry);
END IF; END IF;
RETURN TRUE; RETURN TRUE;
END IF; END IF;
@@ -261,7 +263,8 @@ BEGIN
-- start -- start
IF in_partition = -partition- THEN IF in_partition = -partition- THEN
DELETE FROM location_road_-partition- where place_id = in_place_id; DELETE FROM location_road_-partition- where place_id = in_place_id;
INSERT INTO location_road_-partition- values (in_partition, in_place_id, in_country_code, in_geometry); INSERT INTO location_road_-partition- (partition, place_id, country_code, geometry)
values (in_partition, in_place_id, in_country_code, in_geometry);
RETURN TRUE; RETURN TRUE;
END IF; END IF;
-- end -- end

6
test/bdd/steps/db_ops.py
View File

@@ -278,9 +278,9 @@ def import_and_index_data_from_place_table(context):
context.nominatim.run_setup_script('create-functions', 'create-partition-functions') context.nominatim.run_setup_script('create-functions', 'create-partition-functions')
cur = context.db.cursor() cur = context.db.cursor()
cur.execute( cur.execute(
"""insert into placex (osm_type, osm_id, class, type, name, admin_level, """insert into placex (osm_type, osm_id, class, type, name, admin_level, address, extratags, geometry)
address, extratags, geometry) select osm_type, osm_id, class, type, name, admin_level, address, extratags, geometry
select * from place where not (class='place' and type='houses' and osm_type='W')""") from place where not (class='place' and type='houses' and osm_type='W')""")
cur.execute( cur.execute(
"""insert into location_property_osmline (osm_id, address, linegeo) """insert into location_property_osmline (osm_id, address, linegeo)
SELECT osm_id, address, geometry from place SELECT osm_id, address, geometry from place

4
test/bdd/steps/osm_data.py
View File

@@ -78,8 +78,8 @@ def update_from_osm_file(context):
context.nominatim.run_setup_script('create-functions', 'create-partition-functions') context.nominatim.run_setup_script('create-functions', 'create-partition-functions')
cur = context.db.cursor() cur = context.db.cursor()
cur.execute("""insert into placex (osm_type, osm_id, class, type, name, cur.execute("""insert into placex (osm_type, osm_id, class, type, name, admin_level, address, extratags, geometry)
admin_level, address, extratags, geometry) select * from place""") select osm_type, osm_id, class, type, name, admin_level, address, extratags, geometry from place""")
cur.execute( cur.execute(
"""insert into location_property_osmline (osm_id, address, linegeo) """insert into location_property_osmline (osm_id, address, linegeo)
SELECT osm_id, address, geometry from place SELECT osm_id, address, geometry from place

6
utils/setup.php
View File

@@ -360,13 +360,13 @@ if ($aCMDResult['load-data'] || $aCMDResult['all']) {
} }
echo "Load Data\n"; echo "Load Data\n";
$sColumns = 'osm_type, osm_id, class, type, name, admin_level, address, extratags, geometry';
$aDBInstances = array(); $aDBInstances = array();
$iLoadThreads = max(1, $iInstances - 1); $iLoadThreads = max(1, $iInstances - 1);
for ($i = 0; $i < $iLoadThreads; $i++) { for ($i = 0; $i < $iLoadThreads; $i++) {
$aDBInstances[$i] =& getDB(true); $aDBInstances[$i] =& getDB(true);
$sSQL = 'insert into placex (osm_type, osm_id, class, type, name, admin_level, '; $sSQL = "INSERT INTO placex ($sColumns) SELECT $sColumns FROM place WHERE osm_id % $iLoadThreads = $i";
$sSQL .= ' address, extratags, geometry) ';
$sSQL .= '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')"; $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 ($aCMDResult['verbose']) echo "$sSQL\n";
if (!pg_send_query($aDBInstances[$i]->connection, $sSQL)) fail(pg_last_error($oDB->connection)); if (!pg_send_query($aDBInstances[$i]->connection, $sSQL)) fail(pg_last_error($oDB->connection));