X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/ab6a99677293c9ddb96a717f03b8a009e98ab955..399cb31507ce9c53e1be2b8606a9070c2bc132fb:/sql/tables.sql diff --git a/sql/tables.sql b/sql/tables.sql index 5945ee79..6908e7ed 100644 --- a/sql/tables.sql +++ b/sql/tables.sql @@ -13,6 +13,16 @@ CREATE TABLE import_osmosis_log ( event text ); +drop table import_npi_log; +CREATE TABLE import_npi_log ( + npiid integer, + batchend timestamp, + batchsize integer, + starttime timestamp, + endtime timestamp, + event text + ); + --drop table IF EXISTS query_log; CREATE TABLE query_log ( starttime timestamp, @@ -23,6 +33,7 @@ CREATE TABLE query_log ( ); CREATE INDEX idx_query_log ON query_log USING BTREE (starttime); GRANT INSERT ON query_log TO "www-data" ; +GRANT UPDATE ON query_log TO "www-data" ; CREATE TABLE new_query_log ( type text, @@ -63,20 +74,21 @@ CREATE TABLE word ( class text, type text, country_code varchar(2), - search_name_count INTEGER - ); + search_name_count INTEGER, + operator TEXT + ) TABLESPACE ssd; SELECT AddGeometryColumn('word', 'location', 4326, 'GEOMETRY', 2); -CREATE INDEX idx_word_word_id on word USING BTREE (word_id); -CREATE INDEX idx_word_word_token on word USING BTREE (word_token); -CREATE INDEX idx_word_trigram ON word USING gin(word_trigram gin_trgm_ops); +CREATE INDEX idx_word_word_token on word USING BTREE (word_token) TABLESPACE ssd; +--CREATE INDEX idx_word_trigram ON word USING gin(word_trigram gin_trgm_ops) WITH (fastupdate = off); GRANT SELECT ON word TO "www-data" ; DROP SEQUENCE seq_word; CREATE SEQUENCE seq_word start 1; drop table IF EXISTS location_area CASCADE; CREATE TABLE location_area ( - partition varchar(10), - place_id bigint, + partition integer, + place_id BIGINT, + country_code VARCHAR(2), keywords INTEGER[], rank_search INTEGER NOT NULL, rank_address INTEGER NOT NULL, @@ -89,36 +101,58 @@ CREATE TABLE location_area_large () INHERITS (location_area); CREATE TABLE location_area_roadnear () INHERITS (location_area); CREATE TABLE location_area_roadfar () INHERITS (location_area); -drop table IF EXISTS search_name; -CREATE TABLE search_name ( - place_id bigint, +drop table IF EXISTS location_property CASCADE; +CREATE TABLE location_property ( + place_id BIGINT, + partition integer, + parent_place_id BIGINT, + housenumber TEXT, + postcode TEXT + ); +SELECT AddGeometryColumn('location_property', 'centroid', 4326, 'POINT', 2); + +CREATE TABLE location_property_aux () INHERITS (location_property); +CREATE INDEX idx_location_property_aux_place_id ON location_property_aux USING BTREE (place_id); +CREATE INDEX idx_location_property_aux_parent_place_id ON location_property_aux USING BTREE (parent_place_id); +CREATE INDEX idx_location_property_aux_housenumber_parent_place_id ON location_property_aux USING BTREE (parent_place_id, housenumber); +GRANT SELECT ON location_property_aux TO "www-data"; + +CREATE TABLE location_property_tiger () INHERITS (location_property); +CREATE INDEX idx_location_property_tiger_place_id ON location_property_tiger USING BTREE (place_id); +CREATE INDEX idx_location_property_tiger_parent_place_id ON location_property_tiger USING BTREE (parent_place_id); +CREATE INDEX idx_location_property_tiger_housenumber_parent_place_id ON location_property_tiger USING BTREE (parent_place_id, housenumber); +GRANT SELECT ON location_property_tiger TO "www-data"; + +drop table IF EXISTS search_name_blank CASCADE; +CREATE TABLE search_name_blank ( + place_id BIGINT, search_rank integer, address_rank integer, + importance FLOAT, country_code varchar(2), name_vector integer[], nameaddress_vector integer[] ); -CREATE INDEX search_name_name_vector_idx ON search_name USING GIN (name_vector gin__int_ops); -CREATE INDEX searchnameplacesearch_search_nameaddress_vector_idx ON search_name USING GIN (nameaddress_vector gin__int_ops); -SELECT AddGeometryColumn('search_name', 'centroid', 4326, 'GEOMETRY', 2); -CREATE INDEX idx_search_name_centroid ON search_name USING GIST (centroid); -CREATE INDEX idx_search_name_place_id ON search_name USING BTREE (place_id); +SELECT AddGeometryColumn('search_name_blank', 'centroid', 4326, 'GEOMETRY', 2); + +drop table IF EXISTS search_name; +CREATE TABLE search_name () INHERITS (search_name_blank) TABLESPACE ssd; +CREATE INDEX idx_search_name_place_id ON search_name USING BTREE (place_id) TABLESPACE ssd; drop table IF EXISTS place_addressline; CREATE TABLE place_addressline ( - place_id bigint, - address_place_id bigint, + place_id BIGINT, + address_place_id BIGINT, fromarea boolean, isaddress boolean, distance float, cached_rank_address integer - ); -CREATE INDEX idx_place_addressline_place_id on place_addressline USING BTREE (place_id); -CREATE INDEX idx_place_addressline_address_place_id on place_addressline USING BTREE (address_place_id); + ) TABLESPACE data; +CREATE INDEX idx_place_addressline_place_id on place_addressline USING BTREE (place_id) TABLESPACE ssd; drop table IF EXISTS place_boundingbox CASCADE; CREATE TABLE place_boundingbox ( - place_id bigint, + place_id BIGINT, minlat float, maxlat float, minlon float, @@ -126,9 +160,7 @@ CREATE TABLE place_boundingbox ( numfeatures integer, area float ); -CREATE INDEX idx_place_boundingbox_place_id on place_boundingbox USING BTREE (place_id); SELECT AddGeometryColumn('place_boundingbox', 'outline', 4326, 'GEOMETRY', 2); -CREATE INDEX idx_place_boundingbox_outline ON place_boundingbox USING GIST (outline); GRANT SELECT on place_boundingbox to "www-data" ; GRANT INSERT on place_boundingbox to "www-data" ; @@ -136,7 +168,7 @@ drop table IF EXISTS reverse_cache; CREATE TABLE reverse_cache ( latlonzoomid integer, country_code varchar(2), - place_id bigint + place_id BIGINT ); GRANT SELECT on reverse_cache to "www-data" ; GRANT INSERT on reverse_cache to "www-data" ; @@ -149,49 +181,45 @@ CREATE TABLE country ( country_default_language_code varchar(2) ); SELECT AddGeometryColumn('country', 'geometry', 4326, 'POLYGON', 2); -insert into country select iso3166::varchar(2), ARRAY[ROW('name:en',cntry_name)::keyvalue], null, +insert into country select iso3166::varchar(2), 'name:en'->cntry_name, null, ST_Transform(geometryn(the_geom, generate_series(1, numgeometries(the_geom))), 4326) from worldboundaries; CREATE INDEX idx_country_country_code ON country USING BTREE (country_code); CREATE INDEX idx_country_geometry ON country USING GIST (geometry); drop table placex; CREATE TABLE placex ( - place_id bigint NOT NULL, - partition varchar(10), + place_id BIGINT NOT NULL, + partition integer, osm_type char(1), - osm_id bigint, + osm_id INTEGER, class TEXT NOT NULL, type TEXT NOT NULL, name HSTORE, - admin_level integer, + admin_level INTEGER, housenumber TEXT, street TEXT, isin TEXT, postcode TEXT, country_code varchar(2), - street_place_id bigint, + extratags HSTORE, + parent_place_id BIGINT, + linked_place_id BIGINT, rank_address INTEGER, rank_search INTEGER, + importance FLOAT, indexed_status INTEGER, indexed_date TIMESTAMP, geometry_sector INTEGER - ); + ) TABLESPACE ssd; SELECT AddGeometryColumn('placex', 'geometry', 4326, 'GEOMETRY', 2); -CREATE UNIQUE INDEX idx_place_id ON placex USING BTREE (place_id); -CREATE INDEX idx_placex_osmid ON placex USING BTREE (osm_type, osm_id); -CREATE INDEX idx_placex_rank_search ON placex USING BTREE (rank_search); -CREATE INDEX idx_placex_rank_address ON placex USING BTREE (rank_address); -CREATE INDEX idx_placex_geometry ON placex USING GIST (geometry); -CREATE INDEX idx_placex_indexed ON placex USING BTREE (indexed); -CREATE INDEX idx_placex_pending ON placex USING BTREE (rank_search) where name IS NOT NULL and indexed = false; -CREATE INDEX idx_placex_pendingbylatlon ON placex USING BTREE (geometry_index(geometry_sector,indexed,name),rank_search) - where geometry_index(geometry_sector,indexed,name) IS NOT NULL; -CREATE INDEX idx_placex_street_place_id ON placex USING BTREE (street_place_id) where street_place_id IS NOT NULL; -CREATE INDEX idx_placex_gb_postcodesector ON placex USING BTREE (substring(upper(postcode) from '^([A-Z][A-Z]?[0-9][0-9A-Z]? [0-9])[A-Z][A-Z]$')) - where country_code = 'gb' and substring(upper(postcode) from '^([A-Z][A-Z]?[0-9][0-9A-Z]? [0-9])[A-Z][A-Z]$') is not null; -CREATE INDEX idx_placex_interpolation ON placex USING BTREE (geometry_sector) where indexed = false and class='place' and type='houses'; -CREATE INDEX idx_placex_sector ON placex USING BTREE (geometry_sector,rank_address,osm_type,osm_id); -CLUSTER placex USING idx_placex_sector; +CREATE UNIQUE INDEX idx_place_id ON placex USING BTREE (place_id) TABLESPACE ssd; +CREATE INDEX idx_placex_osmid ON placex USING BTREE (osm_type, osm_id) TABLESPACE ssd; +CREATE INDEX idx_placex_rank_search ON placex USING BTREE (rank_search, geometry_sector) TABLESPACE ssd; +CREATE INDEX idx_placex_geometry ON placex USING GIST (geometry) TABLESPACE ssd; + +--CREATE INDEX idx_placex_indexed ON placex USING BTREE (indexed); + +--CREATE INDEX idx_placex_pendingbylatlon ON placex USING BTREE (geometry_index(geometry_sector,indexed,name),rank_search) where geometry_index(geometry_sector,indexed,name) IS NOT NULL; DROP SEQUENCE seq_place; CREATE SEQUENCE seq_place start 1; @@ -203,40 +231,12 @@ GRANT INSERT on search_name to "www-data" ; GRANT SELECT on place_addressline to "www-data" ; GRANT INSERT ON place_addressline to "www-data" ; GRANT DELETE on place_addressline to "www-data" ; -GRANT SELECT on location_point to "www-data" ; GRANT SELECT ON seq_word to "www-data" ; GRANT UPDATE ON seq_word to "www-data" ; GRANT INSERT ON word to "www-data" ; GRANT SELECT ON planet_osm_ways to "www-data" ; GRANT SELECT ON planet_osm_rels to "www-data" ; -GRANT SELECT on location_point to "www-data" ; GRANT SELECT on location_area to "www-data" ; -GRANT SELECT on location_point_26 to "www-data" ; -GRANT SELECT on location_point_25 to "www-data" ; -GRANT SELECT on location_point_24 to "www-data" ; -GRANT SELECT on location_point_23 to "www-data" ; -GRANT SELECT on location_point_22 to "www-data" ; -GRANT SELECT on location_point_21 to "www-data" ; -GRANT SELECT on location_point_20 to "www-data" ; -GRANT SELECT on location_point_19 to "www-data" ; -GRANT SELECT on location_point_18 to "www-data" ; -GRANT SELECT on location_point_17 to "www-data" ; -GRANT SELECT on location_point_16 to "www-data" ; -GRANT SELECT on location_point_15 to "www-data" ; -GRANT SELECT on location_point_14 to "www-data" ; -GRANT SELECT on location_point_13 to "www-data" ; -GRANT SELECT on location_point_12 to "www-data" ; -GRANT SELECT on location_point_11 to "www-data" ; -GRANT SELECT on location_point_10 to "www-data" ; -GRANT SELECT on location_point_9 to "www-data" ; -GRANT SELECT on location_point_8 to "www-data" ; -GRANT SELECT on location_point_7 to "www-data" ; -GRANT SELECT on location_point_6 to "www-data" ; -GRANT SELECT on location_point_5 to "www-data" ; -GRANT SELECT on location_point_4 to "www-data" ; -GRANT SELECT on location_point_3 to "www-data" ; -GRANT SELECT on location_point_2 to "www-data" ; -GRANT SELECT on location_point_1 to "www-data" ; GRANT SELECT on country to "www-data" ; -- insert creates the location tagbles, creates location indexes if indexed == true @@ -263,7 +263,37 @@ update placex set geometry_sector = geometry_sector(geometry); drop index idx_placex_pendingbylatlon; drop index idx_placex_interpolation; drop index idx_placex_sector; -CREATE INDEX idx_placex_pendingbylatlon ON placex USING BTREE (geometry_index(geometry_sector,indexed,name),rank_search) +CREATE INDEX idx_placex_pendingbylatlon ON placex USING BTREE (geometry_index(geometry_sector,indexed,name),rank_search) TABLESPACE ssd where geometry_index(geometry_sector,indexed,name) IS NOT NULL; -CREATE INDEX idx_placex_interpolation ON placex USING BTREE (geometry_sector) where indexed = false and class='place' and type='houses'; -CREATE INDEX idx_placex_sector ON placex USING BTREE (geometry_sector,rank_address,osm_type,osm_id); +CREATE INDEX idx_placex_interpolation ON placex USING BTREE (geometry_sector) TABLESPACE ssd where indexed = false and class='place' and type='houses'; +CREATE INDEX idx_placex_sector ON placex USING BTREE (geometry_sector,rank_address,osm_type,osm_id) TABLESPACE ssd; + +DROP SEQUENCE seq_postcodes; +CREATE SEQUENCE seq_postcodes start 1; + +drop table import_polygon_error; +CREATE TABLE import_polygon_error ( + osm_type char(1), + osm_id INTEGER, + class TEXT NOT NULL, + type TEXT NOT NULL, + name HSTORE, + country_code varchar(2), + updated timestamp, + errormessage text + ); +SELECT AddGeometryColumn('import_polygon_error', 'prevgeometry', 4326, 'GEOMETRY', 2); +SELECT AddGeometryColumn('import_polygon_error', 'newgeometry', 4326, 'GEOMETRY', 2); +CREATE INDEX idx_import_polygon_error_osmid ON import_polygon_error USING BTREE (osm_type, osm_id) TABLESPACE ssd; + +drop table import_polygon_delete; +CREATE TABLE import_polygon_delete ( + osm_type char(1), + osm_id INTEGER, + class TEXT NOT NULL, + type TEXT NOT NULL + ); +CREATE INDEX idx_import_polygon_delete_osmid ON import_polygon_delete USING BTREE (osm_type, osm_id) TABLESPACE ssd; + +drop sequence file; +CREATE SEQUENCE file start 1;