diff options
Diffstat (limited to 'src/backenddb/plugin_merchantdb_postgres.c')
| -rw-r--r-- | src/backenddb/plugin_merchantdb_postgres.c | 211 |
1 files changed, 3 insertions, 208 deletions
diff --git a/src/backenddb/plugin_merchantdb_postgres.c b/src/backenddb/plugin_merchantdb_postgres.c index c7ffe2a5..72ebd7e4 100644 --- a/src/backenddb/plugin_merchantdb_postgres.c +++ b/src/backenddb/plugin_merchantdb_postgres.c @@ -40,6 +40,7 @@ #include "pg_delete_exchange_accounts.h" #include "pg_select_accounts_by_exchange.h" #include "pg_insert_exchange_account.h" +#include "pg_lookup_reserves.h" /** @@ -4679,191 +4680,6 @@ postgres_activate_reserve (void *cls, /** - * Closure for #lookup_reserves_cb. - */ -struct LookupReservesContext -{ - /** - * Postgres context. - */ - struct PostgresClosure *pg; - - /** - * Function to call with the results - */ - TALER_MERCHANTDB_ReservesCallback cb; - - /** - * Closure for @e cb - */ - void *cb_cls; - - /** - * Filter by active reserves. - */ - enum TALER_EXCHANGE_YesNoAll active; - - /** - * Filter by failures (mismatch in exchange claimed and - * merchant claimed initial amounts). - */ - enum TALER_EXCHANGE_YesNoAll failures; - - /** - * Set in case of errors. - */ - enum GNUNET_DB_QueryStatus qs; - -}; - - -/** - * Function to be called with the results of a SELECT statement - * that has returned @a num_results results about accounts. - * - * @param[in,out] cls of type `struct LookupReservesContext *` - * @param result the postgres result - * @param num_results the number of results in @a result - */ -static void -lookup_reserves_cb (void *cls, - PGresult *result, - unsigned int num_results) -{ - struct LookupReservesContext *lrc = cls; - struct PostgresClosure *pg = lrc->pg; - - for (unsigned int i = 0; i < num_results; i++) - { - struct TALER_ReservePublicKeyP reserve_pub; - struct GNUNET_TIME_Timestamp creation_time; - struct GNUNET_TIME_Timestamp expiration_time; - struct TALER_Amount merchant_initial_balance; - struct TALER_Amount exchange_initial_balance; - struct TALER_Amount pickup_amount; - struct TALER_Amount committed_amount; - uint8_t active; - struct GNUNET_PQ_ResultSpec rs[] = { - GNUNET_PQ_result_spec_auto_from_type ("reserve_pub", - &reserve_pub), - GNUNET_PQ_result_spec_timestamp ("creation_time", - &creation_time), - GNUNET_PQ_result_spec_timestamp ("expiration", - &expiration_time), - TALER_PQ_RESULT_SPEC_AMOUNT ("merchant_initial_balance", - &merchant_initial_balance), - TALER_PQ_RESULT_SPEC_AMOUNT ("exchange_initial_balance", - &exchange_initial_balance), - TALER_PQ_RESULT_SPEC_AMOUNT ("tips_committed", - &committed_amount), - TALER_PQ_RESULT_SPEC_AMOUNT ("tips_picked_up", - &pickup_amount), - GNUNET_PQ_result_spec_auto_from_type ("active", - &active), - GNUNET_PQ_result_spec_end - }; - - if (GNUNET_OK != - GNUNET_PQ_extract_result (result, - rs, - i)) - { - GNUNET_break (0); - lrc->qs = GNUNET_DB_STATUS_HARD_ERROR; - return; - } - switch (lrc->active) - { - case TALER_EXCHANGE_YNA_YES: - if (0 == active) - continue; - break; - case TALER_EXCHANGE_YNA_NO: - if (0 != active) - continue; - break; - case TALER_EXCHANGE_YNA_ALL: - break; - } - switch (lrc->failures) - { - case TALER_EXCHANGE_YNA_YES: - if (0 == - TALER_amount_cmp (&merchant_initial_balance, - &exchange_initial_balance)) - continue; - break; - case TALER_EXCHANGE_YNA_NO: - if (0 != - TALER_amount_cmp (&merchant_initial_balance, - &exchange_initial_balance)) - continue; - break; - case TALER_EXCHANGE_YNA_ALL: - break; - } - lrc->cb (lrc->cb_cls, - &reserve_pub, - creation_time, - expiration_time, - &merchant_initial_balance, - &exchange_initial_balance, - &pickup_amount, - &committed_amount, - (0 != active)); - } -} - - -/** - * Lookup reserves. - * - * @param cls closure - * @param instance_id instance to lookup payments for - * @param created_after filter by reserves created after this date - * @param active filter by active reserves - * @param failures filter by reserves with a disagreement on the initial balance - * @param cb function to call with reserve summary data - * @param cb_cls closure for @a cb - * @return transaction status - */ -static enum GNUNET_DB_QueryStatus -postgres_lookup_reserves (void *cls, - const char *instance_id, - struct GNUNET_TIME_Timestamp created_after, - enum TALER_EXCHANGE_YesNoAll active, - enum TALER_EXCHANGE_YesNoAll failures, - TALER_MERCHANTDB_ReservesCallback cb, - void *cb_cls) -{ - struct PostgresClosure *pg = cls; - struct LookupReservesContext lrc = { - .pg = pg, - .active = active, - .failures = failures, - .cb = cb, - .cb_cls = cb_cls - }; - struct GNUNET_PQ_QueryParam params[] = { - GNUNET_PQ_query_param_string (instance_id), - GNUNET_PQ_query_param_timestamp (&created_after), - GNUNET_PQ_query_param_end - }; - enum GNUNET_DB_QueryStatus qs; - - check_connection (pg); - qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn, - "lookup_reserves", - params, - &lookup_reserves_cb, - &lrc); - if (lrc.qs < 0) - return lrc.qs; - return qs; -} - - -/** * Closure for #lookup_pending_reserves_cb. */ struct LookupPendingReservesContext @@ -9076,28 +8892,6 @@ postgres_connect (void *cls) " (SELECT merchant_serial" " FROM merchant_instances" " WHERE merchant_id=$1)"), - /* For postgres_lookup_reserves() */ - GNUNET_PQ_make_prepare ("lookup_reserves", - "SELECT" - " reserve_pub" - ",creation_time" - ",expiration" - ",merchant_initial_balance_val" - ",merchant_initial_balance_frac" - ",exchange_initial_balance_val" - ",exchange_initial_balance_frac" - ",tips_committed_val" - ",tips_committed_frac" - ",tips_picked_up_val" - ",tips_picked_up_frac" - ",reserve_priv IS NOT NULL AS active" - " FROM merchant_tip_reserves" - " FULL OUTER JOIN merchant_tip_reserve_keys USING (reserve_serial)" - " WHERE creation_time > $2" - " AND merchant_serial =" - " (SELECT merchant_serial" - " FROM merchant_instances" - " WHERE merchant_id=$1)"), /* For postgres_lookup_pending_reserves() */ GNUNET_PQ_make_prepare ("lookup_pending_reserves", "SELECT" @@ -9775,7 +9569,8 @@ libtaler_plugin_merchantdb_postgres_init (void *cls) plugin->store_wire_fee_by_exchange = &postgres_store_wire_fee_by_exchange; plugin->insert_reserve = &postgres_insert_reserve; plugin->activate_reserve = &postgres_activate_reserve; - plugin->lookup_reserves = &postgres_lookup_reserves; + plugin->lookup_reserves + = &TMH_PG_lookup_reserves; plugin->lookup_pending_reserves = &postgres_lookup_pending_reserves; plugin->lookup_reserve = &postgres_lookup_reserve; plugin->delete_reserve = &postgres_delete_reserve; |