X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/80cf5df1cd5c249a547f877c73fd6feba9b763b0..a974d2509257cb2c4967631cea30eb483c37c837:/sql/tables.sql?ds=sidebyside diff --git a/sql/tables.sql b/sql/tables.sql index 795b9277..3bb41e28 100644 --- a/sql/tables.sql +++ b/sql/tables.sql @@ -32,6 +32,7 @@ CREATE TABLE query_log ( results integer ); CREATE INDEX idx_query_log ON query_log USING BTREE (starttime); +GRANT SELECT ON query_log TO "www-data" ; GRANT INSERT ON query_log TO "www-data" ; GRANT UPDATE ON query_log TO "www-data" ; @@ -69,7 +70,6 @@ drop table IF EXISTS word; CREATE TABLE word ( word_id INTEGER, word_token text, - word_trigram text, word text, class text, type text, @@ -77,9 +77,7 @@ CREATE TABLE word ( 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; CREATE SEQUENCE seq_word start 1; @@ -123,8 +121,8 @@ CREATE INDEX idx_location_property_tiger_parent_place_id ON location_property_ti 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 ( +drop table IF EXISTS search_name; +CREATE TABLE search_name ( place_id BIGINT, search_rank integer, address_rank integer, @@ -133,10 +131,7 @@ CREATE TABLE search_name_blank ( 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); +SELECT AddGeometryColumn('search_name', 'centroid', 4326, 'GEOMETRY', 2); CREATE INDEX idx_search_name_place_id ON search_name USING BTREE (place_id); drop table IF EXISTS place_addressline; @@ -190,18 +185,7 @@ drop table 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, @@ -209,14 +193,17 @@ CREATE TABLE placex ( 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_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); @@ -256,17 +243,7 @@ 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; @@ -286,6 +263,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-data"; drop table import_polygon_delete; CREATE TABLE import_polygon_delete ( @@ -295,6 +273,32 @@ 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-data"; 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); +