4 files changed, 11 insertions, 7 deletions

diff --git a/TODO b/TODO
index 184cf33fb..bd94dcfbe 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,6 @@
 0.9.0pre3: [2'11]
 * DATASTORE:
-  - get_random seems to not just return a SINGLE value, but an entire
-    sequence of values... => migration queue overflows!
+  - postgres support currently not implemented
 * NAT/UPNP: [Milan / Ayush / MW]
   - [#1609] code clean up
   - testing
@@ -11,6 +10,8 @@
 * Transport:
   - UDP fragmentation
 * FS/CORE [CG]
+  - adjust service to deal with new datastore API (also crashes all over the place still,
+    likely related).
   - download of 100 MB file from 'leach' peer hung due to 
     failure of core-api to call back after a change preference request
     (structs indicate request was transmitted but reply never received?)
diff --git a/src/Makefile.am b/src/Makefile.am
index 1b88b08d2..7b40eeb73 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,7 +8,6 @@ if HAVE_OPENSSL
 endif
 endif
 if HAVE_EXPERIMENTAL
- DS_exp = datastore
  FS_exp = fs
 endif
 
@@ -22,7 +21,7 @@ SUBDIRS = \
   $(MONKEY_DIR) \
   peerinfo \
   datacache \
-  $(DS_exp) \
+  datastore \
   template \
   nat \
   transport \
diff --git a/src/include/gnunet_datastore_plugin.h b/src/include/gnunet_datastore_plugin.h
index f499cb827..a5c548146 100644
--- a/src/include/gnunet_datastore_plugin.h
+++ b/src/include/gnunet_datastore_plugin.h
@@ -325,9 +325,9 @@ struct GNUNET_DATASTORE_PluginFunctions
   /**
    * Function to get a random item with high replication score from
    * the database, lowering the item's replication score.  Returns a
-   * single, not expired, random item from those with the highest
-   * replication counters.  The item's replication counter is
-   * decremented by one IF it was positive before.
+   * single random item from those with the highest replication
+   * counters.  The item's replication counter is decremented by one
+   * IF it was positive before.
    */
   PluginRandomGet replication_get;
 
diff --git a/src/include/gnunet_datastore_service.h b/src/include/gnunet_datastore_service.h
index e18d4ef12..53d04e517 100644
--- a/src/include/gnunet_datastore_service.h
+++ b/src/include/gnunet_datastore_service.h
@@ -52,6 +52,10 @@ struct GNUNET_DATASTORE_QueueEntry;
  */
 struct GNUNET_DATASTORE_Handle;
 
+/**
+ * Maximum size of a value that can be stored in the datastore.
+ */
+#define GNUNET_DATASTORE_MAX_VALUE_SIZE 65536
 
 /**
  * Connect to the datastore service.