From c4b63c13029b9d731b826ffab4a9d59005b0c6a5 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 28 Jan 2015 20:37:51 +0100 Subject: move PostGres-specific logic out of libtalerutil --- src/Makefile.am | 2 +- src/include/taler_json_lib.h | 10 +- src/mint/Makefile.am | 5 + src/pq/Makefile.am | 16 ++++ src/pq/db_pq.c | 217 +++++++++++++++++++++++++++++++++++++++++++ src/util/Makefile.am | 7 +- src/util/db.c | 217 ------------------------------------------- src/util/json.c | 8 +- 8 files changed, 249 insertions(+), 233 deletions(-) create mode 100644 src/pq/Makefile.am create mode 100644 src/pq/db_pq.c delete mode 100644 src/util/db.c (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index ed9c9c2bf..1edbf2a54 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,2 +1,2 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/include -SUBDIRS = include util mint lib +SUBDIRS = include util pq mint lib diff --git a/src/include/taler_json_lib.h b/src/include/taler_json_lib.h index ec354cce7..b9e42069a 100644 --- a/src/include/taler_json_lib.h +++ b/src/include/taler_json_lib.h @@ -13,13 +13,11 @@ You should have received a copy of the GNU General Public License along with TALER; see the file COPYING. If not, If not, see */ - /** * @file include/taler_json_lib.h * @brief helper functions for JSON processing using libjansson * @author Sree Harsha Totakura */ - #ifndef TALER_JSON_LIB_H_ #define TALER_JSON_LIB_H_ @@ -75,7 +73,7 @@ TALER_JSON_from_data (const void *data, size_t size); * * @param json the json object representing Amount * @param r_amount where the amount has to be written - * @return #GNUNET_OK upon successful parsing; GNUNET_SYSERR upon error + * @return #GNUNET_OK upon successful parsing; #GNUNET_SYSERR upon error */ int TALER_JSON_to_amount (json_t *json, @@ -86,7 +84,7 @@ TALER_JSON_to_amount (json_t *json, * * @param json the json object representing absolute time in seconds * @param r_abs where the time has to be written - * @return #GNUNET_OK upon successful parsing; GNUNET_SYSERR upon error + * @return #GNUNET_OK upon successful parsing; #GNUNET_SYSERR upon error */ int TALER_JSON_to_abs (json_t *json, @@ -97,8 +95,8 @@ TALER_JSON_to_abs (json_t *json, * * @param json the json object representing data * @param out the pointer to hold the parsed data. - * @param out_size the size of r_data. - * @return #GNUNET_OK upon successful parsing; GNUNET_SYSERR upon error + * @param out_size the size of @a out + * @return #GNUNET_OK upon successful parsing; #GNUNET_SYSERR upon error */ int TALER_JSON_to_data (json_t *json, diff --git a/src/mint/Makefile.am b/src/mint/Makefile.am index e2c44d21f..d1a68e590 100644 --- a/src/mint/Makefile.am +++ b/src/mint/Makefile.am @@ -31,6 +31,7 @@ taler_mint_keyup_SOURCES = \ taler_mint_keyup_LDADD = \ $(LIBGCRYPT_LIBS) \ $(top_builddir)/src/util/libtalerutil.la \ + $(top_builddir)/src/pq/libtalerpq.la \ $(top_builddir)/src/mint/libtalermint_common.la \ -lpq \ -lgnunetutil @@ -43,6 +44,7 @@ taler_mint_keycheck_SOURCES = \ taler_mint_keycheck_LDADD = \ $(LIBGCRYPT_LIBS) \ $(top_builddir)/src/util/libtalerutil.la \ + $(top_builddir)/src/pq/libtalerpq.la \ $(top_builddir)/src/mint/libtalermint_common.la \ -lgnunetutil \ -lpq @@ -53,6 +55,7 @@ taler_mint_reservemod_SOURCES = \ taler_mint_reservemod_LDADD = \ $(LIBGCRYPT_LIBS) \ $(top_builddir)/src/util/libtalerutil.la \ + $(top_builddir)/src/pq/libtalerpq.la \ $(top_builddir)/src/mint/libtalermint_common.la \ -lpq \ -lgnunetutil @@ -73,6 +76,7 @@ taler_mint_httpd_SOURCES = \ taler_mint_httpd_LDADD = \ $(LIBGCRYPT_LIBS) \ $(top_builddir)/src/util/libtalerutil.la \ + $(top_builddir)/src/pq/libtalerpq.la \ $(top_builddir)/src/mint/libtalermint_common.la \ -lpq \ -lmicrohttpd \ @@ -88,6 +92,7 @@ taler_mint_dbinit_SOURCES = \ taler_mint_dbinit_LDADD = \ $(LIBGCRYPT_LIBS) \ $(top_builddir)/src/util/libtalerutil.la \ + $(top_builddir)/src/pq/libtalerpq.la \ $(top_builddir)/src/mint/libtalermint_common.la \ -lpq \ -lgnunetutil diff --git a/src/pq/Makefile.am b/src/pq/Makefile.am new file mode 100644 index 000000000..cd7a5c93f --- /dev/null +++ b/src/pq/Makefile.am @@ -0,0 +1,16 @@ +AM_CPPFLAGS = -I$(top_srcdir)/src/include $(LIBGCRYPT_CFLAGS) $(POSTGRESQL_CPPFLAGS) + +lib_LTLIBRARIES = \ + libtalerpq.la + +libtalerpq_la_SOURCES = \ + db_pq.c + +libtalerpq_la_LIBADD = \ + -lgnunetutil \ + -lpq + +libtalerpq_la_LDFLAGS = \ + $(POSTGRESQL_LDFLAGS) \ + -version-info 0:0:0 \ + -export-dynamic -no-undefined diff --git a/src/pq/db_pq.c b/src/pq/db_pq.c new file mode 100644 index 000000000..2864f3475 --- /dev/null +++ b/src/pq/db_pq.c @@ -0,0 +1,217 @@ +/* + This file is part of TALER + (C) 2014 Christian Grothoff (and other contributing authors) + + TALER 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. + + TALER 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. + + You should have received a copy of the GNU General Public License along with + TALER; see the file COPYING. If not, If not, see +*/ +/** + * @file util/db_pq.c + * @brief helper functions for libpq (PostGres) interactions + * @author Sree Harsha Totakura + * @author Florian Dold + * @author Christian Grothoff + */ +#include "platform.h" +#include +#include "taler_db_lib.h" + + +/** + * Execute a prepared statement. + */ +PGresult * +TALER_DB_exec_prepared (PGconn *db_conn, + const char *name, + const struct TALER_DB_QueryParam *params) +{ + unsigned len; + unsigned i; + + /* count the number of parameters */ + { + const struct TALER_DB_QueryParam *x; + for (len = 0, x = params; + x->more; + len++, x++); + } + + /* new scope to allow stack allocation without alloca */ + + { + void *param_values[len]; + int param_lengths[len]; + int param_formats[len]; + + for (i = 0; i < len; i += 1) + { + param_values[i] = (void *) params[i].data; + param_lengths[i] = params[i].size; + param_formats[i] = 1; + } + return PQexecPrepared (db_conn, name, len, + (const char **) param_values, + param_lengths, + param_formats, 1); + } +} + + +/** + * 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. + * + * @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 (non-existing field) + */ +int +TALER_DB_extract_result (PGresult *result, + struct TALER_DB_ResultSpec *rs, + int row) +{ + int had_null = GNUNET_NO; + size_t len; + unsigned int i; + unsigned int j; + + for (i=0; NULL != rs[i].fname; i++) + { + int fnum; + + fnum = PQfnumber (result, rs[i].fname); + if (fnum < 0) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "field '%s' does not exist in result\n", + rs->fname); + return GNUNET_SYSERR; + } + + /* if a field is null, continue but + * remember that we now return a different result */ + if (PQgetisnull (result, row, fnum)) + { + had_null = GNUNET_YES; + continue; + } + const char *res; + len = PQgetlength (result, row, fnum); + if ( (0 != rs[i].dst_size) && + (rs[i].dst_size != len) ) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "field '%s' has wrong size (got %d, expected %d)\n", + rs[i].fname, + (int) len, + (int) rs->dst_size); + for (j=0;jdst_size) + *(void**) rs->dst = GNUNET_malloc (*rs->result_size = len); + memcpy (rs->dst, + res, + len); + } + if (GNUNET_YES == had_null) + return GNUNET_NO; + return GNUNET_YES; +} + + +int +TALER_DB_field_isnull (PGresult *result, + int row, + const char *fname) +{ + int fnum; + + fnum = PQfnumber (result, fname); + GNUNET_assert (fnum >= 0); + if (PQgetisnull (result, row, fnum)) + return GNUNET_YES; + return GNUNET_NO; +} + + +int +TALER_DB_extract_amount_nbo (PGresult *result, + int row, + const char *val_name, + const char *frac_name, + const char *curr_name, + struct TALER_AmountNBO *r_amount_nbo) +{ + int val_num; + int frac_num; + int curr_num; + int len; + + GNUNET_assert (NULL != strstr (val_name, "_val")); + GNUNET_assert (NULL != strstr (frac_name, "_frac")); + GNUNET_assert (NULL != strstr (curr_name, "_curr")); + + val_num = PQfnumber (result, val_name); + GNUNET_assert (val_num >= 0); + frac_num = PQfnumber (result, frac_name); + GNUNET_assert (frac_num >= 0); + curr_num = PQfnumber (result, curr_name); + GNUNET_assert (curr_num >= 0); + + r_amount_nbo->value = *(uint32_t *) PQgetvalue (result, row, val_num); + r_amount_nbo->fraction = *(uint32_t *) PQgetvalue (result, row, frac_num); + memset (r_amount_nbo->currency, 0, TALER_CURRENCY_LEN); + // FIXME: overflow? + len = PQgetlength (result, row, curr_num); + len = GNUNET_MIN (TALER_CURRENCY_LEN, len); + memcpy (r_amount_nbo->currency, PQgetvalue (result, row, curr_num), len); + r_amount_nbo->currency[TALER_CURRENCY_LEN - 1] = '\0'; + + return GNUNET_OK; +} + + +int +TALER_DB_extract_amount (PGresult *result, + int row, + const char *val_name, + const char *frac_name, + const char *curr_name, + struct TALER_Amount *r_amount) +{ + struct TALER_AmountNBO amount_nbo; + + (void) + TALER_DB_extract_amount_nbo (result, + row, + val_name, + frac_name, + curr_name, + &amount_nbo); + r_amount->value = ntohl (amount_nbo.value); + r_amount->fraction = ntohl (amount_nbo.fraction); + (void) strncpy (r_amount->currency, amount_nbo.currency, TALER_CURRENCY_LEN); + + return GNUNET_OK; +} + +/* end of pq/db_pq.c */ diff --git a/src/util/Makefile.am b/src/util/Makefile.am index bb07e2ca3..b62e8a42f 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -7,17 +7,14 @@ libtalerutil_la_SOURCES = \ amount.c \ crypto.c \ util.c \ - json.c \ - db.c + json.c libtalerutil_la_LIBADD = \ -lgnunetutil \ $(LIBGCRYPT_LIBS) \ -ljansson \ - -lmicrohttpd \ - -lpq + -lmicrohttpd libtalerutil_la_LDFLAGS = \ - $(POSTGRESQL_LDFLAGS) \ -version-info 0:0:0 \ -export-dynamic -no-undefined diff --git a/src/util/db.c b/src/util/db.c deleted file mode 100644 index c048a30ff..000000000 --- a/src/util/db.c +++ /dev/null @@ -1,217 +0,0 @@ -/* - This file is part of TALER - (C) 2014 Christian Grothoff (and other contributing authors) - - TALER 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. - - TALER 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. - - You should have received a copy of the GNU General Public License along with - TALER; see the file COPYING. If not, If not, see -*/ -/** - * @file util/db.c - * @brief helper functions for DB interactions - * @author Sree Harsha Totakura - * @author Florian Dold - * @author Christian Grothoff - */ -#include "platform.h" -#include -#include "taler_db_lib.h" - - -/** - * Execute a prepared statement. - */ -PGresult * -TALER_DB_exec_prepared (PGconn *db_conn, - const char *name, - const struct TALER_DB_QueryParam *params) -{ - unsigned len; - unsigned i; - - /* count the number of parameters */ - { - const struct TALER_DB_QueryParam *x; - for (len = 0, x = params; - x->more; - len++, x++); - } - - /* new scope to allow stack allocation without alloca */ - - { - void *param_values[len]; - int param_lengths[len]; - int param_formats[len]; - - for (i = 0; i < len; i += 1) - { - param_values[i] = (void *) params[i].data; - param_lengths[i] = params[i].size; - param_formats[i] = 1; - } - return PQexecPrepared (db_conn, name, len, - (const char **) param_values, - param_lengths, - param_formats, 1); - } -} - - -/** - * 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. - * - * @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 (non-existing field) - */ -int -TALER_DB_extract_result (PGresult *result, - struct TALER_DB_ResultSpec *rs, - int row) -{ - int had_null = GNUNET_NO; - size_t len; - unsigned int i; - unsigned int j; - - for (i=0; NULL != rs[i].fname; i++) - { - int fnum; - - fnum = PQfnumber (result, rs[i].fname); - if (fnum < 0) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "field '%s' does not exist in result\n", - rs->fname); - return GNUNET_SYSERR; - } - - /* if a field is null, continue but - * remember that we now return a different result */ - if (PQgetisnull (result, row, fnum)) - { - had_null = GNUNET_YES; - continue; - } - const char *res; - len = PQgetlength (result, row, fnum); - if ( (0 != rs[i].dst_size) && - (rs[i].dst_size != len) ) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "field '%s' has wrong size (got %d, expected %d)\n", - rs[i].fname, - (int) len, - (int) rs->dst_size); - for (j=0;jdst_size) - *(void**) rs->dst = GNUNET_malloc (*rs->result_size = len); - memcpy (rs->dst, - res, - len); - } - if (GNUNET_YES == had_null) - return GNUNET_NO; - return GNUNET_YES; -} - - -int -TALER_DB_field_isnull (PGresult *result, - int row, - const char *fname) -{ - int fnum; - - fnum = PQfnumber (result, fname); - GNUNET_assert (fnum >= 0); - if (PQgetisnull (result, row, fnum)) - return GNUNET_YES; - return GNUNET_NO; -} - - -int -TALER_DB_extract_amount_nbo (PGresult *result, - int row, - const char *val_name, - const char *frac_name, - const char *curr_name, - struct TALER_AmountNBO *r_amount_nbo) -{ - int val_num; - int frac_num; - int curr_num; - int len; - - GNUNET_assert (NULL != strstr (val_name, "_val")); - GNUNET_assert (NULL != strstr (frac_name, "_frac")); - GNUNET_assert (NULL != strstr (curr_name, "_curr")); - - val_num = PQfnumber (result, val_name); - GNUNET_assert (val_num >= 0); - frac_num = PQfnumber (result, frac_name); - GNUNET_assert (frac_num >= 0); - curr_num = PQfnumber (result, curr_name); - GNUNET_assert (curr_num >= 0); - - r_amount_nbo->value = *(uint32_t *) PQgetvalue (result, row, val_num); - r_amount_nbo->fraction = *(uint32_t *) PQgetvalue (result, row, frac_num); - memset (r_amount_nbo->currency, 0, TALER_CURRENCY_LEN); - // FIXME: overflow? - len = PQgetlength (result, row, curr_num); - len = GNUNET_MIN (TALER_CURRENCY_LEN, len); - memcpy (r_amount_nbo->currency, PQgetvalue (result, row, curr_num), len); - r_amount_nbo->currency[TALER_CURRENCY_LEN - 1] = '\0'; - - return GNUNET_OK; -} - - -int -TALER_DB_extract_amount (PGresult *result, - int row, - const char *val_name, - const char *frac_name, - const char *curr_name, - struct TALER_Amount *r_amount) -{ - struct TALER_AmountNBO amount_nbo; - - (void) - TALER_DB_extract_amount_nbo (result, - row, - val_name, - frac_name, - curr_name, - &amount_nbo); - r_amount->value = ntohl (amount_nbo.value); - r_amount->fraction = ntohl (amount_nbo.fraction); - (void) strncpy (r_amount->currency, amount_nbo.currency, TALER_CURRENCY_LEN); - - return GNUNET_OK; -} - -/* end of util/db.c */ diff --git a/src/util/json.c b/src/util/json.c index fecf0c5af..252def394 100644 --- a/src/util/json.c +++ b/src/util/json.c @@ -146,7 +146,7 @@ TALER_JSON_from_data (const void *data, size_t size) * * @param json the json object representing Amount * @param r_amount where the amount has to be written - * @return GNUNET_OK upon successful parsing; GNUNET_SYSERR upon error + * @return #GNUNET_OK upon successful parsing; #GNUNET_SYSERR upon error */ int TALER_JSON_to_amount (json_t *json, @@ -177,7 +177,7 @@ TALER_JSON_to_amount (json_t *json, * * @param json the json object representing Amount * @param r_amount where the amount has to be written - * @return GNUNET_OK upon successful parsing; GNUNET_SYSERR upon error + * @return #GNUNET_OK upon successful parsing; #GNUNET_SYSERR upon error */ int TALER_JSON_to_abs (json_t *json, @@ -201,8 +201,8 @@ TALER_JSON_to_abs (json_t *json, * * @param json the json object representing data * @param out the pointer to hold the parsed data. - * @param out_size the size of r_data. - * @return GNUNET_OK upon successful parsing; GNUNET_SYSERR upon error + * @param out_size the size of @a out + * @return #GNUNET_OK upon successful parsing; #GNUNET_SYSERR upon error */ int TALER_JSON_to_data (json_t *json, -- cgit v1.2.3