hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-10 03:54:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove unused columns in search_name_* and use right index

Browse Source 
We only need the address rank these days, so get rid of
search rank. Also switch indexes to work on address rank.
This commit is contained in:
Sarah Hoffmann
2020-11-13 21:28:14 +01:00
parent 885dc0a8e1
commit 9160cce6d8
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/partition-functions.src.sql
View File

@@ -176,7 +176,7 @@ BEGIN
INTO parent INTO parent
WHERE name_vector && isin_token WHERE name_vector && isin_token
AND centroid && ST_Expand(point, 0.015) AND centroid && ST_Expand(point, 0.015)
AND search_rank between 26 and 27 AND address_rank between 26 and 27
ORDER BY ST_Distance(centroid, point) ASC limit 1; ORDER BY ST_Distance(centroid, point) ASC limit 1;
RETURN parent; RETURN parent;
END IF; END IF;
@@ -224,8 +224,8 @@ BEGIN
IF in_partition = -partition- THEN IF in_partition = -partition- THEN
DELETE FROM search_name_-partition- values WHERE place_id = in_place_id; DELETE FROM search_name_-partition- values WHERE place_id = in_place_id;
IF in_rank_address > 0 THEN IF in_rank_address > 0 THEN
INSERT INTO search_name_-partition- (place_id, search_rank, address_rank, name_vector, centroid) INSERT INTO search_name_-partition- (place_id, address_rank, name_vector, centroid)
values (in_place_id, in_rank_search, in_rank_address, in_name_vector, in_geometry); values (in_place_id, in_rank_address, in_name_vector, in_geometry);
END IF; END IF;
RETURN TRUE; RETURN TRUE;
END IF; END IF;

5
sql/partition-tables.src.sql
View File

@@ -1,7 +1,6 @@
drop table IF EXISTS search_name_blank CASCADE; drop table IF EXISTS search_name_blank CASCADE;
CREATE TABLE search_name_blank ( CREATE TABLE search_name_blank (
place_id BIGINT, place_id BIGINT,
search_rank smallint,
address_rank smallint, address_rank smallint,
name_vector integer[], name_vector integer[],
centroid GEOMETRY(Geometry, 4326) centroid GEOMETRY(Geometry, 4326)
@@ -15,8 +14,8 @@ CREATE INDEX idx_location_area_large_-partition-_geometry ON location_area_large
CREATE TABLE search_name_-partition- () INHERITS (search_name_blank) {ts:address-data}; CREATE TABLE search_name_-partition- () INHERITS (search_name_blank) {ts:address-data};
CREATE INDEX idx_search_name_-partition-_place_id ON search_name_-partition- USING BTREE (place_id) {ts:address-index}; CREATE INDEX idx_search_name_-partition-_place_id ON search_name_-partition- USING BTREE (place_id) {ts:address-index};
CREATE INDEX idx_search_name_-partition-_centroid_street ON search_name_-partition- USING GIST (centroid) {ts:address-index} where search_rank between 26 and 27; CREATE INDEX idx_search_name_-partition-_centroid_street ON search_name_-partition- USING GIST (centroid) {ts:address-index} where address_rank between 26 and 27;
CREATE INDEX idx_search_name_-partition-_centroid_place ON search_name_-partition- USING GIST (centroid) {ts:address-index} where search_rank between 2 and 25; CREATE INDEX idx_search_name_-partition-_centroid_place ON search_name_-partition- USING GIST (centroid) {ts:address-index} where address_rank between 2 and 25;
DROP TABLE IF EXISTS location_road_-partition-; DROP TABLE IF EXISTS location_road_-partition-;
CREATE TABLE location_road_-partition- ( CREATE TABLE location_road_-partition- (