[datastore] Create remove plugin API call

The only use of vhash in the get_key call was for removing, split that out
into its own function.  This simplifies the get_key call and removes the
need for some indexes, speeding up insertion into the database.

1 files changed, 33 insertions, 47 deletions

diff --git a/src/datastore/gnunet-service-datastore.c b/src/datastore/gnunet-service-datastore.c
index d965ad8e0..53ba858e4 100644
--- a/src/datastore/gnunet-service-datastore.c
+++ b/src/datastore/gnunet-service-datastore.c
@@ -880,7 +880,6 @@ handle_get (void *cls,
                         GNUNET_ntohll (msg->next_uid),
                         msg->random,
                         NULL,
-                        NULL,
                         ntohl (msg->type),
                         &transmit_item,
                         client);
@@ -932,7 +931,6 @@ handle_get_key (void *cls,
                         GNUNET_ntohll (msg->next_uid),
                         msg->random,
                         &msg->key,
-                        NULL,
                         ntohl (msg->type),
                         &transmit_item,
                         client);
@@ -1001,50 +999,46 @@ handle_get_zero_anonymity (void *cls,
 
 
 /**
- * Callback function that will cause the item that is passed
- * in to be deleted (by returning #GNUNET_NO).
+ * Remove continuation.
  *
  * @param cls closure
  * @param key key for the content
  * @param size number of bytes in data
- * @param data content stored
- * @param type type of the content
- * @param priority priority of the content
- * @param anonymity anonymity-level for the content
- * @param replication replication-level for the content
- * @param expiration expiration time for the content
- * @param uid unique identifier for the datum
- * @return #GNUNET_OK to keep the item
- *         #GNUNET_NO to delete the item
+ * @param status #GNUNET_OK if removed, #GNUNET_NO if not found,
+ *        or #GNUNET_SYSERROR if error
+ * @param msg error message on error
  */
-static int
-remove_callback (void *cls,
-                 const struct GNUNET_HashCode *key,
-                 uint32_t size,
-                 const void *data,
-                 enum GNUNET_BLOCK_Type type,
-                 uint32_t priority,
-                 uint32_t anonymity,
-                 uint32_t replication,
-                 struct GNUNET_TIME_Absolute expiration,
-                 uint64_t uid)
+static void
+remove_continuation (void *cls,
+                     const struct GNUNET_HashCode *key,
+                     uint32_t size,
+                     int status,
+                     const char *msg)
 {
   struct GNUNET_SERVICE_Client *client = cls;
 
-  if (NULL == key)
+  if (GNUNET_SYSERR == status)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "REMOVE request failed: %s.\n",
+                msg);
+    transmit_status (client,
+                     GNUNET_NO,
+                     msg);
+    return;
+  }
+  if (GNUNET_NO == status)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "No further matches for REMOVE request.\n");
+                "Content not found for REMOVE request.\n");
     transmit_status (client,
                      GNUNET_NO,
                      _("Content not found"));
-    return GNUNET_OK;           /* last item */
+    return;
   }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Item %llu matches REMOVE request for key `%s' and type %u.\n",
-              (unsigned long long) uid,
-              GNUNET_h2s (key),
-              type);
+              "Item matches REMOVE request for key `%s'.\n",
+              GNUNET_h2s (key));
   GNUNET_STATISTICS_update (stats,
                             gettext_noop ("# bytes removed (explicit request)"),
                             size,
@@ -1054,7 +1048,6 @@ remove_callback (void *cls,
   transmit_status (client,
                    GNUNET_OK,
                    NULL);
-  return GNUNET_NO;
 }
 
 
@@ -1090,26 +1083,19 @@ handle_remove (void *cls,
                const struct DataMessage *dm)
 {
   struct GNUNET_SERVICE_Client *client = cls;
-  struct GNUNET_HashCode vhash;
 
   GNUNET_STATISTICS_update (stats,
                             gettext_noop ("# REMOVE requests received"),
                             1, GNUNET_NO);
-  GNUNET_CRYPTO_hash (&dm[1],
-                      ntohl (dm->size),
-                      &vhash);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Processing REMOVE request for `%s' of type %u\n",
-              GNUNET_h2s (&dm->key),
-              (uint32_t) ntohl (dm->type));
-  plugin->api->get_key (plugin->api->cls,
-                        0,
-                        false,
-                        &dm->key,
-                        &vhash,
-                        (enum GNUNET_BLOCK_Type) ntohl (dm->type),
-                        &remove_callback,
-                        client);
+              "Processing REMOVE request for `%s'\n",
+              GNUNET_h2s (&dm->key));
+  plugin->api->remove_key (plugin->api->cls,
+                           &dm->key,
+                           ntohl (dm->size),
+                           &dm[1],
+                           &remove_continuation,
+                           client);
   GNUNET_SERVICE_client_continue (client);
 }