/*
This file is part of GNUnet
- Copyright (C) 2016 Inria & GNUnet e.V.
+ Copyright (C) 2016, 2018 GNUnet e.V.
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
+ GNUnet is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published
+ by the Free Software Foundation, either version 3 of the License,
+ or (at your option) any later version.
GNUnet is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: AGPL3.0-or-later
*/
/**
* @file my/my.c
#include <mysql/mysql.h>
#include "gnunet_my_lib.h"
-#define STRING_SIZE 50
/**
* Run a prepared SELECT statement.
#GNUNET_YES if we can prepare all statement
#GNUNET_SYSERR if we can't prepare all statement
*/
-
int
GNUNET_MY_exec_prepared (struct GNUNET_MYSQL_Context *mc,
struct GNUNET_MYSQL_StatementHandle *sh,
- const struct GNUNET_MY_QueryParam *params)
+ struct GNUNET_MY_QueryParam *params)
{
const struct GNUNET_MY_QueryParam *p;
unsigned int num;
- unsigned int i;
MYSQL_STMT *stmt;
num = 0;
- for (i=0;NULL != params[i].conv;i++)
+ for (unsigned int i=0;NULL != params[i].conv;i++)
num += params[i].num_params;
{
MYSQL_BIND qbind[num];
unsigned int off;
- memset(qbind, 0, sizeof(qbind));
+ memset (qbind,
+ 0,
+ sizeof(qbind));
off = 0;
- for (i=0;NULL != (p = ¶ms[i])->conv;i++)
+ for (unsigned int i=0;NULL != (p = ¶ms[i])->conv;i++)
{
if (GNUNET_OK !=
p->conv (p->conv_cls,
p,
&qbind[off]))
{
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Conversion for MySQL query failed at offset %u\n",
+ i);
return GNUNET_SYSERR;
}
off += p->num_params;
}
- stmt = GNUNET_MYSQL_statement_get_stmt (mc, sh);
+ stmt = GNUNET_MYSQL_statement_get_stmt (sh);
if (mysql_stmt_bind_param (stmt,
qbind))
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "mysql",
+ GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
+ "my",
_("`%s' failed at %s:%d with error: %s\n"),
- "mysql_stmt_bind_param", __FILE__, __LINE__,
+ "mysql_stmt_bind_param",
+ __FILE__, __LINE__,
mysql_stmt_error (stmt));
GNUNET_MYSQL_statements_invalidate (mc);
return GNUNET_SYSERR;
}
+ if (mysql_stmt_execute (stmt))
+ {
+ GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
+ "my",
+ _("`%s' failed at %s:%d with error: %s\n"),
+ "mysql_stmt_execute", __FILE__, __LINE__,
+ mysql_stmt_error (stmt));
+ GNUNET_MYSQL_statements_invalidate (mc);
+ return GNUNET_SYSERR;
+ }
+ GNUNET_MY_cleanup_query (params,
+ qbind);
}
- if (mysql_stmt_execute (stmt))
- {
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "mysql",
- _("`%s' failed at %s:%d with error: %s\n"),
- "mysql_stmt_execute", __FILE__, __LINE__,
- mysql_stmt_error (stmt));
- GNUNET_MYSQL_statements_invalidate (mc);
- return GNUNET_SYSERR;
- }
-
return GNUNET_OK;
}
+/**
+ * Free all memory that was allocated in @a qp during
+ * #GNUNET_MY_exec_prepared().
+ *
+ * @param qp query specification to clean up
+ * @param qbind array of parameter to clean up
+ */
+void
+GNUNET_MY_cleanup_query (struct GNUNET_MY_QueryParam *qp,
+ MYSQL_BIND *qbind)
+{
+ for (unsigned int i=0; NULL != qp[i].conv ;i++)
+ if (NULL != qp[i].cleaner)
+ qp[i].cleaner (qp[i].conv_cls,
+ &qbind[i]);
+}
+
+
/**
* Extract results from a query result according to the given
* specification. Always fetches the next row.
*
- *
* @param sh statement that returned results
* @param rs specification to extract for
* @return
struct GNUNET_MY_ResultSpec *rs)
{
unsigned int num_fields;
- unsigned int i;
int ret;
MYSQL_STMT *stmt;
- stmt = GNUNET_MYSQL_statement_get_stmt (NULL /* FIXME */, sh);
+ stmt = GNUNET_MYSQL_statement_get_stmt (sh);
if (NULL == stmt)
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "mysql",
- ("`%s' failed at %s:%d with error: %s\n"),
- "mysql_stmt_bind_result", __FILE__, __LINE__,
- mysql_stmt_error (stmt));
+ GNUNET_break (0);
return GNUNET_SYSERR;
}
+ if (NULL == rs)
+ {
+ mysql_stmt_free_result (stmt);
+ return GNUNET_NO;
+ }
num_fields = 0;
- for (i=0;NULL != rs[i].pre_conv;i++)
+ for (unsigned int i=0;NULL != rs[i].pre_conv;i++)
num_fields += rs[i].num_fields;
if (mysql_stmt_field_count (stmt) != num_fields)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Number of fields missmatch between SQL result and result specification\n");
+ "Number of fields mismatch between SQL result and result specification\n");
return GNUNET_SYSERR;
}
memset (result, 0, sizeof (MYSQL_BIND) * num_fields);
field_off = 0;
- for (i=0;NULL != rs[i].pre_conv;i++)
+ for (unsigned int i=0;NULL != rs[i].pre_conv;i++)
{
struct GNUNET_MY_ResultSpec *rp = &rs[i];
stmt,
field_off,
&result[field_off]))
+
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Pre-conversion for MySQL result failed at offset %u\n",
i);
- GNUNET_MY_cleanup_result (rs);
return GNUNET_SYSERR;
}
field_off += rp->num_fields;
}
+
if (mysql_stmt_bind_result (stmt, result))
{
GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
"my",
- _("`%s' failed at %s:%d with error: %s\n"),
- "mysql_stmt_bind_result", __FILE__, __LINE__,
+ _("%s failed at %s:%d with error: %s\n"),
+ "mysql_stmt_bind_result",
+ __FILE__, __LINE__,
mysql_stmt_error (stmt));
return GNUNET_SYSERR;
}
-
+#if TEST_OPTIMIZATION
+ (void) mysql_stmt_store_result (stmt);
+#endif
ret = mysql_stmt_fetch (stmt);
-
if (MYSQL_NO_DATA == ret)
+ {
+ mysql_stmt_free_result (stmt);
return GNUNET_NO;
- if ((0 != ret ) & (MYSQL_DATA_TRUNCATED != ret))
+ }
+ if (1 == ret)
{
GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
"my",
- _("mysql_stmt_fetch failed at %s:%d with error: %s\n"),
+ _("%s failed at %s:%d with error: %s\n"),
+ "mysql_stmt_fetch",
__FILE__, __LINE__,
mysql_stmt_error (stmt));
+ GNUNET_MY_cleanup_result (rs);
+ mysql_stmt_free_result (stmt);
return GNUNET_SYSERR;
}
field_off = 0;
- for (i=0;NULL != rs[i].post_conv;i++)
+ for (unsigned int i=0;NULL != rs[i].post_conv;i++)
{
struct GNUNET_MY_ResultSpec *rp = &rs[i];
field_off,
&result[field_off]))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Post-conversion for MySQL result failed at offset %u\n",
i);
+ mysql_stmt_free_result (stmt);
GNUNET_MY_cleanup_result (rs);
return GNUNET_SYSERR;
}
* Free all memory that was allocated in @a rs during
* #GNUNET_MY_extract_result().
*
- * @param rs reult specification to clean up
+ * @param rs result specification to clean up
*/
void
GNUNET_MY_cleanup_result (struct GNUNET_MY_ResultSpec *rs)
{
- unsigned int i;
-
- for (i=0;NULL != rs[i].cleaner;i++)
- rs[i].cleaner (rs[i].conv_cls,
- &rs[i]);
+ for (unsigned int i=0;NULL != rs[i].post_conv;i++)
+ if (NULL != rs[i].cleaner)
+ rs[i].cleaner (rs[i].conv_cls,
+ &rs[i]);
}
projects / oweals / gnunet.git / blobdiff