1 files changed, 2 insertions, 59 deletions

diff --git a/src/peerstore/plugin_peerstore_sqlite.c b/src/peerstore/plugin_peerstore_sqlite.c
index ead2aade6..8d35466de 100644
--- 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.
  */
@@ -98,11 +100,6 @@ struct Plugin
   sqlite3_stmt *select_peerstoredata_by_all;
 
   /**
-   * Precompiled SQL for selecting from peerstoredata
-   */
-  sqlite3_stmt *select_peerstoredata_by_all_and_value;
-
-  /**
    * Precompiled SQL for deleting expired records from peerstoredata
    */
   sqlite3_stmt *expire_peerstoredata;
@@ -237,42 +234,6 @@ peerstore_sqlite_iterate_records (void *cls,
 }
 
 /**
- * Checks if a record with the given information
- * already exists
- *
- * @return #GNUNET_YES / #GNUNET_NO
- *
-static int
-check_existing(void *cls,
-    const char *sub_system,
-    const struct GNUNET_PeerIdentity *peer,
-    const char *key,
-    const void *value,
-    size_t size)
-{
-  struct Plugin *plugin = cls;
-  sqlite3_stmt *stmt = plugin->select_peerstoredata_by_all_and_value;
-  int sret;
-
-  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)
-      || SQLITE_OK != sqlite3_bind_blob(stmt, 4, value, size, SQLITE_STATIC))
-  {
-    LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-        "sqlite3_bind");
-    sqlite3_reset(stmt);
-    return GNUNET_NO;
-  }
-  sret = sqlite3_step (stmt);
-  sqlite3_reset(stmt);
-  if(SQLITE_ROW == sret)
-    return GNUNET_YES;
-  return GNUNET_NO;
-
-}*/
-
-/**
  * Store a record in the peerstore.
  * Key is the combination of sub system and peer identity.
  * One key can store multiple values.
@@ -296,17 +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(GNUNET_YES == check_existing(cls,
-      sub_system,
-      peer,
-      key,
-      value,
-      size))
-  {
-
-  }*/
-
   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)
@@ -466,13 +416,6 @@ database_setup (struct Plugin *plugin)
       " AND key = ?",
       &plugin->select_peerstoredata_by_all);
   sql_prepare(plugin->dbh,
-      "SELECT * FROM peerstoredata"
-      " WHERE sub_system = ?"
-      " AND peer_id = ?"
-      " AND key = ?"
-      " AND value = ?",
-      &plugin->select_peerstoredata_by_all_and_value);
-  sql_prepare(plugin->dbh,
       "DELETE FROM peerstoredata"
       " WHERE expiry < ?",
       &plugin->expire_peerstoredata);