refactoring datastore API to use MQ API, also fixing misc. bugs in new mysql backend

8 files changed, 6 insertions, 22 deletions

diff --git a/src/fs/fs_publish.c b/src/fs/fs_publish.c
index 530a7ac9b..89cc2714c 100644
--- a/src/fs/fs_publish.c
+++ b/src/fs/fs_publish.c
@@ -266,7 +266,6 @@ publish_sblocks_cont (void *cls,
   {
     pc->qre =
         GNUNET_DATASTORE_release_reserve (pc->dsh, pc->rid, UINT_MAX, UINT_MAX,
-                                          GNUNET_TIME_UNIT_FOREVER_REL,
                                           &finish_release_reserve, pc);
   }
   else
@@ -526,7 +525,6 @@ block_proc (void *cls,
                               p->bo.replication_level,
                               p->bo.expiration_time,
                               -2, 1,
-                              GNUNET_CONSTANTS_SERVICE_TIMEOUT,
                               &ds_put_cont, pc);
     return;
   }
@@ -547,7 +545,6 @@ block_proc (void *cls,
                             p->bo.replication_level,
                             p->bo.expiration_time,
                             -2, 1,
-                            GNUNET_CONSTANTS_SERVICE_TIMEOUT,
                             &ds_put_cont,
                             pc);
 }
diff --git a/src/fs/fs_publish_ublock.c b/src/fs/fs_publish_ublock.c
index 9ea7bf41b..7de9ea689 100644
--- a/src/fs/fs_publish_ublock.c
+++ b/src/fs/fs_publish_ublock.c
@@ -294,7 +294,6 @@ GNUNET_FS_publish_ublock_ (struct GNUNET_FS_Handle *h,
                             bo->replication_level,
                             bo->expiration_time,
                             -2, 1,
-                            GNUNET_CONSTANTS_SERVICE_TIMEOUT,
                             &ublock_put_cont, uc);
   }
   else
diff --git a/src/fs/fs_unindex.c b/src/fs/fs_unindex.c
index 2e9c17217..2c4cb6ae6 100644
--- a/src/fs/fs_unindex.c
+++ b/src/fs/fs_unindex.c
@@ -215,7 +215,7 @@ unindex_process (void *cls,
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Sending REMOVE request to DATASTORE service\n");
   GNUNET_DATASTORE_remove (uc->dsh, &chk->query, size, data, -2, 1,
-                           GNUNET_CONSTANTS_SERVICE_TIMEOUT, &process_cont, uc);
+                           &process_cont, uc);
   uc->chk = *chk;
 }
 
@@ -552,7 +552,6 @@ process_kblock_for_unindex (void *cls,
                                      data,
                                      0 /* priority */,
                                      1 /* queue size */,
-                                     GNUNET_TIME_UNIT_FOREVER_REL,
                                      &continue_after_remove,
                                      uc);
   return;
@@ -563,7 +562,6 @@ process_kblock_for_unindex (void *cls,
                                       GNUNET_BLOCK_TYPE_FS_UBLOCK,
                                       0 /* priority */,
                                       1 /* queue size */,
-                                      GNUNET_TIME_UNIT_FOREVER_REL,
                                       &process_kblock_for_unindex,
                                       uc);
 }
@@ -615,7 +613,6 @@ GNUNET_FS_unindex_do_remove_kblocks_ (struct GNUNET_FS_UnindexContext *uc)
                                       GNUNET_BLOCK_TYPE_FS_UBLOCK,
                                       0 /* priority */,
                                       1 /* queue size */,
-                                      GNUNET_TIME_UNIT_FOREVER_REL,
                                       &process_kblock_for_unindex,
                                       uc);
 }
diff --git a/src/fs/gnunet-service-fs_cadet_server.c b/src/fs/gnunet-service-fs_cadet_server.c
index ccf6b3c5c..c9d838fef 100644
--- a/src/fs/gnunet-service-fs_cadet_server.c
+++ b/src/fs/gnunet-service-fs_cadet_server.c
@@ -445,7 +445,6 @@ request_cb (void *cls,
                                      ntohl (sqm->type),
                                      0 /* priority */,
                                      GSF_datastore_queue_size,
-                                     GNUNET_TIME_UNIT_FOREVER_REL,
                                      &handle_datastore_reply, sc);
   if (NULL == sc->qe)
   {
diff --git a/src/fs/gnunet-service-fs_indexing.c b/src/fs/gnunet-service-fs_indexing.c
index 9687b24bc..87de0986d 100644
--- a/src/fs/gnunet-service-fs_indexing.c
+++ b/src/fs/gnunet-service-fs_indexing.c
@@ -523,7 +523,7 @@ GNUNET_FS_handle_on_demand_block (const struct GNUNET_HashCode * key, uint32_t s
   {
     GNUNET_break (0);
     GNUNET_DATASTORE_remove (dsh, key, size, data, -1, -1,
-                             GNUNET_TIME_UNIT_FOREVER_REL, &remove_cont, NULL);
+                             &remove_cont, NULL);
     return GNUNET_SYSERR;
   }
   odb = (const struct OnDemandBlock *) data;
@@ -542,7 +542,7 @@ GNUNET_FS_handle_on_demand_block (const struct GNUNET_HashCode * key, uint32_t s
                               ("# index blocks removed: original file inaccessible"),
                               1, GNUNET_YES);
     GNUNET_DATASTORE_remove (dsh, key, size, data, -1, -1,
-                             GNUNET_TIME_UNIT_FOREVER_REL, &remove_cont, NULL);
+                             &remove_cont, NULL);
     return GNUNET_SYSERR;
   }
   if ((NULL ==
@@ -560,7 +560,7 @@ GNUNET_FS_handle_on_demand_block (const struct GNUNET_HashCode * key, uint32_t s
     if (fh != NULL)
       GNUNET_DISK_file_close (fh);
     GNUNET_DATASTORE_remove (dsh, key, size, data, -1, -1,
-                             GNUNET_TIME_UNIT_FOREVER_REL, &remove_cont, NULL);
+                             &remove_cont, NULL);
     return GNUNET_SYSERR;
   }
   GNUNET_DISK_file_close (fh);
@@ -574,7 +574,7 @@ GNUNET_FS_handle_on_demand_block (const struct GNUNET_HashCode * key, uint32_t s
                 _("Indexed file `%s' changed at offset %llu\n"), fn,
                 (unsigned long long) off);
     GNUNET_DATASTORE_remove (dsh, key, size, data, -1, -1,
-                             GNUNET_TIME_UNIT_FOREVER_REL, &remove_cont, NULL);
+                             &remove_cont, NULL);
     return GNUNET_SYSERR;
   }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
diff --git a/src/fs/gnunet-service-fs_pr.c b/src/fs/gnunet-service-fs_pr.c
index a7a62a743..d82b2a954 100644
--- a/src/fs/gnunet-service-fs_pr.c
+++ b/src/fs/gnunet-service-fs_pr.c
@@ -1149,7 +1149,6 @@ handle_dht_reply (void *cls,
                               1 /* anonymity */ ,
                               0 /* replication */ ,
                               exp, 1 + prq.priority, MAX_DATASTORE_QUEUE,
-                              GNUNET_CONSTANTS_SERVICE_TIMEOUT,
                               &put_migration_continuation, pmc))
     {
       put_migration_continuation (pmc,
@@ -1472,7 +1471,6 @@ process_local_reply (void *cls,
                                     pr->public_data.options)) ? UINT_MAX :
                                   GSF_datastore_queue_size
                                   /* max queue size */ ,
-                                  GNUNET_TIME_UNIT_FOREVER_REL,
                                   &process_local_reply, pr);
     if (NULL != pr->qe)
       return;                   /* we're done */
@@ -1492,7 +1490,7 @@ process_local_reply (void *cls,
   {
     GNUNET_break (0);
     GNUNET_DATASTORE_remove (GSF_dsh, key, size, data, -1, -1,
-                             GNUNET_TIME_UNIT_FOREVER_REL, NULL, NULL);
+                             NULL, NULL);
     pr->qe_start = GNUNET_TIME_absolute_get ();
     pr->warn_task =
         GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES,
@@ -1512,7 +1510,6 @@ process_local_reply (void *cls,
                                     pr->public_data.options)) ? UINT_MAX :
                                   GSF_datastore_queue_size
                                   /* max queue size */ ,
-                                  GNUNET_TIME_UNIT_FOREVER_REL,
                                   &process_local_reply, pr);
     if (NULL == pr->qe)
     {
@@ -1574,7 +1571,6 @@ process_local_reply (void *cls,
                                   public_data.options)) ? UINT_MAX :
                                 GSF_datastore_queue_size
                                 /* max queue size */ ,
-                                GNUNET_TIME_UNIT_FOREVER_REL,
                                 &process_local_reply, pr);
   /* check if we successfully queued another datastore request;
    * if so, return, otherwise call our continuation (if we have
@@ -1681,7 +1677,6 @@ GSF_local_lookup_ (struct GSF_PendingRequest *pr,
                                   public_data.options)) ? UINT_MAX :
                                 GSF_datastore_queue_size
                                 /* max queue size */ ,
-                                GNUNET_TIME_UNIT_FOREVER_REL,
                                 &process_local_reply, pr);
   if (NULL != pr->qe)
     return;
@@ -1795,7 +1790,6 @@ GSF_handle_p2p_content_ (struct GSF_ConnectedPeer *cp,
                               prq.priority, 1 /* anonymity */ ,
                               0 /* replication */ ,
                               expiration, 1 + prq.priority, MAX_DATASTORE_QUEUE,
-                              GNUNET_CONSTANTS_SERVICE_TIMEOUT,
                               &put_migration_continuation, pmc))
     {
       put_migration_continuation (pmc,
diff --git a/src/fs/gnunet-service-fs_push.c b/src/fs/gnunet-service-fs_push.c
index d7a15fad6..71a8e81e4 100644
--- a/src/fs/gnunet-service-fs_push.c
+++ b/src/fs/gnunet-service-fs_push.c
@@ -582,7 +582,6 @@ gather_migration_blocks (void *cls)
   value_found = GNUNET_NO;
   mig_qe =
     GNUNET_DATASTORE_get_for_replication (GSF_dsh, 0, UINT_MAX,
-                                          GNUNET_TIME_UNIT_FOREVER_REL,
                                           &process_migration_content, NULL);
   if (NULL == mig_qe)
     consider_gathering ();
diff --git a/src/fs/gnunet-service-fs_put.c b/src/fs/gnunet-service-fs_put.c
index 3517c7b24..bb4cb4ecb 100644
--- a/src/fs/gnunet-service-fs_put.c
+++ b/src/fs/gnunet-service-fs_put.c
@@ -225,7 +225,6 @@ gather_dht_put_blocks (void *cls)
   po->dht_qe =
       GNUNET_DATASTORE_get_zero_anonymity (GSF_dsh, po->current_offset++, 0,
                                            UINT_MAX,
-                                           GNUNET_TIME_UNIT_FOREVER_REL,
                                            po->dht_put_type,
                                            &process_dht_put_content, po);
   if (NULL == po->dht_qe)