diff options
| author | Joseph <Joseph.xu@efrei.net> | 2022-11-21 09:45:16 -0500 |
|---|---|---|
| committer | Joseph <Joseph.xu@efrei.net> | 2022-11-21 10:40:10 -0500 |
| commit | dbfd4e252a1bdbc7e4c8c97fd4780a13369b872c (patch) | |
| tree | 9bf8828191e023a47dee0bbdb458165ba2f12b7b /src/exchangedb/pg_batch_reserves_in_insert.c | |
| parent | b9ccfbd66b192e11766f4129bae65c16fddffc5a (diff) | |
| download | exchange-dbfd4e252a1bdbc7e4c8c97fd4780a13369b872c.tar.xz | |
batch test for reserves-in-insert
Diffstat (limited to 'src/exchangedb/pg_batch_reserves_in_insert.c')
| -rw-r--r-- | src/exchangedb/pg_batch_reserves_in_insert.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/exchangedb/pg_batch_reserves_in_insert.c b/src/exchangedb/pg_batch_reserves_in_insert.c index 216de96be..fd056e0ca 100644 --- a/src/exchangedb/pg_batch_reserves_in_insert.c +++ b/src/exchangedb/pg_batch_reserves_in_insert.c @@ -25,6 +25,7 @@ #include "pg_batch_reserves_in_insert.h" #include "pg_helper.h" #include "pg_start.h" +#include "pg_rollback.h" #include "pg_start_read_committed.h" #include "pg_commit.h" #include "pg_reserves_get.h" @@ -97,7 +98,6 @@ TEH_PG_batch_reserves_in_insert (void *cls, { struct GNUNET_PQ_QueryParam params[] = { GNUNET_PQ_query_param_auto_from_type (&reserves->reserve_pub), /*$1*/ - TALER_PQ_query_param_amount (&reserves->balance), /*$2+3*/ GNUNET_PQ_query_param_timestamp (&expiry), /*$4*/ GNUNET_PQ_query_param_timestamp (&gc), /*$5*/ GNUNET_PQ_query_param_uint64 (&reserves->wire_reference), /*6*/ @@ -121,6 +121,7 @@ TEH_PG_batch_reserves_in_insert (void *cls, GNUNET_PQ_result_spec_end }; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Reserve does not exist; creating a new one\n"); /* Note: query uses 'on conflict do nothing' */ @@ -129,21 +130,23 @@ TEH_PG_batch_reserves_in_insert (void *cls, "SELECT " "out_reserve_found AS conflicted" ",transaction_duplicate" - ",ruuid" + ",ruuid AS reserve_uuid" " FROM batch_reserves_in" - " ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12);"); + " ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11);"); qs1 = GNUNET_PQ_eval_prepared_singleton_select (pg->conn, "reserve_create", params, rs); + + if (qs1 < 0) return qs1; } - + if ((int)conflicted == 0 && (int)transaction_duplicate == 1) + TEH_PG_rollback(pg); notify_on_reserve (pg, &reserves->reserve_pub); - return GNUNET_DB_STATUS_SUCCESS_ONE_RESULT; } |