X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/3ea1b35b3243e4e2d061a207460b009883522d24..20f1939c4c61ef28b128593b2ae5f841af567042:/sql/tables.sql?ds=inline diff --git a/sql/tables.sql b/sql/tables.sql index f3a82b3b..d5cf7bcd 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, @@ -67,7 +78,6 @@ CREATE TABLE word ( operator TEXT ); 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) WITH (fastupdate = off); GRANT SELECT ON word TO "www-data" ; @@ -77,7 +87,7 @@ CREATE SEQUENCE seq_word start 1; drop table IF EXISTS location_area CASCADE; CREATE TABLE location_area ( partition integer, - place_id INTEGER, + place_id BIGINT, country_code VARCHAR(2), keywords INTEGER[], rank_search INTEGER NOT NULL, @@ -93,9 +103,9 @@ CREATE TABLE location_area_roadfar () INHERITS (location_area); drop table IF EXISTS location_property CASCADE; CREATE TABLE location_property ( - place_id INTEGER, + place_id BIGINT, partition integer, - parent_place_id INTEGER, + parent_place_id BIGINT, housenumber TEXT, postcode TEXT ); @@ -105,15 +115,17 @@ 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 INTEGER, + place_id BIGINT, search_rank integer, address_rank integer, importance FLOAT, @@ -125,26 +137,22 @@ 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 search_name_name_vector_idx ON search_name USING GIN (name_vector gin__int_ops) WITH (fastupdate = off); -CREATE INDEX searchnameplacesearch_search_nameaddress_vector_idx ON search_name USING GIN (nameaddress_vector gin__int_ops) WITH (fastupdate = off); -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); drop table IF EXISTS place_addressline; CREATE TABLE place_addressline ( - place_id INTEGER, - address_place_id INTEGER, + 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); drop table IF EXISTS place_boundingbox CASCADE; CREATE TABLE place_boundingbox ( - place_id INTEGER, + place_id BIGINT, minlat float, maxlat float, minlon float, @@ -152,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" ; @@ -162,7 +168,7 @@ drop table IF EXISTS reverse_cache; CREATE TABLE reverse_cache ( latlonzoomid integer, country_code varchar(2), - place_id INTEGER + place_id BIGINT ); GRANT SELECT on reverse_cache to "www-data" ; GRANT INSERT on reverse_cache to "www-data" ; @@ -182,49 +188,32 @@ CREATE INDEX idx_country_geometry ON country USING GIST (geometry); drop table placex; CREATE TABLE placex ( - place_id INTEGER NOT NULL, + 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, - parent_place_id INTEGER, - linked_place_id INTEGER, + LIKE place INCLUDING CONSTRAINTS, + 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 + wikipedia TEXT, -- calculated wikipedia article name (language:title) + geometry_sector INTEGER, + calculated_country_code varchar(2) ); -SELECT AddGeometryColumn('placex', 'geometry', 4326, 'GEOMETRY', 2); +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_rank_search ON placex USING BTREE (rank_search); -CREATE INDEX idx_placex_rank_address ON placex USING BTREE (rank_address); +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_pending ON placex USING BTREE (rank_search) where indexed_status > 0; -CREATE INDEX idx_placex_pendingsector ON placex USING BTREE (rank_search,geometry_sector) where indexed_status > 0; - --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_parent_place_id ON placex USING BTREE (parent_place_id) where parent_place_id IS NOT NULL; -CREATE INDEX idx_placex_interpolation ON placex USING BTREE (geometry_sector) where indexed_status > 0 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; - DROP SEQUENCE seq_place; CREATE SEQUENCE seq_place start 1; GRANT SELECT on placex to "www-data" ; @@ -289,3 +278,40 @@ 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); + +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); + +drop sequence file; +CREATE SEQUENCE file start 1; + +-- null table so it won't error +-- deliberately no drop - importing the table is expensive and static, if it is already there better to avoid removing it +CREATE TABLE wikipedia_article ( + language text NOT NULL, + title text NOT NULL, + langcount integer, + othercount integer, + totalcount integer, + lat double precision, + lon double precision, + importance double precision, + osm_type character(1), + osm_id bigint +); +ALTER TABLE ONLY wikipedia_article ADD CONSTRAINT wikipedia_article_pkey PRIMARY KEY (language, title); +CREATE INDEX idx_wikipedia_article_osm_id ON wikipedia_article USING btree (osm_type, osm_id); + +CREATE TABLE wikipedia_redirect ( + language text, + from_title text, + to_title text +); +ALTER TABLE ONLY wikipedia_redirect ADD CONSTRAINT wikipedia_redirect_pkey PRIMARY KEY (language, from_title); +