peerstore: fixes in watch functionality

[oweals/gnunet.git] / src / peerstore / plugin_peerstore_sqlite.c

diff --git a/src/peerstore/plugin_peerstore_sqlite.c b/src/peerstore/plugin_peerstore_sqlite.c
index c44914f433c21ac1c78cf73893de8f67fb8de0e5..8d35466de10240adae1409af7a75d242f425afc3 100644 (file)
--- a/src/peerstore/plugin_peerstore_sqlite.c
+++ b/src/peerstore/plugin_peerstore_sqlite.c
@@ -51,6 +51,8 @@
 
 #define LOG(kind,...) GNUNET_log_from (kind, "peerstore-sqlite", __VA_ARGS__)
 
+//FIXME: Indexes
+
 /**
  * Context for all functions in this plugin.
  */
@@ -97,8 +99,46 @@ struct Plugin
    */
   sqlite3_stmt *select_peerstoredata_by_all;
 
+  /**
+   * Precompiled SQL for deleting expired records from peerstoredata
+   */
+  sqlite3_stmt *expire_peerstoredata;
+
 };
 
+/**
+ * Delete expired records (expiry < now)
+ *
+ * @param cls closure (internal context for the plugin)
+ * @param now time to use as reference
+ * @return number of records deleted
+ */
+static int
+peerstore_sqlite_expire_records(void *cls,
+    struct GNUNET_TIME_Absolute now)
+{
+  struct Plugin *plugin = cls;
+  sqlite3_stmt *stmt = plugin->expire_peerstoredata;
+
+  if(SQLITE_OK != sqlite3_bind_int64(stmt, 1, (sqlite3_int64)now.abs_value_us))
+  {
+    LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, "sqlite3_bind");
+  }
+  else if (SQLITE_DONE != sqlite3_step (stmt))
+  {
+    LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+                "sqlite3_step");
+  }
+  if (SQLITE_OK != sqlite3_reset (stmt))
+  {
+    LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+                "sqlite3_reset");
+    return 0;
+  }
+  return sqlite3_changes(plugin->dbh);
+
+}
+
 /**
  * Iterate over the records given an optional peer id
  * and/or key.
@@ -116,18 +156,15 @@ peerstore_sqlite_iterate_records (void *cls,
     const char *sub_system,
     const struct GNUNET_PeerIdentity *peer,
     const char *key,
-    GNUNET_PEERSTORE_RecordIterator iter, void *iter_cls)
+    GNUNET_PEERSTORE_Processor iter, void *iter_cls)
 {
   struct Plugin *plugin = cls;
   sqlite3_stmt *stmt;
   int err = 0;
   int sret;
-  const char *ret_sub_system;
-  const struct GNUNET_PeerIdentity *ret_peer;
-  const char *ret_key;
-  const void *ret_value;
-  size_t ret_value_size;
+  struct GNUNET_PEERSTORE_Record *ret;
 
+  LOG(GNUNET_ERROR_TYPE_DEBUG, "Executing iterate request on sqlite db.\n");
   if(NULL == peer && NULL == key)
   {
     stmt = plugin->select_peerstoredata;
@@ -165,13 +202,19 @@ peerstore_sqlite_iterate_records (void *cls,
   }
   while (SQLITE_ROW == (sret = sqlite3_step (stmt)))
   {
-    ret_sub_system = (const char *)sqlite3_column_text(stmt, 0);
-    ret_peer = sqlite3_column_blob(stmt, 1);
-    ret_key = (const char *)sqlite3_column_text(stmt, 2);
-    ret_value = sqlite3_column_blob(stmt, 3);
-    ret_value_size = sqlite3_column_bytes(stmt, 3);
+    LOG(GNUNET_ERROR_TYPE_DEBUG, "Returning a matched record.\n");
+    ret = GNUNET_new(struct GNUNET_PEERSTORE_Record);
+    ret->sub_system = (char *)sqlite3_column_text(stmt, 0);
+    ret->peer = (struct GNUNET_PeerIdentity *)sqlite3_column_blob(stmt, 1);
+    ret->key = (char *)sqlite3_column_text(stmt, 2);
+    ret->value = (void *)sqlite3_column_blob(stmt, 3);
+    ret->value_size = sqlite3_column_bytes(stmt, 3);
+    ret->expiry = GNUNET_new(struct GNUNET_TIME_Absolute);
+    ret->expiry->abs_value_us = (uint64_t)sqlite3_column_int64(stmt, 4);
     if (NULL != iter)
-      iter (iter_cls, ret_sub_system, ret_peer, ret_key, ret_value, ret_value_size);
+      iter (iter_cls,
+          ret,
+          NULL);
   }
   if (SQLITE_DONE != sret)
   {
@@ -214,8 +257,6 @@ peerstore_sqlite_store_record(void *cls,
   struct Plugin *plugin = cls;
   sqlite3_stmt *stmt = plugin->insert_peerstoredata;
 
-  //FIXME: check if value exists with the same key first
-
   if(SQLITE_OK != sqlite3_bind_text(stmt, 1, sub_system, strlen(sub_system) + 1, SQLITE_STATIC)
       || SQLITE_OK != sqlite3_bind_blob(stmt, 2, peer, sizeof(struct GNUNET_PeerIdentity), SQLITE_STATIC)
       || SQLITE_OK != sqlite3_bind_text(stmt, 3, key, strlen(key) + 1, SQLITE_STATIC)
@@ -374,6 +415,10 @@ database_setup (struct Plugin *plugin)
       " AND peer_id = ?"
       " AND key = ?",
       &plugin->select_peerstoredata_by_all);
+  sql_prepare(plugin->dbh,
+      "DELETE FROM peerstoredata"
+      " WHERE expiry < ?",
+      &plugin->expire_peerstoredata);
 
   return GNUNET_OK;
 }
@@ -427,6 +472,7 @@ libgnunet_plugin_peerstore_sqlite_init (void *cls)
   api->cls = &plugin;
   api->store_record = &peerstore_sqlite_store_record;
   api->iterate_records = &peerstore_sqlite_iterate_records;
+  api->expire_records = &peerstore_sqlite_expire_records;
   LOG(GNUNET_ERROR_TYPE_DEBUG, "Sqlite plugin is running\n");
   return api;
 }