aboutsummaryrefslogtreecommitdiff
path: root/src/exchangedb/pg_batch4_reserves_in_insert.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/exchangedb/pg_batch4_reserves_in_insert.c')
-rw-r--r--src/exchangedb/pg_batch4_reserves_in_insert.c505
1 files changed, 417 insertions, 88 deletions
diff --git a/src/exchangedb/pg_batch4_reserves_in_insert.c b/src/exchangedb/pg_batch4_reserves_in_insert.c
index 604a31e78..6536eb56c 100644
--- a/src/exchangedb/pg_batch4_reserves_in_insert.c
+++ b/src/exchangedb/pg_batch4_reserves_in_insert.c
@@ -1,3 +1,4 @@
+
/*
This file is part of TALER
Copyright (C) 2022 Taler Systems SA
@@ -14,7 +15,7 @@
TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
*/
/**
- * @file exchangedb/pg_batch4_reserves_in_insert.c
+ * @file exchangedb/pg_batch_reserves_in_insert.c
* @brief Implementation of the reserves_in_insert function for Postgres
* @author Joseph Xu
*/
@@ -52,28 +53,357 @@ compute_notify_on_reserve (const struct TALER_ReservePublicKeyP *reserve_pub)
}
+static enum GNUNET_DB_QueryStatus
+insert1(struct PostgresClosure *pg,
+ const struct TALER_EXCHANGEDB_ReserveInInfo *reserve,
+ struct GNUNET_TIME_Timestamp expiry,
+ struct GNUNET_TIME_Timestamp gc,
+ struct TALER_PaytoHashP h_payto,
+ const char *notify_s,
+ struct GNUNET_TIME_Timestamp reserve_expiration,
+ bool *transaction_duplicate,
+ bool *conflict,
+ uint64_t *reserve_uuid)
+{
+ enum GNUNET_DB_QueryStatus qs2;
+ PREPARE (pg,
+ "reserve_creates",
+ "SELECT "
+ "out_reserve_found AS conflicted"
+ ",transaction_duplicate"
+ ",ruuid AS reserve_uuid"
+ " FROM exchange_do_batch_reserves_in_insert"
+ " ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12);");
+
+ struct GNUNET_PQ_QueryParam params[] = {
+ GNUNET_PQ_query_param_auto_from_type (&reserve->reserve_pub),
+ GNUNET_PQ_query_param_timestamp (&expiry),
+ GNUNET_PQ_query_param_timestamp (&gc),
+ GNUNET_PQ_query_param_uint64 (&reserve->wire_reference),
+ TALER_PQ_query_param_amount (&reserve->balance),
+ GNUNET_PQ_query_param_string (reserve->exchange_account_name),
+ GNUNET_PQ_query_param_timestamp (&reserve->execution_time),
+ GNUNET_PQ_query_param_auto_from_type (&h_payto),
+ GNUNET_PQ_query_param_string (reserve->sender_account_details),
+ GNUNET_PQ_query_param_timestamp (&reserve_expiration),
+ GNUNET_PQ_query_param_string (notify_s),
+ GNUNET_PQ_query_param_end
+ };
+
+ struct GNUNET_PQ_ResultSpec rs[] = {
+ GNUNET_PQ_result_spec_bool ("conflicted",
+ conflict),
+ GNUNET_PQ_result_spec_bool ("transaction_duplicate",
+ transaction_duplicate),
+ GNUNET_PQ_result_spec_uint64 ("reserve_uuid",
+ reserve_uuid),
+ GNUNET_PQ_result_spec_end
+ };
+
+ TALER_payto_hash (reserve->sender_account_details,
+ &h_payto);
+
+ /* Note: query uses 'on conflict do nothing' */
+ qs2 = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+ "reserve_creates",
+ params,
+ rs);
+
+ if (qs2 < 0)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Failed to create reserves (%d)\n",
+ qs2);
+ return qs2;
+ }
+ GNUNET_assert (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS != qs2);
+
+ if ((*conflict) && (*transaction_duplicate))
+ {
+ GNUNET_break (0);
+ TEH_PG_rollback (pg);
+ return GNUNET_DB_STATUS_HARD_ERROR;
+ }
+ return qs2;
+}
+
+
+
+static enum GNUNET_DB_QueryStatus
+insert2 (struct PostgresClosure *pg,
+ const struct TALER_EXCHANGEDB_ReserveInInfo *reserve0,
+ const struct TALER_EXCHANGEDB_ReserveInInfo *reserve1,
+ struct GNUNET_TIME_Timestamp expiry,
+ struct GNUNET_TIME_Timestamp gc,
+ struct TALER_PaytoHashP h_payto,
+ const char *notify_s,
+ struct GNUNET_TIME_Timestamp reserve_expiration,
+ bool *transaction_duplicate,
+ bool *transaction_duplicate2,
+ bool *conflict,
+ bool *conflict2,
+ uint64_t *reserve_uuid,
+ uint64_t *reserve_uuid2)
+{
+ PREPARE (pg,
+ "reserve_create",
+ "SELECT "
+ "out_reserve_found AS conflicted"
+ ",out_reserve_found2 AS conflicted2"
+ ",transaction_duplicate"
+ ",transaction_duplicate2"
+ ",ruuid AS reserve_uuid"
+ ",ruuid2 AS reserve_uuid2"
+ " FROM exchange_do_batch2_reserves_insert"
+ " ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16,$17,$18,$19,$20,$21);");
+
+ struct GNUNET_PQ_QueryParam params[] = {
+ GNUNET_PQ_query_param_auto_from_type (&reserve0->reserve_pub),
+ GNUNET_PQ_query_param_timestamp (&expiry),
+ GNUNET_PQ_query_param_timestamp (&gc),
+ GNUNET_PQ_query_param_uint64 (&reserve0->wire_reference),
+ TALER_PQ_query_param_amount (&reserve0->balance),
+ GNUNET_PQ_query_param_string (reserve0->exchange_account_name),
+ GNUNET_PQ_query_param_timestamp (&reserve0->execution_time),
+ GNUNET_PQ_query_param_auto_from_type (&h_payto),
+ GNUNET_PQ_query_param_string (reserve0->sender_account_details),
+ GNUNET_PQ_query_param_timestamp (&reserve_expiration),
+ GNUNET_PQ_query_param_string (notify_s),
+ GNUNET_PQ_query_param_auto_from_type (&reserve1->reserve_pub),
+ GNUNET_PQ_query_param_uint64 (&reserve1->wire_reference),
+ TALER_PQ_query_param_amount (&reserve1->balance),
+ GNUNET_PQ_query_param_string (reserve1->exchange_account_name),
+ GNUNET_PQ_query_param_timestamp (&reserve1->execution_time),
+ GNUNET_PQ_query_param_auto_from_type (&h_payto),
+ GNUNET_PQ_query_param_string (reserve1->sender_account_details),
+ GNUNET_PQ_query_param_timestamp (&reserve_expiration),
+
+ GNUNET_PQ_query_param_end
+ };
+
+ struct GNUNET_PQ_ResultSpec rs[] = {
+ GNUNET_PQ_result_spec_bool ("conflicted",
+ conflict),
+ GNUNET_PQ_result_spec_bool ("conflicted2",
+ conflict2),
+ GNUNET_PQ_result_spec_bool ("transaction_duplicate",
+ transaction_duplicate),
+ GNUNET_PQ_result_spec_bool ("transaction_duplicate2",
+ transaction_duplicate2),
+ GNUNET_PQ_result_spec_uint64 ("reserve_uuid",
+ reserve_uuid),
+ GNUNET_PQ_result_spec_uint64 ("reserve_uuid2",
+ reserve_uuid2),
+ GNUNET_PQ_result_spec_end
+ };
+
+ TALER_payto_hash (reserve0->sender_account_details,
+ &h_payto);
+ TALER_payto_hash (reserve1->sender_account_details,
+ &h_payto);
+
+
+ qs1 = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+ "reserve_create",
+ params,
+ rs);
+ if (qs1 < 0)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Failed to create reserves (%d)\n",
+ qs1);
+ return qs1;
+ }
+ /*
+ GNUNET_assert (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS != qs1);
+ results[i] = (transaction_duplicate)
+ ? GNUNET_DB_STATUS_SUCCESS_NO_RESULTS
+ : GNUNET_DB_STATUS_SUCCESS_ONE_RESULT;*/
+
+ if ((*conflict) && (*transaction_duplicate) ||((*conflict2) && (*transaction_duplicate2)))
+ {
+ GNUNET_break (0);
+ TEH_PG_rollback (pg);
+ return GNUNET_DB_STATUS_HARD_ERROR;
+ }
+
+}
+
+
+static enum GNUNET_DB_QueryStatus
+insert4 (struct PostgresClosure *pg,
+ const struct TALER_EXCHANGEDB_ReserveInInfo *reserve0,
+ const struct TALER_EXCHANGEDB_ReserveInInfo *reserve1,
+ const struct TALER_EXCHANGEDB_ReserveInInfo *reserve2,
+ const struct TALER_EXCHANGEDB_ReserveInInfo *reserve3,
+ struct GNUNET_TIME_Timestamp expiry,
+ struct GNUNET_TIME_Timestamp gc,
+ struct TALER_PaytoHashP h_payto,
+ const char *notify_s,
+ struct GNUNET_TIME_Timestamp reserve_expiration,
+ bool *transaction_duplicate,
+ bool *transaction_duplicate2,
+ bool *transaction_duplicate3,
+ bool *transaction_duplicate4,
+ bool *conflict,
+ bool *conflict2,
+ bool *conflict3,
+ bool *conflict4,
+ uint64_t *reserve_uuid,
+ uint64_t *reserve_uuid2,
+ uint64_t *reserve_uuid3,
+ uint64_t *reserve_uuid4)
+{
+ PREPARE (pg,
+ "reserve_create",
+ "SELECT "
+ "out_reserve_found AS conflicted"
+ ",out_reserve_found2 AS conflicted2"
+ ",out_reserve_found3 AS conflicted3"
+ ",out_reserve_found4 AS conflicted4"
+ ",transaction_duplicate"
+ ",transaction_duplicate2"
+ ",transaction_duplicate3"
+ ",transaction_duplicate4"
+ ",ruuid AS reserve_uuid"
+ ",ruuid2 AS reserve_uuid2"
+ ",ruuid3 AS reserve_uuid3"
+ ",ruuid4 AS reserve_uuid4"
+ " FROM exchange_do_batch4_reserves_insert"
+ " ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16,$17,$18,$19,$20,$21,$22,$23,$24,$25,$26,$27,$28,$29,$30,$31,$32,$33,$34,$35,$36,$37,$38,$39);");
+
+ struct GNUNET_PQ_QueryParam params[] = {
+ GNUNET_PQ_query_param_auto_from_type (&reserve0->reserve_pub),
+ GNUNET_PQ_query_param_timestamp (&expiry),
+ GNUNET_PQ_query_param_timestamp (&gc),
+ GNUNET_PQ_query_param_uint64 (&reserve0->wire_reference),
+ TALER_PQ_query_param_amount (&reserve0->balance),
+ GNUNET_PQ_query_param_string (reserve0->exchange_account_name),
+ GNUNET_PQ_query_param_timestamp (&reserve0->execution_time),
+ GNUNET_PQ_query_param_auto_from_type (&h_payto),
+ GNUNET_PQ_query_param_string (reserve0->sender_account_details),
+ GNUNET_PQ_query_param_timestamp (&reserve_expiration),
+ GNUNET_PQ_query_param_string (notify_s),
+
+ GNUNET_PQ_query_param_auto_from_type (&reserve1->reserve_pub),
+ GNUNET_PQ_query_param_uint64 (&reserve1->wire_reference),
+ TALER_PQ_query_param_amount (&reserve1->balance),
+ GNUNET_PQ_query_param_string (reserve1->exchange_account_name),
+ GNUNET_PQ_query_param_timestamp (&reserve1->execution_time),
+ GNUNET_PQ_query_param_auto_from_type (&h_payto),
+ GNUNET_PQ_query_param_string (reserve1->sender_account_details),
+ GNUNET_PQ_query_param_timestamp (&reserve_expiration),
+
+ GNUNET_PQ_query_param_auto_from_type (&reserve2->reserve_pub),
+ GNUNET_PQ_query_param_timestamp (&expiry),
+ GNUNET_PQ_query_param_timestamp (&gc),
+ GNUNET_PQ_query_param_uint64 (&reserve2->wire_reference),
+ TALER_PQ_query_param_amount (&reserve2->balance),
+ GNUNET_PQ_query_param_string (reserve2->exchange_account_name),
+ GNUNET_PQ_query_param_timestamp (&reserve2->execution_time),
+ GNUNET_PQ_query_param_auto_from_type (&h_payto),
+ GNUNET_PQ_query_param_string (reserve2->sender_account_details),
+ GNUNET_PQ_query_param_timestamp (&reserve_expiration),
+
+ GNUNET_PQ_query_param_auto_from_type (&reserve3->reserve_pub),
+ GNUNET_PQ_query_param_timestamp (&expiry),
+ GNUNET_PQ_query_param_timestamp (&gc),
+ GNUNET_PQ_query_param_uint64 (&reserve3->wire_reference),
+ TALER_PQ_query_param_amount (&reserve3->balance),
+ GNUNET_PQ_query_param_string (reserve3->exchange_account_name),
+ GNUNET_PQ_query_param_timestamp (&reserve3->execution_time),
+ GNUNET_PQ_query_param_auto_from_type (&h_payto),
+ GNUNET_PQ_query_param_string (reserve3->sender_account_details),
+ GNUNET_PQ_query_param_timestamp (&reserve_expiration)
+
+ GNUNET_PQ_query_param_end
+ };
+
+ struct GNUNET_PQ_ResultSpec rs[] = {
+ GNUNET_PQ_result_spec_bool ("conflicted",
+ conflict),
+ GNUNET_PQ_result_spec_bool ("conflicted2",
+ conflict2),
+ GNUNET_PQ_result_spec_bool ("conflicted3",
+ conflict3),
+ GNUNET_PQ_result_spec_bool ("conflicted4",
+ conflict4),
+ GNUNET_PQ_result_spec_bool ("transaction_duplicate",
+ transaction_duplicate),
+ GNUNET_PQ_result_spec_bool ("transaction_duplicate2",
+ transaction_duplicate2),
+ GNUNET_PQ_result_spec_bool ("transaction_duplicate3",
+ transaction_duplicate3),
+ GNUNET_PQ_result_spec_bool ("transaction_duplicate4",
+ transaction_duplicate4),
+ GNUNET_PQ_result_spec_uint64 ("reserve_uuid",
+ reserve_uuid),
+ GNUNET_PQ_result_spec_uint64 ("reserve_uuid2",
+ reserve_uuid2),
+ GNUNET_PQ_result_spec_uint64 ("reserve_uuid3",
+ reserve_uuid3),
+ GNUNET_PQ_result_spec_uint64 ("reserve_uuid4",
+ reserve_uuid4),
+ GNUNET_PQ_result_spec_end
+ };
+
+ TALER_payto_hash (reserve0->sender_account_details,
+ &h_payto);
+ TALER_payto_hash (reserve1->sender_account_details,
+ &h_payto);
+
+
+ qs1 = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+ "reserve_create",
+ params,
+ rs);
+ if (qs1 < 0)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Failed to create reserves (%d)\n",
+ qs1);
+ return qs1;
+ }
+ /*
+ GNUNET_assert (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS != qs1);
+ results[i] = (transaction_duplicate)
+ ? GNUNET_DB_STATUS_SUCCESS_NO_RESULTS
+ : GNUNET_DB_STATUS_SUCCESS_ONE_RESULT;*/
+
+ if ((*conflict) && (*transaction_duplicate) ||((*conflict2) && (*transaction_duplicate2)))
+ {
+ GNUNET_break (0);
+ TEH_PG_rollback (pg);
+ return GNUNET_DB_STATUS_HARD_ERROR;
+ }
+
+}
+
+
+
enum GNUNET_DB_QueryStatus
-TEH_PG_batch4_reserves_in_insert (void *cls,
+TEH_PG_batch2_reserves_in_insert (void *cls,
const struct TALER_EXCHANGEDB_ReserveInInfo *reserves,
unsigned int reserves_length,
enum GNUNET_DB_QueryStatus *results)
{
struct PostgresClosure *pg = cls;
enum GNUNET_DB_QueryStatus qs1;
+ enum GNUNET_DB_QueryStatus qs2;
+ enum GNUNET_DB_QueryStatus qs4;
+ enum GNUNET_DB_QueryStatus qs5;
struct GNUNET_TIME_Timestamp expiry;
struct GNUNET_TIME_Timestamp gc;
struct TALER_PaytoHashP h_payto;
- uint64_t reserve_uuid;
+ uint64_t reserve_uuid[reserves_length];
bool conflicted;
bool conflicted2;
- bool transaction_duplicate;
- bool transaction_duplicate2;
+ bool transaction_duplicate[reserves_length];
bool need_update = false;
bool need_update2 = false;
struct GNUNET_TIME_Timestamp reserve_expiration
= GNUNET_TIME_relative_to_timestamp (pg->idle_reserve_expiration_time);
bool conflicts[reserves_length];
- bool conflicts2[reserves_length];
char *notify_s[reserves_length];
if (GNUNET_OK !=
@@ -82,16 +412,7 @@ TEH_PG_batch4_reserves_in_insert (void *cls,
GNUNET_break (0);
return GNUNET_DB_STATUS_HARD_ERROR;
}
- PREPARE (pg,
- "reserve_create",
- "SELECT "
- "out_reserve_found AS conflicted"
- ",out_reserve_found2 AS conflicted2"
- ",transaction_duplicate"
- ",transaction_duplicate2"
- ",ruuid AS reserve_uuid"
- " FROM batch2_reserves_insert"
- " ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16,$17,$18,$19,$20,$21);");
+
expiry = GNUNET_TIME_absolute_to_timestamp (
GNUNET_TIME_absolute_add (reserves->execution_time.abs_time,
pg->idle_reserve_expiration_time));
@@ -124,75 +445,83 @@ TEH_PG_batch4_reserves_in_insert (void *cls,
notify_s[i] = compute_notify_on_reserve (&reserve->reserve_pub);
}
- for (unsigned int i=0;i<reserves_length;i++)
- {
- const struct TALER_EXCHANGEDB_ReserveInInfo *reserve = &reserves[i];
- struct GNUNET_PQ_QueryParam params[] = {
- GNUNET_PQ_query_param_auto_from_type (&reserve->reserve_pub),
- GNUNET_PQ_query_param_timestamp (&expiry),
- GNUNET_PQ_query_param_timestamp (&gc),
- GNUNET_PQ_query_param_uint64 (&reserve->wire_reference),
- TALER_PQ_query_param_amount (&reserve->balance),
- GNUNET_PQ_query_param_string (reserve->exchange_account_name),
- GNUNET_PQ_query_param_timestamp (&reserve->execution_time),
- GNUNET_PQ_query_param_auto_from_type (&h_payto),
- GNUNET_PQ_query_param_string (reserve->sender_account_details),
- GNUNET_PQ_query_param_timestamp (&reserve_expiration),
- GNUNET_PQ_query_param_string (notify_s[i]),
- GNUNET_PQ_query_param_auto_from_type (&reserve->reserve_pub),
- GNUNET_PQ_query_param_uint64 (&reserve->wire_reference),
- TALER_PQ_query_param_amount (&reserve->balance),
- GNUNET_PQ_query_param_string (reserve->exchange_account_name),
- GNUNET_PQ_query_param_timestamp (&reserve->execution_time),
- GNUNET_PQ_query_param_auto_from_type (&h_payto),
- GNUNET_PQ_query_param_string (reserve->sender_account_details),
- GNUNET_PQ_query_param_timestamp (&reserve_expiration),
- GNUNET_PQ_query_param_end
- };
+ unsigned int i=0;
- struct GNUNET_PQ_ResultSpec rs[] = {
- GNUNET_PQ_result_spec_bool ("conflicted",
- &conflicted),
- GNUNET_PQ_result_spec_bool ("conflicted2",
- &conflicted2),
- GNUNET_PQ_result_spec_bool ("transaction_duplicate",
- &transaction_duplicate),
- GNUNET_PQ_result_spec_uint64 ("reserve_uuid",
- &reserve_uuid),
- GNUNET_PQ_result_spec_end
- };
-
- TALER_payto_hash (reserve->sender_account_details,
- &h_payto);
-
- /* Note: query uses 'on conflict do nothing' */
- qs1 = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
- "reserve_create",
- params,
- rs);
+ while (i < reserves_length)
+ {
+ if (reserves_length - i >= 4)
+ {
+ qs4=insert4(pg,
+ &reserves[i],
+ &reserves[i+2],
+ &reserves[i+3],
+ &reserves[i+4],
+ expiry,
+ gc,
+ h_payto,
+ &notify_s[i],
+ reserve_expiration,
+ &transaction_duplicate[i],
+ &transaction_duplicate[i+1],
+ &transaction_duplicate[i+2],
+ &transaction_duplicate[i+3],
+ &conflicts[i],
+ &conflicts[i+1],
+ &conflicts[i+2],
+ &conflicts[i+3],
+ &reserve_uuid[i],
+ &reserve_uuid[i+1],
+ &reserve_uuid[i+2],
+ &reserve_uuid[i+3]);
- if (qs1 < 0)
+ need_update |= conflicts[i];
+ need_update |= conflicts[i+1];
+ need_update |= conflicts[i+2];
+ need_update |= conflicts[i+3];
+ i += 4;
+ continue;
+ }
+ switch (reserves_length - i)
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "Failed to create reserves (%d)\n",
- qs1);
- return qs1;
+ case 3:
+ case 2:
+ qs5=insert2(pg,
+ &reserves[i],
+ &reserves[i+1],
+ expiry,
+ gc,
+ h_payto,
+ notify_s[i],
+ reserve_expiration,
+ &transaction_duplicate[i],
+ &transaction_duplicate[i+1],
+ &conflicts[i],
+ &conflicts[i+1],
+ &reserve_uuid[i],
+ &reserve_uuid[i+1]);
+ need_update |= conflicts[i];
+ need_update |= conflicts[i+1];
+ i += 2;
+ break;
+ case 1:
+ qs2 = insert1(pg,
+ &reserves[i],
+ expiry,
+ gc,
+ h_payto,
+ notify_s[i],
+ reserve_expiration,
+ &transaction_duplicate[i],
+ &conflicts[i],
+ &reserve_uuid[i]);
+ need_update |= conflicts[i];
+ i += 1;
+ break;
+ case 0:
+ GNUNET_assert (0);
+ break;
}
- GNUNET_assert (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS != qs1);
- results[i] = (transaction_duplicate)
- ? GNUNET_DB_STATUS_SUCCESS_NO_RESULTS
- : GNUNET_DB_STATUS_SUCCESS_ONE_RESULT;
- conflicts[i] = conflicted;
- conflicts2[i] = conflicted2;
- // fprintf(stdout, "%d", conflicts[i]);
- if (!conflicts[i] && !conflicts2[i]&& transaction_duplicate)
- {
- GNUNET_break (0);
- TEH_PG_rollback (pg);
- return GNUNET_DB_STATUS_HARD_ERROR;
- }
- need_update |= conflicted |= conflicted2;
- }
+ } /* end while */
// commit
{
enum GNUNET_DB_QueryStatus cs;
@@ -202,7 +531,7 @@ TEH_PG_batch4_reserves_in_insert (void *cls,
return cs;
}
- if (!need_update)
+ if (!need_update )
goto exit;
// begin serializable
{
@@ -215,10 +544,10 @@ TEH_PG_batch4_reserves_in_insert (void *cls,
}
}
- enum GNUNET_DB_QueryStatus qs2;
+ enum GNUNET_DB_QueryStatus qs3;
PREPARE (pg,
"reserves_in_add_transaction",
- "SELECT batch_reserves_update"
+ "CALL exchange_do_batch_reserves_update"
" ($1,$2,$3,$4,$5,$6,$7,$8,$9);");
for (unsigned int i=0;i<reserves_length;i++)
{
@@ -238,15 +567,15 @@ TEH_PG_batch4_reserves_in_insert (void *cls,
GNUNET_PQ_query_param_end
};
- qs2 = GNUNET_PQ_eval_prepared_non_select (pg->conn,
+ qs3 = GNUNET_PQ_eval_prepared_non_select (pg->conn,
"reserves_in_add_transaction",
params);
- if (qs2<0)
+ if (qs3<0)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"Failed to update reserves (%d)\n",
- qs2);
- return qs2;
+ qs3);
+ return qs3;
}
}
}