X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/1c0fa81d88dd4d640e9582390bcadd6285acb72b..fadffeaa2da7ff122c6c32ef892c958ee2f5616e:/sql/tables.sql diff --git a/sql/tables.sql b/sql/tables.sql index fd01663e..19398eb5 100644 --- a/sql/tables.sql +++ b/sql/tables.sql @@ -1,10 +1,10 @@ -drop table import_status; +drop table if exists import_status; CREATE TABLE import_status ( lastimportdate timestamp NOT NULL ); -GRANT SELECT ON import_status TO "www-data" ; +GRANT SELECT ON import_status TO "{www-user}" ; -drop table import_osmosis_log; +drop table if exists import_osmosis_log; CREATE TABLE import_osmosis_log ( batchend timestamp, batchsize integer, @@ -13,28 +13,6 @@ 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, - query text, - ipaddress text, - endtime timestamp, - results integer - ); -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, starttime timestamp, @@ -42,53 +20,41 @@ CREATE TABLE new_query_log ( useragent text, language text, query text, + searchterm text, endtime timestamp, results integer, format text, secret text ); CREATE INDEX idx_new_query_log_starttime ON new_query_log USING BTREE (starttime); -GRANT INSERT ON new_query_log TO "www-data" ; -GRANT UPDATE ON new_query_log TO "www-data" ; -GRANT SELECT ON new_query_log TO "www-data" ; - -create view vw_search_query_log as SELECT substr(query, 1, 50) AS query, starttime, endtime - starttime AS duration, substr(useragent, 1, 20) as -useragent, language, results, ipaddress FROM new_query_log WHERE type = 'search' ORDER BY starttime DESC; +GRANT INSERT ON new_query_log TO "{www-user}" ; +GRANT UPDATE ON new_query_log TO "{www-user}" ; +GRANT SELECT ON new_query_log TO "{www-user}" ; ---drop table IF EXISTS report_log; -CREATE TABLE report_log ( - starttime timestamp, - ipaddress text, - query text, - description text, - email text - ); -GRANT INSERT ON report_log TO "www-data" ; +GRANT SELECT ON TABLE country_name TO "{www-user}"; +GRANT SELECT ON TABLE gb_postcode TO "{www-user}"; drop table IF EXISTS word; CREATE TABLE word ( word_id INTEGER, word_token text, - word_trigram text, word text, class text, type text, country_code varchar(2), search_name_count INTEGER, operator TEXT - ); -SELECT AddGeometryColumn('word', 'location', 4326, 'GEOMETRY', 2); -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) WITH (fastupdate = off); -GRANT SELECT ON word TO "www-data" ; -DROP SEQUENCE seq_word; + ) {ts:search-data}; +CREATE INDEX idx_word_word_token on word USING BTREE (word_token) {ts:search-index}; +GRANT SELECT ON word TO "{www-user}" ; +DROP SEQUENCE IF EXISTS seq_word; CREATE SEQUENCE seq_word start 1; drop table IF EXISTS location_area CASCADE; CREATE TABLE location_area ( partition integer, place_id BIGINT, - country_code VARCHAR(2), + country_code VARCHAR(2), keywords INTEGER[], rank_search INTEGER NOT NULL, rank_address INTEGER NOT NULL, @@ -98,8 +64,6 @@ SELECT AddGeometryColumn('location_area', 'centroid', 4326, 'POINT', 2); SELECT AddGeometryColumn('location_area', 'geometry', 4326, 'GEOMETRY', 2); 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 location_property CASCADE; CREATE TABLE location_property ( @@ -115,16 +79,35 @@ 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"; +GRANT SELECT ON location_property_aux TO "{www-user}"; + +CREATE TABLE location_property_tiger (linegeo GEOMETRY, place_id BIGINT, partition INTEGER, parent_place_id BIGINT, startnumber INTEGER, endnumber INTEGER, interpolationtype TEXT, postcode TEXT); +GRANT SELECT ON location_property_tiger TO "{www-user}"; + +drop table if exists location_property_osmline; +CREATE TABLE location_property_osmline ( + linegeo GEOMETRY, + place_id BIGINT NOT NULL, + partition INTEGER, + osm_id BIGINT, + parent_place_id BIGINT, + startnumber INTEGER, + endnumber INTEGER, + interpolationtype TEXT, + street TEXT, + addr_place TEXT, + postcode TEXT, + calculated_country_code VARCHAR(2), + geometry_sector INTEGER, + indexed_status INTEGER, + indexed_date TIMESTAMP){ts:search-data}; +CREATE UNIQUE INDEX idx_osmline_place_id ON location_property_osmline USING BTREE (place_id) {ts:search-index}; +CREATE INDEX idx_osmline_geometry_sector ON location_property_osmline USING BTREE (geometry_sector) {ts:address-index}; +CREATE INDEX idx_osmline_linegeo ON location_property_osmline USING GIST (linegeo) {ts:search-index}; +GRANT SELECT ON location_property_osmline TO "{www-user}"; -drop table IF EXISTS search_name_blank CASCADE; -CREATE TABLE search_name_blank ( +drop table IF EXISTS search_name; +CREATE TABLE search_name ( place_id BIGINT, search_rank integer, address_rank integer, @@ -132,13 +115,9 @@ CREATE TABLE search_name_blank ( country_code varchar(2), name_vector integer[], nameaddress_vector integer[] - ); -SELECT AddGeometryColumn('search_name_blank', 'centroid', 4326, 'GEOMETRY', 2); - -drop table IF EXISTS search_name; -CREATE TABLE search_name () INHERITS (search_name_blank); -CREATE INDEX idx_search_name_place_id ON search_name USING BTREE (place_id); -CREATE INDEX search_name_name_vector_idx ON search_name USING GIN (name_vector) WITH (fastupdate = off); + ) {ts:search-data}; +SELECT AddGeometryColumn('search_name', 'centroid', 4326, 'GEOMETRY', 2); +CREATE INDEX idx_search_name_place_id ON search_name USING BTREE (place_id) {ts:search-index}; drop table IF EXISTS place_addressline; CREATE TABLE place_addressline ( @@ -148,61 +127,14 @@ CREATE TABLE place_addressline ( isaddress boolean, distance float, cached_rank_address integer - ); -CREATE INDEX idx_place_addressline_place_id on place_addressline USING BTREE (place_id); - -drop table IF EXISTS place_boundingbox CASCADE; -CREATE TABLE place_boundingbox ( - place_id BIGINT, - minlat float, - maxlat float, - minlon float, - maxlon float, - numfeatures integer, - area float - ); -SELECT AddGeometryColumn('place_boundingbox', 'outline', 4326, 'GEOMETRY', 2); -GRANT SELECT on place_boundingbox to "www-data" ; -GRANT INSERT on place_boundingbox to "www-data" ; - -drop table IF EXISTS reverse_cache; -CREATE TABLE reverse_cache ( - latlonzoomid integer, - country_code varchar(2), - place_id BIGINT - ); -GRANT SELECT on reverse_cache to "www-data" ; -GRANT INSERT on reverse_cache to "www-data" ; -CREATE INDEX idx_reverse_cache_latlonzoomid ON reverse_cache USING BTREE (latlonzoomid); - -drop table country; -CREATE TABLE country ( - country_code varchar(2), - country_name hstore, - country_default_language_code varchar(2) - ); -SELECT AddGeometryColumn('country', 'geometry', 4326, 'POLYGON', 2); -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); + ) {ts:search-data}; +CREATE INDEX idx_place_addressline_place_id on place_addressline USING BTREE (place_id) {ts:search-index}; -drop table placex; +drop table if exists placex; CREATE TABLE placex ( place_id BIGINT NOT NULL, partition integer, - osm_type char(1), - osm_id INTEGER, - class TEXT NOT NULL, - type TEXT NOT NULL, - name HSTORE, - admin_level INTEGER, - housenumber TEXT, - street TEXT, - isin TEXT, - postcode TEXT, - country_code varchar(2), - extratags HSTORE, + LIKE place INCLUDING CONSTRAINTS, parent_place_id BIGINT, linked_place_id BIGINT, rank_address INTEGER, @@ -211,46 +143,36 @@ CREATE TABLE placex ( indexed_status INTEGER, indexed_date TIMESTAMP, wikipedia TEXT, -- calculated wikipedia article name (language:title) - geometry_sector INTEGER - ); -SELECT AddGeometryColumn('placex', 'geometry', 4326, 'GEOMETRY', 2); + geometry_sector INTEGER, + calculated_country_code varchar(2) + ) {ts:search-data}; SELECT AddGeometryColumn('placex', 'centroid', 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_linked_place_id ON placex USING BTREE (linked_place_id); -CREATE INDEX idx_placex_rank_search ON placex USING BTREE (rank_search, geometry_sector); -CREATE INDEX idx_placex_geometry ON placex USING GIST (geometry); -CREATE INDEX idx_placex_adminname on placex USING BTREE (make_standard_name(name->'name'),rank_search) WHERE osm_type='N' and rank_search < 26; - ---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 UNIQUE INDEX idx_place_id ON placex USING BTREE (place_id) {ts:search-index}; +CREATE INDEX idx_placex_osmid ON placex USING BTREE (osm_type, osm_id) {ts:search-index}; +CREATE INDEX idx_placex_linked_place_id ON placex USING BTREE (linked_place_id) {ts:address-index}; +CREATE INDEX idx_placex_rank_search ON placex USING BTREE (rank_search, geometry_sector) {ts:address-index}; +CREATE INDEX idx_placex_geometry ON placex USING GIST (geometry) {ts:search-index}; +CREATE INDEX idx_placex_adminname on placex USING BTREE (make_standard_name(name->'name'),rank_search) {ts:address-index} WHERE osm_type='N' and rank_search < 26; + +DROP SEQUENCE IF EXISTS seq_place; CREATE SEQUENCE seq_place start 1; -GRANT SELECT on placex to "www-data" ; -GRANT UPDATE ON placex to "www-data" ; -GRANT SELECT ON search_name to "www-data" ; -GRANT DELETE on search_name to "www-data" ; -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 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_area to "www-data" ; -GRANT SELECT on country to "www-data" ; - --- insert creates the location tagbles, creates location indexes if indexed == true +GRANT SELECT on placex to "{www-user}" ; +GRANT SELECT ON search_name to "{www-user}" ; +GRANT SELECT on place_addressline to "{www-user}" ; +GRANT SELECT ON seq_word to "{www-user}" ; +GRANT SELECT ON planet_osm_ways to "{www-user}" ; +GRANT SELECT ON planet_osm_rels to "{www-user}" ; +GRANT SELECT on location_area to "{www-user}" ; + +-- insert creates the location tables, creates location indexes if indexed == true CREATE TRIGGER placex_before_insert BEFORE INSERT ON placex FOR EACH ROW EXECUTE PROCEDURE placex_insert(); -- update insert creates the location tables CREATE TRIGGER placex_before_update BEFORE UPDATE ON placex FOR EACH ROW EXECUTE PROCEDURE placex_update(); +CREATE TRIGGER osmline_before_update BEFORE UPDATE ON location_property_osmline + FOR EACH ROW EXECUTE PROCEDURE osmline_update(); -- diff update triggers CREATE TRIGGER placex_before_delete AFTER DELETE ON placex @@ -260,19 +182,6 @@ CREATE TRIGGER place_before_delete BEFORE DELETE ON place CREATE TRIGGER place_before_insert BEFORE INSERT ON place FOR EACH ROW EXECUTE PROCEDURE place_insert(); -alter table placex add column geometry_sector INTEGER; -alter table placex add column indexed_status INTEGER; -alter table placex add column indexed_date TIMESTAMP; - -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) - 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); - DROP SEQUENCE seq_postcodes; CREATE SEQUENCE seq_postcodes start 1; @@ -290,6 +199,7 @@ CREATE TABLE import_polygon_error ( 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); +GRANT SELECT ON import_polygon_error TO "{www-user}"; drop table import_polygon_delete; CREATE TABLE import_polygon_delete ( @@ -299,6 +209,7 @@ CREATE TABLE import_polygon_delete ( type TEXT NOT NULL ); CREATE INDEX idx_import_polygon_delete_osmid ON import_polygon_delete USING BTREE (osm_type, osm_id); +GRANT SELECT ON import_polygon_delete TO "{www-user}"; drop sequence file; CREATE SEQUENCE file start 1;