* - The tables can be verified/fixed in two ways;
* 1) by running mysqlcheck -A, or
* 2) by executing (inside of mysql using the GNUnet database):
- * mysql> REPAIR TABLE gn080;
+ * mysql> REPAIR TABLE gn090;
* mysql> REPAIR TABLE gn072;
*
* PROBLEMS?
* to it, create tables, issue queries etc.
*
* TODO:
- * - implement GET
- * - remove 'size' field in gn080.
* - use FOREIGN KEY for 'uid/vkey'
* - consistent naming of uid/vkey
*/
automatically apply a LIMIT on the outermost clause, so we need to
repeat ourselves quite a bit. All hail the performance gods (and thanks
to #mysql on freenode) */
-#define SELECT_IT_LOW_PRIORITY "(SELECT size,type,prio,anonLevel,expire,hash,vkey FROM gn080 FORCE INDEX(prio) WHERE (prio = ? AND vkey > ?) "\
- "ORDER BY prio ASC,vkey ASC LIMIT 1) "\
+#define SELECT_IT_LOW_PRIORITY "(SELECT type,prio,anonLevel,expire,hash,vkey FROM gn090 FORCE INDEX(prio) WHERE (prio = ? AND vkey > ?) "\
+ "ORDER BY prio ASC,vkey ASC LIMIT 1) " \
"UNION "\
- "(SELECT size,type,prio,anonLevel,expire,hash,vkey FROM gn080 FORCE INDEX(prio) WHERE (prio > ? AND vkey != ?)"\
+ "(SELECT type,prio,anonLevel,expire,hash,vkey FROM gn090 FORCE INDEX(prio) WHERE (prio > ? AND vkey != ?)"\
"ORDER BY prio ASC,vkey ASC LIMIT 1)"\
"ORDER BY prio ASC,vkey ASC LIMIT 1"
-#define SELECT_IT_NON_ANONYMOUS "(SELECT size,type,prio,anonLevel,expire,hash,vkey FROM gn080 FORCE INDEX(prio) WHERE (prio = ? AND vkey < ?)"\
+#define SELECT_IT_NON_ANONYMOUS "(SELECT type,prio,anonLevel,expire,hash,vkey FROM gn090 FORCE INDEX(prio) WHERE (prio = ? AND vkey < ?)"\
" AND anonLevel=0 ORDER BY prio DESC,vkey DESC LIMIT 1) "\
"UNION "\
- "(SELECT size,type,prio,anonLevel,expire,hash,vkey FROM gn080 FORCE INDEX(prio) WHERE (prio < ? AND vkey != ?)"\
+ "(SELECT type,prio,anonLevel,expire,hash,vkey FROM gn090 FORCE INDEX(prio) WHERE (prio < ? AND vkey != ?)"\
" AND anonLevel=0 ORDER BY prio DESC,vkey DESC LIMIT 1) "\
"ORDER BY prio DESC,vkey DESC LIMIT 1"
-#define SELECT_IT_EXPIRATION_TIME "(SELECT size,type,prio,anonLevel,expire,hash,vkey FROM gn080 FORCE INDEX(expire) WHERE (expire = ? AND vkey > ?) "\
+#define SELECT_IT_EXPIRATION_TIME "(SELECT type,prio,anonLevel,expire,hash,vkey FROM gn090 FORCE INDEX(expire) WHERE (expire = ? AND vkey > ?) "\
"ORDER BY expire ASC,vkey ASC LIMIT 1) "\
"UNION "\
- "(SELECT size,type,prio,anonLevel,expire,hash,vkey FROM gn080 FORCE INDEX(expire) WHERE (expire > ? AND vkey != ?) "\
+ "(SELECT type,prio,anonLevel,expire,hash,vkey FROM gn090 FORCE INDEX(expire) WHERE (expire > ? AND vkey != ?) "\
"ORDER BY expire ASC,vkey ASC LIMIT 1)"\
"ORDER BY expire ASC,vkey ASC LIMIT 1"
-#define SELECT_IT_MIGRATION_ORDER "(SELECT size,type,prio,anonLevel,expire,hash,vkey FROM gn080 FORCE INDEX(expire) WHERE (expire = ? AND vkey < ?)"\
+#define SELECT_IT_MIGRATION_ORDER "(SELECT type,prio,anonLevel,expire,hash,vkey FROM gn090 FORCE INDEX(expire) WHERE (expire = ? AND vkey < ?)"\
" AND expire > ? AND type!=3"\
" ORDER BY expire DESC,vkey DESC LIMIT 1) "\
"UNION "\
- "(SELECT size,type,prio,anonLevel,expire,hash,vkey FROM gn080 FORCE INDEX(expire) WHERE (expire < ? AND vkey != ?)"\
+ "(SELECT type,prio,anonLevel,expire,hash,vkey FROM gn090 FORCE INDEX(expire) WHERE (expire < ? AND vkey != ?)"\
" AND expire > ? AND type!=3"\
" ORDER BY expire DESC,vkey DESC LIMIT 1)"\
"ORDER BY expire DESC,vkey DESC LIMIT 1"
-#define SELECT_SIZE "SELECT sum(size) FROM gn080"
+// #define SELECT_SIZE "SELECT SUM(BIT_LENGTH(value) DIV 8) FROM gn072"
struct GNUNET_MysqlStatementHandle
*/
void *prep_cls;
- MYSQL_BIND rbind[7];
+ MYSQL_BIND rbind[6];
unsigned int type;
struct GNUNET_MysqlStatementHandle *insert_value;
/**
- * Statements dealing with gn080 table
+ * Statements dealing with gn090 table
*/
-#define INSERT_ENTRY "INSERT INTO gn080 (size,type,prio,anonLevel,expire,hash,vhash,vkey) VALUES (?,?,?,?,?,?,?,?)"
+#define INSERT_ENTRY "INSERT INTO gn090 (type,prio,anonLevel,expire,hash,vhash,vkey) VALUES (?,?,?,?,?,?,?)"
struct GNUNET_MysqlStatementHandle *insert_entry;
-#define DELETE_ENTRY_BY_VKEY "DELETE FROM gn080 WHERE vkey=?"
+#define DELETE_ENTRY_BY_VKEY "DELETE FROM gn090 WHERE vkey=?"
struct GNUNET_MysqlStatementHandle *delete_entry_by_vkey;
-#define SELECT_ENTRY_BY_HASH "SELECT size,type,prio,anonLevel,expire,hash,vkey FROM gn080 FORCE INDEX (hash_vkey) WHERE hash=? AND vkey > ? ORDER BY vkey ASC LIMIT 1 OFFSET ?"
+#define SELECT_ENTRY_BY_HASH "SELECT type,prio,anonLevel,expire,hash,vkey FROM gn090 FORCE INDEX (hash_vkey) WHERE hash=? AND vkey > ? ORDER BY vkey ASC LIMIT 1 OFFSET ?"
struct GNUNET_MysqlStatementHandle *select_entry_by_hash;
-#define SELECT_ENTRY_BY_HASH_AND_VHASH "SELECT size,type,prio,anonLevel,expire,hash,vkey FROM gn080 FORCE INDEX (hash_vhash_vkey) WHERE hash=? AND vhash=? AND vkey > ? ORDER BY vkey ASC LIMIT 1 OFFSET ?"
+#define SELECT_ENTRY_BY_HASH_AND_VHASH "SELECT type,prio,anonLevel,expire,hash,vkey FROM gn090 FORCE INDEX (hash_vhash_vkey) WHERE hash=? AND vhash=? AND vkey > ? ORDER BY vkey ASC LIMIT 1 OFFSET ?"
struct GNUNET_MysqlStatementHandle *select_entry_by_hash_and_vhash;
-#define SELECT_ENTRY_BY_HASH_AND_TYPE "SELECT size,type,prio,anonLevel,expire,hash,vkey FROM gn080 FORCE INDEX (hash_vkey) WHERE hash=? AND vkey > ? AND type=? ORDER BY vkey ASC LIMIT 1 OFFSET ?"
+#define SELECT_ENTRY_BY_HASH_AND_TYPE "SELECT type,prio,anonLevel,expire,hash,vkey FROM gn090 FORCE INDEX (hash_vkey) WHERE hash=? AND vkey > ? AND type=? ORDER BY vkey ASC LIMIT 1 OFFSET ?"
struct GNUNET_MysqlStatementHandle *select_entry_by_hash_and_type;
-#define SELECT_ENTRY_BY_HASH_VHASH_AND_TYPE "SELECT size,type,prio,anonLevel,expire,hash,vkey FROM gn080 FORCE INDEX (hash_vhash_vkey) WHERE hash=? AND vhash=? AND vkey > ? AND type=? ORDER BY vkey ASC LIMIT 1 OFFSET ?"
+#define SELECT_ENTRY_BY_HASH_VHASH_AND_TYPE "SELECT type,prio,anonLevel,expire,hash,vkey FROM gn090 FORCE INDEX (hash_vhash_vkey) WHERE hash=? AND vhash=? AND vkey > ? AND type=? ORDER BY vkey ASC LIMIT 1 OFFSET ?"
struct GNUNET_MysqlStatementHandle *select_entry_by_hash_vhash_and_type;
-#define COUNT_ENTRY_BY_HASH "SELECT count(*) FROM gn080 FORCE INDEX (hash) WHERE hash=?"
+#define COUNT_ENTRY_BY_HASH "SELECT count(*) FROM gn090 FORCE INDEX (hash) WHERE hash=?"
struct GNUNET_MysqlStatementHandle *count_entry_by_hash;
-#define COUNT_ENTRY_BY_HASH_AND_VHASH "SELECT count(*) FROM gn080 FORCE INDEX (hash_vhash_vkey) WHERE hash=? AND vhash=?"
+#define COUNT_ENTRY_BY_HASH_AND_VHASH "SELECT count(*) FROM gn090 FORCE INDEX (hash_vhash_vkey) WHERE hash=? AND vhash=?"
struct GNUNET_MysqlStatementHandle *count_entry_by_hash_and_vhash;
-#define COUNT_ENTRY_BY_HASH_AND_TYPE "SELECT count(*) FROM gn080 FORCE INDEX (hash) WHERE hash=? AND type=?"
+#define COUNT_ENTRY_BY_HASH_AND_TYPE "SELECT count(*) FROM gn090 FORCE INDEX (hash) WHERE hash=? AND type=?"
struct GNUNET_MysqlStatementHandle *count_entry_by_hash_and_type;
-#define COUNT_ENTRY_BY_HASH_VHASH_AND_TYPE "SELECT count(*) FROM gn080 FORCE INDEX (hash_vhash) WHERE hash=? AND vhash=? AND type=?"
+#define COUNT_ENTRY_BY_HASH_VHASH_AND_TYPE "SELECT count(*) FROM gn090 FORCE INDEX (hash_vhash) WHERE hash=? AND vhash=? AND type=?"
struct GNUNET_MysqlStatementHandle *count_entry_by_hash_vhash_and_type;
-#define UPDATE_ENTRY "UPDATE gn080 SET prio=prio+?,expire=IF(expire>=?,expire,?) WHERE vkey=?"
+#define UPDATE_ENTRY "UPDATE gn090 SET prio=prio+?,expire=IF(expire>=?,expire,?) WHERE vkey=?"
struct GNUNET_MysqlStatementHandle *update_entry;
struct GNUNET_MysqlStatementHandle *iter[4];
- //static unsigned int stat_size;
-
/**
* Size of the mysql database on disk.
*/
#ifndef WINDOWS
struct passwd *pw;
#endif
+ int configured;
#ifndef WINDOWS
pw = getpwuid (getuid ());
}
if (GNUNET_YES ==
GNUNET_CONFIGURATION_have_value (cfg,
- "MYSQL", "CONFIG"))
+ "datastore-mysql", "CONFIG"))
{
- GNUNET_CONFIGURATION_get_value_filename (cfg,
- "MYSQL", "CONFIG", &cnffile);
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_filename (cfg,
+ "datastore-mysql", "CONFIG", &cnffile));
+ configured = GNUNET_YES;
}
else
{
#endif
GNUNET_asprintf (&cnffile, "%s/.my.cnf", home_dir);
GNUNET_free (home_dir);
+ configured = GNUNET_NO;
}
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
_("Trying to use file `%s' for MySQL configuration.\n"),
if ((0 != STAT (cnffile, &st)) ||
(0 != ACCESS (cnffile, R_OK)) || (!S_ISREG (st.st_mode)))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Could not access file `%s': %s\n"), cnffile,
- STRERROR (errno));
+ if (configured == GNUNET_YES)
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Could not access file `%s': %s\n"), cnffile,
+ STRERROR (errno));
GNUNET_free (cnffile);
return NULL;
}
mysql_options (ret->dbf, MYSQL_OPT_RECONNECT, &reconnect);
mysql_options (ret->dbf,
MYSQL_OPT_CONNECT_TIMEOUT, (const void *) &timeout);
+ mysql_options(ret->dbf, MYSQL_SET_CHARSET_NAME, "UTF8");
timeout = 60; /* in seconds */
mysql_options (ret->dbf, MYSQL_OPT_READ_TIMEOUT, (const void *) &timeout);
mysql_options (ret->dbf, MYSQL_OPT_WRITE_TIMEOUT, (const void *) &timeout);
mysql_dbname = NULL;
if (GNUNET_YES == GNUNET_CONFIGURATION_have_value (ret->env->cfg,
- "MYSQL", "DATABASE"))
+ "datastore-mysql", "DATABASE"))
GNUNET_assert (GNUNET_OK ==
GNUNET_CONFIGURATION_get_value_string (ret->env->cfg,
- "MYSQL", "DATABASE",
+ "datastore-mysql", "DATABASE",
&mysql_dbname));
else
mysql_dbname = GNUNET_strdup ("gnunet");
mysql_user = NULL;
if (GNUNET_YES == GNUNET_CONFIGURATION_have_value (ret->env->cfg,
- "MYSQL", "USER"))
+ "datastore-mysql", "USER"))
{
- GNUNET_break (GNUNET_OK ==
+ GNUNET_assert (GNUNET_OK ==
GNUNET_CONFIGURATION_get_value_string (ret->env->cfg,
- "MYSQL", "USER",
+ "datastore-mysql", "USER",
&mysql_user));
}
mysql_password = NULL;
if (GNUNET_YES == GNUNET_CONFIGURATION_have_value (ret->env->cfg,
- "MYSQL", "PASSWORD"))
+ "datastore-mysql", "PASSWORD"))
{
- GNUNET_break (GNUNET_OK ==
+ GNUNET_assert (GNUNET_OK ==
GNUNET_CONFIGURATION_get_value_string (ret->env->cfg,
- "MYSQL", "PASSWORD",
+ "datastore-mysql", "PASSWORD",
&mysql_password));
}
mysql_server = NULL;
if (GNUNET_YES == GNUNET_CONFIGURATION_have_value (ret->env->cfg,
- "MYSQL", "HOST"))
+ "datastore-mysql", "HOST"))
{
- GNUNET_break (GNUNET_OK ==
+ GNUNET_assert (GNUNET_OK ==
GNUNET_CONFIGURATION_get_value_string (ret->env->cfg,
- "MYSQL", "HOST",
+ "datastore-mysql", "HOST",
&mysql_server));
}
mysql_port = 0;
if (GNUNET_YES == GNUNET_CONFIGURATION_have_value (ret->env->cfg,
- "MYSQL", "PORT"))
+ "datastore-mysql", "PORT"))
{
- GNUNET_break (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_number (ret->env->cfg, "MYSQL",
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_number (ret->env->cfg, "datastore-mysql",
"PORT", &mysql_port));
}
GNUNET_assert (mysql_dbname != NULL);
mysql_real_connect (ret->dbf, mysql_server, mysql_user, mysql_password,
- mysql_dbname, (unsigned int) mysql_port, NULL, 0);
+ mysql_dbname, (unsigned int) mysql_port, NULL,
+ CLIENT_IGNORE_SIGPIPE);
+ GNUNET_free_non_null (mysql_server);
+ GNUNET_free_non_null (mysql_user);
+ GNUNET_free_non_null (mysql_password);
GNUNET_free (mysql_dbname);
if (mysql_error (ret->dbf)[0])
{
}
-#if 0
-/**
- * Run the given MySQL SELECT statement. The statement
- * must have only a single result (one column, one row).
- *
- * @return result on success, NULL on error
- */
-static char *
-run_statement_select (struct Plugin *plugin,
- const char *statement)
-{
- MYSQL_RES *sql_res;
- MYSQL_ROW sql_row;
- char *ret;
-
- if ((NULL == plugin->dbf) && (GNUNET_OK != iopen (plugin)))
- return NULL;
- mysql_query (plugin->dbf, statement);
- if ((mysql_error (plugin->dbf)[0]) ||
- (!(sql_res = mysql_use_result (plugin->dbf))) ||
- (!(sql_row = mysql_fetch_row (sql_res))))
- {
- LOG_MYSQL (GNUNET_ERROR_TYPE_ERROR,
- "mysql_query", plugin);
- return NULL;
- }
- if ((mysql_num_fields (sql_res) != 1) || (sql_row[0] == NULL))
- {
- GNUNET_break (mysql_num_fields (sql_res) == 1);
- if (sql_res != NULL)
- mysql_free_result (sql_res);
- return NULL;
- }
- ret = GNUNET_strdup (sql_row[0]);
- mysql_free_result (sql_res);
- return ret;
-}
-#endif
-
-
/**
* Create a prepared statement.
*
{
int ret;
+#if DEBUG_MYSQL
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Deleting value %llu from gn072 table\n",
+ vkey);
+#endif
ret = prepared_statement_run (plugin,
plugin->delete_value,
NULL,
MYSQL_TYPE_LONGLONG,
&vkey, GNUNET_YES, -1);
if (ret > 0)
- ret = GNUNET_OK;
+ {
+ ret = GNUNET_OK;
+ }
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Deleting value %llu from gn072 table failed\n",
+ vkey);
+ }
return ret;
}
unsigned long long *vkey)
{
unsigned long length = size;
+ int ret;
- return prepared_statement_run (plugin,
- plugin->insert_value,
- vkey,
- MYSQL_TYPE_BLOB,
- value, length, &length, -1);
+ ret = prepared_statement_run (plugin,
+ plugin->insert_value,
+ vkey,
+ MYSQL_TYPE_BLOB,
+ value, length, &length, -1);
+ if (ret == GNUNET_OK)
+ {
+#if DEBUG_MYSQL
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Inserted value number %llu with length %u into gn072 table\n",
+ *vkey,
+ size);
+#endif
+ }
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Failed to insert %u byte value into gn072 table\n",
+ size);
+ }
+ return ret;
}
/**
- * Delete an entry from the gn080 table.
+ * Delete an entry from the gn090 table.
*
* @param vkey vkey identifying the entry to delete
* @return GNUNET_OK on success, GNUNET_NO if no such value exists, GNUNET_SYSERR on error
{
int ret;
+#if DEBUG_MYSQL
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Deleting value %llu from gn090 table\n",
+ vkey);
+#endif
ret = prepared_statement_run (plugin,
plugin->delete_entry_by_vkey,
NULL,
MYSQL_TYPE_LONGLONG,
&vkey, GNUNET_YES, -1);
if (ret > 0)
- ret = GNUNET_OK;
+ {
+ ret = GNUNET_OK;
+ }
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Deleting value %llu from gn090 table failed\n",
+ vkey);
+ }
return ret;
}
case 1:
ret = prepared_statement_run_select (plugin,
plugin->iter[nrc->iter_select],
- 7,
+ 6,
nrc->rbind,
&return_ok,
NULL,
case 2:
ret = prepared_statement_run_select (plugin,
plugin->iter[nrc->iter_select],
- 7,
+ 6,
nrc->rbind,
&return_ok,
NULL,
case 3:
ret = prepared_statement_run_select (plugin,
plugin->iter[nrc->iter_select],
- 7,
+ 6,
nrc->rbind,
&return_ok,
NULL,
/**
- * Continuation of "sqlite_next_request".
+ * Continuation of "mysql_next_request".
*
* @param next_cls the next context
* @param tc the task context (unused)
*/
static void
-sqlite_next_request_cont (void *next_cls,
+mysql_next_request_cont (void *next_cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct NextRequestClosure *nrc = next_cls;
struct Plugin *plugin;
int ret;
- unsigned int size;
unsigned int type;
unsigned int priority;
unsigned int anonymity;
unsigned long hashSize;
GNUNET_HashCode key;
struct GNUNET_TIME_Absolute expiration;
- unsigned int contentSize;
unsigned long length;
MYSQL_BIND *rbind; /* size 7 */
MYSQL_BIND dbind[1];
plugin->next_task = GNUNET_SCHEDULER_NO_TASK;
plugin->next_task_nc = NULL;
- AGAIN:
- ret = nrc->prep (nrc->prep_cls,
- nrc);
- if (ret != GNUNET_OK)
- goto END_SET;
+ AGAIN:
+ GNUNET_assert (nrc->plugin->next_task == GNUNET_SCHEDULER_NO_TASK);
nrc->now = GNUNET_TIME_absolute_get ();
hashSize = sizeof (GNUNET_HashCode);
memset (nrc->rbind, 0, sizeof (nrc->rbind));
rbind = nrc->rbind;
rbind[0].buffer_type = MYSQL_TYPE_LONG;
- rbind[0].buffer = &size;
+ rbind[0].buffer = &type;
rbind[0].is_unsigned = 1;
rbind[1].buffer_type = MYSQL_TYPE_LONG;
- rbind[1].buffer = &type;
+ rbind[1].buffer = &priority;
rbind[1].is_unsigned = 1;
rbind[2].buffer_type = MYSQL_TYPE_LONG;
- rbind[2].buffer = &priority;
+ rbind[2].buffer = &anonymity;
rbind[2].is_unsigned = 1;
- rbind[3].buffer_type = MYSQL_TYPE_LONG;
- rbind[3].buffer = &anonymity;
+ rbind[3].buffer_type = MYSQL_TYPE_LONGLONG;
+ rbind[3].buffer = &exp;
rbind[3].is_unsigned = 1;
- rbind[4].buffer_type = MYSQL_TYPE_LONGLONG;
- rbind[4].buffer = &exp;
- rbind[4].is_unsigned = 1;
- rbind[5].buffer_type = MYSQL_TYPE_BLOB;
- rbind[5].buffer = &key;
- rbind[5].buffer_length = hashSize;
- rbind[5].length = &hashSize;
- rbind[6].buffer_type = MYSQL_TYPE_LONGLONG;
- rbind[6].buffer = &vkey;
- rbind[6].is_unsigned = GNUNET_YES;
-
+ rbind[4].buffer_type = MYSQL_TYPE_BLOB;
+ rbind[4].buffer = &key;
+ rbind[4].buffer_length = hashSize;
+ rbind[4].length = &hashSize;
+ rbind[5].buffer_type = MYSQL_TYPE_LONGLONG;
+ rbind[5].buffer = &vkey;
+ rbind[5].is_unsigned = GNUNET_YES;
+
+ if ( (GNUNET_YES == nrc->end_it) ||
+ (GNUNET_OK != nrc->prep (nrc->prep_cls,
+ nrc)))
+ goto END_SET;
+ GNUNET_assert (nrc->plugin->next_task == GNUNET_SCHEDULER_NO_TASK);
nrc->last_vkey = vkey;
nrc->last_prio = priority;
nrc->last_expire = exp;
- if ((rbind[0].buffer_type != MYSQL_TYPE_LONG) ||
- (!rbind[0].is_unsigned) ||
- (rbind[1].buffer_type != MYSQL_TYPE_LONG) ||
- (!rbind[1].is_unsigned) ||
- (rbind[2].buffer_type != MYSQL_TYPE_LONG) ||
- (!rbind[2].is_unsigned) ||
- (rbind[3].buffer_type != MYSQL_TYPE_LONG) ||
- (!rbind[3].is_unsigned) ||
- (rbind[4].buffer_type != MYSQL_TYPE_LONGLONG) ||
- (!rbind[4].is_unsigned) ||
- (rbind[5].buffer_type != MYSQL_TYPE_BLOB) ||
- (rbind[5].buffer_length != sizeof (GNUNET_HashCode)) ||
- (*rbind[5].length != sizeof (GNUNET_HashCode)) ||
- (rbind[6].buffer_type != MYSQL_TYPE_LONGLONG) ||
- (!rbind[6].is_unsigned))
+ if ( (rbind[4].buffer_length != sizeof (GNUNET_HashCode)) ||
+ (hashSize != sizeof (GNUNET_HashCode)) )
{
GNUNET_break (0);
goto END_SET;
}
- contentSize = *(unsigned int *) rbind[0].buffer;
- if (contentSize >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
- {
- GNUNET_break (0); /* far too big */
- goto END_SET;
- }
+#if DEBUG_MYSQL
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Found value %llu with prio %u, anon %u, expire %llu selecting from gn090 table\n",
+ vkey,
+ priority,
+ anonymity,
+ exp);
+#endif
/* now do query on gn072 */
- length = contentSize;
- memset (rbind, 0, sizeof (rbind));
- rbind[0].buffer_type = MYSQL_TYPE_BLOB;
- rbind[0].buffer_length = contentSize;
- rbind[0].length = &length;
- rbind[0].buffer = datum;
+ length = sizeof (datum);
+ memset (dbind, 0, sizeof (dbind));
+ dbind[0].buffer_type = MYSQL_TYPE_BLOB;
+ dbind[0].buffer_length = length;
+ dbind[0].length = &length;
+ dbind[0].buffer = datum;
ret = prepared_statement_run_select (plugin,
plugin->select_value,
1,
GNUNET_break (ret <= 1); /* should only have one rbind! */
if (ret > 0)
ret = GNUNET_OK;
- if ((ret != GNUNET_OK) ||
- (dbind[0].buffer_length != contentSize) || (length != contentSize))
+ if (ret != GNUNET_OK)
{
- GNUNET_break (ret != 0); /* should have one rbind! */
- GNUNET_break (length == contentSize); /* length should match! */
- GNUNET_break (dbind[0].buffer_length == contentSize); /* length should be internally consistent! */
- do_delete_value (plugin, vkey);
- if (ret != 0)
- do_delete_entry_by_vkey (plugin, vkey);
- plugin->content_size -= contentSize;
+ GNUNET_break (0);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Failed to obtain value %llu from table `%s'\n"),
+ vkey,
+ "gn072");
goto AGAIN;
}
+ GNUNET_break (length <= sizeof(datum));
+#if DEBUG_MYSQL
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Calling iterator with value `%s' number %llu of size %u with type %u, priority %u, anonymity %u and expiration %llu\n",
+ GNUNET_h2s (&key),
+ vkey,
+ length,
+ type,
+ priority,
+ anonymity,
+ exp);
+#endif
+ GNUNET_assert (nrc->plugin->next_task == GNUNET_SCHEDULER_NO_TASK);
expiration.value = exp;
ret = nrc->dviter (nrc->dviter_cls,
nrc,
&key,
- contentSize,
+ length,
datum,
type,
priority,
vkey);
if (ret == GNUNET_SYSERR)
{
- /* is this correct, or should we not call iter again period? */
- goto END_SET;
+ nrc->end_it = GNUNET_YES;
+ return;
}
if (ret == GNUNET_NO)
{
do_delete_value (plugin, vkey);
do_delete_entry_by_vkey (plugin, vkey);
- plugin->content_size -= contentSize;
+ plugin->content_size -= length;
}
return;
END_SET:
/* call dviter with "end of set" */
+ GNUNET_assert (nrc->plugin->next_task == GNUNET_SCHEDULER_NO_TASK);
nrc->dviter (nrc->dviter_cls,
NULL, NULL, 0, NULL, 0, 0, 0,
GNUNET_TIME_UNIT_ZERO_ABS, 0);
+ GNUNET_assert (nrc->plugin->next_task == GNUNET_SCHEDULER_NO_TASK);
nrc->prep (nrc->prep_cls, NULL);
+ GNUNET_assert (nrc->plugin->next_task == GNUNET_SCHEDULER_NO_TASK);
GNUNET_free (nrc);
}
nrc->end_it = GNUNET_YES;
nrc->plugin->next_task_nc = nrc;
nrc->plugin->next_task = GNUNET_SCHEDULER_add_now (nrc->plugin->env->sched,
- &sqlite_next_request_cont,
+ &mysql_next_request_cont,
nrc);
}
*/
static int
mysql_plugin_put (void *cls,
- const GNUNET_HashCode * key,
- uint32_t size,
- const void *data,
- enum GNUNET_BLOCK_Type type,
- uint32_t priority,
- uint32_t anonymity,
- struct GNUNET_TIME_Absolute expiration,
- char **msg)
+ const GNUNET_HashCode * key,
+ uint32_t size,
+ const void *data,
+ enum GNUNET_BLOCK_Type type,
+ uint32_t priority,
+ uint32_t anonymity,
+ struct GNUNET_TIME_Absolute expiration,
+ char **msg)
{
struct Plugin *plugin = cls;
+ unsigned int itype = type;
+ unsigned int ipriority = priority;
+ unsigned int ianonymity = anonymity;
+ unsigned long long lexpiration = expiration.value;
unsigned long hashSize;
unsigned long hashSize2;
unsigned long long vkey;
plugin->insert_entry,
NULL,
MYSQL_TYPE_LONG,
- &size,
+ &itype,
GNUNET_YES,
MYSQL_TYPE_LONG,
- &type,
+ &ipriority,
GNUNET_YES,
MYSQL_TYPE_LONG,
- &priority,
- GNUNET_YES,
- MYSQL_TYPE_LONG,
- &anonymity,
+ &ianonymity,
GNUNET_YES,
MYSQL_TYPE_LONGLONG,
- &expiration.value,
+ &lexpiration,
GNUNET_YES,
MYSQL_TYPE_BLOB,
key,
do_delete_value (plugin, vkey);
return GNUNET_SYSERR;
}
+#if DEBUG_MYSQL
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Inserted value `%s' number %llu with size %u into gn090 table\n",
+ GNUNET_h2s (key),
+ vkey,
+ (unsigned int) size);
+#endif
plugin->content_size += size;
return GNUNET_OK;
}
unsigned int prio;
unsigned int anonymity;
- unsigned int limit_off;
unsigned long long expiration;
unsigned long long vkey;
unsigned long long total;
int off;
int count;
int have_vhash;
- unsigned long size; /* OBSOLETE! */
- unsigned long hashSize;
};
{
struct GetContext *gc = cls;
struct Plugin *plugin;
- MYSQL_BIND *rbind;
int ret;
+ unsigned int limit_off;
+ unsigned long hashSize;
if (NULL == nrc)
{
if (gc->count == gc->total)
return GNUNET_NO;
plugin = nrc->plugin;
- memset (nrc->rbind, 0, sizeof (nrc->rbind));
- gc->hashSize = sizeof (GNUNET_HashCode);
- rbind = nrc->rbind;
- rbind[0].buffer_type = MYSQL_TYPE_LONG;
- rbind[0].buffer = &gc->size;
- rbind[0].is_unsigned = GNUNET_YES;
- rbind[1].buffer_type = MYSQL_TYPE_LONG;
- rbind[1].buffer = &nrc->type;
- rbind[1].is_unsigned = GNUNET_YES;
- rbind[2].buffer_type = MYSQL_TYPE_LONG;
- rbind[2].buffer = &nrc->last_prio;
- rbind[2].is_unsigned = GNUNET_YES;
- rbind[3].buffer_type = MYSQL_TYPE_LONG;
- rbind[3].buffer = &gc->anonymity;
- rbind[3].is_unsigned = GNUNET_YES;
- rbind[4].buffer_type = MYSQL_TYPE_LONGLONG;
- rbind[4].buffer = &gc->expiration;
- rbind[4].is_unsigned = GNUNET_YES;
- rbind[5].buffer_type = MYSQL_TYPE_BLOB;
- rbind[5].buffer = &gc->key;
- rbind[5].buffer_length = gc->hashSize;
- rbind[5].length = &gc->hashSize;
- rbind[6].buffer_type = MYSQL_TYPE_LONGLONG;
- rbind[6].buffer = &gc->vkey;
- rbind[6].is_unsigned = GNUNET_YES;
+ hashSize = sizeof (GNUNET_HashCode);
+ if (gc->count + gc->off == gc->total)
+ nrc->last_vkey = 0; /* back to start */
if (gc->count == 0)
- gc->limit_off = gc->off;
+ limit_off = gc->off;
else
- gc->limit_off = 0;
-
+ limit_off = 0;
+#if DEBUG_MYSQL
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Obtaining result number %d/%lld at offset %d with lvc %llu for GET `%s'\n",
+ gc->count+1,
+ gc->total,
+ limit_off,
+ nrc->last_vkey,
+ GNUNET_h2s (&gc->key));
+#endif
if (nrc->type != 0)
{
if (gc->have_vhash)
ret =
prepared_statement_run_select
(plugin,
- plugin->select_entry_by_hash_vhash_and_type, 7, nrc->rbind, &return_ok,
- NULL, MYSQL_TYPE_BLOB, &gc->key, gc->hashSize, &gc->hashSize,
- MYSQL_TYPE_BLOB, &gc->vhash, gc->hashSize, &gc->hashSize,
+ plugin->select_entry_by_hash_vhash_and_type, 6, nrc->rbind, &return_ok,
+ NULL, MYSQL_TYPE_BLOB, &gc->key, hashSize, &hashSize,
+ MYSQL_TYPE_BLOB, &gc->vhash, hashSize, &hashSize,
MYSQL_TYPE_LONGLONG, &nrc->last_vkey, GNUNET_YES, MYSQL_TYPE_LONG,
- &nrc->type, GNUNET_YES, MYSQL_TYPE_LONG, &gc->limit_off, GNUNET_YES,
+ &nrc->type, GNUNET_YES, MYSQL_TYPE_LONG, &limit_off, GNUNET_YES,
-1);
}
else
ret =
prepared_statement_run_select
(plugin,
- plugin->select_entry_by_hash_and_type, 7, nrc->rbind, &return_ok, NULL,
- MYSQL_TYPE_BLOB, &gc->key, gc->hashSize, &gc->hashSize,
+ plugin->select_entry_by_hash_and_type, 6, nrc->rbind, &return_ok, NULL,
+ MYSQL_TYPE_BLOB, &gc->key, hashSize, &hashSize,
MYSQL_TYPE_LONGLONG, &nrc->last_vkey, GNUNET_YES, MYSQL_TYPE_LONG,
- &nrc->type, GNUNET_YES, MYSQL_TYPE_LONG, &gc->limit_off, GNUNET_YES,
+ &nrc->type, GNUNET_YES, MYSQL_TYPE_LONG, &limit_off, GNUNET_YES,
-1);
}
}
ret =
prepared_statement_run_select
(plugin,
- plugin->select_entry_by_hash_and_vhash, 7, nrc->rbind, &return_ok, NULL,
- MYSQL_TYPE_BLOB, &gc->key, gc->hashSize, &gc->hashSize, MYSQL_TYPE_BLOB,
- &gc->vhash, gc->hashSize, &gc->hashSize, MYSQL_TYPE_LONGLONG,
- &nrc->last_vkey, GNUNET_YES, MYSQL_TYPE_LONG, &gc->limit_off,
+ plugin->select_entry_by_hash_and_vhash, 6, nrc->rbind, &return_ok, NULL,
+ MYSQL_TYPE_BLOB, &gc->key, hashSize, &hashSize, MYSQL_TYPE_BLOB,
+ &gc->vhash, hashSize, &hashSize, MYSQL_TYPE_LONGLONG,
+ &nrc->last_vkey, GNUNET_YES, MYSQL_TYPE_LONG, &limit_off,
GNUNET_YES, -1);
}
else
ret =
prepared_statement_run_select
(plugin,
- plugin->select_entry_by_hash, 7, nrc->rbind, &return_ok, NULL,
- MYSQL_TYPE_BLOB, &gc->key, gc->hashSize, &gc->hashSize,
+ plugin->select_entry_by_hash, 6, nrc->rbind, &return_ok, NULL,
+ MYSQL_TYPE_BLOB, &gc->key, hashSize, &hashSize,
MYSQL_TYPE_LONGLONG, &nrc->last_vkey, GNUNET_YES, MYSQL_TYPE_LONG,
- &gc->limit_off, GNUNET_YES, -1);
+ &limit_off, GNUNET_YES, -1);
}
}
- if (gc->count + gc->off == gc->total)
- nrc->last_vkey = 0; /* back to start */
+ gc->count++;
return ret;
}
PluginIterator iter, void *iter_cls)
{
struct Plugin *plugin = cls;
+ unsigned int itype = type;
int ret;
MYSQL_BIND cbind[1];
struct GetContext *gc;
struct NextRequestClosure *nrc;
- unsigned long long total;
+ long long total;
unsigned long hashSize;
if (iter == NULL)
total = -1;
cbind[0].buffer_type = MYSQL_TYPE_LONGLONG;
cbind[0].buffer = &total;
- cbind[0].is_unsigned = GNUNET_YES;
+ cbind[0].is_unsigned = GNUNET_NO;
if (type != 0)
{
if (vhash != NULL)
(plugin,
plugin->count_entry_by_hash_vhash_and_type, 1, cbind, &return_ok, NULL,
MYSQL_TYPE_BLOB, key, hashSize, &hashSize, MYSQL_TYPE_BLOB,
- vhash, hashSize, &hashSize, MYSQL_TYPE_LONG, &type, GNUNET_YES,
+ vhash, hashSize, &hashSize, MYSQL_TYPE_LONG, &itype, GNUNET_YES,
-1);
}
else
(plugin,
plugin->count_entry_by_hash_and_type, 1, cbind, &return_ok, NULL,
MYSQL_TYPE_BLOB, key, hashSize, &hashSize, MYSQL_TYPE_LONG,
- &type, GNUNET_YES, -1);
+ &itype, GNUNET_YES, -1);
}
}
&hashSize, -1);
}
}
- if ((ret != GNUNET_OK) || (-1 == total) || (0 == total))
+ if ((ret != GNUNET_OK) || (0 >= total))
{
iter (iter_cls,
NULL, NULL, 0, NULL, 0, 0, 0,
GNUNET_TIME_UNIT_ZERO_ABS, 0);
return;
}
+#if DEBUG_MYSQL
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Iterating over %lld results for GET `%s'\n",
+ total,
+ GNUNET_h2s (key));
+#endif
gc = GNUNET_malloc (sizeof (struct GetContext));
gc->key = *key;
if (vhash != NULL)
nrc->dviter_cls = iter_cls;
nrc->prep = &get_statement_prepare;
nrc->prep_cls = gc;
- nrc->last_vkey = 0; // FIXME: used to be 'vkey', why? where did vkey come from?
+ nrc->last_vkey = 0;
mysql_plugin_next_request (nrc, GNUNET_NO);
}
{
struct Plugin *plugin = cls;
unsigned long long vkey = uid;
+ unsigned long long lexpire = expire.value;
+ int ret;
- return prepared_statement_run (plugin,
- plugin->update_entry,
- NULL,
- MYSQL_TYPE_LONG,
- &delta,
- GNUNET_NO,
- MYSQL_TYPE_LONGLONG,
- &expire.value,
- GNUNET_YES,
- MYSQL_TYPE_LONGLONG,
- &expire.value,
- GNUNET_YES,
- MYSQL_TYPE_LONGLONG,
- &vkey,
- GNUNET_YES, -1);
+#if DEBUG_MYSQL
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Updating value %llu adding %d to priority and maxing exp at %llu\n",
+ vkey,
+ delta,
+ lexpire);
+#endif
+ ret = prepared_statement_run (plugin,
+ plugin->update_entry,
+ NULL,
+ MYSQL_TYPE_LONG,
+ &delta,
+ GNUNET_NO,
+ MYSQL_TYPE_LONGLONG,
+ &lexpire,
+ GNUNET_YES,
+ MYSQL_TYPE_LONGLONG,
+ &lexpire,
+ GNUNET_YES,
+ MYSQL_TYPE_LONGLONG,
+ &vkey,
+ GNUNET_YES, -1);
+ if (ret != GNUNET_OK)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Failed to update value %llu\n",
+ vkey);
+ }
+ return ret;
}
*/
static void
mysql_plugin_iter_ascending_expiration (void *cls,
- enum GNUNET_BLOCK_Type type,
- PluginIterator iter,
+ enum GNUNET_BLOCK_Type type,
+ PluginIterator iter,
void *iter_cls)
{
struct Plugin *plugin = cls;
struct Plugin *plugin = cls;
if ((GNUNET_OK != run_statement (plugin,
- "DROP TABLE gn080")) ||
+ "DROP TABLE gn090")) ||
(GNUNET_OK != run_statement (plugin,
"DROP TABLE gn072")))
return; /* error */
}
#define MRUNS(a) (GNUNET_OK != run_statement (plugin, a) )
#define PINIT(a,b) (NULL == (a = prepared_statement_create(plugin, b)))
- if (MRUNS ("CREATE TABLE IF NOT EXISTS gn080 ("
- " size INT(11) UNSIGNED NOT NULL DEFAULT 0,"
+ if (MRUNS ("CREATE TABLE IF NOT EXISTS gn090 ("
" type INT(11) UNSIGNED NOT NULL DEFAULT 0,"
" prio INT(11) UNSIGNED NOT NULL DEFAULT 0,"
" anonLevel INT(11) UNSIGNED NOT NULL DEFAULT 0,"
projects / oweals / gnunet.git / blobdiff