[datastore] Combine put and update plugin APIs

This resolves issue #4965.

1 files changed, 64 insertions, 85 deletions

diff --git a/src/datastore/plugin_datastore_sqlite.c b/src/datastore/plugin_datastore_sqlite.c
index 1f874e190..469dd7717 100644
--- a/src/datastore/plugin_datastore_sqlite.c
+++ b/src/datastore/plugin_datastore_sqlite.c
@@ -95,7 +95,7 @@ struct Plugin
   /**
    * Precompiled SQL for update.
    */
-  sqlite3_stmt *updPrio;
+  sqlite3_stmt *update;
 
   /**
    * Get maximum repl value in database.
@@ -356,8 +356,8 @@ database_setup (const struct GNUNET_CONFIGURATION_Handle *cfg,
                     "SET prio = prio + ?, "
                     "repl = repl + ?, "
                     "expire = MAX(expire, ?) "
-                    "WHERE _ROWID_ = ?",
-                    &plugin->updPrio)) ||
+                    "WHERE hash = ? AND vhash = ?",
+                    &plugin->update)) ||
        (SQLITE_OK !=
         sq_prepare (plugin->dbh,
                     "UPDATE gn090 " "SET repl = MAX (0, repl - 1) WHERE _ROWID_ = ?",
@@ -450,8 +450,8 @@ database_shutdown (struct Plugin *plugin)
 
   if (NULL != plugin->delRow)
     sqlite3_finalize (plugin->delRow);
-  if (NULL != plugin->updPrio)
-    sqlite3_finalize (plugin->updPrio);
+  if (NULL != plugin->update)
+    sqlite3_finalize (plugin->update);
   if (NULL != plugin->updRepl)
     sqlite3_finalize (plugin->updRepl);
   if (NULL != plugin->selRepl)
@@ -541,6 +541,7 @@ delete_by_rowid (struct Plugin *plugin,
  *
  * @param cls closure
  * @param key key for the item
+ * @param absent true if the key was not found in the bloom filter
  * @param size number of bytes in @a data
  * @param data content stored
  * @param type type of the content
@@ -554,6 +555,7 @@ delete_by_rowid (struct Plugin *plugin,
 static void
 sqlite_plugin_put (void *cls,
                    const struct GNUNET_HashCode *key,
+                   bool absent,
                    uint32_t size,
                    const void *data,
                    enum GNUNET_BLOCK_Type type,
@@ -564,8 +566,63 @@ sqlite_plugin_put (void *cls,
                    PluginPutCont cont,
                    void *cont_cls)
 {
-  uint64_t rvalue;
+  struct Plugin *plugin = cls;
   struct GNUNET_HashCode vhash;
+  char *msg = NULL;
+
+  GNUNET_CRYPTO_hash (data,
+                      size,
+                      &vhash);
+
+  if (!absent)
+  {
+    struct GNUNET_SQ_QueryParam params[] = {
+      GNUNET_SQ_query_param_uint32 (&priority),
+      GNUNET_SQ_query_param_uint32 (&replication),
+      GNUNET_SQ_query_param_absolute_time (&expiration),
+      GNUNET_SQ_query_param_auto_from_type (key),
+      GNUNET_SQ_query_param_auto_from_type (&vhash),
+      GNUNET_SQ_query_param_end
+    };
+
+    if (GNUNET_OK !=
+        GNUNET_SQ_bind (plugin->update,
+                        params))
+    {
+      cont (cont_cls,
+            key,
+            size,
+            GNUNET_SYSERR,
+            _("sqlite bind failure"));
+      return;
+    }
+    if (SQLITE_DONE != sqlite3_step (plugin->update))
+    {
+      LOG_SQLITE_MSG (plugin, &msg, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+                      "sqlite3_step");
+      cont (cont_cls,
+            key,
+            size,
+            GNUNET_SYSERR,
+            msg);
+      GNUNET_free_non_null (msg);
+      return;
+    }
+    int changes = sqlite3_changes (plugin->dbh);
+    GNUNET_SQ_reset (plugin->dbh,
+                     plugin->update);
+    if (0 != changes)
+    {
+      cont (cont_cls,
+            key,
+            size,
+            GNUNET_NO,
+            NULL);
+      return;
+    }
+  }
+
+  uint64_t rvalue;
   uint32_t type32 = (uint32_t) type;
   struct GNUNET_SQ_QueryParam params[] = {
     GNUNET_SQ_query_param_uint32 (&replication),
@@ -579,11 +636,9 @@ sqlite_plugin_put (void *cls,
     GNUNET_SQ_query_param_fixed_size (data, size),
     GNUNET_SQ_query_param_end
   };
-  struct Plugin *plugin = cls;
   int n;
   int ret;
   sqlite3_stmt *stmt;
-  char *msg = NULL;
 
   if (size > MAX_ITEM_SIZE)
   {
@@ -598,15 +653,13 @@ sqlite_plugin_put (void *cls,
                    GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_remaining (expiration),
                                                            GNUNET_YES),
                    GNUNET_STRINGS_absolute_time_to_string (expiration));
-  GNUNET_CRYPTO_hash (data, size, &vhash);
   stmt = plugin->insertContent;
   rvalue = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK, UINT64_MAX);
   if (GNUNET_OK !=
       GNUNET_SQ_bind (stmt,
                       params))
   {
-    cont (cont_cls, key, size, GNUNET_SYSERR, msg);
-    GNUNET_free_non_null(msg);
+    cont (cont_cls, key, size, GNUNET_SYSERR, NULL);
     return;
   }
   n = sqlite3_step (stmt);
@@ -646,79 +699,6 @@ sqlite_plugin_put (void *cls,
 
 
 /**
- * Update the priority, replication and expiration for a particular
- * unique ID in the datastore.  If the expiration time in value is
- * different than the time found in the datastore, the higher value
- * should be kept.  The specified priority and replication is added
- * to the existing value.
- *
- * @param cls the plugin context (state for this module)
- * @param uid unique identifier of the datum
- * @param priority by how much should the priority
- *     change?
- * @param replication by how much should the replication
- *     change?
- * @param expire new expiration time should be the
- *     MAX of any existing expiration time and
- *     this value
- * @param cont continuation called with success or failure status
- * @param cons_cls closure for @a cont
- */
-static void
-sqlite_plugin_update (void *cls,
-                      uint64_t uid,
-                      uint32_t priority,
-                      uint32_t replication,
-                      struct GNUNET_TIME_Absolute expire,
-                      PluginUpdateCont cont,
-                      void *cont_cls)
-{
-  struct Plugin *plugin = cls;
-  struct GNUNET_SQ_QueryParam params[] = {
-    GNUNET_SQ_query_param_uint32 (&priority),
-    GNUNET_SQ_query_param_uint32 (&replication),
-    GNUNET_SQ_query_param_absolute_time (&expire),
-    GNUNET_SQ_query_param_uint64 (&uid),
-    GNUNET_SQ_query_param_end
-  };
-  int n;
-  char *msg = NULL;
-
-  if (GNUNET_OK !=
-      GNUNET_SQ_bind (plugin->updPrio,
-                      params))
-  {
-    cont (cont_cls, GNUNET_SYSERR, msg);
-    GNUNET_free_non_null(msg);
-    return;
-  }
-  n = sqlite3_step (plugin->updPrio);
-  GNUNET_SQ_reset (plugin->dbh,
-                   plugin->updPrio);
-  switch (n)
-  {
-  case SQLITE_DONE:
-    GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "sqlite", "Block updated\n");
-    cont (cont_cls, GNUNET_OK, NULL);
-    return;
-  case SQLITE_BUSY:
-    LOG_SQLITE_MSG (plugin, &msg,
-                    GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK,
-                    "sqlite3_step");
-    cont (cont_cls, GNUNET_NO, msg);
-    GNUNET_free_non_null(msg);
-    return;
-  default:
-    LOG_SQLITE_MSG (plugin, &msg, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-                    "sqlite3_step");
-    cont (cont_cls, GNUNET_SYSERR, msg);
-    GNUNET_free_non_null(msg);
-    return;
-  }
-}
-
-
-/**
  * Execute statement that gets a row and call the callback
  * with the result.  Resets the statement afterwards.
  *
@@ -1300,7 +1280,6 @@ libgnunet_plugin_datastore_sqlite_init (void *cls)
   api->cls = &plugin;
   api->estimate_size = &sqlite_plugin_estimate_size;
   api->put = &sqlite_plugin_put;
-  api->update = &sqlite_plugin_update;
   api->get_key = &sqlite_plugin_get_key;
   api->get_replication = &sqlite_plugin_get_replication;
   api->get_expiration = &sqlite_plugin_get_expiration;