removing "unused variable" error
[oweals/gnunet.git] / src / datastore / plugin_datastore_sqlite.c
index 1576cef00694e3ff5958d4ea4e87edddf85e58e2..4799b6bcaea7639c831fe5a3e36838a5fa5eae86 100644 (file)
@@ -4,7 +4,7 @@
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
  */
 
 #include "platform.h"
-#include "gnunet_statistics_service.h"
-#include "plugin_datastore.h"
+#include "gnunet_datastore_plugin.h"
 #include <sqlite3.h>
 
-#define DEBUG_SQLITE GNUNET_YES
+#define DEBUG_SQLITE GNUNET_NO
 
-/**
- * After how many payload-changing operations
- * do we sync our statistics?
- */
-#define MAX_STAT_SYNC_LAG 50
-
-#define QUOTA_STAT_NAME gettext_noop ("# bytes used in file-sharing datastore")
 
 /**
  * Log an error message at log-level 'level' that indicates
@@ -112,6 +104,11 @@ struct Plugin
    */
   sqlite3 *dbh;
 
+  /**
+   * Precompiled SQL for deletion.
+   */
+  sqlite3_stmt *delRow;
+
   /**
    * Precompiled SQL for update.
    */
@@ -122,16 +119,6 @@ struct Plugin
    */
   sqlite3_stmt *insertContent;
 
-  /**
-   * Handle to the statistics service.
-   */
-  struct GNUNET_STATISTICS_Handle *statistics;
-
-  /**
-   * Handle for pending get request.
-   */
-  struct GNUNET_STATISTICS_GetHandle *stat_get;
-
   /**
    * Closure of the 'next_task' (must be freed if 'next_task' is cancelled).
    */
@@ -141,29 +128,12 @@ struct Plugin
    * Pending task with scheduler for running the next request.
    */
   GNUNET_SCHEDULER_TaskIdentifier next_task;
-  
-  /**
-   * How much data are we currently storing
-   * in the database?
-   */
-  unsigned long long payload;
-
-  /**
-   * Number of updates that were made to the
-   * payload value since we last synchronized
-   * it with the statistics service.
-   */
-  unsigned int lastSync;
 
   /**
    * Should the database be dropped on shutdown?
    */
   int drop_on_shutdown;
 
-  /**
-   * Did we get an answer from statistics?
-   */
-  int stats_worked;
 };
 
 
@@ -180,9 +150,16 @@ sq_prepare (sqlite3 * dbh, const char *zSql,
             sqlite3_stmt ** ppStmt)
 {
   char *dummy;
-  return sqlite3_prepare (dbh,
-                          zSql,
-                          strlen (zSql), ppStmt, (const char **) &dummy);
+  int result;
+  result = sqlite3_prepare_v2 (dbh,
+                              zSql,
+                              strlen (zSql), ppStmt, (const char **) &dummy);
+#if DEBUG_SQLITE
+  GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
+                  "sqlite",
+                   "Prepared %p: %d\n", *ppStmt, result);
+#endif
+  return result;
 }
 
 
@@ -214,13 +191,13 @@ create_indices (sqlite3 * dbh)
 
 
 
-#if 1
+#if 0
 #define CHECK(a) GNUNET_break(a)
 #define ENULL NULL
 #else
 #define ENULL &e
 #define ENULL_DEFINED 1
-#define CHECK(a) if (! a) { GNUNET_log(GNUNET_ERROR_TYPE_ERRROR, "%s\n", e); sqlite3_free(e); }
+#define CHECK(a) if (! a) { GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "%s\n", e); sqlite3_free(e); }
 #endif
 
 
@@ -267,20 +244,15 @@ database_setup (const struct GNUNET_CONFIGURATION_Handle *cfg,
          return GNUNET_SYSERR;
        }
       /* database is new or got deleted, reset payload to zero! */
-      if (plugin->stat_get != NULL)
-       {
-         GNUNET_STATISTICS_get_cancel (plugin->stat_get);
-         plugin->stat_get = NULL;
-       }
-      plugin->payload = 0;
+      plugin->env->duc (plugin->env->cls, 0);
     }
-  plugin->fn = GNUNET_STRINGS_to_utf8 (afsdir, strlen (afsdir),
 #ifdef ENABLE_NLS
-                                             nl_langinfo (CODESET)
+  plugin->fn = GNUNET_STRINGS_to_utf8 (afsdir, strlen (afsdir),
+                                      nl_langinfo (CODESET));
 #else
-                                             "UTF-8"   /* good luck */
+  plugin->fn = GNUNET_STRINGS_to_utf8 (afsdir, strlen (afsdir),
+                                      "UTF-8");   /* good luck */
 #endif
-                                             );
   GNUNET_free (afsdir);
   
   /* Open database and precompile statements */
@@ -364,29 +336,17 @@ database_setup (const struct GNUNET_CONFIGURATION_Handle *cfg,
                    "INSERT INTO gn080 (size, type, prio, "
                    "anonLevel, expire, hash, vhash, value) VALUES "
                    "(?, ?, ?, ?, ?, ?, ?, ?)",
-                   &plugin->insertContent) != SQLITE_OK))
+                   &plugin->insertContent) != SQLITE_OK) ||
+      (sq_prepare (plugin->dbh,
+                   "DELETE FROM gn080 WHERE _ROWID_ = ?",
+                   &plugin->delRow) != SQLITE_OK))
     {
       LOG_SQLITE (plugin, NULL,
                   GNUNET_ERROR_TYPE_ERROR, "precompiling");
       return GNUNET_SYSERR;
     }
-  return GNUNET_OK;
-}
-
 
-/**
- * Synchronize our utilization statistics with the 
- * statistics service.
- * @param plugin the plugin context (state for this module)
- */
-static void 
-sync_stats (struct Plugin *plugin)
-{
-  GNUNET_STATISTICS_set (plugin->statistics,
-                        QUOTA_STAT_NAME,
-                        plugin->payload,
-                        GNUNET_YES);
-  plugin->lastSync = 0;
+  return GNUNET_OK;
 }
 
 
@@ -398,28 +358,48 @@ sync_stats (struct Plugin *plugin)
 static void
 database_shutdown (struct Plugin *plugin)
 {
-  if (plugin->lastSync > 0)
-    sync_stats (plugin);
+  int result;
+  sqlite3_stmt *stmt;
+  stmt = NULL;
+
+  if (plugin->delRow != NULL)
+    sqlite3_finalize (plugin->delRow);
   if (plugin->updPrio != NULL)
     sqlite3_finalize (plugin->updPrio);
   if (plugin->insertContent != NULL)
     sqlite3_finalize (plugin->insertContent);
-  sqlite3_close (plugin->dbh);
-  GNUNET_free_non_null (plugin->fn);
-}
-
+  result = sqlite3_close(plugin->dbh);
+#if SQLITE_VERSION_NUMBER >= 3007000
+  if (result == SQLITE_BUSY)
+    {
+      GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING, 
+                      "sqlite",
+                      _("Tried to close sqlite without finalizing all prepared statements.\n"));
+      stmt = sqlite3_next_stmt(plugin->dbh, NULL); 
+      while (stmt != NULL)
+        {
+#if DEBUG_SQLITE
+          GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
+                    "sqlite", "Closing statement %p\n", stmt);
+#endif
+          result = sqlite3_finalize(stmt);
+#if DEBUG_SQLITE
+          if (result != SQLITE_OK)
+              GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
+                              "sqlite",
+                               "Failed to close statement %p: %d\n", stmt, result);
+#endif
+         stmt = sqlite3_next_stmt(plugin->dbh, NULL);
+        }
+      result = sqlite3_close(plugin->dbh);
+    }
+#endif
+  if (SQLITE_OK != result)
+      LOG_SQLITE (plugin, NULL,
+                  GNUNET_ERROR_TYPE_ERROR, 
+                 "sqlite3_close");
 
-/**
- * Get an estimate of how much space the database is
- * currently using.
- *
- * @param cls our plugin context
- * @return number of bytes used on disk
- */
-static unsigned long long sqlite_plugin_get_size (void *cls)
-{
-  struct Plugin *plugin = cls;
-  return plugin->payload;
+  GNUNET_free_non_null (plugin->fn);
 }
 
 
@@ -434,26 +414,23 @@ static int
 delete_by_rowid (struct Plugin* plugin, 
                 unsigned long long rid)
 {
-  sqlite3_stmt *stmt;
 
-  if (sq_prepare (plugin->dbh,
-                  "DELETE FROM gn080 WHERE _ROWID_ = ?", &stmt) != SQLITE_OK)
+  sqlite3_bind_int64 (plugin->delRow, 1, rid);
+  if (SQLITE_DONE != sqlite3_step (plugin->delRow))
     {
       LOG_SQLITE (plugin, NULL,
                   GNUNET_ERROR_TYPE_ERROR |
-                  GNUNET_ERROR_TYPE_BULK, "sq_prepare");
+                  GNUNET_ERROR_TYPE_BULK, "sqlite3_step");
+      if (SQLITE_OK != sqlite3_reset (plugin->delRow))
+          LOG_SQLITE (plugin, NULL,
+                      GNUNET_ERROR_TYPE_ERROR |
+                      GNUNET_ERROR_TYPE_BULK, "sqlite3_reset");
       return GNUNET_SYSERR;
     }
-  sqlite3_bind_int64 (stmt, 1, rid);
-  if (SQLITE_DONE != sqlite3_step (stmt))
-    {
+  if (SQLITE_OK != sqlite3_reset (plugin->delRow))
       LOG_SQLITE (plugin, NULL,
                   GNUNET_ERROR_TYPE_ERROR |
-                  GNUNET_ERROR_TYPE_BULK, "sqlite3_step");
-      sqlite3_finalize (stmt);
-      return GNUNET_SYSERR;
-    }
-  sqlite3_finalize (stmt);
+                  GNUNET_ERROR_TYPE_BULK, "sqlite3_reset");
   return GNUNET_OK;
 }
 
@@ -628,7 +605,7 @@ sqlite_next_request_cont (void *cls,
 
   priority = sqlite3_column_int (nc->stmt, 2);
   anonymity = sqlite3_column_int (nc->stmt, 3);
-  expiration.value = sqlite3_column_int64 (nc->stmt, 4);
+  expiration.abs_value = sqlite3_column_int64 (nc->stmt, 4);
   key = sqlite3_column_blob (nc->stmt, 5);
   nc->lastPriority = priority;
   nc->lastExpiration = expiration;
@@ -661,23 +638,15 @@ sqlite_next_request_cont (void *cls,
   if ( (ret == GNUNET_NO) &&
        (GNUNET_OK == delete_by_rowid (plugin, rowid)) )
     {
-      if (plugin->payload >= size + GNUNET_DATASTORE_ENTRY_OVERHEAD)
-       plugin->payload -= (size + GNUNET_DATASTORE_ENTRY_OVERHEAD);
-      else
-       GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                   _("Datastore payload inaccurate, please fix and restart!\n"));
-      plugin->lastSync++; 
+      plugin->env->duc (plugin->env->cls,
+                       - (size + GNUNET_DATASTORE_ENTRY_OVERHEAD));
 #if DEBUG_SQLITE
-      if (ret == GNUNET_NO)
-       GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
-                        "sqlite",
-                        "Removed entry %llu (%u bytes), new payload is %llu\n",
-                        (unsigned long long) rowid,
-                        size + GNUNET_DATASTORE_ENTRY_OVERHEAD,
-                        plugin->payload);
+      GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
+                      "sqlite",
+                      "Removed entry %llu (%u bytes)\n",
+                      (unsigned long long) rowid,
+                      size + GNUNET_DATASTORE_ENTRY_OVERHEAD);
 #endif
-      if (plugin->lastSync >= MAX_STAT_SYNC_LAG)
-       sync_stats (plugin);
     }
 }
 
@@ -703,8 +672,7 @@ sqlite_next_request (void *next_cls,
   if (GNUNET_YES == end_it)
     nc->end_it = GNUNET_YES;
   nc->plugin->next_task_nc = nc;
-  nc->plugin->next_task = GNUNET_SCHEDULER_add_now (nc->plugin->env->sched,
-                                                   &sqlite_next_request_cont,
+  nc->plugin->next_task = GNUNET_SCHEDULER_add_now (&sqlite_next_request_cont,
                                                    nc);
 }
 
@@ -747,8 +715,8 @@ sqlite_plugin_put (void *cls,
                   type, 
                   GNUNET_h2s(key),
                   priority,
-                  (unsigned long long) GNUNET_TIME_absolute_get_remaining (expiration).value,
-                  (long long) expiration.value);
+                  (unsigned long long) GNUNET_TIME_absolute_get_remaining (expiration).rel_value,
+                  (long long) expiration.abs_value);
 #endif
   GNUNET_CRYPTO_hash (data, size, &vhash);
   stmt = plugin->insertContent;
@@ -756,7 +724,7 @@ sqlite_plugin_put (void *cls,
       (SQLITE_OK != sqlite3_bind_int (stmt, 2, type)) ||
       (SQLITE_OK != sqlite3_bind_int (stmt, 3, priority)) ||
       (SQLITE_OK != sqlite3_bind_int (stmt, 4, anonymity)) ||
-      (SQLITE_OK != sqlite3_bind_int64 (stmt, 5, (sqlite3_int64) expiration.value)) ||
+      (SQLITE_OK != sqlite3_bind_int64 (stmt, 5, expiration.abs_value)) ||
       (SQLITE_OK !=
        sqlite3_bind_blob (stmt, 6, key, sizeof (GNUNET_HashCode),
                           SQLITE_TRANSIENT)) ||
@@ -776,7 +744,7 @@ sqlite_plugin_put (void *cls,
       return GNUNET_SYSERR;
     }
   n = sqlite3_step (stmt);
-  if (n != SQLITE_DONE)
+  if (n != SQLITE_DONE) 
     {
       if (n == SQLITE_BUSY)
         {
@@ -798,17 +766,14 @@ sqlite_plugin_put (void *cls,
     LOG_SQLITE (plugin, NULL,
                 GNUNET_ERROR_TYPE_ERROR |
                 GNUNET_ERROR_TYPE_BULK, "sqlite3_reset");
-  plugin->lastSync++;
-  plugin->payload += size + GNUNET_DATASTORE_ENTRY_OVERHEAD;
+  plugin->env->duc (plugin->env->cls,
+                   size + GNUNET_DATASTORE_ENTRY_OVERHEAD);
 #if DEBUG_SQLITE
   GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
                   "sqlite",
-                  "Stored new entry (%u bytes), new payload is %llu\n",
-                  size + GNUNET_DATASTORE_ENTRY_OVERHEAD,
-                  plugin->payload);
+                  "Stored new entry (%u bytes)\n",
+          size + GNUNET_DATASTORE_ENTRY_OVERHEAD);
 #endif
-  if (plugin->lastSync >= MAX_STAT_SYNC_LAG)
-    sync_stats (plugin);
   return GNUNET_OK;
 }
 
@@ -846,7 +811,7 @@ sqlite_plugin_update (void *cls,
   int n;
 
   sqlite3_bind_int (plugin->updPrio, 1, delta);
-  sqlite3_bind_int64 (plugin->updPrio, 2, expire.value);
+  sqlite3_bind_int64 (plugin->updPrio, 2, expire.abs_value);
   sqlite3_bind_int64 (plugin->updPrio, 3, uid);
   n = sqlite3_step (plugin->updPrio);
   if (n != SQLITE_DONE)
@@ -954,10 +919,10 @@ iter_next_prepare (void *cls,
 #if DEBUG_SQLITE
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                  "Restricting to results larger than the last expiration %llu\n",
-                 (unsigned long long) nc->lastExpiration.value);
+                 (unsigned long long) nc->lastExpiration.abs_value);
 #endif
-      sqlite3_bind_int64 (ic->stmt_1, 1, nc->lastExpiration.value);
-      sqlite3_bind_int64 (ic->stmt_2, 1, nc->lastExpiration.value);
+      sqlite3_bind_int64 (ic->stmt_1, 1, nc->lastExpiration.abs_value);
+      sqlite3_bind_int64 (ic->stmt_2, 1, nc->lastExpiration.abs_value);
     }
 #if DEBUG_SQLITE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -1057,7 +1022,7 @@ basic_iter (struct Plugin *plugin,
 #if DEBUG_SQLITE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "At %llu, using queries `%s' and `%s'\n",
-             (unsigned long long) GNUNET_TIME_absolute_get ().value,
+             (unsigned long long) GNUNET_TIME_absolute_get ().abs_value,
              stmt_str_1,
              stmt_str_2);
 #endif
@@ -1065,7 +1030,7 @@ basic_iter (struct Plugin *plugin,
     {
       LOG_SQLITE (plugin, NULL,
                   GNUNET_ERROR_TYPE_ERROR |
-                  GNUNET_ERROR_TYPE_BULK, "sqlite3_prepare");
+                  GNUNET_ERROR_TYPE_BULK, "sqlite3_prepare_v2");
       iter (iter_cls, NULL, NULL, 0, NULL, 0, 0, 0, GNUNET_TIME_UNIT_ZERO_ABS, 0);
       return;
     }
@@ -1073,7 +1038,7 @@ basic_iter (struct Plugin *plugin,
     {
       LOG_SQLITE (plugin, NULL,
                   GNUNET_ERROR_TYPE_ERROR |
-                  GNUNET_ERROR_TYPE_BULK, "sqlite3_prepare");
+                  GNUNET_ERROR_TYPE_BULK, "sqlite3_prepare_v2");
       sqlite3_finalize (stmt_1);
       iter (iter_cls, NULL, NULL, 0, NULL, 0, 0, 0, GNUNET_TIME_UNIT_ZERO_ABS, 0);
       return;
@@ -1097,13 +1062,13 @@ basic_iter (struct Plugin *plugin,
   if (is_asc)
     {
       nc->lastPriority = 0;
-      nc->lastExpiration.value = 0;
+      nc->lastExpiration.abs_value = 0;
       memset (&nc->lastKey, 0, sizeof (GNUNET_HashCode));
     }
   else
     {
       nc->lastPriority = 0x7FFFFFFF;
-      nc->lastExpiration.value = 0x7FFFFFFFFFFFFFFFLL;
+      nc->lastExpiration.abs_value = 0x7FFFFFFFFFFFFFFFLL;
       memset (&nc->lastKey, 255, sizeof (GNUNET_HashCode));
     }
   sqlite_next_request (nc, GNUNET_NO);
@@ -1160,9 +1125,9 @@ sqlite_plugin_iter_zero_anonymity (void *cls,
 
   now = GNUNET_TIME_absolute_get ();
   GNUNET_asprintf (&q1, SELECT_IT_NON_ANONYMOUS_1,
-                  (unsigned long long) now.value);
+                  (unsigned long long) now.abs_value);
   GNUNET_asprintf (&q2, SELECT_IT_NON_ANONYMOUS_2,
-                  (unsigned long long) now.value);
+                  (unsigned long long) now.abs_value);
   basic_iter (cls,
              type, 
              GNUNET_NO, GNUNET_YES, 
@@ -1199,9 +1164,9 @@ sqlite_plugin_iter_ascending_expiration (void *cls,
 
   now = GNUNET_TIME_absolute_get ();
   GNUNET_asprintf (&q1, SELECT_IT_EXPIRATION_TIME_1,
-                  (unsigned long long) 0*now.value);
+                  (unsigned long long) 0*now.abs_value);
   GNUNET_asprintf (&q2, SELECT_IT_EXPIRATION_TIME_2,
-                  (unsigned long long) 0*now.value);
+                  (unsigned long long) 0*now.abs_value);
   basic_iter (cls,
              type, 
              GNUNET_YES, GNUNET_NO, 
@@ -1235,7 +1200,7 @@ sqlite_plugin_iter_migration_order (void *cls,
 
   now = GNUNET_TIME_absolute_get ();
   GNUNET_asprintf (&q, SELECT_IT_MIGRATION_ORDER_2,
-                  (unsigned long long) now.value);
+                  (unsigned long long) now.abs_value);
   basic_iter (cls,
              type, 
              GNUNET_NO, GNUNET_NO, 
@@ -1251,7 +1216,7 @@ sqlite_plugin_iter_migration_order (void *cls,
  * Call sqlite using the already prepared query to get
  * the next result.
  *
- * @param cls not used
+ * @param cls context with the prepared query
  * @param nc context with the prepared query
  * @return GNUNET_OK on success, GNUNET_SYSERR on error, GNUNET_NO if
  *        there are no more results 
@@ -1269,6 +1234,10 @@ all_next_prepare (void *cls,
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                  "Asked to clean up iterator state.\n");
 #endif
+      nc = (struct NextContext *)cls;
+      if (nc->stmt)
+          sqlite3_finalize (nc->stmt);
+      nc->stmt = NULL;
       return GNUNET_SYSERR;
     }
   plugin = nc->plugin;
@@ -1315,7 +1284,7 @@ sqlite_plugin_iter_all_now (void *cls,
     {
       LOG_SQLITE (plugin, NULL,
                   GNUNET_ERROR_TYPE_ERROR |
-                  GNUNET_ERROR_TYPE_BULK, "sqlite3_prepare");
+                  GNUNET_ERROR_TYPE_BULK, "sqlite3_prepare_v2");
       iter (iter_cls, NULL, NULL, 0, NULL, 0, 0, 0, GNUNET_TIME_UNIT_ZERO_ABS, 0);
       return;
     }
@@ -1325,7 +1294,7 @@ sqlite_plugin_iter_all_now (void *cls,
   nc->iter_cls = iter_cls;
   nc->stmt = stmt;
   nc->prep = &all_next_prepare;
-  nc->prep_cls = NULL;
+  nc->prep_cls = nc;
   sqlite_next_request (nc, GNUNET_NO);
 }
 
@@ -1574,74 +1543,53 @@ sqlite_plugin_drop (void *cls)
 }
 
 
-/**
- * Callback function to process statistic values.
- *
- * @param cls closure
- * @param subsystem name of subsystem that created the statistic
- * @param name the name of the datum
- * @param value the current value
- * @param is_persistent GNUNET_YES if the value is persistent, GNUNET_NO if not
- * @return GNUNET_OK to continue, GNUNET_SYSERR to abort iteration
- */
-static int
-process_stat_in (void *cls,
-                const char *subsystem,
-                const char *name,
-                uint64_t value,
-                int is_persistent)
-{
-  struct Plugin *plugin = cls;
-
-  plugin->stats_worked = GNUNET_YES;
-  plugin->payload += value;
-#if DEBUG_SQLITE
-  GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
-                  "sqlite",
-                  "Notification from statistics about existing payload (%llu), new payload is %llu\n",
-                  value,
-                  plugin->payload);
-#endif
-  return GNUNET_OK;
-}
-
-
-static void
-process_stat_done (void *cls,
-                  int success)
+static unsigned long long
+sqlite_plugin_get_size (void *cls)
 {
   struct Plugin *plugin = cls;
   sqlite3_stmt *stmt;
   uint64_t pages;
-  uint64_t free_pages;
+  uint64_t page_size;
+#if ENULL_DEFINED
+  char *e;
+#endif
 
-  plugin->stat_get = NULL;
-  if (plugin->stats_worked == GNUNET_NO)
+  if (SQLITE_VERSION_NUMBER < 3006000)
     {
-      CHECK (SQLITE_OK ==
-            sq_prepare (plugin->dbh,
-                        "PRAGMA page_count",
-                        &stmt));
-      if (SQLITE_ROW ==
-         sqlite3_step (stmt))
-       pages = sqlite3_column_int64 (stmt, 0);
-      else
-       pages = 0;
-      sqlite3_finalize (stmt);
-      CHECK (SQLITE_OK ==
-            sq_prepare (plugin->dbh,
-                        "PRAGMA freelist_count",
-                        &stmt));
-      CHECK (SQLITE_ROW ==
-            sqlite3_step (stmt));
-      free_pages = sqlite3_column_int64 (stmt, 0);
-      sqlite3_finalize (stmt);
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                 _("Using sqlite page utilization to estimate payload (%llu pages total, %llu free)\n"),
-                 (unsigned long long) pages,
-                 (unsigned long long) free_pages);
-      plugin->payload = (pages - free_pages) * 4092LL;
+      GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING,
+                      "datastore-sqlite",
+                      _("sqlite version to old to determine size, assuming zero\n"));
+      return 0;
     }
+  CHECK (SQLITE_OK ==
+        sqlite3_exec (plugin->dbh,
+                      "VACUUM", NULL, NULL, ENULL));
+  CHECK (SQLITE_OK ==
+        sqlite3_exec (plugin->dbh,
+                      "PRAGMA auto_vacuum=INCREMENTAL", NULL, NULL, ENULL));
+  CHECK (SQLITE_OK ==
+        sq_prepare (plugin->dbh,
+                    "PRAGMA page_count",
+                    &stmt));
+  if (SQLITE_ROW ==
+      sqlite3_step (stmt))
+    pages = sqlite3_column_int64 (stmt, 0);
+  else
+    pages = 0;
+  sqlite3_finalize (stmt);
+  CHECK (SQLITE_OK ==
+        sq_prepare (plugin->dbh,
+                    "PRAGMA page_size",
+                    &stmt));
+  CHECK (SQLITE_ROW ==
+        sqlite3_step (stmt));
+  page_size = sqlite3_column_int64 (stmt, 0);
+  sqlite3_finalize (stmt);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+             _("Using sqlite page utilization to estimate payload (%llu pages of size %llu bytes)\n"),
+             (unsigned long long) pages,
+             (unsigned long long) page_size);
+  return  pages * page_size;
 }
                                         
 
@@ -1662,16 +1610,6 @@ libgnunet_plugin_datastore_sqlite_init (void *cls)
     return NULL; /* can only initialize once! */
   memset (&plugin, 0, sizeof(struct Plugin));
   plugin.env = env;
-  plugin.statistics = GNUNET_STATISTICS_create (env->sched,
-                                               "ds-sqlite",
-                                               env->cfg);
-  plugin.stat_get = GNUNET_STATISTICS_get (plugin.statistics,
-                                          "ds-sqlite",
-                                          QUOTA_STAT_NAME,
-                                          GNUNET_TIME_UNIT_SECONDS,
-                                          &process_stat_done,
-                                          &process_stat_in,
-                                          &plugin);
   if (GNUNET_OK !=
       database_setup (env->cfg, &plugin))
     {
@@ -1710,16 +1648,26 @@ libgnunet_plugin_datastore_sqlite_done (void *cls)
   struct GNUNET_DATASTORE_PluginFunctions *api = cls;
   struct Plugin *plugin = api->cls;
 
-  if (plugin->stat_get != NULL)
-    {
-      GNUNET_STATISTICS_get_cancel (plugin->stat_get);
-      plugin->stat_get = NULL;
-    }
+#if DEBUG_SQLITE
+  GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
+                  "sqlite",
+                  "sqlite plugin is doneing\n");
+#endif
+
   if (plugin->next_task != GNUNET_SCHEDULER_NO_TASK)
     {
-      GNUNET_SCHEDULER_cancel (plugin->env->sched,
-                              plugin->next_task);
+#if DEBUG_SQLITE
+      GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
+                      "sqlite",
+                      "Canceling next task\n");
+#endif
+      GNUNET_SCHEDULER_cancel (plugin->next_task);
       plugin->next_task = GNUNET_SCHEDULER_NO_TASK;
+#if DEBUG_SQLITE
+      GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
+                      "sqlite",
+                      "Prep'ing next task\n");
+#endif
       plugin->next_task_nc->prep (plugin->next_task_nc->prep_cls, NULL);
       GNUNET_free (plugin->next_task_nc);
       plugin->next_task_nc = NULL;
@@ -1727,11 +1675,13 @@ libgnunet_plugin_datastore_sqlite_done (void *cls)
   fn = NULL;
   if (plugin->drop_on_shutdown)
     fn = GNUNET_strdup (plugin->fn);
+#if DEBUG_SQLITE
+  GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
+                  "sqlite",
+                  "Shutting down database\n");
+#endif
   database_shutdown (plugin);
-  GNUNET_STATISTICS_destroy (plugin->statistics,
-                            GNUNET_NO);
   plugin->env = NULL; 
-  plugin->payload = 0;
   GNUNET_free (api);
   if (fn != NULL)
     {
@@ -1741,6 +1691,11 @@ libgnunet_plugin_datastore_sqlite_done (void *cls)
                                  fn);
       GNUNET_free (fn);
     }
+#if DEBUG_SQLITE
+  GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
+                  "sqlite",
+                  "sqlite plugin is finished doneing\n");
+#endif
   return NULL;
 }