Merge remote-tracking branch 'upstream/master'

[nominatim.git] / nominatim / index.c

diff --git a/nominatim/index.c b/nominatim/index.c
index 2a5fa78b47ec10e5664a126d9fcbf2151c382c85..ab87bdca32272d0aaf9ffbdc290c16a13e5c056d 100644 (file)
--- a/nominatim/index.c
+++ b/nominatim/index.c
@@ -140,13 +140,7 @@ struct index_thread_data * thread_data, const char *structuredoutputfile)
 
             // Get all the place_id's for this sector
             paramRank = PGint32(rank);
 
             // Get all the place_id's for this sector
             paramRank = PGint32(rank);

-            paramValues[0] = (char *)&paramRank;
-            paramLengths[0] = sizeof(paramRank);
-            paramFormats[0] = 1;

             paramSector = PGint32(sector);
             paramSector = PGint32(sector);

-            paramValues[1] = (char *)&paramSector;
-            paramLengths[1] = sizeof(paramSector);
-            paramFormats[1] = 1;

             if (rankTotalTuples-rankCountTuples < num_threads*1000)
             {
                 // no sectors
             if (rankTotalTuples-rankCountTuples < num_threads*1000)
             {
                 // no sectors


@@ -156,6 +150,9 @@ struct index_thread_data * thread_data, const char *structuredoutputfile)
                 }
                 else
                 {
                 }
                 else
                 {

+                    paramValues[0] = (char *)&paramRank;
+                    paramLengths[0] = sizeof(paramRank);
+                    paramFormats[0] = 1;

                     iResult = PQsendQueryPrepared(conn, "index_nosector_places", 1, paramValues, paramLengths, paramFormats, 1);
                 }
             }
                     iResult = PQsendQueryPrepared(conn, "index_nosector_places", 1, paramValues, paramLengths, paramFormats, 1);
                 }
             }


@@ -163,11 +160,20 @@ struct index_thread_data * thread_data, const char *structuredoutputfile)
             {
                 if (interpolation)
                 {
             {
                 if (interpolation)
                 {

-                    iResult = PQsendQueryPrepared(conn, "index_sector_places", 2, paramValues, paramLengths, paramFormats, 1);
+                    iResult = PQsendQueryPrepared(conn, "index_sector_places_osmline", 1, paramValues, paramLengths, paramFormats, 1);
+                    paramValues[0] = (char *)&paramSector;
+                    paramLengths[0] = sizeof(paramSector);
+                    paramFormats[0] = 1;

                 }
                 else
                 {
                 }
                 else
                 {

-                    iResult = PQsendQueryPrepared(conn, "index_sector_places_osmline", 1, paramValues, paramLengths, paramFormats, 1);
+                    paramValues[0] = (char *)&paramRank;
+                    paramLengths[0] = sizeof(paramRank);
+                    paramFormats[0] = 1;
+                    paramValues[1] = (char *)&paramSector;
+                    paramLengths[1] = sizeof(paramSector);
+                    paramFormats[1] = 1;
+                    iResult = PQsendQueryPrepared(conn, "index_sector_places", 2, paramValues, paramLengths, paramFormats, 1);

                 }
             }
             if (!iResult)
                 }
             }
             if (!iResult)


@@ -212,10 +218,18 @@ struct index_thread_data * thread_data, const char *structuredoutputfile)
                     usleep(1000);
 
                     // Aim for one update per second
                     usleep(1000);
 
                     // Aim for one update per second

-                    if (sleepcount++ > 500)
+                    if (sleepcount++ > 1000)

                     {
                         rankPerSecond = ((float)rankCountTuples + (float)count) / MAX(difftime(time(0), rankStartTime),1);
                     {
                         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);
+                        if(interpolation)
+                        {
+                            fprintf(stderr, "  Done %i in %i @ %f per second - Interpolation lines ETA (seconds): %f\n", (rankCountTuples + count), (int)(difftime(time(0), rankStartTime)), rankPerSecond, ((float)(rankTotalTuples - (rankCountTuples + count)))/rankPerSecond);
+                        }
+                        else
+                        {
+                            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);
+                        }
+                        

                         sleepcount = 0;
                     }
                 }
                         sleepcount = 0;
                     }
                 }


@@ -244,8 +258,6 @@ struct index_thread_data * thread_data, const char *structuredoutputfile)
     fprintf(stderr, "\r  Done %i in %i @ %f per second - FINISHED\n\n", rankCountTuples, (int)(difftime(time(0), rankStartTime)), rankPerSecond);
 
     PQclear(resSectors);
     fprintf(stderr, "\r  Done %i in %i @ %f per second - FINISHED\n\n", rankCountTuples, (int)(difftime(time(0), rankStartTime)), rankPerSecond);
 
     PQclear(resSectors);

-    
-    

 }
 
 void nominatim_index(int rank_min, int rank_max, int num_threads, const char *conninfo, const char *structuredoutputfile)
 }
 
 void nominatim_index(int rank_min, int rank_max, int num_threads, const char *conninfo, const char *structuredoutputfile)


@@ -364,7 +376,7 @@ void nominatim_index(int rank_min, int rank_max, int num_threads, const char *co
                         1, pg_prepare_params);
         if (PQresultStatus(res) != PGRES_COMMAND_OK)
         {
                         1, pg_prepare_params);
         if (PQresultStatus(res) != PGRES_COMMAND_OK)
         {

-            fprintf(stderr, "Failed preparing index_placex: %s\n", PQerrorMessage(conn));
+            fprintf(stderr, "Failed preparing index_placex: %s\n", PQerrorMessage(thread_data[i].conn));

             exit(EXIT_FAILURE);
         }
         PQclear(res);
             exit(EXIT_FAILURE);
         }
         PQclear(res);


@@ -375,18 +387,19 @@ void nominatim_index(int rank_min, int rank_max, int num_threads, const char *co
                         1, pg_prepare_params);
         if (PQresultStatus(res) != PGRES_COMMAND_OK)
         {
                         1, pg_prepare_params);
         if (PQresultStatus(res) != PGRES_COMMAND_OK)
         {

-            fprintf(stderr, "Failed preparing index_osmline: %s\n", PQerrorMessage(conn));
+            fprintf(stderr, "Failed preparing index_osmline: %s\n", PQerrorMessage(thread_data[i].conn));

             exit(EXIT_FAILURE);
         }
         PQclear(res);
 
             exit(EXIT_FAILURE);
         }
         PQclear(res);
 

-        /*res = PQexec(thread_data[i].conn, "set enable_seqscan = false");
+        // Make sure the error message is not localized as we parse it later.
+        res = PQexec(thread_data[i].conn, "SET lc_messages TO 'C'");

         if (PQresultStatus(res) != PGRES_COMMAND_OK)
         {
         if (PQresultStatus(res) != PGRES_COMMAND_OK)
         {

-            fprintf(stderr, "Failed disabling sequential scan: %s\n", PQerrorMessage(conn));
+            fprintf(stderr, "Failed to set langauge: %s\n", PQerrorMessage(thread_data[i].conn));

             exit(EXIT_FAILURE);
         }
             exit(EXIT_FAILURE);
         }

-        PQclear(res);*/
+        PQclear(res);

 
         nominatim_exportCreatePreparedQueries(thread_data[i].conn);
     }
 
         nominatim_exportCreatePreparedQueries(thread_data[i].conn);
     }


@@ -404,17 +417,12 @@ void nominatim_index(int rank_min, int rank_max, int num_threads, const char *co
         }
         run_indexing(rank, 0, conn, num_threads, thread_data, structuredoutputfile);
     }
         }
         run_indexing(rank, 0, conn, num_threads, thread_data, structuredoutputfile);
     }

-            
-
-    if (rank == 30)
-    {
-        // Close all connections
-        for (i = 0; i < num_threads; i++)
-        {
-            PQfinish(thread_data[i].conn);
-        }
-        PQfinish(conn);
-    }
+       // Close all connections
+       for (i = 0; i < num_threads; i++)
+       {
+               PQfinish(thread_data[i].conn);
+       }
+       PQfinish(conn);

 }
 
 void *nominatim_indexThread(void * thread_data_in)
 }
 
 void *nominatim_indexThread(void * thread_data_in)