[datastore] Combine put and update plugin APIs

This resolves issue #4965.

1 files changed, 22 insertions, 172 deletions

diff --git a/src/datastore/gnunet-service-datastore.c b/src/datastore/gnunet-service-datastore.c
index 277530843..d965ad8e0 100644
--- a/src/datastore/gnunet-service-datastore.c
+++ b/src/datastore/gnunet-service-datastore.c
@@ -733,41 +733,23 @@ check_data (const struct DataMessage *dm)
 
 
 /**
- * Context for a PUT request used to see if the content is
- * already present.
- */
-struct PutContext
-{
-  /**
-   * Client to notify on completion.
-   */
-  struct GNUNET_SERVICE_Client *client;
-
-#if ! HAVE_UNALIGNED_64_ACCESS
-  void *reserved;
-#endif
-
-  /* followed by the 'struct DataMessage' */
-};
-
-
-/**
  * Put continuation.
  *
  * @param cls closure
  * @param key key for the item stored
  * @param size size of the item stored
- * @param status #GNUNET_OK or #GNUNET_SYSERROR
+ * @param status #GNUNET_OK if inserted, #GNUNET_NO if updated,
+ *        or #GNUNET_SYSERROR if error
  * @param msg error message on error
  */
 static void
 put_continuation (void *cls,
-                  const struct GNUNET_HashCode *key,
-                  uint32_t size,
+                  const struct GNUNET_HashCode *key,
+                  uint32_t size,
                   int status,
-                  const char *msg)
+                  const char *msg)
 {
-  struct PutContext *pc = cls;
+  struct GNUNET_SERVICE_Client *client = cls;
 
   if (GNUNET_OK == status)
   {
@@ -782,10 +764,9 @@ put_continuation (void *cls,
                 size,
                 GNUNET_h2s (key));
   }
-  transmit_status (pc->client,
-                   status,
+  transmit_status (client,
+                   GNUNET_SYSERR == status ? GNUNET_SYSERR : GNUNET_OK,
                    msg);
-  GNUNET_free (pc);
   if (quota - reserved - cache_size < payload)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
@@ -799,125 +780,6 @@ put_continuation (void *cls,
 
 
 /**
- * Actually put the data message.
- *
- * @param pc put context
- */
-static void
-execute_put (struct PutContext *pc)
-{
-  const struct DataMessage *dm;
-
-  dm = (const struct DataMessage *) &pc[1];
-  plugin->api->put (plugin->api->cls,
-                    &dm->key,
-                    ntohl (dm->size),
-                    &dm[1],
-                    ntohl (dm->type),
-                    ntohl (dm->priority),
-                    ntohl (dm->anonymity),
-                    ntohl (dm->replication),
-                    GNUNET_TIME_absolute_ntoh (dm->expiration),
-                    &put_continuation,
-                    pc);
-}
-
-
-/**
- *
- * @param cls closure
- * @param status #GNUNET_OK or #GNUNET_SYSERR
- * @param msg error message on error
- */
-static void
-check_present_continuation (void *cls,
-                            int status,
-                            const char *msg)
-{
-  struct GNUNET_SERVICE_Client *client = cls;
-
-  transmit_status (client,
-                   GNUNET_NO,
-                   NULL);
-}
-
-
-/**
- * Function that will check if the given datastore entry
- * matches the put and if none match executes the put.
- *
- * @param cls closure, pointer to the client (of type `struct PutContext`).
- * @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;
- *        maybe 0 if no unique identifier is available
- * @return #GNUNET_OK usually
- *         #GNUNET_NO to delete the item
- */
-static int
-check_present (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)
-{
-  struct PutContext *pc = cls;
-  const struct DataMessage *dm;
-
-  dm = (const struct DataMessage *) &pc[1];
-  if (key == NULL)
-  {
-    execute_put (pc);
-    return GNUNET_OK;
-  }
-  if ( (GNUNET_BLOCK_TYPE_FS_DBLOCK == type) ||
-       (GNUNET_BLOCK_TYPE_FS_IBLOCK == type) ||
-       ( (size == ntohl (dm->size)) &&
-         (0 == memcmp (&dm[1],
-                       data,
-                       size)) ) )
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Result already present in datastore\n");
-    if ( (ntohl (dm->priority) > 0) ||
-         (ntohl (dm->replication) > 0) ||
-         (GNUNET_TIME_absolute_ntoh (dm->expiration).abs_value_us >
-          expiration.abs_value_us) )
-      plugin->api->update (plugin->api->cls,
-                           uid,
-                           ntohl (dm->priority),
-                           ntohl (dm->replication),
-                           GNUNET_TIME_absolute_ntoh (dm->expiration),
-                           &check_present_continuation,
-                           pc->client);
-    else
-    {
-      transmit_status (pc->client,
-                       GNUNET_NO,
-                       NULL);
-    }
-    GNUNET_free (pc);
-  }
-  else
-  {
-    execute_put (pc);
-  }
-  return GNUNET_OK;
-}
-
-
-/**
  * Verify PUT-message.
  *
  * @param cls identification of the client
@@ -950,8 +812,6 @@ handle_put (void *cls,
   struct GNUNET_SERVICE_Client *client = cls;
   int rid;
   struct ReservationList *pos;
-  struct PutContext *pc;
-  struct GNUNET_HashCode vhash;
   uint32_t size;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -979,30 +839,20 @@ handle_put (void *cls,
                              GNUNET_NO);
     }
   }
-  pc = GNUNET_malloc (sizeof (struct PutContext) + size +
-                      sizeof (struct DataMessage));
-  pc->client = client;
-  GNUNET_memcpy (&pc[1],
-                 dm,
-                 size + sizeof (struct DataMessage));
-  if (GNUNET_YES == GNUNET_CONTAINER_bloomfilter_test (filter,
-                                                       &dm->key))
-  {
-    GNUNET_CRYPTO_hash (&dm[1],
-                        size,
-                        &vhash);
-    plugin->api->get_key (plugin->api->cls,
-                          0,
-                          false,
-                          &dm->key,
-                          &vhash,
-                          ntohl (dm->type),
-                          &check_present,
-                          pc);
-    GNUNET_SERVICE_client_continue (client);
-    return;
-  }
-  execute_put (pc);
+  bool absent = GNUNET_NO == GNUNET_CONTAINER_bloomfilter_test (filter,
+                                                                &dm->key);
+  plugin->api->put (plugin->api->cls,
+                    &dm->key,
+                    absent,
+                    ntohl (dm->size),
+                    &dm[1],
+                    ntohl (dm->type),
+                    ntohl (dm->priority),
+                    ntohl (dm->anonymity),
+                    ntohl (dm->replication),
+                    GNUNET_TIME_absolute_ntoh (dm->expiration),
+                    &put_continuation,
+                    client);
   GNUNET_SERVICE_client_continue (client);
 }