X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/fb6d13a1a72bab57b3abf51b335c01cac4ec42a3..1716e4b387e4a6aa210442963ba36013f61d1067:/nominatim/index.c

diff --git a/nominatim/index.c b/nominatim/index.c
index 0b87abdc..13f29273 100644
--- a/nominatim/index.c
+++ b/nominatim/index.c
@@ -40,7 +40,6 @@ void nominatim_index(int rank_min, int rank_max, int num_threads, const char *co
     int i;
     int iSector;
     int iResult;
-    int bSkip;
 
     const char *paramValues[2];
     int         paramLengths[2];
@@ -117,7 +116,7 @@ void nominatim_index(int rank_min, int rank_max, int num_threads, const char *co
             exit(EXIT_FAILURE);
         }
 
-        pg_prepare_params[0] = PG_OID_INT4;
+        pg_prepare_params[0] = PG_OID_INT8;
         res = PQprepare(thread_data[i].conn, "index_placex",
                         "update placex set indexed_status = 0 where place_id = $1",
                         1, pg_prepare_params);
@@ -128,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);
     }
@@ -146,7 +145,7 @@ void nominatim_index(int rank_min, int rank_max, int num_threads, const char *co
         writer = nominatim_exportXMLStart(structuredoutputfile);
     }
 
-    fprintf(stderr, "Starting indexing rank (%i to %i) using %i treads\n", rank_min, rank_max, num_threads);
+    fprintf(stderr, "Starting indexing rank (%i to %i) using %i threads\n", rank_min, rank_max, num_threads);
 
     for (rank = rank_min; rank <= rank_max; rank++)
     {
@@ -200,7 +199,7 @@ void nominatim_index(int rank_min, int rank_max, int num_threads, const char *co
                     PQclear(resPlaces);
                     exit(EXIT_FAILURE);
                 }
-                if (PQftype(resPlaces, 0) != PG_OID_INT4)
+                if (PQftype(resPlaces, 0) != PG_OID_INT8)
                 {
                     fprintf(stderr, "Place_id value has unexpected type\n");
                     PQclear(resPlaces);
@@ -309,6 +308,13 @@ void nominatim_index(int rank_min, int rank_max, int num_threads, const char *co
     {
         nominatim_exportXMLEnd(writer);
     }
+
+    // Close all connections
+    for (i = 0; i < num_threads; i++)
+    {
+        PQfinish(thread_data[i].conn);
+    }
+    PQfinish(conn);
 }
 
 void *nominatim_indexThread(void * thread_data_in)
@@ -321,8 +327,8 @@ void *nominatim_indexThread(void * thread_data_in)
     const char *paramValues[1];
     int         paramLengths[1];
     int         paramFormats[1];
-    uint32_t    paramPlaceID;
-    uint32_t 	place_id;
+    uint64_t    paramPlaceID;
+    uint64_t 	place_id;
     time_t 		updateStartTime;
 
     while (1)
@@ -334,12 +340,12 @@ void *nominatim_indexThread(void * thread_data_in)
             break;
         }
 
-        place_id = PGint32(*((uint32_t *)PQgetvalue(thread_data->res, *thread_data->count, 0)));
+        place_id = PGint64(*((uint64_t *)PQgetvalue(thread_data->res, *thread_data->count, 0)));
         (*thread_data->count)++;
 
         pthread_mutex_unlock( thread_data->count_mutex );
 
-        if (verbose) fprintf(stderr, "  Processing place_id %d\n", place_id);
+        if (verbose) fprintf(stderr, "  Processing place_id %ld\n", place_id);
 
         updateStartTime = time(0);
 	int done = 0;
@@ -351,8 +357,7 @@ void *nominatim_indexThread(void * thread_data_in)
 
 	while(!done)
 	{
-
-	        paramPlaceID = PGint32(place_id);
+	        paramPlaceID = PGint64(place_id);
         	paramValues[0] = (char *)&paramPlaceID;
 	        paramLengths[0] = sizeof(paramPlaceID);
         	paramFormats[0] = 1;
@@ -361,9 +366,9 @@ void *nominatim_indexThread(void * thread_data_in)
 			done = 1;
 		else
 	        {
-			if (strncmp(PQerrorMessage(thread_data->conn), "ERROR:  deadlock detected", 25))
+			if (!strncmp(PQerrorMessage(thread_data->conn), "ERROR:  deadlock detected", 25))
 			{
-		            fprintf(stderr, "index_placex: UPDATE failed - deadlock, retrying\n");
+		            fprintf(stderr, "index_placex: UPDATE failed - deadlock, retrying (%ld)\n", place_id);
 		            PQclear(res);
                             sleep(rand() % 10);
 			}
@@ -371,13 +376,12 @@ void *nominatim_indexThread(void * thread_data_in)
 			{
 		            fprintf(stderr, "index_placex: UPDATE failed: %s", PQerrorMessage(thread_data->conn));
 		            PQclear(res);
-                            sleep(rand() % 10);
-//		            exit(EXIT_FAILURE);
+		            exit(EXIT_FAILURE);
 			}
 		}
         }
         PQclear(res);
-        if (difftime(time(0), updateStartTime) > 1) fprintf(stderr, "  Slow place_id %d\n", place_id);
+        if (difftime(time(0), updateStartTime) > 1) fprintf(stderr, "  Slow place_id %ld\n", place_id);
 
         if (thread_data->writer)
         {