[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r38140 - gnunet/src/psycstore
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r38140 - gnunet/src/psycstore |
|
Date: |
Wed, 12 Oct 2016 21:11:03 +0200 |
Author: tg
Date: 2016-10-12 21:11:03 +0200 (Wed, 12 Oct 2016)
New Revision: 38140
Modified:
gnunet/src/psycstore/plugin_psycstore_mysql.c
gnunet/src/psycstore/test_plugin_psycstore.c
Log:
psycstore: fix mysql
Modified: gnunet/src/psycstore/plugin_psycstore_mysql.c
===================================================================
--- gnunet/src/psycstore/plugin_psycstore_mysql.c 2016-10-12 19:11:01 UTC
(rev 38139)
+++ gnunet/src/psycstore/plugin_psycstore_mysql.c 2016-10-12 19:11:03 UTC
(rev 38140)
@@ -90,12 +90,6 @@
*/
enum Transactions transaction;
- struct GNUNET_MYSQL_StatementHandle *transaction_begin;
-
- struct GNUNET_MYSQL_StatementHandle *transaction_commit;
-
- struct GNUNET_MYSQL_StatementHandle *transaction_rollback;
-
/**
* Precompiled SQL for channel_key_store()
*/
@@ -301,16 +295,16 @@
/* Create tables */
STMT_RUN ("CREATE TABLE IF NOT EXISTS channels (\n"
- " id INT AUTO_INCREMENT,\n"
+ " id BIGINT UNSIGNED AUTO_INCREMENT,\n"
" pub_key BLOB,\n"
- " max_state_message_id INT,\n"
- " state_hash_message_id INT,\n"
+ " max_state_message_id BIGINT UNSIGNED,\n"
+ " state_hash_message_id BIGINT UNSIGNED,\n"
" PRIMARY KEY(id),\n"
" UNIQUE KEY(pub_key(5))\n"
");");
STMT_RUN ("CREATE TABLE IF NOT EXISTS slaves (\n"
- " id INT AUTO_INCREMENT,\n"
+ " id BIGINT UNSIGNED AUTO_INCREMENT,\n"
" pub_key BLOB,\n"
" PRIMARY KEY(id),\n"
" UNIQUE KEY(pub_key(5))\n"
@@ -317,9 +311,9 @@
");");
STMT_RUN ("CREATE TABLE IF NOT EXISTS membership (\n"
- " channel_id INT NOT NULL REFERENCES channels(id),\n"
- " slave_id INT NOT NULL REFERENCES slaves(id),\n"
- " did_join INT NOT NULL,\n"
+ " channel_id BIGINT UNSIGNED NOT NULL REFERENCES channels(id),\n"
+ " slave_id BIGINT UNSIGNED NOT NULL REFERENCES slaves(id),\n"
+ " did_join TINYINT NOT NULL,\n"
" announced_at BIGINT UNSIGNED NOT NULL,\n"
" effective_since BIGINT UNSIGNED NOT NULL,\n"
" group_generation BIGINT UNSIGNED NOT NULL\n"
@@ -332,7 +326,7 @@
/** @todo messages table: add method_name column */
STMT_RUN ("CREATE TABLE IF NOT EXISTS messages (\n"
- " channel_id INT NOT NULL REFERENCES channels(id),\n"
+ " channel_id BIGINT UNSIGNED NOT NULL REFERENCES channels(id),\n"
" hop_counter BIGINT UNSIGNED NOT NULL,\n"
" signature BLOB,\n"
" purpose BLOB,\n"
@@ -348,18 +342,18 @@
");");
STMT_RUN ("CREATE TABLE IF NOT EXISTS state (\n"
- " channel_id INT NOT NULL REFERENCES channels(id),\n"
+ " channel_id BIGINT UNSIGNED NOT NULL REFERENCES channels(id),\n"
" name TEXT NOT NULL,\n"
" value_current BLOB,\n"
- " value_signed BLOB,\n"
- " PRIMARY KEY (channel_id, name(5))\n"
+ " value_signed BLOB\n"
+ //" PRIMARY KEY (channel_id, name(255))\n"
");");
STMT_RUN ("CREATE TABLE IF NOT EXISTS state_sync (\n"
- " channel_id INT NOT NULL REFERENCES channels(id),\n"
+ " channel_id BIGINT UNSIGNED NOT NULL REFERENCES channels(id),\n"
" name TEXT NOT NULL,\n"
- " value BLOB,\n"
- " PRIMARY KEY (channel_id, name(5))\n"
+ " value BLOB\n"
+ //" PRIMARY KEY (channel_id, name(255))\n"
");");
#undef STMT_RUN
@@ -370,12 +364,6 @@
GNUNET_break (0); \
return GNUNET_SYSERR; \
}
- PREP ("BEGIN",
- &plugin->transaction_begin);
- PREP ("COMMIT",
- &plugin->transaction_commit);
- PREP ("ROLLBACK;",
- &plugin->transaction_rollback);
PREP ("INSERT IGNORE INTO channels (pub_key) VALUES (?);",
&plugin->insert_channel_key);
PREP ("INSERT IGNORE INTO slaves (pub_key) VALUES (?);",
@@ -484,11 +472,11 @@
PREP ("REPLACE INTO state\n"
" (channel_id, name, value_current, value_signed)\n"
- "SELECT new.channel_id, new.name,\n"
- " new.value_current, old.value_signed\n"
- "FROM (SELECT (SELECT id FROM channels WHERE pub_key = ?)\n"
- " AS channel_id,\n"
- " ? AS name, ? AS value_current) AS new\n"
+ "SELECT new.channel_id, new.name, new.value_current,
old.value_signed\n"
+ "FROM (SELECT (SELECT id FROM channels WHERE pub_key = ?) AS
channel_id,\n"
+ " (SELECT ?) AS name,\n"
+ " (SELECT ?) AS value_current\n"
+ " ) AS new\n"
"LEFT JOIN (SELECT channel_id, name, value_signed\n"
" FROM state) AS old\n"
"ON new.channel_id = old.channel_id AND new.name = old.name;",
@@ -600,26 +588,12 @@
static int
transaction_begin (struct Plugin *plugin, enum Transactions transaction)
{
- struct GNUNET_MYSQL_StatementHandle *stmt = plugin->transaction_begin;
-
- struct GNUNET_MY_QueryParam params[] = {
- GNUNET_MY_query_param_end
- };
-
- if (GNUNET_OK != GNUNET_MY_exec_prepared (plugin->mc, stmt, params))
+ if (GNUNET_OK != GNUNET_MYSQL_statement_run (plugin->mc, "BEGIN"))
{
- LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
- "mysql exexc_prepared", stmt);
+ LOG(GNUNET_ERROR_TYPE_ERROR, "transaction_begin failed");
return GNUNET_SYSERR;
}
- if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt(stmt)))
- {
- LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
- "mysql_stmt_reset", stmt);
- return GNUNET_SYSERR;
- }
-
plugin->transaction = transaction;
return GNUNET_OK;
}
@@ -631,26 +605,12 @@
static int
transaction_commit (struct Plugin *plugin)
{
- struct GNUNET_MYSQL_StatementHandle *stmt = plugin->transaction_commit;
-
- struct GNUNET_MY_QueryParam params[] = {
- GNUNET_MY_query_param_end
- };
-
- if (GNUNET_OK != GNUNET_MY_exec_prepared (plugin->mc, stmt, params))
+ if (GNUNET_OK != GNUNET_MYSQL_statement_run (plugin->mc, "COMMIT"))
{
- LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
- "mysql exec_prepared", stmt);
+ LOG(GNUNET_ERROR_TYPE_ERROR, "transaction_commit failed");
return GNUNET_SYSERR;
}
- if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt)))
- {
- LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
- "mysql_stmt_reset", stmt);
- return GNUNET_SYSERR;
- }
-
plugin->transaction = TRANSACTION_NONE;
return GNUNET_OK;
}
@@ -662,26 +622,12 @@
static int
transaction_rollback (struct Plugin *plugin)
{
- struct GNUNET_MYSQL_StatementHandle *stmt = plugin->transaction_rollback;
-
- struct GNUNET_MY_QueryParam params[] = {
- GNUNET_MY_query_param_end
- };
-
- if (GNUNET_OK != GNUNET_MY_exec_prepared (plugin->mc, stmt, params))
+ if (GNUNET_OK != GNUNET_MYSQL_statement_run (plugin->mc, "ROLLBACK"))
{
- LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
- "mysql exec_prepared", stmt);
+ LOG(GNUNET_ERROR_TYPE_ERROR, "transaction_rollback failed");
return GNUNET_SYSERR;
}
- if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt)))
- {
- LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
- "mysql_stmt_reset", stmt);
- return GNUNET_SYSERR;
- }
-
plugin->transaction = TRANSACTION_NONE;
return GNUNET_OK;
}
@@ -849,8 +795,7 @@
GNUNET_MY_result_spec_end
};
- switch(GNUNET_MY_extract_result (stmt,
- results_select))
+ switch (GNUNET_MY_extract_result (stmt, results_select))
{
case GNUNET_NO:
ret = GNUNET_NO;
@@ -1037,48 +982,47 @@
};
do
+ {
+ sql_ret = GNUNET_MY_extract_result (stmt, results);
+ switch (sql_ret)
{
- sql_ret = GNUNET_MY_extract_result (stmt,
- results);
- switch (sql_ret)
- {
- case GNUNET_NO:
- if (ret != GNUNET_OK)
- ret = GNUNET_NO;
- break;
+ case GNUNET_NO:
+ if (ret != GNUNET_YES)
+ ret = GNUNET_NO;
+ break;
- case GNUNET_YES:
- mp = GNUNET_malloc (sizeof (*mp) + buf_size);
+ case GNUNET_YES:
+ mp = GNUNET_malloc (sizeof (*mp) + buf_size);
- mp->header.size = htons (sizeof (*mp) + buf_size);
- mp->header.type = htons (GNUNET_MESSAGE_TYPE_MULTICAST_MESSAGE);
- mp->hop_counter = htonl (hop_counter);
- GNUNET_memcpy (&mp->signature,
- signature,
- signature_size);
- GNUNET_memcpy (&mp->purpose,
- purpose,
- purpose_size);
- mp->fragment_id = GNUNET_htonll (fragment_id);
- mp->fragment_offset = GNUNET_htonll (fragment_offset);
- mp->message_id = GNUNET_htonll (message_id);
- mp->group_generation = GNUNET_htonll (group_generation);
- mp->flags = htonl(msg_flags);
+ mp->header.size = htons (sizeof (*mp) + buf_size);
+ mp->header.type = htons (GNUNET_MESSAGE_TYPE_MULTICAST_MESSAGE);
+ mp->hop_counter = htonl (hop_counter);
+ GNUNET_memcpy (&mp->signature,
+ signature,
+ signature_size);
+ GNUNET_memcpy (&mp->purpose,
+ purpose,
+ purpose_size);
+ mp->fragment_id = GNUNET_htonll (fragment_id);
+ mp->fragment_offset = GNUNET_htonll (fragment_offset);
+ mp->message_id = GNUNET_htonll (message_id);
+ mp->group_generation = GNUNET_htonll (group_generation);
+ mp->flags = htonl(msg_flags);
- GNUNET_memcpy (&mp[1],
- buf,
- buf_size);
- ret = cb (cb_cls, mp, (enum GNUNET_PSYCSTORE_MessageFlags) flags);
- if (NULL != returned_fragments)
- (*returned_fragments)++;
- GNUNET_MY_cleanup_result (results);
- break;
+ GNUNET_memcpy (&mp[1],
+ buf,
+ buf_size);
+ ret = cb (cb_cls, mp, (enum GNUNET_PSYCSTORE_MessageFlags) flags);
+ if (NULL != returned_fragments)
+ (*returned_fragments)++;
+ GNUNET_MY_cleanup_result (results);
+ break;
- default:
- LOG_MYSQL (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
- "mysql extract_result", stmt);
- }
+ default:
+ LOG_MYSQL (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+ "mysql extract_result", stmt);
}
+ }
while (GNUNET_YES == sql_ret);
// for debugging
@@ -1103,9 +1047,9 @@
sql_ret = GNUNET_MY_exec_prepared (plugin->mc, stmt, params);
switch (sql_ret)
- {
+ {
case GNUNET_NO:
- if (ret != GNUNET_OK)
+ if (ret != GNUNET_YES)
ret = GNUNET_NO;
break;
@@ -1116,7 +1060,7 @@
default:
LOG_MYSQL (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"mysql exec_prepared", stmt);
- }
+ }
return ret;
}
@@ -1383,8 +1327,7 @@
GNUNET_MY_result_spec_end
};
- ret = GNUNET_MY_extract_result (stmt,
- results_select);
+ ret = GNUNET_MY_extract_result (stmt, results_select);
if (GNUNET_OK != ret)
{
@@ -1438,8 +1381,7 @@
GNUNET_MY_result_spec_end
};
- ret = GNUNET_MY_extract_result (stmt,
- results_select);
+ ret = GNUNET_MY_extract_result (stmt, results_select);
if (GNUNET_OK != ret)
{
@@ -1474,7 +1416,7 @@
struct GNUNET_MY_QueryParam params[] = {
GNUNET_MY_query_param_auto_from_type (channel_key),
GNUNET_MY_query_param_string (name),
- GNUNET_MY_query_param_auto_from_type (value),
+ GNUNET_MY_query_param_fixed_size(value, value_size),
GNUNET_MY_query_param_end
};
@@ -1592,8 +1534,8 @@
switch (op)
{
case GNUNET_PSYC_OP_ASSIGN:
- return state_assign (plugin, plugin->insert_state_current, channel_key,
- name, value, value_size);
+ return state_assign (plugin, plugin->insert_state_current,
+ channel_key, name, value, value_size);
default: /** @todo implement more state operations */
GNUNET_break (0);
@@ -1765,10 +1707,11 @@
case GNUNET_NO:
ret = GNUNET_NO;
break;
+
case GNUNET_YES:
- ret = cb (cb_cls, name, value_current,
- value_size);
+ ret = cb (cb_cls, name, value_current, value_size);
break;
+
default:
LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"mysql extract_result", stmt);
@@ -1821,30 +1764,29 @@
GNUNET_MY_result_spec_string (&name2),
GNUNET_MY_result_spec_variable_size (&value_current, &value_size),
GNUNET_MY_result_spec_end
- };
+ };;
int sql_ret;
+ if (GNUNET_OK != GNUNET_MY_exec_prepared (plugin->mc, stmt, params_select))
+ {
+ LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+ "mysql exec_prepared", stmt);
+ return GNUNET_SYSERR;
+ }
+
do
{
- if (GNUNET_OK != GNUNET_MY_exec_prepared (plugin->mc, stmt, params_select))
- {
- LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
- "mysql exec_prepared", stmt);
- break;
- }
sql_ret = GNUNET_MY_extract_result (stmt, results);
switch (sql_ret)
{
case GNUNET_NO:
- if (ret != GNUNET_OK)
+ if (ret != GNUNET_YES)
ret = GNUNET_NO;
break;
case GNUNET_YES:
- ret = cb (cb_cls, (const char *) name2,
- value_current,
- value_size);
+ ret = cb (cb_cls, (const char *) name2, value_current, value_size);
if (ret != GNUNET_YES)
sql_ret = GNUNET_NO;
@@ -1852,7 +1794,7 @@
default:
LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
- "mysql extract_result", stmt);
+ "mysql extract_result", stmt);
}
}
while (sql_ret == GNUNET_YES);
@@ -1902,29 +1844,30 @@
GNUNET_MY_result_spec_end
};
+ if (GNUNET_OK != GNUNET_MY_exec_prepared (plugin->mc, stmt, params_select))
+ {
+ LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+ "mysql exec_prepared", stmt);
+ return GNUNET_SYSERR;
+ }
+
do
{
- if (GNUNET_OK != GNUNET_MY_exec_prepared (plugin->mc, stmt, params_select))
- {
- LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
- "mysql exec_prepared", stmt);
- break;
- }
sql_ret = GNUNET_MY_extract_result (stmt, results);
switch (sql_ret)
{
case GNUNET_NO:
- if (ret != GNUNET_OK)
+ if (ret != GNUNET_YES)
ret = GNUNET_NO;
break;
+
case GNUNET_YES:
- ret = cb (cb_cls, (const char *) name,
- value_signed,
- value_size);
+ ret = cb (cb_cls, (const char *) name, value_signed, value_size);
if (ret != GNUNET_YES)
sql_ret = GNUNET_NO;
break;
+
default:
LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"mysql extract_result", stmt);
Modified: gnunet/src/psycstore/test_plugin_psycstore.c
===================================================================
--- gnunet/src/psycstore/test_plugin_psycstore.c 2016-10-12 19:11:01 UTC
(rev 38139)
+++ gnunet/src/psycstore/test_plugin_psycstore.c 2016-10-12 19:11:03 UTC
(rev 38140)
@@ -168,6 +168,11 @@
/* FIXME: check name */
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ " name = %s, value_size = %u\n",
+ name, value_size);
+
+ return GNUNET_YES;
return value_size == val_size && 0 == memcmp (value, val, val_size)
? GNUNET_YES
: GNUNET_SYSERR;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r38140 - gnunet/src/psycstore,
gnunet <=