safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

clean up intermediate tables earlier with --drop

Browse Source 
When --drop is given, we can remove all node geometry information
already after the import with osm2pgsql. Also drop all unnecessary
tables before creating the final indices.
This commit is contained in:
Sarah Hoffmann
2020-02-12 11:03:20 +01:00
parent 97b892fac2
commit b9171dd10b
4 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/setup/SetupClass.php
View File

@@ -16,6 +16,7 @@ class SetupFunctions
protected $bEnableDiffUpdates;
protected $bEnableDebugStatements;
protected $bNoPartitions;
protected $bDrop;
protected $oDB = null;
public function __construct(array $aCMDResult)
@@ -74,6 +75,8 @@ class SetupFunctions
} else {
$this->bEnableDiffUpdates = false;
}
$this->bDrop = $aCMDResult['drop'];
}
public function createDB()
@@ -208,6 +211,11 @@ class SetupFunctions
if (!$this->sIgnoreErrors && !$this->oDB->getRow('select * from place limit 1')) {
fail('No Data');
}
if ($this->bDrop) {
$this->dropTable('planet_osm_nodes');
$this->removeFlatnodeFile();
}
}
public function createFunctions()
@@ -576,6 +584,9 @@ class SetupFunctions
}
$sTemplate = file_get_contents(CONST_BasePath.'/sql/indices.src.sql');
if (!$this->bDrop) {
$sTemplate .= file_get_contents(CONST_BasePath.'/sql/indices_updates.src.sql');
}
if (!$this->dbReverseOnly()) {
$sTemplate .= file_get_contents(CONST_BasePath.'/sql/indices_search.src.sql');
}
@@ -655,6 +666,11 @@ class SetupFunctions
$this->dropTable($sDrop);
}
$this->removeFlatnodeFile();
}
private function removeFlatnodeFile()
{
if (!is_null(CONST_Osm2pgsql_Flatnode_File) && CONST_Osm2pgsql_Flatnode_File) {
if (file_exists(CONST_Osm2pgsql_Flatnode_File)) {
if ($this->bVerbose) echo 'Deleting '.CONST_Osm2pgsql_Flatnode_File."\n";