#include "gnunet_datacache_plugin.h"
#include <sqlite3.h>
-#define DEBUG_DATACACHE_SQLITE GNUNET_NO
+#define LOG(kind,...) GNUNET_log_from (kind, "datacache-sqlite", __VA_ARGS__)
+
+#define LOG_STRERROR_FILE(kind,op,fn) GNUNET_log_from_strerror_file (kind, "datacache-sqlite", op, fn)
+
/**
* How much overhead do we assume per entry in the
* datacache?
*/
-#define OVERHEAD (sizeof(GNUNET_HashCode) + 32)
+#define OVERHEAD (sizeof(struct GNUNET_HashCode) + 32)
/**
* Context for all functions in this plugin.
*/
-struct Plugin
+struct Plugin
{
/**
* Our execution environment.
/**
* Filename used for the DB.
- */
+ */
char *fn;
};
* a failure of the command 'cmd' on file 'filename'
* with the message given by strerror(errno).
*/
-#define LOG_SQLITE(db, level, cmd) do { GNUNET_log(level, _("`%s' failed at %s:%d with error: %s\n"), cmd, __FILE__, __LINE__, sqlite3_errmsg(db)); } while(0)
+#define LOG_SQLITE(db, level, cmd) do { LOG (level, _("`%s' failed at %s:%d with error: %s\n"), cmd, __FILE__, __LINE__, sqlite3_errmsg(db)); } while(0)
-#define SQLITE3_EXEC(db, cmd) do { emsg = NULL; if (SQLITE_OK != sqlite3_exec(db, cmd, NULL, NULL, &emsg)) { GNUNET_log(GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, _("`%s' failed at %s:%d with error: %s\n"), "sqlite3_exec", __FILE__, __LINE__, emsg); sqlite3_free(emsg); } } while(0)
+#define SQLITE3_EXEC(db, cmd) do { emsg = NULL; if (SQLITE_OK != sqlite3_exec(db, cmd, NULL, NULL, &emsg)) { LOG (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, _("`%s' failed at %s:%d with error: %s\n"), "sqlite3_exec", __FILE__, __LINE__, emsg); sqlite3_free(emsg); } } while(0)
/**
sqlite3_stmt ** ppStmt)
{ /* OUT: Statement handle */
char *dummy;
- return sqlite3_prepare (dbh,
- zSql,
- strlen (zSql), ppStmt, (const char **) &dummy);
+
+ return sqlite3_prepare (dbh, zSql, strlen (zSql), ppStmt,
+ (const char **) &dummy);
}
* @param data data to store
* @param type type of the value
* @param discard_time when to discard the value in any case
- * @return 0 on error, number of bytes used otherwise
+ * @param path_info_len number of entries in 'path_info'
+ * @param path_info array of peers that have processed the request
+ * @return 0 if duplicate, -1 on error, number of bytes used otherwise
*/
-static size_t
+static ssize_t
sqlite_plugin_put (void *cls,
- const GNUNET_HashCode * key,
- size_t size,
- const char *data,
+ const struct GNUNET_HashCode *key,
+ size_t size, const char *data,
enum GNUNET_BLOCK_Type type,
- struct GNUNET_TIME_Absolute discard_time)
+ struct GNUNET_TIME_Absolute discard_time,
+ unsigned int path_info_len,
+ const struct GNUNET_PeerIdentity *path_info)
{
struct Plugin *plugin = cls;
sqlite3_stmt *stmt;
int64_t dval;
-#if DEBUG_DATACACHE_SQLITE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Processing `%s' of %u bytes with key `%4s' and expiration %llums\n",
- "PUT",
- (unsigned int) size,
- GNUNET_h2s (key),
- (unsigned long long) GNUNET_TIME_absolute_get_remaining (discard_time).rel_value);
-#endif
- dval = (int64_t) discard_time.abs_value;
- if (dval < 0)
- dval = INT64_MAX;
- if (sq_prepare (plugin->dbh,
- "INSERT INTO ds090 "
- "(type, expire, key, value) "
- "VALUES (?, ?, ?, ?)", &stmt) != SQLITE_OK)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
- _("`%s' failed at %s:%d with error: %s\n"),
- "sq_prepare", __FILE__, __LINE__,
- sqlite3_errmsg (plugin->dbh));
- return 0;
- }
- if ( (SQLITE_OK != sqlite3_bind_int (stmt, 1, type)) ||
- (SQLITE_OK != sqlite3_bind_int64 (stmt, 2, dval)) ||
- (SQLITE_OK != sqlite3_bind_blob (stmt, 3, key, sizeof (GNUNET_HashCode),
- SQLITE_TRANSIENT)) ||
- (SQLITE_OK != sqlite3_bind_blob (stmt, 4, data, size, SQLITE_TRANSIENT)))
- {
- LOG_SQLITE (plugin->dbh,
- GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
- "sqlite3_bind_xxx");
- sqlite3_finalize (stmt);
- return 0;
- }
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Processing `%s' of %u bytes with key `%4s' and expiration %s\n",
+ "PUT", (unsigned int) size, GNUNET_h2s (key),
+ GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_remaining (discard_time), GNUNET_YES));
+ dval = (int64_t) discard_time.abs_value_us;
+ if (dval < 0)
+ dval = INT64_MAX;
+ if (sq_prepare
+ (plugin->dbh,
+ "INSERT INTO ds090 (type, expire, key, value, path) VALUES (?, ?, ?, ?, ?)",
+ &stmt) != SQLITE_OK)
+ {
+ LOG_SQLITE (plugin->dbh, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+ "sq_prepare");
+ return -1;
+ }
+ if ((SQLITE_OK != sqlite3_bind_int (stmt, 1, type)) ||
+ (SQLITE_OK != sqlite3_bind_int64 (stmt, 2, dval)) ||
+ (SQLITE_OK !=
+ sqlite3_bind_blob (stmt, 3,
+ key, sizeof (struct GNUNET_HashCode),
+ SQLITE_TRANSIENT)) ||
+ (SQLITE_OK != sqlite3_bind_blob (stmt, 4,
+ data, size,
+ SQLITE_TRANSIENT)) ||
+ (SQLITE_OK != sqlite3_bind_blob (stmt, 5,
+ path_info,
+ path_info_len * sizeof (struct GNUNET_PeerIdentity),
+ SQLITE_TRANSIENT)))
+ {
+ LOG_SQLITE (plugin->dbh, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+ "sqlite3_bind_xxx");
+ sqlite3_finalize (stmt);
+ return -1;
+ }
if (SQLITE_DONE != sqlite3_step (stmt))
- {
- LOG_SQLITE (plugin->dbh,
- GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
- "sqlite3_step");
- sqlite3_finalize (stmt);
- return 0;
- }
+ {
+ LOG_SQLITE (plugin->dbh, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+ "sqlite3_step");
+ sqlite3_finalize (stmt);
+ return -1;
+ }
if (SQLITE_OK != sqlite3_finalize (stmt))
- LOG_SQLITE (plugin->dbh,
- GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
- "sqlite3_finalize");
+ LOG_SQLITE (plugin->dbh, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+ "sqlite3_finalize");
return size + OVERHEAD;
}
* @param iter_cls closure for iter
* @return the number of results found
*/
-static unsigned int
-sqlite_plugin_get (void *cls,
- const GNUNET_HashCode * key,
- enum GNUNET_BLOCK_Type type,
- GNUNET_DATACACHE_Iterator iter,
- void *iter_cls)
+static unsigned int
+sqlite_plugin_get (void *cls, const struct GNUNET_HashCode * key,
+ enum GNUNET_BLOCK_Type type, GNUNET_DATACACHE_Iterator iter,
+ void *iter_cls)
{
struct Plugin *plugin = cls;
sqlite3_stmt *stmt;
unsigned int cnt;
unsigned int off;
unsigned int total;
+ unsigned int psize;
char scratch[256];
int64_t ntime;
+ const struct GNUNET_PeerIdentity *path;
now = GNUNET_TIME_absolute_get ();
-#if DEBUG_DATACACHE_SQLITE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Processing `%s' for key `%4s'\n",
- "GET",
- GNUNET_h2s (key));
-#endif
- if (sq_prepare (plugin->dbh,
- "SELECT count(*) FROM ds090 WHERE key=? AND type=? AND expire >= ?",
- &stmt) != SQLITE_OK)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
- _("`%s' failed at %s:%d with error: %s\n"),
- "sq_prepare", __FILE__, __LINE__,
- sqlite3_errmsg (plugin->dbh));
- return 0;
- }
- if (GNUNET_OK !=
- sqlite3_bind_blob (stmt, 1, key, sizeof (GNUNET_HashCode),
- SQLITE_TRANSIENT))
- {
- LOG_SQLITE (plugin->dbh,
- GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
- "sqlite3_bind_xxx");
- sqlite3_finalize (stmt);
- return 0;
- }
- sqlite3_bind_int (stmt, 2, type);
- ntime = (int64_t) now.abs_value;
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Processing `%s' for key `%4s'\n", "GET",
+ GNUNET_h2s (key));
+ if (sq_prepare
+ (plugin->dbh,
+ "SELECT count(*) FROM ds090 WHERE key=? AND type=? AND expire >= ?",
+ &stmt) != SQLITE_OK)
+ {
+ LOG_SQLITE (plugin->dbh, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+ "sq_prepare");
+ return 0;
+ }
+ ntime = (int64_t) now.abs_value_us;
GNUNET_assert (ntime >= 0);
- sqlite3_bind_int64 (stmt, 3, now.abs_value);
+ if ((SQLITE_OK !=
+ sqlite3_bind_blob (stmt, 1, key, sizeof (struct GNUNET_HashCode),
+ SQLITE_TRANSIENT)) ||
+ (SQLITE_OK != sqlite3_bind_int (stmt, 2, type)) ||
+ (SQLITE_OK != sqlite3_bind_int64 (stmt, 3, now.abs_value_us)))
+ {
+ LOG_SQLITE (plugin->dbh, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+ "sqlite3_bind_xxx");
+ sqlite3_finalize (stmt);
+ return 0;
+ }
+
if (SQLITE_ROW != sqlite3_step (stmt))
- {
- LOG_SQLITE (plugin->dbh,
- GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
- "sqlite_step");
- sqlite3_finalize (stmt);
- return 0;
- }
+ {
+ LOG_SQLITE (plugin->dbh, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+ "sqlite_step");
+ sqlite3_finalize (stmt);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "No content found when processing `%s' for key `%4s'\n", "GET",
+ GNUNET_h2s (key));
+ return 0;
+ }
total = sqlite3_column_int (stmt, 0);
sqlite3_finalize (stmt);
- if ( (total == 0) || (iter == NULL) )
- return total;
+ if ((total == 0) || (iter == NULL))
+ {
+ if (0 == total)
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "No content found when processing `%s' for key `%4s'\n", "GET",
+ GNUNET_h2s (key));
+ return total;
+ }
cnt = 0;
off = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, total);
while (cnt < total)
+ {
+ off = (off + 1) % total;
+ GNUNET_snprintf (scratch, sizeof (scratch),
+ "SELECT value,expire,path FROM ds090 WHERE key=? AND type=? AND expire >= ? LIMIT 1 OFFSET %u",
+ off);
+ if (sq_prepare (plugin->dbh, scratch, &stmt) != SQLITE_OK)
+ {
+ LOG_SQLITE (plugin->dbh, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+ "sq_prepare");
+ return cnt;
+ }
+ if ((SQLITE_OK !=
+ sqlite3_bind_blob (stmt, 1, key, sizeof (struct GNUNET_HashCode),
+ SQLITE_TRANSIENT)) ||
+ (SQLITE_OK != sqlite3_bind_int (stmt, 2, type)) ||
+ (SQLITE_OK != sqlite3_bind_int64 (stmt, 3, now.abs_value_us)))
+ {
+ LOG_SQLITE (plugin->dbh, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+ "sqlite3_bind_xxx");
+ sqlite3_finalize (stmt);
+ return cnt;
+ }
+ if (sqlite3_step (stmt) != SQLITE_ROW)
+ break;
+ size = sqlite3_column_bytes (stmt, 0);
+ dat = sqlite3_column_blob (stmt, 0);
+ exp.abs_value_us = sqlite3_column_int64 (stmt, 1);
+ psize = sqlite3_column_bytes (stmt, 2);
+ if (0 != psize % sizeof (struct GNUNET_PeerIdentity))
+ {
+ GNUNET_break (0);
+ psize = 0;
+ }
+ psize /= sizeof (struct GNUNET_PeerIdentity);
+ if (0 != psize)
+ path = sqlite3_column_blob (stmt, 2);
+ else
+ path = NULL;
+ ntime = (int64_t) exp.abs_value_us;
+ if (ntime == INT64_MAX)
+ exp = GNUNET_TIME_UNIT_FOREVER_ABS;
+ cnt++;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Found %u-byte result when processing `%s' for key `%4s'\n",
+ (unsigned int) size, "GET", GNUNET_h2s (key));
+ if (GNUNET_OK != iter (iter_cls, key, size, dat, type, exp, psize, path))
{
- off = (off + 1) % total;
- GNUNET_snprintf (scratch,
- sizeof(scratch),
- "SELECT value,expire FROM ds090 WHERE key=? AND type=? AND expire >= ? LIMIT 1 OFFSET %u",
- off);
- if (sq_prepare (plugin->dbh, scratch, &stmt) != SQLITE_OK)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
- _("`%s' failed at %s:%d with error: %s\n"),
- "sq_prepare", __FILE__, __LINE__,
- sqlite3_errmsg (plugin->dbh));
- return cnt;
- }
- sqlite3_bind_blob (stmt, 1, key, sizeof (GNUNET_HashCode),
- SQLITE_TRANSIENT);
- sqlite3_bind_int (stmt, 2, type);
- sqlite3_bind_int64 (stmt, 3, now.abs_value);
- if (sqlite3_step (stmt) != SQLITE_ROW)
- break;
- size = sqlite3_column_bytes (stmt, 0);
- dat = sqlite3_column_blob (stmt, 0);
- exp.abs_value = sqlite3_column_int64 (stmt, 1);
- ntime = (int64_t) exp.abs_value;
- if (ntime == INT64_MAX)
- exp = GNUNET_TIME_UNIT_FOREVER_ABS;
- cnt++;
- if (GNUNET_OK != iter (iter_cls,
- exp,
- key,
- size,
- dat,
- type))
- {
- sqlite3_finalize (stmt);
- break;
- }
sqlite3_finalize (stmt);
+ break;
}
+ sqlite3_finalize (stmt);
+ }
return cnt;
}
/**
* Delete the entry with the lowest expiration value
* from the datacache right now.
- *
+ *
* @param cls closure (our "struct Plugin")
* @return GNUNET_OK on success, GNUNET_SYSERR on error
- */
-static int
+ */
+static int
sqlite_plugin_del (void *cls)
{
struct Plugin *plugin = cls;
+ unsigned long long rowid;
unsigned int dsize;
- unsigned int dtype;
sqlite3_stmt *stmt;
sqlite3_stmt *dstmt;
- char blob[65536];
- GNUNET_HashCode hc;
+ struct GNUNET_HashCode hc;
-#if DEBUG_DATACACHE_SQLITE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Processing `%s'\n",
- "DEL");
-#endif
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Processing `%s'\n", "DEL");
stmt = NULL;
dstmt = NULL;
- if (sq_prepare (plugin->dbh,
- "SELECT type, key, value FROM ds090 ORDER BY expire ASC LIMIT 1",
- &stmt) != SQLITE_OK)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
- _("`%s' failed at %s:%d with error: %s\n"),
- "sq_prepare", __FILE__, __LINE__, sqlite3_errmsg (plugin->dbh));
- if (stmt != NULL)
- (void) sqlite3_finalize (stmt);
- return GNUNET_SYSERR;
- }
- if (SQLITE_ROW != sqlite3_step (stmt))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
- _("`%s' failed at %s:%d with error: %s\n"),
- "sqlite3_step", __FILE__, __LINE__,
- sqlite3_errmsg (plugin->dbh));
+ if (sq_prepare
+ (plugin->dbh,
+ "SELECT _ROWID_,key,value FROM ds090 ORDER BY expire ASC LIMIT 1",
+ &stmt) != SQLITE_OK)
+ {
+ LOG_SQLITE (plugin->dbh, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+ "sq_prepare");
+ if (stmt != NULL)
(void) sqlite3_finalize (stmt);
- return GNUNET_SYSERR;
- }
- dtype = sqlite3_column_int (stmt, 0);
- GNUNET_break (sqlite3_column_bytes (stmt, 1) == sizeof (GNUNET_HashCode));
+ return GNUNET_SYSERR;
+ }
+ if (SQLITE_ROW != sqlite3_step (stmt))
+ {
+ LOG_SQLITE (plugin->dbh, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+ "sqlite3_step");
+ (void) sqlite3_finalize (stmt);
+ return GNUNET_SYSERR;
+ }
+ rowid = sqlite3_column_int64 (stmt, 0);
+ GNUNET_assert (sqlite3_column_bytes (stmt, 1) == sizeof (struct GNUNET_HashCode));
+ memcpy (&hc, sqlite3_column_blob (stmt, 1), sizeof (struct GNUNET_HashCode));
dsize = sqlite3_column_bytes (stmt, 2);
- GNUNET_assert (dsize <= sizeof (blob));
- memcpy (blob, sqlite3_column_blob (stmt, 2), dsize);
- memcpy (&hc, sqlite3_column_blob (stmt, 1), sizeof (GNUNET_HashCode));
if (SQLITE_OK != sqlite3_finalize (stmt))
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
- _("`%s' failed at %s:%d with error: %s\n"),
- "sqlite3_step", __FILE__, __LINE__,
- sqlite3_errmsg (plugin->dbh));
- if (sq_prepare (plugin->dbh,
- "DELETE FROM ds090 "
- "WHERE key=? AND value=? AND type=?",
- &dstmt) != SQLITE_OK)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
- _("`%s' failed at %s:%d with error: %s\n"),
- "sq_prepare", __FILE__, __LINE__, sqlite3_errmsg (plugin->dbh));
- if (stmt != NULL)
- (void) sqlite3_finalize (stmt);
- return GNUNET_SYSERR;
- }
- if ( (SQLITE_OK !=
- sqlite3_bind_blob (dstmt,
- 1, &hc,
- sizeof (GNUNET_HashCode),
- SQLITE_TRANSIENT)) ||
- (SQLITE_OK !=
- sqlite3_bind_blob (dstmt,
- 2, blob,
- dsize,
- SQLITE_TRANSIENT)) ||
- (SQLITE_OK !=
- sqlite3_bind_int (dstmt, 3, dtype)) )
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
- _("`%s' failed at %s:%d with error: %s\n"),
- "sqlite3_bind", __FILE__, __LINE__,
- sqlite3_errmsg (plugin->dbh));
- (void) sqlite3_finalize (dstmt);
- return GNUNET_SYSERR;
- }
+ LOG_SQLITE (plugin->dbh, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+ "sqlite3_step");
+ if (sq_prepare (plugin->dbh, "DELETE FROM ds090 WHERE _ROWID_=?", &dstmt) !=
+ SQLITE_OK)
+ {
+ LOG_SQLITE (plugin->dbh, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+ "sq_prepare");
+ if (stmt != NULL)
+ (void) sqlite3_finalize (stmt);
+ return GNUNET_SYSERR;
+ }
+ if (SQLITE_OK != sqlite3_bind_int64 (dstmt, 1, rowid))
+ {
+ LOG_SQLITE (plugin->dbh, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+ "sqlite3_bind");
+ (void) sqlite3_finalize (dstmt);
+ return GNUNET_SYSERR;
+ }
if (sqlite3_step (dstmt) != SQLITE_DONE)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
- _("`%s' failed at %s:%d with error: %s\n"),
- "sqlite3_step", __FILE__, __LINE__,
- sqlite3_errmsg (plugin->dbh));
- (void) sqlite3_finalize (dstmt);
- return GNUNET_SYSERR;
- }
- plugin->env->delete_notify (plugin->env->cls,
- &hc,
- dsize + OVERHEAD);
+ {
+ LOG_SQLITE (plugin->dbh, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+ "sqlite3_step");
+ (void) sqlite3_finalize (dstmt);
+ return GNUNET_SYSERR;
+ }
+ plugin->env->delete_notify (plugin->env->cls, &hc, dsize + OVERHEAD);
if (SQLITE_OK != sqlite3_finalize (dstmt))
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
- _("`%s' failed at %s:%d with error: %s\n"),
- "sqlite3_finalize", __FILE__, __LINE__,
- sqlite3_errmsg (plugin->dbh));
+ LOG_SQLITE (plugin->dbh, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+ "sqlite3_finalize");
return GNUNET_OK;
}
sqlite3 *dbh;
char *emsg;
- fn = GNUNET_DISK_mktemp ("gnunet-datacache");
- if (fn == NULL)
- {
- GNUNET_break (0);
+ if (GNUNET_YES ==
+ GNUNET_CONFIGURATION_get_value_yesno (env->cfg,
+ "datacache-sqlite",
+ "IN_MEMORY"))
+ {
+ if (SQLITE_OK != sqlite3_open (":memory:", &dbh))
return NULL;
- }
-#ifdef ENABLE_NLS
- fn_utf8 = GNUNET_STRINGS_to_utf8 (fn, strlen (fn), nl_langinfo (CODESET));
-#else
- /* good luck */
- fn_utf8 = GNUNET_STRINGS_to_utf8 (fn, strlen (fn), "UTF-8");
-#endif
- if (SQLITE_OK != sqlite3_open (fn_utf8, &dbh))
+ fn_utf8 = NULL;
+ }
+ else
+ {
+ fn = GNUNET_DISK_mktemp ("gnunet-datacache");
+ if (fn == NULL)
+ {
+ GNUNET_break (0);
+ return NULL;
+ }
+ /* fn should be UTF-8-encoded. If it isn't, it's a bug. */
+ fn_utf8 = GNUNET_strdup (fn);
+ if (SQLITE_OK != sqlite3_open (fn_utf8, &dbh))
{
GNUNET_free (fn);
GNUNET_free (fn_utf8);
return NULL;
}
- GNUNET_free (fn);
+ GNUNET_free (fn);
+ }
SQLITE3_EXEC (dbh, "PRAGMA temp_store=MEMORY");
SQLITE3_EXEC (dbh, "PRAGMA locking_mode=EXCLUSIVE");
SQLITE3_EXEC (dbh, "PRAGMA synchronous=OFF");
SQLITE3_EXEC (dbh, "PRAGMA count_changes=OFF");
SQLITE3_EXEC (dbh, "PRAGMA page_size=4092");
+ if (GNUNET_YES ==
+ GNUNET_CONFIGURATION_get_value_yesno (env->cfg,
+ "datacache-sqlite",
+ "IN_MEMORY"))
+ SQLITE3_EXEC (dbh, "PRAGMA sqlite_temp_store=3");
+
SQLITE3_EXEC (dbh,
- "CREATE TABLE ds090 ("
- " type INTEGER NOT NULL DEFAULT 0,"
+ "CREATE TABLE ds090 (" " type INTEGER NOT NULL DEFAULT 0,"
" expire INTEGER NOT NULL DEFAULT 0,"
" key BLOB NOT NULL DEFAULT '',"
- " value BLOB NOT NULL DEFAULT '')");
+ " value BLOB NOT NULL DEFAULT '',"
+ " path BLOB DEFAULT '')");
SQLITE3_EXEC (dbh, "CREATE INDEX idx_hashidx ON ds090 (key,type,expire)");
+ SQLITE3_EXEC (dbh, "CREATE INDEX idx_expire ON ds090 (expire)");
plugin = GNUNET_malloc (sizeof (struct Plugin));
plugin->env = env;
plugin->dbh = dbh;
api->get = &sqlite_plugin_get;
api->put = &sqlite_plugin_put;
api->del = &sqlite_plugin_del;
- GNUNET_log_from (GNUNET_ERROR_TYPE_INFO,
- "sqlite", _("Sqlite datacache running\n"));
+ LOG (GNUNET_ERROR_TYPE_INFO, _("Sqlite datacache running\n"));
return api;
}
-// explain SELECT type FROM gn090 WHERE NOT EXISTS (SELECT 1 from gn090 WHERE expire < 42 LIMIT 1) OR expire < 42 ORDER BY repl DESC, Random() LIMIT 1;
/**
struct GNUNET_DATACACHE_PluginFunctions *api = cls;
struct Plugin *plugin = api->cls;
int result;
+
#if SQLITE_VERSION_NUMBER >= 3007000
sqlite3_stmt *stmt;
#endif
#if !WINDOWS || defined(__CYGWIN__)
- if (0 != UNLINK (plugin->fn))
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
- "unlink",
- plugin->fn);
- GNUNET_free (plugin->fn);
+ if ( (NULL != plugin->fn) &&
+ (0 != UNLINK (plugin->fn)) )
+ LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "unlink", plugin->fn);
+ GNUNET_free_non_null (plugin->fn);
#endif
result = sqlite3_close (plugin->dbh);
#if SQLITE_VERSION_NUMBER >= 3007000
if (result == SQLITE_BUSY)
+ {
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ _
+ ("Tried to close sqlite without finalizing all prepared statements.\n"));
+ stmt = sqlite3_next_stmt (plugin->dbh, NULL);
+ while (stmt != NULL)
{
- 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);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Closing statement %p\n", stmt);
+ result = sqlite3_finalize (stmt);
+ if (result != SQLITE_OK)
+ LOG (GNUNET_ERROR_TYPE_WARNING, _("Failed to close statement %p: %d\n"),
+ stmt, result);
+ stmt = sqlite3_next_stmt (plugin->dbh, NULL);
}
+ result = sqlite3_close (plugin->dbh);
+ }
#endif
if (SQLITE_OK != result)
- LOG_SQLITE (plugin->dbh,
- GNUNET_ERROR_TYPE_ERROR,
- "sqlite3_close");
+ LOG_SQLITE (plugin->dbh, GNUNET_ERROR_TYPE_ERROR, "sqlite3_close");
#if WINDOWS && !defined(__CYGWIN__)
- if (0 != UNLINK (plugin->fn))
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
- "unlink",
- plugin->fn);
- GNUNET_free (plugin->fn);
+ if ( (NULL != plugin->fn) &&
+ (0 != UNLINK (plugin->fn)) )
+ LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "unlink", plugin->fn);
+ GNUNET_free_non_null (plugin->fn);
#endif
GNUNET_free (plugin);
GNUNET_free (api);
/* end of plugin_datacache_sqlite.c */
-
projects / oweals / gnunet.git / blobdiff