PEERSTORE: Remove faulty upsert API again.

NEWS: -

3 files changed, 9 insertions, 53 deletions

diff --git a/src/include/gnunet_peerstore_service.h b/src/include/gnunet_peerstore_service.h
index 319946e1d..3fb9df82a 100644
--- a/src/include/gnunet_peerstore_service.h
+++ b/src/include/gnunet_peerstore_service.h
@@ -110,10 +110,6 @@ enum GNUNET_PEERSTORE_StoreOption
    */
   GNUNET_PEERSTORE_STOREOPTION_REPLACE = 1,
 
-  /**
-   * Upserts values. Replaces if expiry is later than existing.
-   */
-  GNUNET_PEERSTORE_STOREOPTION_UPSERT_LATER_EXPIRY = 2
 };
 
 /**
diff --git a/src/plugin/peerstore/plugin_peerstore_sqlite.c b/src/plugin/peerstore/plugin_peerstore_sqlite.c
index 373315bab..c7132bd85 100644
--- a/src/plugin/peerstore/plugin_peerstore_sqlite.c
+++ b/src/plugin/peerstore/plugin_peerstore_sqlite.c
@@ -106,11 +106,6 @@ struct Plugin
   sqlite3_stmt *select_peerstoredata_by_all;
 
   /**
-   * Precompiled SQL for selecting from peerstoredata
-   */
-  sqlite3_stmt *upsert_peerstoredata_later_expiry;
-
-  /**
    * Precompiled SQL for deleting expired
    * records from peerstoredata
    */
@@ -438,40 +433,15 @@ peerstore_sqlite_store_record (void *cls,
                                      key);
   }
 
-  if (GNUNET_PEERSTORE_STOREOPTION_UPSERT_LATER_EXPIRY == options)
-  {
-    struct GNUNET_SQ_QueryParam params_upsert[] = {
-      GNUNET_SQ_query_param_fixed_size (value, size),
-      GNUNET_SQ_query_param_absolute_time (&expiry),
-      GNUNET_SQ_query_param_string (sub_system),
-      GNUNET_SQ_query_param_auto_from_type (peer),
-      GNUNET_SQ_query_param_string (key),
-      GNUNET_SQ_query_param_absolute_time (&expiry),
-      GNUNET_SQ_query_param_end
-    };
-    stmt = plugin->upsert_peerstoredata_later_expiry;
-    if (GNUNET_OK !=
-        GNUNET_SQ_bind (stmt,
-                        params_upsert))
-    {
-      LOG_SQLITE (plugin,
-                  GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-                  "sqlite3_bind");
-      GNUNET_assert (0);
-    }
-  }
-  else
+  stmt = plugin->insert_peerstoredata;
+  if (GNUNET_OK !=
+      GNUNET_SQ_bind (stmt,
+                      params))
   {
-    stmt = plugin->insert_peerstoredata;
-    if (GNUNET_OK !=
-        GNUNET_SQ_bind (stmt,
-                        params))
-    {
-      LOG_SQLITE (plugin,
-                  GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-                  "sqlite3_bind");
-      GNUNET_assert (0);
-    }
+    LOG_SQLITE (plugin,
+                GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+                "sqlite3_bind");
+    GNUNET_assert (0);
   }
   if (SQLITE_DONE != sqlite3_step (stmt))
   {
@@ -641,16 +611,6 @@ database_setup (struct Plugin *plugin)
                " VALUES (?,?,?,?,?);",
                &plugin->insert_peerstoredata);
   sql_prepare (plugin->dbh,
-               "UPDATE peerstoredata"
-               " SET"
-               " value = ?,"
-               " expiry = ?"
-               " WHERE sub_system = ?"
-               " AND peer_id = ?"
-               " AND key = ?"
-               " AND expiry < ?",
-               &plugin->upsert_peerstoredata_later_expiry);
-  sql_prepare (plugin->dbh,
                "SELECT uid,sub_system,peer_id,key,value,expiry FROM peerstoredata"
                " WHERE sub_system = ?"
                " AND uid > ?"
diff --git a/src/service/peerstore/peerstore_api.c b/src/service/peerstore/peerstore_api.c
index bf8b990e5..9f6523e38 100644
--- a/src/service/peerstore/peerstore_api.c
+++ b/src/service/peerstore/peerstore_api.c
@@ -876,7 +876,7 @@ hello_add_iter (void *cls, const struct GNUNET_PEERSTORE_Record *record,
                                       huc->hello,
                                       ntohs (huc->hello->size),
                                       hello_exp,
-                                      GNUNET_PEERSTORE_STOREOPTION_UPSERT_LATER_EXPIRY,
+                                      GNUNET_PEERSTORE_STOREOPTION_REPLACE,
                                       &hello_store_success,
                                       huc);
     return;