hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-16 15:47:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2119 from mtmail/check-import-finished-when-tables-droped

Browse Source 
utils/check_import_finished: skip some checks when setup ran with --drop
This commit is contained in:
Sarah Hoffmann
2020-12-22 15:57:48 +01:00
committed by GitHub
parent f3e0e401fd d60f89867b
commit a8ec250993
1 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
utils/check_import_finished.php
View File

@@ -28,6 +28,13 @@ function isReverseOnlyInstallation()
return !$oDB->tableExists('search_name'); return !$oDB->tableExists('search_name');
} }
// Check (guess) if the setup.php included --drop
function isNoUpdateInstallation()
{
global $oDB;
return $oDB->tableExists('placex') && !$oDB->tableExists('planet_osm_rels') ;
}
echo 'Checking database got created ... '; echo 'Checking database got created ... ';
if ($oDB->checkConnection()) { if ($oDB->checkConnection()) {
@@ -63,27 +70,28 @@ END;
exit(1); exit(1);
} }
echo 'Checking place table ... '; if (!isNoUpdateInstallation()) {
if ($oDB->tableExists('place')) { echo 'Checking place table ... ';
$print_success(); if ($oDB->tableExists('place')) {
} else { $print_success();
$print_fail(); } else {
echo <<< END $print_fail();
* The import didn't finish. echo <<< END
Hints: * The import didn't finish.
* Check the output of the utils/setup.php you ran. Hints:
Usually the osm2pgsql step failed. Check for errors related to * Check the output of the utils/setup.php you ran.
* the file you imported not containing any places Usually the osm2pgsql step failed. Check for errors related to
* harddrive full * the file you imported not containing any places
* out of memory (RAM) * harddrive full
* osm2pgsql killed by other scripts, for consuming to much memory * out of memory (RAM)
* osm2pgsql killed by other scripts, for consuming to much memory
END; END;
exit(1); exit(1);
}
} }
echo 'Checking indexing status ... '; echo 'Checking indexing status ... ';
$iUnindexed = $oDB->getOne('SELECT count(*) FROM placex WHERE indexed_status > 0'); $iUnindexed = $oDB->getOne('SELECT count(*) FROM placex WHERE indexed_status > 0');
if ($iUnindexed == 0) { if ($iUnindexed == 0) {
@@ -106,14 +114,11 @@ $aExpectedIndices = array(
'idx_place_addressline_address_place_id', 'idx_place_addressline_address_place_id',
'idx_placex_rank_search', 'idx_placex_rank_search',
'idx_placex_rank_address', 'idx_placex_rank_address',
'idx_placex_pendingsector',
'idx_placex_parent_place_id', 'idx_placex_parent_place_id',
'idx_placex_geometry_reverse_lookuppolygon', 'idx_placex_geometry_reverse_lookuppolygon',
'idx_placex_geometry_reverse_placenode', 'idx_placex_geometry_reverse_placenode',
'idx_location_area_country_place_id',
'idx_osmline_parent_place_id', 'idx_osmline_parent_place_id',
'idx_osmline_parent_osm_id', 'idx_osmline_parent_osm_id',
'idx_place_osm_unique',
'idx_postcode_id', 'idx_postcode_id',
'idx_postcode_postcode' 'idx_postcode_postcode'
); );
@@ -125,6 +130,13 @@ if (!isReverseOnlyInstallation()) {
'idx_search_name_centroid' 'idx_search_name_centroid'
)); ));
} }
if (!isNoUpdateInstallation()) {
$aExpectedIndices = array_merge($aExpectedIndices, array(
'idx_placex_pendingsector',
'idx_location_area_country_place_id',
'idx_place_osm_unique',
));
}
foreach ($aExpectedIndices as $sExpectedIndex) { foreach ($aExpectedIndices as $sExpectedIndex) {
echo "Checking index $sExpectedIndex ... "; echo "Checking index $sExpectedIndex ... ";