[GNUnet-SVN] r11410 - gnunet/src/datastore

[gnunet]

Author: grothoff
Date: 2010-05-18 09:05:20 +0200 (Tue, 18 May 2010)
New Revision: 11410

Modified:
   gnunet/src/datastore/plugin_datastore_sqlite.c
Log:
fix quota calculations

Modified: gnunet/src/datastore/plugin_datastore_sqlite.c
===================================================================
--- gnunet/src/datastore/plugin_datastore_sqlite.c      2010-05-18 07:05:09 UTC 
(rev 11409)
+++ gnunet/src/datastore/plugin_datastore_sqlite.c      2010-05-18 07:05:20 UTC 
(rev 11410)
@@ -1613,13 +1613,19 @@
   struct Plugin *plugin = cls;
   sqlite3_stmt *stmt;
   uint64_t pages;
-  uint64_t free_pages;
+  uint64_t page_size;
 
   plugin->stat_get = NULL;
   if (plugin->stats_worked == GNUNET_NO)
     {
       CHECK (SQLITE_OK ==
             sq_prepare (plugin->dbh,
+                        "VACUUM;",
+                        &stmt));
+      sqlite3_step (stmt);
+      sqlite3_finalize (stmt);
+      CHECK (SQLITE_OK ==
+            sq_prepare (plugin->dbh,
                         "PRAGMA page_count",
                         &stmt));
       if (SQLITE_ROW ==
@@ -1630,17 +1636,17 @@
       sqlite3_finalize (stmt);
       CHECK (SQLITE_OK ==
             sq_prepare (plugin->dbh,
-                        "PRAGMA freelist_count",
+                        "PRAGMA page_size",
                         &stmt));
       CHECK (SQLITE_ROW ==
             sqlite3_step (stmt));
-      free_pages = sqlite3_column_int64 (stmt, 0);
+      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 total, %llu free)\n"),
+                 _("Using sqlite page utilization to estimate payload (%llu 
pages of size %llu bytes)\n"),
                  (unsigned long long) pages,
-                 (unsigned long long) free_pages);
-      plugin->payload = (pages - free_pages) * 4092LL;
+                 (unsigned long long) page_size);
+      plugin->payload = pages * page_size;
     }
 }