improving datastore API --- not working yet

4 files changed, 54 insertions, 54 deletions

diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c
index caf534140..35d89c50f 100644
--- a/src/fs/gnunet-service-fs.c
+++ b/src/fs/gnunet-service-fs.c
@@ -1297,7 +1297,7 @@ process_migration_content (void *cls,
       MIN_MIGRATION_CONTENT_LIFETIME.rel_value)
     {
       /* content will expire soon, don't bother */
-      GNUNET_DATASTORE_get_next (dsh);
+      GNUNET_DATASTORE_iterate_get_next (dsh);
       return;
     }
   if (type == GNUNET_BLOCK_TYPE_FS_ONDEMAND)
@@ -1309,7 +1309,7 @@ process_migration_content (void *cls,
                                             &process_migration_content,
                                             NULL))
         {
-          GNUNET_DATASTORE_get_next (dsh);
+          GNUNET_DATASTORE_iterate_get_next (dsh);
         }
       return;
     }
@@ -1333,7 +1333,7 @@ process_migration_content (void *cls,
   GNUNET_CONTAINER_multihashmap_iterate (connected_peers,
                                          &consider_migration,
                                          mb);
-  GNUNET_DATASTORE_get_next (dsh);
+  GNUNET_DATASTORE_iterate_get_next (dsh);
 }
 
 
@@ -1344,7 +1344,7 @@ static void
 dht_put_continuation (void *cls,
                       const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GNUNET_DATASTORE_get_next (dsh);
+  GNUNET_DATASTORE_iterate_get_next (dsh);
 }
 
 
@@ -1455,10 +1455,10 @@ gather_dht_put_blocks (void *cls,
     {
       if (dht_put_type == GNUNET_BLOCK_TYPE_FS_ONDEMAND)
         dht_put_type = GNUNET_BLOCK_TYPE_FS_KBLOCK;
-      dht_qe = GNUNET_DATASTORE_get_zero_anonymity (dsh, 0, UINT_MAX,
-                                                    GNUNET_TIME_UNIT_FOREVER_REL,
-                                                    dht_put_type++,
-                                                    &process_dht_put_content, NULL);
+      dht_qe = GNUNET_DATASTORE_iterate_zero_anonymity (dsh, 0, UINT_MAX,
+                                                        GNUNET_TIME_UNIT_FOREVER_REL,
+                                                        dht_put_type++,
+                                                        &process_dht_put_content, NULL);
       GNUNET_assert (dht_qe != NULL);
     }
 }
@@ -3991,7 +3991,7 @@ process_local_reply (void *cls,
                                             pr))
       if (pr->qe != NULL)
         {
-          GNUNET_DATASTORE_get_next (dsh);
+          GNUNET_DATASTORE_iterate_get_next (dsh);
         }
       return;
     }
@@ -4014,7 +4014,7 @@ process_local_reply (void *cls,
                                -1, -1, 
                                GNUNET_TIME_UNIT_FOREVER_REL,
                                NULL, NULL);
-      GNUNET_DATASTORE_get_next (dsh);
+      GNUNET_DATASTORE_iterate_get_next (dsh);
       return;
     }
   prq.type = type;
@@ -4033,7 +4033,7 @@ process_local_reply (void *cls,
   if (prq.eval == GNUNET_BLOCK_EVALUATION_OK_LAST)
     {
       pr->local_only = GNUNET_YES; /* do not forward */
-      GNUNET_DATASTORE_get_next (dsh);
+      GNUNET_DATASTORE_iterate_get_next (dsh);
       return;
     }
   if ( (pr->client_request_list == NULL) &&
@@ -4048,10 +4048,10 @@ process_local_reply (void *cls,
                                 gettext_noop ("# processing result set cut short due to load"),
                                 1,
                                 GNUNET_NO);
-      GNUNET_DATASTORE_get_next (dsh);
+      GNUNET_DATASTORE_iterate_get_next (dsh);
       return;
     }
-  GNUNET_DATASTORE_get_next (dsh);
+  GNUNET_DATASTORE_iterate_get_next (dsh);
 }
 
 
@@ -4412,14 +4412,14 @@ handle_p2p_get (void *cls,
                   "Handing request for `%s' to datastore\n",
                   GNUNET_h2s (&gm->query));
 #endif
-      pr->qe = GNUNET_DATASTORE_get (dsh,
-                                     &gm->query,
-                                     type,                             
-                                     pr->priority + 1,
-                                     MAX_DATASTORE_QUEUE,                                
-                                     timeout,
-                                     &process_local_reply,
-                                     pr);
+      pr->qe = GNUNET_DATASTORE_iterate_key (dsh,
+                                             &gm->query,
+                                             type,                             
+                                             pr->priority + 1,
+                                             MAX_DATASTORE_QUEUE,
+                                             timeout,
+                                             &process_local_reply,
+                                             pr);
       if (NULL == pr->qe)
         {
           GNUNET_STATISTICS_update (stats,
@@ -4617,13 +4617,13 @@ handle_start_search (void *cls,
                                                    GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE));
   if (type == GNUNET_BLOCK_TYPE_FS_DBLOCK)
     type = GNUNET_BLOCK_TYPE_ANY; /* get on-demand blocks too! */
-  pr->qe = GNUNET_DATASTORE_get (dsh,
-                                 &sm->query,
-                                 type,
-                                 -3, -1,
-                                 GNUNET_CONSTANTS_SERVICE_TIMEOUT,                             
-                                 &process_local_reply,
-                                 pr);
+  pr->qe = GNUNET_DATASTORE_iterate_key (dsh,
+                                         &sm->query,
+                                         type,
+                                         -3, -1,
+                                         GNUNET_CONSTANTS_SERVICE_TIMEOUT,                             
+                                         &process_local_reply,
+                                         pr);
 }
 
 
diff --git a/src/fs/gnunet-service-fs_pr.c b/src/fs/gnunet-service-fs_pr.c
index c44a658df..16389e130 100644
--- a/src/fs/gnunet-service-fs_pr.c
+++ b/src/fs/gnunet-service-fs_pr.c
@@ -1047,7 +1047,7 @@ process_local_reply (void *cls,
                                             pr))
         {
           if (pr->qe != NULL)
-            GNUNET_DATASTORE_get_next (GSF_dsh);
+            GNUNET_DATASTORE_iterate_get_next (GSF_dsh);
         }
       return;
     }
@@ -1070,7 +1070,7 @@ process_local_reply (void *cls,
                                -1, -1, 
                                GNUNET_TIME_UNIT_FOREVER_REL,
                                NULL, NULL);
-      GNUNET_DATASTORE_get_next (GSF_dsh);
+      GNUNET_DATASTORE_iterate_get_next (GSF_dsh);
       return;
     }
   prq.type = type;
@@ -1112,7 +1112,7 @@ process_local_reply (void *cls,
         }
       return;
     }
-  GNUNET_DATASTORE_get_next (GSF_dsh);
+  GNUNET_DATASTORE_iterate_get_next (GSF_dsh);
 }
 
 
@@ -1132,20 +1132,20 @@ GSF_local_lookup_ (struct GSF_PendingRequest *pr,
   GNUNET_assert (NULL == pr->llc_cont);
   pr->llc_cont = cont;
   pr->llc_cont_cls = cont_cls;
-  pr->qe = GNUNET_DATASTORE_get (GSF_dsh,
-                                 &pr->public_data.query,
-                                 pr->public_data.type == GNUNET_BLOCK_TYPE_FS_DBLOCK 
-                                 ? GNUNET_BLOCK_TYPE_ANY 
-                                 : pr->public_data.type, 
-                                 (0 != (GSF_PRO_PRIORITY_UNLIMITED & pr->public_data.options))
-                                 ? UINT_MAX
-                                 : 1 /* queue priority */,
-                                 (0 != (GSF_PRO_PRIORITY_UNLIMITED & pr->public_data.options))
-                                 ? UINT_MAX
-                                 : 1 /* max queue size */,
-                                 GNUNET_TIME_UNIT_FOREVER_REL,
-                                 &process_local_reply,
-                                 pr);
+  pr->qe = GNUNET_DATASTORE_iterate_key (GSF_dsh,
+                                         &pr->public_data.query,
+                                         pr->public_data.type == GNUNET_BLOCK_TYPE_FS_DBLOCK 
+                                         ? GNUNET_BLOCK_TYPE_ANY 
+                                         : pr->public_data.type, 
+                                         (0 != (GSF_PRO_PRIORITY_UNLIMITED & pr->public_data.options))
+                                         ? UINT_MAX
+                                         : 1 /* queue priority */,
+                                         (0 != (GSF_PRO_PRIORITY_UNLIMITED & pr->public_data.options))
+                                         ? UINT_MAX
+                                         : 1 /* max queue size */,
+                                         GNUNET_TIME_UNIT_FOREVER_REL,
+                                         &process_local_reply,
+                                         pr);
 }
 
 
diff --git a/src/fs/gnunet-service-fs_push.c b/src/fs/gnunet-service-fs_push.c
index 094489273..c08b57020 100644
--- a/src/fs/gnunet-service-fs_push.c
+++ b/src/fs/gnunet-service-fs_push.c
@@ -507,7 +507,7 @@ process_migration_content (void *cls,
       MIN_MIGRATION_CONTENT_LIFETIME.rel_value)
     {
       /* content will expire soon, don't bother */
-      GNUNET_DATASTORE_get_next (GSF_dsh);
+      GNUNET_DATASTORE_iterate_get_next (GSF_dsh);
       return;
     }
   if (type == GNUNET_BLOCK_TYPE_FS_ONDEMAND)
@@ -519,7 +519,7 @@ process_migration_content (void *cls,
                                             &process_migration_content,
                                             NULL))
         {
-          GNUNET_DATASTORE_get_next (GSF_dsh);
+          GNUNET_DATASTORE_iterate_get_next (GSF_dsh);
         }
       return;
     }
@@ -556,7 +556,7 @@ process_migration_content (void *cls,
         }
       pos = pos->next;
     }
-  GNUNET_DATASTORE_get_next (GSF_dsh);
+  GNUNET_DATASTORE_iterate_get_next (GSF_dsh);
 }
 
 
diff --git a/src/fs/gnunet-service-fs_put.c b/src/fs/gnunet-service-fs_put.c
index 5fd2ce81c..121a90bcd 100644
--- a/src/fs/gnunet-service-fs_put.c
+++ b/src/fs/gnunet-service-fs_put.c
@@ -109,7 +109,7 @@ static void
 dht_put_continuation (void *cls,
                       const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GNUNET_DATASTORE_get_next (GSF_dsh);
+  GNUNET_DATASTORE_iterate_get_next (GSF_dsh);
 }
 
 
@@ -198,11 +198,11 @@ gather_dht_put_blocks (void *cls,
     return;
   if (dht_put_type == GNUNET_BLOCK_TYPE_FS_ONDEMAND)
     dht_put_type = GNUNET_BLOCK_TYPE_FS_KBLOCK;
-  dht_qe = GNUNET_DATASTORE_get_zero_anonymity (GSF_dsh, 
-                                                0, UINT_MAX,
-                                                GNUNET_TIME_UNIT_FOREVER_REL,
-                                                dht_put_type++,
-                                                &process_dht_put_content, NULL);
+  dht_qe = GNUNET_DATASTORE_iterate_zero_anonymity (GSF_dsh, 
+                                                    0, UINT_MAX,
+                                                    GNUNET_TIME_UNIT_FOREVER_REL,
+                                                    dht_put_type++,
+                                                    &process_dht_put_content, NULL);
   GNUNET_assert (dht_qe != NULL);
 }