From 6f6d116451083e50a82f41c6f36370824bece5de Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Fri, 17 Jan 2020 17:47:10 +0100 Subject: [PATCH] adapt index for changes name lookup --- sql/functions/placex_triggers.sql | 3 ++- sql/tables.sql | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sql/functions/placex_triggers.sql b/sql/functions/placex_triggers.sql index cedbb608..9803e815 100644 --- a/sql/functions/placex_triggers.sql +++ b/sql/functions/placex_triggers.sql @@ -225,6 +225,7 @@ BEGIN WHERE make_standard_name(name->'name') = bnd_name AND placex.rank_address = bnd.rank_address AND placex.osm_type = 'N' + AND placex.rank_search < 26 -- needed to select the right index AND st_covers(geometry, placex.geometry) LOOP --DEBUG: RAISE WARNING 'Found matching place node %', linkedPlacex.osm_id; @@ -235,7 +236,7 @@ BEGIN RETURN NULL; END; $$ -LANGUAGE plpgsql; +LANGUAGE plpgsql STABLE; CREATE OR REPLACE FUNCTION placex_insert() RETURNS TRIGGER diff --git a/sql/tables.sql b/sql/tables.sql index f9fa95c0..28d664be 100644 --- a/sql/tables.sql +++ b/sql/tables.sql @@ -176,7 +176,7 @@ CREATE INDEX idx_placex_osmid ON placex USING BTREE (osm_type, osm_id) {ts:searc CREATE INDEX idx_placex_linked_place_id ON placex USING BTREE (linked_place_id) {ts:address-index} WHERE linked_place_id IS NOT NULL; CREATE INDEX idx_placex_rank_search ON placex USING BTREE (rank_search, geometry_sector) {ts:address-index}; CREATE INDEX idx_placex_geometry ON placex USING GIST (geometry) {ts:search-index}; -CREATE INDEX idx_placex_adminname on placex USING BTREE (make_standard_name(name->'name'),rank_search) {ts:address-index} WHERE osm_type='N' and rank_search < 26; +CREATE INDEX idx_placex_adminname on placex USING BTREE (make_standard_name(name->'name')) {ts:address-index} WHERE osm_type='N' and rank_search < 26; DROP SEQUENCE IF EXISTS seq_place; CREATE SEQUENCE seq_place start 1; -- 2.39.5