From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 11 Jan 2015 12:44:39 +0000 (+0100)
Subject: support tablespaces and www user config in tiger import
X-Git-Tag: v2.4.0~59
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/f156da6b63e4a3e6a65ec49d2943b88255adb4c6

support tablespaces and www user config in tiger import
---

diff --git a/sql/tiger_import_finish.sql b/sql/tiger_import_finish.sql
index a0f4efc7..4718d502 100644
--- a/sql/tiger_import_finish.sql
+++ b/sql/tiger_import_finish.sql
@@ -1,9 +1,9 @@
-CREATE INDEX idx_location_property_tiger_housenumber_parent_place_id_imp ON location_property_tiger_import (parent_place_id, housenumber);
-CREATE UNIQUE INDEX idx_location_property_tiger_place_id_imp ON location_property_tiger_import (place_id);
+CREATE INDEX idx_location_property_tiger_housenumber_parent_place_id_imp ON location_property_tiger_import (parent_place_id, housenumber) {ts:aux-index};
+CREATE UNIQUE INDEX idx_location_property_tiger_place_id_imp ON location_property_tiger_import (place_id) {ts:aux-index};
 
-GRANT SELECT ON location_property_tiger_import TO "www-data";
+GRANT SELECT ON location_property_tiger_import TO "{www-user}";
 
-DROP TABLE location_property_tiger;
+DROP TABLE IF EXISTS location_property_tiger;
 ALTER TABLE location_property_tiger_import RENAME TO location_property_tiger;
 
 ALTER INDEX idx_location_property_tiger_housenumber_parent_place_id_imp RENAME TO idx_location_property_tiger_housenumber_parent_place_id;
diff --git a/sql/tiger_import_start.sql b/sql/tiger_import_start.sql
index a6f417f2..9846f609 100644
--- a/sql/tiger_import_start.sql
+++ b/sql/tiger_import_start.sql
@@ -1,5 +1,5 @@
 DROP TABLE IF EXISTS location_property_tiger_import;
-CREATE TABLE location_property_tiger_import () INHERITS (location_property);
+CREATE TABLE location_property_tiger_import () INHERITS (location_property) {ts:aux-data};
 
 CREATE OR REPLACE FUNCTION tigger_create_interpolation(linegeo GEOMETRY, in_startnumber INTEGER, 
   in_endnumber INTEGER, interpolationtype TEXT, 
diff --git a/utils/setup.php b/utils/setup.php
index f7ebafa6..be385698 100755
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -500,7 +500,13 @@
 	{
 		$bDidSomething = true;
 
-		pgsqlRunScriptFile(CONST_BasePath.'/sql/tiger_import_start.sql');
+		$sTemplate = file_get_contents(CONST_BasePath.'/sql/tiger_import_start.sql');
+		$sTemplate = str_replace('{www-user}', CONST_Database_Web_User, $sTemplate);
+		$sTemplate = replace_tablespace('{ts:aux-data}',
+		                                CONST_Tablespace_Aux_Data, $sTemplate);
+		$sTemplate = replace_tablespace('{ts:aux-index}',
+		                                CONST_Tablespace_Aux_Index, $sTemplate);
+		pgsqlRunScript($sTemplate, false);
 
 		$aDBInstances = array();
 		for($i = 0; $i < $iInstances; $i++)
@@ -552,7 +558,13 @@
 		}
 
 		echo "Creating indexes\n";
-		pgsqlRunScriptFile(CONST_BasePath.'/sql/tiger_import_finish.sql');
+		$sTemplate = file_get_contents(CONST_BasePath.'/sql/tiger_import_finish.sql');
+		$sTemplate = str_replace('{www-user}', CONST_Database_Web_User, $sTemplate);
+		$sTemplate = replace_tablespace('{ts:aux-data}',
+		                                CONST_Tablespace_Aux_Data, $sTemplate);
+		$sTemplate = replace_tablespace('{ts:aux-index}',
+		                                CONST_Tablespace_Aux_Index, $sTemplate);
+		pgsqlRunScript($sTemplate, false);
 	}
 
 	if ($aCMDResult['calculate-postcodes'] || $aCMDResult['all'])