X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/cc6b90b4908c7eeee59879d2f9a5ad7532a2efee..111f0d229532ade32fa01d1af2fceaae070885ee:/sql/tables.sql?ds=sidebyside diff --git a/sql/tables.sql b/sql/tables.sql index 35d6394a..e56af7f6 100644 --- a/sql/tables.sql +++ b/sql/tables.sql @@ -23,17 +23,6 @@ CREATE TABLE import_npi_log ( 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" ; - CREATE TABLE new_query_log ( type text, starttime timestamp, @@ -41,6 +30,7 @@ CREATE TABLE new_query_log ( useragent text, language text, query text, + searchterm text, endtime timestamp, results integer, format text, @@ -51,9 +41,6 @@ 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; - --drop table IF EXISTS report_log; CREATE TABLE report_log ( starttime timestamp, @@ -75,10 +62,9 @@ CREATE TABLE word ( country_code varchar(2), 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_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; @@ -87,7 +73,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, @@ -103,9 +89,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 ); @@ -115,15 +101,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, @@ -134,27 +122,23 @@ CREATE TABLE search_name_blank ( 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); +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 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); + ) 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 INTEGER, + place_id BIGINT, minlat float, maxlat float, minlon float, @@ -162,9 +146,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" ; @@ -172,7 +154,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" ; @@ -192,7 +174,7 @@ 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, @@ -206,35 +188,25 @@ CREATE TABLE placex ( postcode TEXT, country_code varchar(2), extratags HSTORE, - parent_place_id INTEGER, - linked_place_id INTEGER, + 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 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_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" ; @@ -277,10 +249,10 @@ 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; @@ -298,4 +270,16 @@ 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); +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;