X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fmy%2Fmy.c;h=459f09b6a4b65227c88ad532db1d4ea18c054357;hb=2105059516320800eaa8fff1196b58f29a50ba7c;hp=89d8c3370ff00dacb3fea8349c4bad16c88455b4;hpb=bbd7f90332fa9df514cb14bb24f2187c78db432a;p=oweals%2Fgnunet.git diff --git a/src/my/my.c b/src/my/my.c index 89d8c3370..459f09b6a 100644 --- a/src/my/my.c +++ b/src/my/my.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet - Copyright (C) 2016 GNUnet e.V. + Copyright (C) 2016 Inria & 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 @@ -20,6 +20,7 @@ /** * @file my/my.c * @brief library to help with access to a MySQL database + * @author Christophe Genevey * @author Christian Grothoff */ #include "platform.h" @@ -27,7 +28,6 @@ #include "gnunet_my_lib.h" - /** * Run a prepared SELECT statement. * @@ -35,11 +35,13 @@ * @param sh handle to SELECT statment * @param params parameters to the statement * @return + #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; @@ -53,7 +55,7 @@ GNUNET_MY_exec_prepared (struct GNUNET_MYSQL_Context *mc, 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++) { @@ -62,77 +64,207 @@ GNUNET_MY_exec_prepared (struct GNUNET_MYSQL_Context *mc, 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, "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; + + 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); } return GNUNET_OK; } + /** - * Extract results from a query result according - * to the given specification. If colums are NULL, - * the destination is not modified, and #GNUNET_NO is returned - * - * - * @param result - * @param row, the row from the result to extract - * @param result specificatio to extract for - * @return - #GNUNET_YES if all results could be extracted - #GNUNET_NO if at least one result was NULL - #GNUNET_SYSERR if a result was invalid -*/ + * 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) +{ + unsigned int i; + + for (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 + * #GNUNET_YES if all results could be extracted + * #GNUNET_NO if there is no more data in the result set + * #GNUNET_SYSERR if a result was invalid + */ int -GNUNET_MY_extract_result (MYSQL_BIND * result, - int row, - struct GNUNET_MY_ResultSpec *specs) +GNUNET_MY_extract_result (struct GNUNET_MYSQL_StatementHandle *sh, + struct GNUNET_MY_ResultSpec *rs) { + unsigned int num_fields; unsigned int i; - int had_null = GNUNET_NO; int ret; + MYSQL_STMT *stmt; - for(i = 0 ; NULL != specs[i].conv ; i++) + stmt = GNUNET_MYSQL_statement_get_stmt (sh); + if (NULL == stmt) { - struct GNUNET_MY_ResultSpec *spec; - - spec = &specs[i]; - ret = spec->conv(spec->conv_cls, - NULL, //wait GNUNET_MY_QueryParam - result); - - if(ret == GNUNET_SYSERR) - return GNUNET_SYSERR; - - if(spec->result_size != NULL) - *spec->result_size = spec->dst_size; + GNUNET_break (0); + return GNUNET_SYSERR; } - - if(GNUNET_YES == had_null) + if (NULL == rs) + { + mysql_stmt_free_result (stmt); return GNUNET_NO; + } + + num_fields = 0; + for (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"); + return GNUNET_SYSERR; + } + { + MYSQL_BIND result[num_fields]; + unsigned int field_off; + + memset (result, 0, sizeof (MYSQL_BIND) * num_fields); + field_off = 0; + for (i=0;NULL != rs[i].pre_conv;i++) + { + struct GNUNET_MY_ResultSpec *rp = &rs[i]; + + if (GNUNET_OK != + rp->pre_conv (rp->conv_cls, + rp, + stmt, + field_off, + &result[field_off])) + + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Pre-conversion for MySQL result failed at offset %u\n", + i); + 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__, + 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 (1 == ret) + { + GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, + "my", + _("%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++) + { + struct GNUNET_MY_ResultSpec *rp = &rs[i]; + + if (NULL != rp->post_conv) + if (GNUNET_OK != + rp->post_conv (rp->conv_cls, + rp, + stmt, + field_off, + &result[field_off])) + { + 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; + } + field_off += rp->num_fields; + } + } return GNUNET_OK; } -/* end of my.c */ \ No newline at end of file + +/** + * Free all memory that was allocated in @a rs during + * #GNUNET_MY_extract_result(). + * + * @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].post_conv;i++) + if (NULL != rs[i].cleaner) + rs[i].cleaner (rs[i].conv_cls, + &rs[i]); +} + + +/* end of my.c */