use v2

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

diff --git a/src/datastore/plugin_datastore_sqlite.c b/src/datastore/plugin_datastore_sqlite.c
index 6c20b346db7dde97e01153f62bf1322f69bd2e2b..45fd05e6fde107952871239333dbb7600517deb2 100644 (file)
--- a/src/datastore/plugin_datastore_sqlite.c
+++ b/src/datastore/plugin_datastore_sqlite.c
@@ -37,14 +37,14 @@
  */
 #define MAX_STAT_SYNC_LAG 50
 
-#define QUOTA_STAT_NAME gettext_noop ("file-sharing datastore utilization (in bytes)")
+#define QUOTA_STAT_NAME gettext_noop ("# bytes used in file-sharing datastore")
 
 /**
  * Log an error message at log-level 'level' that indicates
  * a failure of the command 'cmd' on file 'filename'
  * with the message given by strerror(errno).
  */
-#define LOG_SQLITE(db, msg, level, cmd) do { GNUNET_log_from (level, "sqlite", _("`%s' failed at %s:%d with error: %s\n"), cmd, __FILE__, __LINE__, sqlite3_errmsg(db->dbh)); if (msg != NULL) GNUNET_asprintf(msg, _("`%s' failed with error: %s"), cmd, sqlite3_errmsg(db->dbh)); } while(0)
+#define LOG_SQLITE(db, msg, level, cmd) do { GNUNET_log_from (level, "sqlite", _("`%s' failed at %s:%d with error: %s\n"), cmd, __FILE__, __LINE__, sqlite3_errmsg(db->dbh)); if (msg != NULL) GNUNET_asprintf(msg, _("`%s' failed at %s:%u with error: %s"), cmd, __FILE__, __LINE__, sqlite3_errmsg(db->dbh)); } while(0)
 
 #define SELECT_IT_LOW_PRIORITY_1 \
   "SELECT size,type,prio,anonLevel,expire,hash,value,_ROWID_ FROM gn080 WHERE (prio = ? AND hash > ?) "\
@@ -180,9 +180,9 @@ sq_prepare (sqlite3 * dbh, const char *zSql,
             sqlite3_stmt ** ppStmt)
 {
   char *dummy;
-  return sqlite3_prepare (dbh,
-                          zSql,
-                          strlen (zSql), ppStmt, (const char **) &dummy);
+  return sqlite3_prepare_v2 (dbh,
+                            zSql,
+                            strlen (zSql), ppStmt, (const char **) &dummy);
 }
 
 
@@ -258,11 +258,21 @@ database_setup (const struct GNUNET_CONFIGURATION_Handle *cfg,
                       "datastore-sqlite");
       return GNUNET_SYSERR;
     }
-  if (GNUNET_OK != GNUNET_DISK_directory_create_for_file (afsdir))
+  if (GNUNET_OK != GNUNET_DISK_file_test (afsdir))
     {
-      GNUNET_break (0);
-      GNUNET_free (afsdir);
-      return GNUNET_SYSERR;
+      if (GNUNET_OK != GNUNET_DISK_directory_create_for_file (afsdir))
+       {
+         GNUNET_break (0);
+         GNUNET_free (afsdir);
+         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->fn = GNUNET_STRINGS_to_utf8 (afsdir, strlen (afsdir),
 #ifdef ENABLE_NLS
@@ -719,7 +729,7 @@ sqlite_plugin_put (void *cls,
                   const GNUNET_HashCode * key,
                   uint32_t size,
                   const void *data,
-                  uint32_t type,
+                  enum GNUNET_BLOCK_Type type,
                   uint32_t priority,
                   uint32_t anonymity,
                   struct GNUNET_TIME_Absolute expiration,
@@ -766,7 +776,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)
         {
@@ -779,6 +789,9 @@ sqlite_plugin_put (void *cls,
       LOG_SQLITE (plugin, msg,
                   GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, "sqlite3_step");
       sqlite3_reset (stmt);
+      database_shutdown (plugin);
+      database_setup (plugin->env->cfg,
+                     plugin);
       return GNUNET_SYSERR;
     }
   if (SQLITE_OK != sqlite3_reset (stmt))
@@ -892,7 +905,7 @@ struct IterContext
   /**
    * Desired type for blocks returned by this iterator.
    */
-  uint32_t type;
+  enum GNUNET_BLOCK_Type type;
 };
 
 
@@ -1026,7 +1039,7 @@ iter_next_prepare (void *cls,
  */
 static void
 basic_iter (struct Plugin *plugin,
-           uint32_t type,
+           enum GNUNET_BLOCK_Type type,
            int is_asc,
            int is_prio,
            int is_migr,
@@ -1052,7 +1065,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;
     }
@@ -1060,7 +1073,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;
@@ -1110,7 +1123,7 @@ basic_iter (struct Plugin *plugin,
  */
 static void
 sqlite_plugin_iter_low_priority (void *cls,
-                                uint32_t type,
+                                enum GNUNET_BLOCK_Type type,
                                 PluginIterator iter,
                                 void *iter_cls)
 {
@@ -1137,7 +1150,7 @@ sqlite_plugin_iter_low_priority (void *cls,
  */
 static void
 sqlite_plugin_iter_zero_anonymity (void *cls,
-                                  uint32_t type,
+                                  enum GNUNET_BLOCK_Type type,
                                   PluginIterator iter,
                                   void *iter_cls)
 {
@@ -1176,7 +1189,7 @@ sqlite_plugin_iter_zero_anonymity (void *cls,
  */
 static void
 sqlite_plugin_iter_ascending_expiration (void *cls,
-                                        uint32_t type,
+                                        enum GNUNET_BLOCK_Type type,
                                         PluginIterator iter,
                                         void *iter_cls)
 {
@@ -1213,7 +1226,7 @@ sqlite_plugin_iter_ascending_expiration (void *cls,
  */
 static void
 sqlite_plugin_iter_migration_order (void *cls,
-                                   uint32_t type,
+                                   enum GNUNET_BLOCK_Type type,
                                    PluginIterator iter,
                                    void *iter_cls)
 {
@@ -1288,7 +1301,7 @@ all_next_prepare (void *cls,
  */
 static void
 sqlite_plugin_iter_all_now (void *cls,
-                           uint32_t type,
+                           enum GNUNET_BLOCK_Type type,
                            PluginIterator iter,
                            void *iter_cls)
 {
@@ -1302,7 +1315,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;
     }
@@ -1439,7 +1452,7 @@ static void
 sqlite_plugin_get (void *cls,
                   const GNUNET_HashCode * key,
                   const GNUNET_HashCode * vhash,
-                  uint32_t type,
+                  enum GNUNET_BLOCK_Type type,
                   PluginIterator iter, void *iter_cls)
 {
   struct Plugin *plugin = cls;
@@ -1600,11 +1613,17 @@ process_stat_done (void *cls,
   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 ==
+            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",
@@ -1617,17 +1636,17 @@ process_stat_done (void *cls,
       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;
     }
 }
                                         
@@ -1650,10 +1669,10 @@ libgnunet_plugin_datastore_sqlite_init (void *cls)
   memset (&plugin, 0, sizeof(struct Plugin));
   plugin.env = env;
   plugin.statistics = GNUNET_STATISTICS_create (env->sched,
-                                               "datastore-sqlite",
+                                               "ds-sqlite",
                                                env->cfg);
   plugin.stat_get = GNUNET_STATISTICS_get (plugin.statistics,
-                                          "datastore-sqlite",
+                                          "ds-sqlite",
                                           QUOTA_STAT_NAME,
                                           GNUNET_TIME_UNIT_SECONDS,
                                           &process_stat_done,