finally fix adminitrative spelling error, disable fast_update on indexes by default...

[nominatim.git] / sql / tables.sql

diff --git a/sql/tables.sql b/sql/tables.sql
index a5b83c30fea778fe3cedab5ebd4f6f3e315ee94e..a4f79044b0e9f5ff66e15f6b1dcb29be3fc5563f 100644 (file)
--- a/sql/tables.sql
+++ b/sql/tables.sql
@@ -63,19 +63,20 @@ CREATE TABLE word (
   class text,
   type text,
   country_code varchar(2),
-  search_name_count INTEGER
+  search_name_count INTEGER,
+  operator TEXT
   );
 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_trigram ON word USING gin(word_trigram gin_trgm_ops);
+--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;
 CREATE SEQUENCE seq_word start 1;
 
 drop table IF EXISTS location_area CASCADE;
 CREATE TABLE location_area (
-  partition varchar(10),
+  partition integer,
   place_id INTEGER,
   country_code VARCHAR(2), 
   keywords INTEGER[],
@@ -90,18 +91,36 @@ CREATE TABLE location_area_large () INHERITS (location_area);
 CREATE TABLE location_area_roadnear () INHERITS (location_area);
 CREATE TABLE location_area_roadfar () INHERITS (location_area);
 
-drop table IF EXISTS search_name;
-CREATE TABLE search_name (
+drop table IF EXISTS location_property CASCADE;
+CREATE TABLE location_property (
+  place_id INTEGER,
+  partition integer,
+  parent_place_id INTEGER,
+  housenumber TEXT,
+  postcode TEXT
+  );
+SELECT AddGeometryColumn('location_property', 'centroid', 4326, 'POINT', 2);
+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);
+
+drop table IF EXISTS search_name_blank CASCADE;
+CREATE TABLE search_name_blank (
   place_id INTEGER,
   search_rank integer,
   address_rank integer,
+  importance FLOAT,
   country_code varchar(2),
   name_vector integer[],
   nameaddress_vector integer[]
   );
-CREATE INDEX search_name_name_vector_idx ON search_name USING GIN (name_vector gin__int_ops);
-CREATE INDEX searchnameplacesearch_search_nameaddress_vector_idx ON search_name USING GIN (nameaddress_vector gin__int_ops);
-SELECT AddGeometryColumn('search_name', 'centroid', 4326, 'GEOMETRY', 2);
+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);
 
@@ -158,7 +177,7 @@ CREATE INDEX idx_country_geometry ON country USING GIST (geometry);
 drop table placex;
 CREATE TABLE placex (
   place_id INTEGER NOT NULL,
-  partition varchar(10),
+  partition integer,
   osm_type char(1),
   osm_id INTEGER,
   class TEXT NOT NULL,
@@ -171,9 +190,11 @@ CREATE TABLE placex (
   postcode TEXT,
   country_code varchar(2),
   extratags HSTORE,
-  street_place_id INTEGER,
+  parent_place_id INTEGER,
+  linked_place_id INTEGER,
   rank_address INTEGER,
   rank_search INTEGER,
+  importance FLOAT,
   indexed_status INTEGER,
   indexed_date TIMESTAMP,
   geometry_sector INTEGER
@@ -192,7 +213,7 @@ CREATE INDEX idx_placex_pendingsector ON placex USING BTREE (rank_search,geometr
 
 --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_street_place_id ON placex USING BTREE (street_place_id) where street_place_id 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);
@@ -244,3 +265,6 @@ CREATE INDEX idx_placex_pendingbylatlon ON placex USING BTREE (geometry_index(ge
   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);
+
+DROP SEQUENCE seq_postcodes;
+CREATE SEQUENCE seq_postcodes start 1;