de-experimentalizing

[oweals/gnunet.git] / src / datastore / plugin_datastore_template.c

diff --git a/src/datastore/plugin_datastore_template.c b/src/datastore/plugin_datastore_template.c
index fc67f600e9948537b6656f0f693d0371e4eb88de..40b191538ab2caf1ffe2cba282ee24212dbf3dc9 100644 (file)
--- a/src/datastore/plugin_datastore_template.c
+++ b/src/datastore/plugin_datastore_template.c
@@ -154,6 +154,22 @@ template_plugin_replication_get (void *cls,
 }
 
 
+/**
+ * Get a random item for expiration.
+ * Call 'iter' with all values ZERO or NULL if the datastore is empty.
+ *
+ * @param cls closure
+ * @param iter function to call the value (once only).
+ * @param iter_cls closure for iter
+ */
+static void
+template_plugin_expiration_get (void *cls,
+                               PluginIterator iter, void *iter_cls)
+{
+  GNUNET_break (0);
+}
+
+
 /**
  * Update the priority for a particular key in the datastore.  If
  * the expiration time in value is different than the time found in
@@ -189,28 +205,6 @@ template_plugin_update (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
-template_plugin_iter_low_priority (void *cls,
-                                  enum GNUNET_BLOCK_Type type,
-                                  PluginIterator iter,
-                                  void *iter_cls)
-{
-  GNUNET_break (0);
-}
-
-
-
 /**
  * Select a subset of the items in the datastore and call
  * the given iterator for each of them.
@@ -232,72 +226,6 @@ template_plugin_iter_zero_anonymity (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
-template_plugin_iter_ascending_expiration (void *cls,
-                                          enum GNUNET_BLOCK_Type type,
-                                          PluginIterator iter,
-                                          void *iter_cls)
-{
-  GNUNET_break (0);
-}
-
-
-
-/**
- * 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
-template_plugin_iter_migration_order (void *cls,
-                                     enum GNUNET_BLOCK_Type type,
-                                     PluginIterator iter,
-                                     void *iter_cls)
-{
-  GNUNET_break (0);
-}
-
-
-
-/**
- * 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
-template_plugin_iter_all_now (void *cls,
-                             enum GNUNET_BLOCK_Type type,
-                             PluginIterator iter,
-                             void *iter_cls)
-{
-  GNUNET_break (0);
-}
-
-
 /**
  * Drop database.
  */
@@ -330,12 +258,9 @@ libgnunet_plugin_datastore_template_init (void *cls)
   api->next_request = &template_plugin_next_request;
   api->get = &template_plugin_get;
   api->replication_get = &template_plugin_replication_get;
+  api->expiration_get = &template_plugin_expiration_get;
   api->update = &template_plugin_update;
-  api->iter_low_priority = &template_plugin_iter_low_priority;
   api->iter_zero_anonymity = &template_plugin_iter_zero_anonymity;
-  api->iter_ascending_expiration = &template_plugin_iter_ascending_expiration;
-  api->iter_migration_order = &template_plugin_iter_migration_order;
-  api->iter_all_now = &template_plugin_iter_all_now;
   api->drop = &template_plugin_drop;
   GNUNET_log_from (GNUNET_ERROR_TYPE_INFO,
                    "template", _("Template database running\n"));