data partitioning

[nominatim.git] / nominatim / index.c

diff --git a/nominatim/index.c b/nominatim/index.c
index e1c21a52a6f5d99b15ab48df891c93ba8138bbc4..1ae414c06f88344ebca4a7abc71aba004b7f2faf 100644 (file)
--- a/nominatim/index.c
+++ b/nominatim/index.c
@@ -51,7 +51,7 @@ void nominatim_index(int rank_min, int rank_max, int num_threads, const char *co
 
     Oid pg_prepare_params[2];
 
 
     Oid pg_prepare_params[2];
 

-       conn = PQconnectdb(conninfo);
+    conn = PQconnectdb(conninfo);

     if (PQstatus(conn) != CONNECTION_OK) {
         fprintf(stderr, "Connection to database failed: %s\n", PQerrorMessage(conn));
         exit(EXIT_FAILURE);
     if (PQstatus(conn) != CONNECTION_OK) {
         fprintf(stderr, "Connection to database failed: %s\n", PQerrorMessage(conn));
         exit(EXIT_FAILURE);


@@ -59,17 +59,25 @@ void nominatim_index(int rank_min, int rank_max, int num_threads, const char *co
 
     pg_prepare_params[0] = PG_OID_INT4;
     res = PQprepare(conn, "index_sectors",
 
     pg_prepare_params[0] = PG_OID_INT4;
     res = PQprepare(conn, "index_sectors",

-       "select geometry_sector,count(*) from placex where rank_search = $1 and indexed = false and name is not null group by geometry_sector order by geometry_sector",
+       "select geometry_sector,count(*) from placex where rank_search = $1 and indexed_status > 0 group by geometry_sector order by geometry_sector",

        1, pg_prepare_params);
        1, pg_prepare_params);

-    if (PQresultStatus(res) != PGRES_COMMAND_OK) exit(EXIT_FAILURE);
+    if (PQresultStatus(res) != PGRES_COMMAND_OK)
+    {
+        fprintf(stderr, "Failed preparing index_sectors: %s\n", PQerrorMessage(conn));
+        exit(EXIT_FAILURE);
+    }

     PQclear(res);
 
     pg_prepare_params[0] = PG_OID_INT4;
     pg_prepare_params[1] = PG_OID_INT4;
     res = PQprepare(conn, "index_sector_places",
     PQclear(res);
 
     pg_prepare_params[0] = PG_OID_INT4;
     pg_prepare_params[1] = PG_OID_INT4;
     res = PQprepare(conn, "index_sector_places",

-       "select place_id from placex where rank_search = $1 and geometry_index(geometry,indexed,name) = $2",
+       "select place_id from placex where rank_search = $1 and geometry_sector = $2 and indexed_status > 0",

        2, pg_prepare_params);
        2, pg_prepare_params);

-    if (PQresultStatus(res) != PGRES_COMMAND_OK) exit(EXIT_FAILURE);
+    if (PQresultStatus(res) != PGRES_COMMAND_OK)
+    {
+        fprintf(stderr, "Failed preparing index_sector_places: %s\n", PQerrorMessage(conn));
+        exit(EXIT_FAILURE);
+    }

     PQclear(res);
 
     // Build the data for each thread
     PQclear(res);
 
     // Build the data for each thread


@@ -82,11 +90,15 @@ void nominatim_index(int rank_min, int rank_max, int num_threads, const char *co
                exit(EXIT_FAILURE);
            }
 
                exit(EXIT_FAILURE);
            }
 

-           pg_prepare_params[0] = PG_OID_INT8;
+           pg_prepare_params[0] = PG_OID_INT4;

            res = PQprepare(thread_data[i].conn, "index_placex",
            res = PQprepare(thread_data[i].conn, "index_placex",

-               "update placex set indexed = true where place_id = $1",
+               "update placex set indexed_status = 0 where place_id = $1",

                1, pg_prepare_params);
                1, pg_prepare_params);

-           if (PQresultStatus(res) != PGRES_COMMAND_OK) exit(EXIT_FAILURE);
+           if (PQresultStatus(res) != PGRES_COMMAND_OK)
+           {
+               fprintf(stderr, "Failed preparing index_placex: %s\n", PQerrorMessage(conn));
+               exit(EXIT_FAILURE);
+           }

            PQclear(res);
 
            nominatim_exportCreatePreparedQueries(thread_data[i].conn);
            PQclear(res);
 
            nominatim_exportCreatePreparedQueries(thread_data[i].conn);


@@ -159,7 +171,7 @@ void nominatim_index(int rank_min, int rank_max, int num_threads, const char *co
                    PQclear(resPlaces);
                    exit(EXIT_FAILURE);
                }
                    PQclear(resPlaces);
                    exit(EXIT_FAILURE);
                }

-                       if (PQftype(resPlaces, 0) != PG_OID_INT8)
+                       if (PQftype(resPlaces, 0) != PG_OID_INT4)

                        {
                    fprintf(stderr, "Place_id value has unexpected type\n");
                    PQclear(resPlaces);
                        {
                    fprintf(stderr, "Place_id value has unexpected type\n");
                    PQclear(resPlaces);


@@ -236,8 +248,8 @@ void *nominatim_indexThread(void * thread_data_in)
     const char *paramValues[1];
     int         paramLengths[1];
     int         paramFormats[1];
     const char *paramValues[1];
     int         paramLengths[1];
     int         paramFormats[1];

-    uint64_t    paramPlaceID;
-    uint64_t place_id;
+    uint32_t    paramPlaceID;
+    uint32_t place_id;

 
        while(1)
        {
 
        while(1)
        {


@@ -248,13 +260,13 @@ void *nominatim_indexThread(void * thread_data_in)
                        break;
                }
 
                        break;
                }
 

-               place_id = PGint64(*((uint64_t *)PQgetvalue(thread_data->res, *thread_data->count, 0)));
+               place_id = PGint32(*((uint32_t *)PQgetvalue(thread_data->res, *thread_data->count, 0)));

                (*thread_data->count)++;
 
                pthread_mutex_unlock( thread_data->count_mutex );
 
                //printf("  Processing place_id %ld\n", place_id);
                (*thread_data->count)++;
 
                pthread_mutex_unlock( thread_data->count_mutex );
 
                //printf("  Processing place_id %ld\n", place_id);

-               paramPlaceID = PGint64(place_id);
+               paramPlaceID = PGint32(place_id);

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