1 files changed, 16 insertions, 48 deletions

diff --git a/src/datastore/plugin_datastore_postgres.c b/src/datastore/plugin_datastore_postgres.c
index c004cd59f..cdd8e405e 100644
--- a/src/datastore/plugin_datastore_postgres.c
+++ b/src/datastore/plugin_datastore_postgres.c
@@ -1220,51 +1220,20 @@ postgres_plugin_replication_get (void *cls,
 
 
 /**
- * Select a subset of the items in the datastore and call
- * the given iterator for each of them.
- *
- * @param cls our "struct Plugin*"
- * @param type entries of which type should be considered?
- *        Use 0 for any type.
- * @param iter function to call on each matching value;
- *        will be called once with a NULL value at the end
- * @param iter_cls closure for iter
- */
-static void
-postgres_plugin_iter_zero_anonymity (void *cls,
-                                     enum GNUNET_BLOCK_Type type,
-                                     PluginIterator iter,
-                                     void *iter_cls)
-{
-  struct Plugin *plugin = cls;
-
-  postgres_iterate (plugin, 
-                    type, GNUNET_NO, 1,
-                    iter, iter_cls);
-}
-
-
-/**
- * Select a subset of the items in the datastore and call
- * the given iterator for each of them.
+ * Get a random item for expiration.
+ * Call 'iter' with all values ZERO or NULL if the datastore is empty.
  *
- * @param cls our "struct Plugin*"
- * @param type entries of which type should be considered?
- *        Use 0 for any type.
- * @param iter function to call on each matching value;
- *        will be called once with a NULL value at the end
+ * @param cls closure
+ * @param iter function to call the value (once only).
  * @param iter_cls closure for iter
  */
 static void
-postgres_plugin_iter_ascending_expiration (void *cls,
-                                           enum GNUNET_BLOCK_Type type,
-                                           PluginIterator iter,
-                                           void *iter_cls)
+postgres_plugin_expiration_get (void *cls,
+                                PluginIterator iter, void *iter_cls)
 {
-  struct Plugin *plugin = cls;
-
-  postgres_iterate (plugin, type, GNUNET_YES, 2,
-                    iter, iter_cls);
+  /* FIXME: not implemented! */
+  iter (iter_cls, NULL, NULL, 0, NULL, 0, 0, 0, 
+        GNUNET_TIME_UNIT_ZERO_ABS, 0);
 }
 
 
@@ -1280,14 +1249,15 @@ postgres_plugin_iter_ascending_expiration (void *cls,
  * @param iter_cls closure for iter
  */
 static void
-postgres_plugin_iter_migration_order (void *cls,
-                                      enum GNUNET_BLOCK_Type type,
-                                      PluginIterator iter,
-                                      void *iter_cls)
+postgres_plugin_iter_zero_anonymity (void *cls,
+                                     enum GNUNET_BLOCK_Type type,
+                                     PluginIterator iter,
+                                     void *iter_cls)
 {
   struct Plugin *plugin = cls;
 
-  postgres_iterate (plugin, 0, GNUNET_NO, 3, 
+  postgres_iterate (plugin, 
+                    type, GNUNET_NO, 1,
                     iter, iter_cls);
 }
 
@@ -1356,11 +1326,9 @@ libgnunet_plugin_datastore_postgres_init (void *cls)
   api->next_request = &postgres_plugin_next_request;
   api->get = &postgres_plugin_get;
   api->replication_get = &postgres_plugin_replication_get;
+  api->expiration_get = &postgres_plugin_expiration_get;
   api->update = &postgres_plugin_update;
-  api->iter_low_priority = &postgres_plugin_iter_low_priority;
   api->iter_zero_anonymity = &postgres_plugin_iter_zero_anonymity;
-  api->iter_ascending_expiration = &postgres_plugin_iter_ascending_expiration;
-  api->iter_migration_order = &postgres_plugin_iter_migration_order;
   api->iter_all_now = &postgres_plugin_iter_all_now;
   api->drop = &postgres_plugin_drop;
   GNUNET_log_from (GNUNET_ERROR_TYPE_INFO,