hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-12 05:44:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

- remove dependency on intarray extension

Browse Source 
- new config options for postgresql version and 
  location of osm2pgsql and osmosis binaries
- new option --no-npi for update.php that supresses writing of NPIs in
  osmosis update mode
- add more GRANTs for www-data
This commit is contained in:
Sarah Hoffmann
2012-01-21 10:21:42 +00:00
parent d7f4a7dac6
commit cc564e2f31
8 changed files with 103 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nominatim/index.c
View File

@@ -127,13 +127,13 @@ void nominatim_index(int rank_min, int rank_max, int num_threads, const char *co
}
PQclear(res);
res = PQexec(thread_data[i].conn, "set enable_seqscan = false");
/*res = PQexec(thread_data[i].conn, "set enable_seqscan = false");
if (PQresultStatus(res) != PGRES_COMMAND_OK)
{
fprintf(stderr, "Failed disabling sequential scan: %s\n", PQerrorMessage(conn));
exit(EXIT_FAILURE);
}
PQclear(res);
PQclear(res);*/
nominatim_exportCreatePreparedQueries(thread_data[i].conn);
}
@@ -270,7 +270,7 @@ void nominatim_index(int rank_min, int rank_max, int num_threads, const char *co
usleep(1000);
// Aim for one update per second
if (sleepcount++ > 500)
if (sleepcount++ > 2000)
{
rankPerSecond = ((float)rankCountTuples + (float)count) / MAX(difftime(time(0), rankStartTime),1);
fprintf(stderr, " Done %i in %i @ %f per second - Rank %i ETA (seconds): %f\n", (rankCountTuples + count), (int)(difftime(time(0), rankStartTime)), rankPerSecond, rank, ((float)(rankTotalTuples - (rankCountTuples + count)))/rankPerSecond);