keep slim tables in ssd for osm2pgsql

diff --git a/sql/indices.src.sql b/sql/indices.src.sql
index 2e5dde71e66ecb25b0cd6b3be3a4ef51247464f0..fe42a7c3965a5b11c0b76c65614b17a0a850f037 100644 (file)
--- a/sql/indices.src.sql
+++ b/sql/indices.src.sql
@@ -1,3 +1,9 @@
+-- osm2pgsql slim tables were on SSD just to speed up the import
+-- move them back to normal space
+ALTER INDEX planet_osm_nodes_pkey SET TABLESPACE "data";
+ALTER INDEX planet_osm_ways_nodes SET TABLESPACE "data";
+ALTER INDEX planet_osm_rels_parts SET TABLESPACE "data";
+

 -- Indices used only during search and update.
 -- These indices are created only after the indexing process is done.
 
 -- Indices used only during search and update.
 -- These indices are created only after the indexing process is done.
 

diff --git a/utils/setup.php b/utils/setup.php
index 663a9694c610b4ccdc2a40a0596c9df09777b592..989e9887926dca587d0090f8d3d1b968c3883c1a 100755 (executable)
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -126,7 +126,7 @@
                        echo "Please download and build osm2pgsql.\nIf it is already installed, check the path in your local settings (settings/local.php) file.\n";
                        fail("osm2pgsql not found in '$osm2pgsql'");
                }
                        echo "Please download and build osm2pgsql.\nIf it is already installed, check the path in your local settings (settings/local.php) file.\n";
                        fail("osm2pgsql not found in '$osm2pgsql'");
                }

-               $osm2pgsql .= ' --tablespace-slim-index ssd --tablespace-main-index ssd --tablespace-main-data ssd --tablespace-slim-data ssd';
+               $osm2pgsql .= ' --tablespace-slim-index ssd --tablespace-main-index ssd --tablespace-main-data ssd --tablespace-slim-data data';

                $osm2pgsql .= ' -lsc -O gazetteer --hstore';
                $osm2pgsql .= ' -C 16000';
                $osm2pgsql .= ' -d '.$aDSNInfo['database'].' '.$aCMDResult['osm-file'];
                $osm2pgsql .= ' -lsc -O gazetteer --hstore';
                $osm2pgsql .= ' -C 16000';
                $osm2pgsql .= ' -d '.$aDSNInfo['database'].' '.$aCMDResult['osm-file'];


@@ -321,6 +321,7 @@
                        echo '.';
                }
                echo "\n";
                        echo '.';
                }
                echo "\n";

+               pgsqlRunScript('ALTER TABLE place SET TABLESPACE "data"');

                echo "Reanalysing database...\n";
                pgsqlRunScript('ANALYSE');
        }
                echo "Reanalysing database...\n";
                pgsqlRunScript('ANALYSE');
        }