[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] branch master updated: converting datacache to sql
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [gnunet] branch master updated: converting datacache to sqlite, fixing misc. issues in libgnunetsq |
|
Date: |
Sun, 12 Mar 2017 02:51:41 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository gnunet.
The following commit(s) were added to refs/heads/master by this push:
new a707b5136 converting datacache to sqlite, fixing misc. issues in
libgnunetsq
a707b5136 is described below
commit a707b513688690a3dad9dc39535900da73a79f28
Author: Christian Grothoff <address@hidden>
AuthorDate: Sun Mar 12 02:51:36 2017 +0100
converting datacache to sqlite, fixing misc. issues in libgnunetsq
---
src/datacache/Makefile.am | 1 +
src/datacache/plugin_datacache_sqlite.c | 549 ++++++++++++++++++--------------
src/datastore/plugin_datastore_sqlite.c | 8 +-
src/include/gnunet_sq_lib.h | 11 +
src/sq/sq.c | 25 ++
src/sq/sq_query_helper.c | 44 ++-
src/sq/sq_result_helper.c | 67 +++-
7 files changed, 457 insertions(+), 248 deletions(-)
diff --git a/src/datacache/Makefile.am b/src/datacache/Makefile.am
index 431b3179e..670a64926 100644
--- a/src/datacache/Makefile.am
+++ b/src/datacache/Makefile.am
@@ -53,6 +53,7 @@ libgnunet_plugin_datacache_sqlite_la_SOURCES = \
plugin_datacache_sqlite.c
libgnunet_plugin_datacache_sqlite_la_LIBADD = \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/sq/libgnunetsq.la \
$(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lsqlite3 \
$(LTLIBINTL)
libgnunet_plugin_datacache_sqlite_la_LDFLAGS = \
diff --git a/src/datacache/plugin_datacache_sqlite.c
b/src/datacache/plugin_datacache_sqlite.c
index 5567077d3..5cc48b26c 100644
--- a/src/datacache/plugin_datacache_sqlite.c
+++ b/src/datacache/plugin_datacache_sqlite.c
@@ -26,6 +26,7 @@
#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_datacache_plugin.h"
+#include "gnunet_sq_lib.h"
#include <sqlite3.h>
#define LOG(kind,...) GNUNET_log_from (kind, "datacache-sqlite", __VA_ARGS__)
@@ -60,6 +61,41 @@ struct Plugin
char *fn;
/**
+ * Prepared statement for #sqlite_plugin_put.
+ */
+ sqlite3_stmt *insert_stmt;
+
+ /**
+ * Prepared statement for #sqlite_plugin_get.
+ */
+ sqlite3_stmt *get_count_stmt;
+
+ /**
+ * Prepared statement for #sqlite_plugin_get.
+ */
+ sqlite3_stmt *get_stmt;
+
+ /**
+ * Prepared statement for #sqlite_plugin_del.
+ */
+ sqlite3_stmt *del_select_stmt;
+
+ /**
+ * Prepared statement for #sqlite_plugin_del.
+ */
+ sqlite3_stmt *del_stmt;
+
+ /**
+ * Prepared statement for #sqlite_plugin_get_random.
+ */
+ sqlite3_stmt *get_random_stmt;
+
+ /**
+ * Prepared statement for #sqlite_plugin_get_closest.
+ */
+ sqlite3_stmt *get_closest_stmt;
+
+ /**
* Number of key-value pairs in the database.
*/
unsigned int num_items;
@@ -132,60 +168,47 @@ sqlite_plugin_put (void *cls,
const struct GNUNET_PeerIdentity *path_info)
{
struct Plugin *plugin = cls;
- sqlite3_stmt *stmt;
- int64_t dval;
+ uint32_t type32 = type;
+ struct GNUNET_SQ_QueryParam params[] = {
+ GNUNET_SQ_query_param_uint32 (&type32),
+ GNUNET_SQ_query_param_absolute_time (&discard_time),
+ GNUNET_SQ_query_param_auto_from_type (key),
+ GNUNET_SQ_query_param_fixed_size (data, size),
+ GNUNET_SQ_query_param_fixed_size (path_info,
+ path_info_len * sizeof (struct
GNUNET_PeerIdentity)),
+ GNUNET_SQ_query_param_end
+ };
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Processing PUT of %u bytes with key `%4s' and expiration %s\n",
+ "Processing PUT of %u bytes with key `%s' and expiration %s\n",
(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)))
+ GNUNET_STRINGS_relative_time_to_string
(GNUNET_TIME_absolute_get_remaining (discard_time),
+ GNUNET_YES));
+ if (GNUNET_OK !=
+ GNUNET_SQ_bind (plugin->insert_stmt,
+ params))
{
LOG_SQLITE (plugin->dbh,
GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"sqlite3_bind_xxx");
- sqlite3_finalize (stmt);
+ GNUNET_SQ_reset (plugin->dbh,
+ plugin->insert_stmt);
return -1;
}
- if (SQLITE_DONE != sqlite3_step (stmt))
+ if (SQLITE_DONE !=
+ sqlite3_step (plugin->insert_stmt))
{
LOG_SQLITE (plugin->dbh,
GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"sqlite3_step");
- sqlite3_finalize (stmt);
+ GNUNET_SQ_reset (plugin->dbh,
+ plugin->insert_stmt);
return -1;
}
plugin->num_items++;
- if (SQLITE_OK != sqlite3_finalize (stmt))
- LOG_SQLITE (plugin->dbh,
- GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
- "sqlite3_finalize");
+ GNUNET_SQ_reset (plugin->dbh,
+ plugin->insert_stmt);
return size + OVERHEAD;
}
@@ -209,120 +232,119 @@ sqlite_plugin_get (void *cls,
void *iter_cls)
{
struct Plugin *plugin = cls;
- sqlite3_stmt *stmt;
+ uint32_t type32 = type;
struct GNUNET_TIME_Absolute now;
struct GNUNET_TIME_Absolute exp;
- unsigned int size;
- const char *dat;
+ size_t size;
+ void *dat;
unsigned int cnt;
- unsigned int off;
+ uint32_t off;
unsigned int total;
- unsigned int psize;
- char scratch[256];
- int64_t ntime;
- const struct GNUNET_PeerIdentity *path;
+ size_t psize;
+ struct GNUNET_PeerIdentity *path;
+ struct GNUNET_SQ_QueryParam params_count[] = {
+ GNUNET_SQ_query_param_auto_from_type (key),
+ GNUNET_SQ_query_param_uint32 (&type32),
+ GNUNET_SQ_query_param_absolute_time (&now),
+ GNUNET_SQ_query_param_end
+ };
+ struct GNUNET_SQ_QueryParam params_select[] = {
+ GNUNET_SQ_query_param_auto_from_type (key),
+ GNUNET_SQ_query_param_uint32 (&type32),
+ GNUNET_SQ_query_param_absolute_time (&now),
+ GNUNET_SQ_query_param_uint32 (&off),
+ GNUNET_SQ_query_param_end
+ };
+ struct GNUNET_SQ_ResultSpec rs[] = {
+ GNUNET_SQ_result_spec_variable_size (&dat,
+ &size),
+ GNUNET_SQ_result_spec_absolute_time (&exp),
+ GNUNET_SQ_result_spec_variable_size ((void **) &path,
+ &psize),
+ GNUNET_SQ_result_spec_end
+ };
now = GNUNET_TIME_absolute_get ();
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Processing GET for key `%4s'\n",
+ "Processing GET for key `%s'\n",
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);
- 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)))
+
+ if (GNUNET_OK !=
+ GNUNET_SQ_bind (plugin->get_count_stmt,
+ params_count))
{
LOG_SQLITE (plugin->dbh,
GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"sqlite3_bind_xxx");
- sqlite3_finalize (stmt);
+ GNUNET_SQ_reset (plugin->dbh,
+ plugin->get_count_stmt);
return 0;
}
-
- if (SQLITE_ROW != sqlite3_step (stmt))
+ if (SQLITE_ROW !=
+ sqlite3_step (plugin->get_count_stmt))
{
LOG_SQLITE (plugin->dbh, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"sqlite_step");
- sqlite3_finalize (stmt);
+ GNUNET_SQ_reset (plugin->dbh,
+ plugin->get_count_stmt);
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "No content found when processing GET for key `%4s'\n",
+ "No content found when processing GET for key `%s'\n",
GNUNET_h2s (key));
return 0;
}
- total = sqlite3_column_int (stmt, 0);
- sqlite3_finalize (stmt);
- if ((0 == total) || (NULL == iter))
+ total = sqlite3_column_int (plugin->get_count_stmt,
+ 0);
+ GNUNET_SQ_reset (plugin->dbh,
+ plugin->get_count_stmt);
+ if ( (0 == total) ||
+ (NULL == iter) )
{
if (0 == total)
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "No content found when processing GET for key `%4s'\n",
+ "No content found when processing GET for key `%s'\n",
GNUNET_h2s (key));
return total;
}
cnt = 0;
- off = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, total);
+ 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)))
+ if (GNUNET_OK !=
+ GNUNET_SQ_bind (plugin->get_stmt,
+ params_select))
{
LOG_SQLITE (plugin->dbh,
GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"sqlite3_bind_xxx");
- sqlite3_finalize (stmt);
+ GNUNET_SQ_reset (plugin->dbh,
+ plugin->get_stmt);
return cnt;
}
- if (sqlite3_step (stmt) != SQLITE_ROW)
+ if (SQLITE_ROW !=
+ sqlite3_step (plugin->get_stmt))
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 (GNUNET_OK !=
+ GNUNET_SQ_extract_result (plugin->get_stmt,
+ rs))
+ {
+ GNUNET_break (0);
+ GNUNET_SQ_reset (plugin->dbh,
+ plugin->get_stmt);
+ break;
+ }
if (0 != psize % sizeof (struct GNUNET_PeerIdentity))
{
GNUNET_break (0);
psize = 0;
+ path = NULL;
}
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 GET for key `%4s'\n",
+ "Found %u-byte result when processing GET for key `%s'\n",
(unsigned int) size,
GNUNET_h2s (key));
if (GNUNET_OK != iter (iter_cls,
@@ -334,11 +356,17 @@ sqlite_plugin_get (void *cls,
psize,
path))
{
- sqlite3_finalize (stmt);
+ GNUNET_SQ_cleanup_result (rs);
+ GNUNET_SQ_reset (plugin->dbh,
+ plugin->get_stmt);
break;
}
- sqlite3_finalize (stmt);
+ GNUNET_SQ_cleanup_result (rs);
+ GNUNET_SQ_reset (plugin->dbh,
+ plugin->get_stmt);
}
+ GNUNET_SQ_reset (plugin->dbh,
+ plugin->get_stmt);
return cnt;
}
@@ -354,79 +382,73 @@ static int
sqlite_plugin_del (void *cls)
{
struct Plugin *plugin = cls;
- unsigned long long rowid;
- unsigned int dsize;
- sqlite3_stmt *stmt;
- sqlite3_stmt *dstmt;
+ uint64_t rowid;
+ void *data;
+ size_t dsize;
struct GNUNET_HashCode hc;
+ struct GNUNET_SQ_ResultSpec rs[] = {
+ GNUNET_SQ_result_spec_uint64 (&rowid),
+ GNUNET_SQ_result_spec_auto_from_type (&hc),
+ GNUNET_SQ_result_spec_variable_size ((void **) &data,
+ &dsize),
+ GNUNET_SQ_result_spec_end
+ };
+ struct GNUNET_SQ_QueryParam params[] = {
+ GNUNET_SQ_query_param_uint64 (&rowid),
+ GNUNET_SQ_query_param_end
+ };
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Processing DEL\n");
- stmt = NULL;
- dstmt = NULL;
- if (SQLITE_OK !=
- sq_prepare (plugin->dbh,
- "SELECT _ROWID_,key,value FROM ds090 ORDER BY expire ASC
LIMIT 1",
- &stmt))
- {
- 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_ROW != sqlite3_step (stmt))
+ if (SQLITE_ROW !=
+ sqlite3_step (plugin->del_select_stmt))
{
LOG_SQLITE (plugin->dbh,
GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"sqlite3_step");
- (void) sqlite3_finalize (stmt);
+ GNUNET_SQ_reset (plugin->dbh,
+ plugin->del_select_stmt);
return GNUNET_SYSERR;
}
- rowid = sqlite3_column_int64 (stmt, 0);
- GNUNET_assert (sqlite3_column_bytes (stmt, 1) == sizeof (struct
GNUNET_HashCode));
- GNUNET_memcpy (&hc, sqlite3_column_blob (stmt, 1), sizeof (struct
GNUNET_HashCode));
- dsize = sqlite3_column_bytes (stmt, 2);
- if (SQLITE_OK != sqlite3_finalize (stmt))
- LOG_SQLITE (plugin->dbh,
- GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
- "sqlite3_step");
- if (SQLITE_OK !=
- sq_prepare (plugin->dbh,
- "DELETE FROM ds090 WHERE _ROWID_=?", &dstmt))
+ if (GNUNET_OK !=
+ GNUNET_SQ_extract_result (plugin->del_select_stmt,
+ rs))
{
- LOG_SQLITE (plugin->dbh,
- GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
- "sq_prepare");
- if (stmt != NULL)
- (void) sqlite3_finalize (stmt);
+ GNUNET_break (0);
+ GNUNET_SQ_reset (plugin->dbh,
+ plugin->del_select_stmt);
return GNUNET_SYSERR;
}
- if (SQLITE_OK != sqlite3_bind_int64 (dstmt, 1, rowid))
+ GNUNET_SQ_cleanup_result (rs);
+ GNUNET_SQ_reset (plugin->dbh,
+ plugin->del_select_stmt);
+ if (GNUNET_OK !=
+ GNUNET_SQ_bind (plugin->del_stmt,
+ params))
{
LOG_SQLITE (plugin->dbh,
GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"sqlite3_bind");
- (void) sqlite3_finalize (dstmt);
+ GNUNET_SQ_reset (plugin->dbh,
+ plugin->del_stmt);
return GNUNET_SYSERR;
}
- if (SQLITE_DONE != sqlite3_step (dstmt))
+ if (SQLITE_DONE !=
+ sqlite3_step (plugin->del_stmt))
{
LOG_SQLITE (plugin->dbh,
GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"sqlite3_step");
- (void) sqlite3_finalize (dstmt);
+ GNUNET_SQ_reset (plugin->dbh,
+ plugin->del_stmt);
return GNUNET_SYSERR;
}
plugin->num_items--;
plugin->env->delete_notify (plugin->env->cls,
&hc,
dsize + OVERHEAD);
- if (SQLITE_OK != sqlite3_finalize (dstmt))
- LOG_SQLITE (plugin->dbh,
- GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
- "sqlite3_finalize");
+ GNUNET_SQ_reset (plugin->dbh,
+ plugin->del_stmt);
return GNUNET_OK;
}
@@ -445,17 +467,28 @@ sqlite_plugin_get_random (void *cls,
void *iter_cls)
{
struct Plugin *plugin = cls;
- sqlite3_stmt *stmt;
struct GNUNET_TIME_Absolute exp;
- unsigned int size;
- const char *dat;
- unsigned int off;
- unsigned int psize;
- unsigned int type;
- char scratch[256];
- int64_t ntime;
- const struct GNUNET_PeerIdentity *path;
- const struct GNUNET_HashCode *key;
+ size_t size;
+ void *dat;
+ uint32_t off;
+ size_t psize;
+ uint32_t type;
+ struct GNUNET_PeerIdentity *path;
+ struct GNUNET_HashCode key;
+ struct GNUNET_SQ_QueryParam params[] = {
+ GNUNET_SQ_query_param_uint32 (&off),
+ GNUNET_SQ_query_param_end
+ };
+ struct GNUNET_SQ_ResultSpec rs[] = {
+ GNUNET_SQ_result_spec_variable_size (&dat,
+ &size),
+ GNUNET_SQ_result_spec_absolute_time (&exp),
+ GNUNET_SQ_result_spec_variable_size ((void **) &path,
+ &psize),
+ GNUNET_SQ_result_spec_auto_from_type (&key),
+ GNUNET_SQ_result_spec_uint32 (&type),
+ GNUNET_SQ_result_spec_end
+ };
if (0 == plugin->num_items)
return 0;
@@ -463,60 +496,51 @@ sqlite_plugin_get_random (void *cls,
return 1;
off = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE,
plugin->num_items);
- GNUNET_snprintf (scratch,
- sizeof (scratch),
- "SELECT value,expire,path,key,type FROM ds090 ORDER BY key
LIMIT 1 OFFSET %u",
- off);
- if (SQLITE_OK !=
- sq_prepare (plugin->dbh, scratch, &stmt))
+ if (GNUNET_OK !=
+ GNUNET_SQ_bind (plugin->get_random_stmt,
+ params))
{
- LOG_SQLITE (plugin->dbh,
- GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
- "sq_prepare");
return 0;
}
- if (SQLITE_ROW != sqlite3_step (stmt))
+ if (SQLITE_ROW !=
+ sqlite3_step (plugin->get_random_stmt))
+ {
+ GNUNET_break (0);
+ GNUNET_SQ_reset (plugin->dbh,
+ plugin->get_random_stmt);
+ return 0;
+ }
+ if (GNUNET_OK !=
+ GNUNET_SQ_extract_result (plugin->get_random_stmt,
+ rs))
{
GNUNET_break (0);
- sqlite3_finalize (stmt);
+ GNUNET_SQ_reset (plugin->dbh,
+ plugin->get_random_stmt);
return 0;
}
- 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;
+ path = NULL;
}
psize /= sizeof (struct GNUNET_PeerIdentity);
- if (0 != psize)
- path = sqlite3_column_blob (stmt, 2);
- else
- path = NULL;
-
- GNUNET_assert (sizeof (struct GNUNET_HashCode) ==
- sqlite3_column_bytes (stmt, 3));
- key = sqlite3_column_blob (stmt, 3);
- type = sqlite3_column_int (stmt, 4);
-
- ntime = (int64_t) exp.abs_value_us;
- if (ntime == INT64_MAX)
- exp = GNUNET_TIME_UNIT_FOREVER_ABS;
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Found %u-byte result with key %s when processing GET-RANDOM\n",
(unsigned int) size,
- GNUNET_h2s (key));
+ GNUNET_h2s (&key));
(void) iter (iter_cls,
- key,
+ &key,
size,
dat,
- type,
+ (enum GNUNET_BLOCK_Type) type,
exp,
psize,
path);
- sqlite3_finalize (stmt);
+ GNUNET_SQ_cleanup_result (rs);
+ GNUNET_SQ_reset (plugin->dbh,
+ plugin->get_random_stmt);
return 1;
}
@@ -542,83 +566,73 @@ sqlite_plugin_get_closest (void *cls,
void *iter_cls)
{
struct Plugin *plugin = cls;
- sqlite3_stmt *stmt;
+ uint32_t num_results32 = num_results;
struct GNUNET_TIME_Absolute now;
struct GNUNET_TIME_Absolute exp;
- unsigned int size;
- const char *dat;
+ size_t size;
+ void *dat;
unsigned int cnt;
- unsigned int psize;
- unsigned int type;
- int64_t ntime;
- const struct GNUNET_PeerIdentity *path;
+ size_t psize;
+ uint32_t type;
+ struct GNUNET_HashCode hc;
+ struct GNUNET_PeerIdentity *path;
+ struct GNUNET_SQ_QueryParam params[] = {
+ GNUNET_SQ_query_param_auto_from_type (key),
+ GNUNET_SQ_query_param_absolute_time (&now),
+ GNUNET_SQ_query_param_uint32 (&num_results32),
+ GNUNET_SQ_query_param_end
+ };
+ struct GNUNET_SQ_ResultSpec rs[] = {
+ GNUNET_SQ_result_spec_variable_size (&dat,
+ &size),
+ GNUNET_SQ_result_spec_absolute_time (&exp),
+ GNUNET_SQ_result_spec_variable_size ((void **) &path,
+ &psize),
+ GNUNET_SQ_result_spec_uint32 (&type),
+ GNUNET_SQ_result_spec_auto_from_type (&hc),
+ GNUNET_SQ_result_spec_end
+ };
now = GNUNET_TIME_absolute_get ();
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Processing GET_CLOSEST for key `%4s'\n",
+ "Processing GET_CLOSEST for key `%s'\n",
GNUNET_h2s (key));
- if (SQLITE_OK !=
- sq_prepare (plugin->dbh,
- "SELECT value,expire,path,type,key FROM ds090 WHERE key>=?
AND expire >= ? ORDER BY KEY ASC LIMIT ?",
- &stmt))
- {
- 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);
- if ((SQLITE_OK !=
- sqlite3_bind_blob (stmt,
- 1,
- key,
- sizeof (struct GNUNET_HashCode),
- SQLITE_TRANSIENT)) ||
- (SQLITE_OK != sqlite3_bind_int64 (stmt, 2, now.abs_value_us)) ||
- (SQLITE_OK != sqlite3_bind_int (stmt, 3, num_results)) )
+ if (GNUNET_OK !=
+ GNUNET_SQ_bind (plugin->get_closest_stmt,
+ params))
{
LOG_SQLITE (plugin->dbh,
GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"sqlite3_bind_xxx");
- sqlite3_finalize (stmt);
+ GNUNET_SQ_reset (plugin->dbh,
+ plugin->get_closest_stmt);
return 0;
}
cnt = 0;
- while (SQLITE_ROW == sqlite3_step (stmt))
+ while (SQLITE_ROW ==
+ sqlite3_step (plugin->get_closest_stmt))
{
- if (sizeof (struct GNUNET_HashCode) !=
- sqlite3_column_bytes (stmt, 4))
+ if (GNUNET_OK !=
+ GNUNET_SQ_extract_result (plugin->get_closest_stmt,
+ rs))
{
GNUNET_break (0);
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);
- type = sqlite3_column_int (stmt, 3);
- key = sqlite3_column_blob (stmt, 4);
if (0 != psize % sizeof (struct GNUNET_PeerIdentity))
{
GNUNET_break (0);
psize = 0;
+ path = NULL;
}
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 at %s when processing GET_CLOSE\n",
(unsigned int) size,
- GNUNET_h2s (key));
+ GNUNET_h2s (&hc));
if (GNUNET_OK != iter (iter_cls,
- key,
+ &hc,
size,
dat,
type,
@@ -626,11 +640,13 @@ sqlite_plugin_get_closest (void *cls,
psize,
path))
{
- sqlite3_finalize (stmt);
+ GNUNET_SQ_cleanup_result (rs);
break;
}
+ GNUNET_SQ_cleanup_result (rs);
}
- sqlite3_finalize (stmt);
+ GNUNET_SQ_reset (plugin->dbh,
+ plugin->get_closest_stmt);
return cnt;
}
@@ -703,6 +719,50 @@ libgnunet_plugin_datacache_sqlite_init (void *cls)
plugin->env = env;
plugin->dbh = dbh;
plugin->fn = fn_utf8;
+
+ if ( (SQLITE_OK !=
+ sq_prepare (plugin->dbh,
+ "INSERT INTO ds090 (type, expire, key, value, path) "
+ "VALUES (?, ?, ?, ?, ?)",
+ &plugin->insert_stmt)) ||
+ (SQLITE_OK !=
+ sq_prepare (plugin->dbh,
+ "SELECT count(*) FROM ds090 "
+ "WHERE key=? AND type=? AND expire >= ?",
+ &plugin->get_count_stmt)) ||
+ (SQLITE_OK !=
+ sq_prepare (plugin->dbh,
+ "SELECT value,expire,path FROM ds090 "
+ "WHERE key=? AND type=? AND expire >= ? LIMIT 1 OFFSET ?",
+ &plugin->get_stmt)) ||
+ (SQLITE_OK !=
+ sq_prepare (plugin->dbh,
+ "SELECT _ROWID_,key,value FROM ds090 ORDER BY expire ASC
LIMIT 1",
+ &plugin->del_select_stmt)) ||
+ (SQLITE_OK !=
+ sq_prepare (plugin->dbh,
+ "DELETE FROM ds090 WHERE _ROWID_=?",
+ &plugin->del_stmt)) ||
+ (SQLITE_OK !=
+ sq_prepare (plugin->dbh,
+ "SELECT value,expire,path,key,type FROM ds090 "
+ "ORDER BY key LIMIT 1 OFFSET ?",
+ &plugin->get_random_stmt)) ||
+ (SQLITE_OK !=
+ sq_prepare (plugin->dbh,
+ "SELECT value,expire,path,type,key FROM ds090 "
+ "WHERE key>=? AND expire >= ? ORDER BY KEY ASC LIMIT ?",
+ &plugin->get_closest_stmt))
+ )
+ {
+ LOG_SQLITE (plugin->dbh,
+ GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+ "sq_prepare");
+ (void) sqlite3_close (plugin->dbh);
+ GNUNET_free (plugin);
+ return NULL;
+ }
+
api = GNUNET_new (struct GNUNET_DATACACHE_PluginFunctions);
api->cls = plugin;
api->get = &sqlite_plugin_get;
@@ -741,6 +801,13 @@ libgnunet_plugin_datacache_sqlite_done (void *cls)
plugin->fn);
GNUNET_free_non_null (plugin->fn);
#endif
+ sqlite3_finalize (plugin->insert_stmt);
+ sqlite3_finalize (plugin->get_count_stmt);
+ sqlite3_finalize (plugin->get_stmt);
+ sqlite3_finalize (plugin->del_select_stmt);
+ sqlite3_finalize (plugin->del_stmt);
+ sqlite3_finalize (plugin->get_random_stmt);
+ sqlite3_finalize (plugin->get_closest_stmt);
result = sqlite3_close (plugin->dbh);
#if SQLITE_VERSION_NUMBER >= 3007000
if (SQLITE_BUSY == result)
diff --git a/src/datastore/plugin_datastore_sqlite.c
b/src/datastore/plugin_datastore_sqlite.c
index 4e65f9d14..54bf4e55d 100644
--- a/src/datastore/plugin_datastore_sqlite.c
+++ b/src/datastore/plugin_datastore_sqlite.c
@@ -855,11 +855,9 @@ execute_get (struct Plugin *plugin,
anonymity,
expiration,
rowid);
- if (SQLITE_OK !=
- sqlite3_reset (stmt))
- LOG_SQLITE (plugin,
- GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
- "sqlite3_reset");
+ GNUNET_SQ_cleanup_result (rs);
+ GNUNET_SQ_reset (plugin->dbh,
+ stmt);
if ( (GNUNET_NO == ret) &&
(GNUNET_OK == delete_by_rowid (plugin,
rowid)) &&
diff --git a/src/include/gnunet_sq_lib.h b/src/include/gnunet_sq_lib.h
index 4d2510ee5..c196d7767 100644
--- a/src/include/gnunet_sq_lib.h
+++ b/src/include/gnunet_sq_lib.h
@@ -194,6 +194,17 @@ GNUNET_SQ_bind (sqlite3_stmt *stmt,
/**
+ * Reset @a stmt and log error.
+ *
+ * @param dbh database handle
+ * @param stmt statement to reset
+ */
+void
+GNUNET_SQ_reset (sqlite3 *dbh,
+ sqlite3_stmt *stmt);
+
+
+/**
* Extract data from a Postgres database @a result at row @a row.
*
* @param cls closure
diff --git a/src/sq/sq.c b/src/sq/sq.c
index 114de2d88..089ebf0ff 100644
--- a/src/sq/sq.c
+++ b/src/sq/sq.c
@@ -90,7 +90,12 @@ GNUNET_SQ_extract_result (sqlite3_stmt *result,
j,
rs[i].result_size,
rs[i].dst))
+ {
+ for (unsigned int k=0;k<i;k++)
+ if (NULL != rs[k].cleaner)
+ rs[k].cleaner (rs[k].cls);
return GNUNET_SYSERR;
+ }
GNUNET_assert (0 != rs[i].num_params);
j += rs[i].num_params;
}
@@ -112,4 +117,24 @@ GNUNET_SQ_cleanup_result (struct GNUNET_SQ_ResultSpec *rs)
rs[i].cleaner (rs[i].cls);
}
+
+/**
+ * Reset @a stmt and log error.
+ *
+ * @param dbh database handle
+ * @param stmt statement to reset
+ */
+void
+GNUNET_SQ_reset (sqlite3 *dbh,
+ sqlite3_stmt *stmt)
+{
+ if (SQLITE_OK !=
+ sqlite3_reset (stmt))
+ GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+ "sqlite",
+ _("Failed to reset sqlite statement with error: %s\n"),
+ sqlite3_errmsg (dbh));
+}
+
+
/* end of sq.c */
diff --git a/src/sq/sq_query_helper.c b/src/sq/sq_query_helper.c
index 5529c5e6c..a04b4ced4 100644
--- a/src/sq/sq_query_helper.c
+++ b/src/sq/sq_query_helper.c
@@ -235,6 +235,40 @@ GNUNET_SQ_query_param_rsa_signature (const struct
GNUNET_CRYPTO_RsaSignature *x)
/**
+ * Function called to convert input argument into SQL parameters.
+ *
+ * @param cls closure
+ * @param data pointer to input argument
+ * @param data_len number of bytes in @a data (if applicable)
+ * @param stmt sqlite statement to bind parameters for
+ * @param off offset of the argument to bind in @a stmt, numbered from 1,
+ * so immediately suitable for passing to `sqlite3_bind`-functions.
+ * @return #GNUNET_SYSERR on error, #GNUNET_OK on success
+ */
+static int
+bind_abstime (void *cls,
+ const void *data,
+ size_t data_len,
+ sqlite3_stmt *stmt,
+ unsigned int off)
+{
+ const struct GNUNET_TIME_Absolute *u = data;
+ struct GNUNET_TIME_Absolute abs;
+
+ abs = *u;
+ if (abs.abs_value_us > INT64_MAX)
+ abs.abs_value_us = INT64_MAX;
+ GNUNET_assert (sizeof (uint64_t) == data_len);
+ if (SQLITE_OK !=
+ sqlite3_bind_int64 (stmt,
+ (int) off,
+ (sqlite3_int64) abs.abs_value_us))
+ return GNUNET_SYSERR;
+ return GNUNET_OK;
+}
+
+
+/**
* Generate query parameter for an absolute time value.
* The database must store a 64-bit integer.
*
@@ -243,7 +277,13 @@ GNUNET_SQ_query_param_rsa_signature (const struct
GNUNET_CRYPTO_RsaSignature *x)
struct GNUNET_SQ_QueryParam
GNUNET_SQ_query_param_absolute_time (const struct GNUNET_TIME_Absolute *x)
{
- return GNUNET_SQ_query_param_uint64 (&x->abs_value_us);
+ struct GNUNET_SQ_QueryParam qp = {
+ .conv = &bind_abstime,
+ .data = x,
+ .size = sizeof (struct GNUNET_TIME_Absolute),
+ .num_params = 1
+ };
+ return qp;
}
@@ -269,6 +309,8 @@ bind_nbotime (void *cls,
struct GNUNET_TIME_Absolute abs;
abs = GNUNET_TIME_absolute_ntoh (*u);
+ if (abs.abs_value_us > INT64_MAX)
+ abs.abs_value_us = INT64_MAX;
GNUNET_assert (sizeof (uint64_t) == data_len);
if (SQLITE_OK !=
sqlite3_bind_int64 (stmt,
diff --git a/src/sq/sq_result_helper.c b/src/sq/sq_result_helper.c
index eaf606aa4..fad3f3c8d 100644
--- a/src/sq/sq_result_helper.c
+++ b/src/sq/sq_result_helper.c
@@ -46,6 +46,15 @@ extract_var_blob (void *cls,
const void *ret;
void **rdst = (void **) dst;
+ if (SQLITE_NULL ==
+ sqlite3_column_type (result,
+ column))
+ {
+ *rdst = NULL;
+ *dst_size = 0;
+ return GNUNET_YES;
+ }
+
if (SQLITE_BLOB !=
sqlite3_column_type (result,
column))
@@ -142,6 +151,14 @@ extract_fixed_blob (void *cls,
int have;
const void *ret;
+ if ( (0 == *dst_size) &&
+ (SQLITE_NULL ==
+ sqlite3_column_type (result,
+ column)) )
+ {
+ return GNUNET_YES;
+ }
+
if (SQLITE_BLOB !=
sqlite3_column_type (result,
column))
@@ -459,6 +476,45 @@ GNUNET_SQ_result_spec_rsa_signature (struct
GNUNET_CRYPTO_RsaSignature **sig)
/**
+ * Extract absolute time value from a Postgres database @a result at row @a
row.
+ *
+ * @param cls closure
+ * @param result where to extract data from
+ * @param column column to extract data from
+ * @param[in,out] dst_size where to store size of result, may be NULL
+ * @param[out] dst where to store the result
+ * @return
+ * #GNUNET_YES if all results could be extracted
+ * #GNUNET_SYSERR if a result was invalid (non-existing field or NULL)
+ */
+static int
+extract_abs_time (void *cls,
+ sqlite3_stmt *result,
+ unsigned int column,
+ size_t *dst_size,
+ void *dst)
+{
+ struct GNUNET_TIME_Absolute *u = dst;
+ struct GNUNET_TIME_Absolute t;
+
+ GNUNET_assert (sizeof (uint64_t) == *dst_size);
+ if (SQLITE_INTEGER !=
+ sqlite3_column_type (result,
+ column))
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ t.abs_value_us = (uint64_t) sqlite3_column_int64 (result,
+ column);
+ if (INT64_MAX == t.abs_value_us)
+ t = GNUNET_TIME_UNIT_FOREVER_ABS;
+ *u = t;
+ return GNUNET_OK;
+}
+
+
+/**
* Absolute time expected.
*
* @param[out] at where to store the result
@@ -467,7 +523,14 @@ GNUNET_SQ_result_spec_rsa_signature (struct
GNUNET_CRYPTO_RsaSignature **sig)
struct GNUNET_SQ_ResultSpec
GNUNET_SQ_result_spec_absolute_time (struct GNUNET_TIME_Absolute *at)
{
- return GNUNET_SQ_result_spec_uint64 (&at->abs_value_us);
+ struct GNUNET_SQ_ResultSpec rs = {
+ .conv = &extract_abs_time,
+ .dst = at,
+ .dst_size = sizeof (struct GNUNET_TIME_Absolute),
+ .num_params = 1
+ };
+
+ return rs;
}
@@ -503,6 +566,8 @@ extract_abs_time_nbo (void *cls,
}
t.abs_value_us = (uint64_t) sqlite3_column_int64 (result,
column);
+ if (INT64_MAX == t.abs_value_us)
+ t = GNUNET_TIME_UNIT_FOREVER_ABS;
*u = GNUNET_TIME_absolute_hton (t);
return GNUNET_OK;
}
--
To stop receiving notification emails like this one, please contact
address@hidden
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [gnunet] branch master updated: converting datacache to sqlite, fixing misc. issues in libgnunetsq,
gnunet <=