From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 16 Apr 2018 18:47:45 +0000 (+0200)
Subject: remove search_name_country table
X-Git-Tag: v3.2.0~79^2
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/53c526c01d145ca27bc3bea298305e483272eb29

remove search_name_country table

The table is no longer used, country names are handled
directly via the word table.
---

diff --git a/sql/indices.src.sql b/sql/indices.src.sql
index cf5c4bc1..61af8900 100644
--- a/sql/indices.src.sql
+++ b/sql/indices.src.sql
@@ -19,8 +19,6 @@ CREATE INDEX idx_location_area_country_place_id ON location_area_country USING B
 
 CREATE INDEX idx_osmline_parent_place_id ON location_property_osmline USING BTREE (parent_place_id) {ts:search-index};
 
-CREATE INDEX idx_search_name_country_centroid ON search_name_country USING GIST (centroid) {ts:address-index};
-
 DROP INDEX IF EXISTS place_id_idx;
 CREATE UNIQUE INDEX idx_place_osm_unique on place using btree(osm_id,osm_type,class,type) {ts:address-index};
 
diff --git a/sql/partition-functions.src.sql b/sql/partition-functions.src.sql
index 5aa6491a..cc11cf96 100644
--- a/sql/partition-functions.src.sql
+++ b/sql/partition-functions.src.sql
@@ -153,15 +153,6 @@ BEGIN
   INSERT INTO search_name (place_id, search_rank, address_rank, importance, country_code, name_vector, nameaddress_vector, centroid)
     values (in_place_id, in_rank_search, in_rank_address, in_importance, in_country_code, in_name_vector, in_nameaddress_vector, in_centroid);
 
-  IF in_rank_search <= 4 THEN
-    DELETE FROM search_name_country WHERE place_id = in_place_id;
-    IF in_rank_address > 0 THEN
-      INSERT INTO search_name_country (place_id, search_rank, address_rank, name_vector, centroid)
-        values (in_place_id, in_rank_search, in_rank_address, in_name_vector, in_geometry);
-    END IF;
-    RETURN TRUE;
-  END IF;
-
 -- start
   IF in_partition = -partition- THEN
     DELETE FROM search_name_-partition- values WHERE place_id = in_place_id;
@@ -184,7 +175,6 @@ DECLARE
 BEGIN
 
   DELETE from search_name WHERE place_id = in_place_id;
-  DELETE from search_name_country WHERE place_id = in_place_id;
 
 -- start
   IF in_partition = -partition- THEN
diff --git a/sql/partition-tables.src.sql b/sql/partition-tables.src.sql
index d8f02e10..61ed5281 100644
--- a/sql/partition-tables.src.sql
+++ b/sql/partition-tables.src.sql
@@ -38,10 +38,6 @@ CREATE TABLE search_name_blank (
 CREATE TABLE location_area_country () INHERITS (location_area_large) {ts:address-data};
 CREATE INDEX idx_location_area_country_geometry ON location_area_country USING GIST (geometry) {ts:address-index};
 
-CREATE TABLE search_name_country () INHERITS (search_name_blank) {ts:address-data};
-CREATE INDEX idx_search_name_country_place_id ON search_name_country USING BTREE (place_id) {ts:address-index};
-CREATE INDEX idx_search_name_country_name_vector ON search_name_country USING GIN (name_vector) WITH (fastupdate = off) {ts:address-index};
-
 -- start
 CREATE TABLE location_area_large_-partition- () INHERITS (location_area_large) {ts:address-data};
 CREATE INDEX idx_location_area_large_-partition-_place_id ON location_area_large_-partition- USING BTREE (place_id) {ts:address-index};