Merge remote-tracking branch 'upstream/master'

[nominatim.git] / sql / indices.src.sql

diff --git a/sql/indices.src.sql b/sql/indices.src.sql
index fe42a7c3965a5b11c0b76c65614b17a0a850f037..37d53a052f936aece5fcc3e8a8e092cd01d09aa1 100644 (file)
--- a/sql/indices.src.sql
+++ b/sql/indices.src.sql
@@ -1,9 +1,3 @@
--- osm2pgsql slim tables were on SSD just to speed up the import
--- move them back to normal space
-ALTER INDEX planet_osm_nodes_pkey SET TABLESPACE "data";
-ALTER INDEX planet_osm_ways_nodes SET TABLESPACE "data";
-ALTER INDEX planet_osm_rels_parts SET TABLESPACE "data";
-
 -- Indices used only during search and update.
 -- These indices are created only after the indexing process is done.
 
@@ -24,10 +18,10 @@ CREATE INDEX idx_placex_rank_address ON placex USING BTREE (rank_address) TABLES
 CREATE INDEX idx_placex_pendingsector ON placex USING BTREE (rank_search,geometry_sector) TABLESPACE ssd where indexed_status > 0;
 CREATE INDEX idx_placex_parent_place_id ON placex USING BTREE (parent_place_id) TABLESPACE ssd where parent_place_id IS NOT NULL;
 CREATE INDEX idx_placex_interpolation ON placex USING BTREE (geometry_sector) TABLESPACE ssd where indexed_status > 0 and class='place' and type='houses';
+CREATE INDEX idx_placex_reverse_geometry ON placex USING gist (geometry) TABLESPACE ssd where rank_search != 28 and (name is not null or housenumber is not null) and class not in ('waterway','railway','tunnel','bridge');
 CREATE INDEX idx_location_area_country_place_id ON location_area_country USING BTREE (place_id) TABLESPACE ssd;
 
 CREATE INDEX idx_search_name_country_centroid ON search_name_country USING GIST (centroid) TABLESPACE ssd;
-CREATE INDEX idx_search_name_country_nameaddress_vector ON search_name_country USING GIN (nameaddress_vector) WITH (fastupdate = off) TABLESPACE ssd;
 
 -- start
 CREATE INDEX idx_location_property_-partition-_centroid ON location_property_-partition- USING GIST (centroid) TABLESPACE ssd;