diff options
| author | Joseph <Joseph.xu@efrei.net> | 2022-12-12 06:49:13 -0500 |
|---|---|---|
| committer | Joseph <Joseph.xu@efrei.net> | 2022-12-20 04:58:57 -0500 |
| commit | 48b7d45959d40cc129991a191a6aa3167412bd9e (patch) | |
| tree | dd8e47cd279aa1a5cb50ac933c5f71e34b62eb31 /src/exchangedb/pg_batch2_reserves_in_insert.c | |
| parent | b6b80e61f49db3d5a4a796d95093c1b6784d3f3f (diff) | |
| download | exchange-48b7d45959d40cc129991a191a6aa3167412bd9e.tar.xz | |
some modifications in sql code
Diffstat (limited to 'src/exchangedb/pg_batch2_reserves_in_insert.c')
| -rw-r--r-- | src/exchangedb/pg_batch2_reserves_in_insert.c | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/src/exchangedb/pg_batch2_reserves_in_insert.c b/src/exchangedb/pg_batch2_reserves_in_insert.c index 77120254c..553dd3160 100644 --- a/src/exchangedb/pg_batch2_reserves_in_insert.c +++ b/src/exchangedb/pg_batch2_reserves_in_insert.c @@ -1,3 +1,4 @@ + /* This file is part of TALER Copyright (C) 2022 Taler Systems SA @@ -93,7 +94,7 @@ TEH_PG_batch2_reserves_in_insert (void *cls, ",transaction_duplicate2" ",ruuid AS reserve_uuid" ",ruuid2 AS reserve_uuid2" - " FROM batch2_reserves_insert" + " 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);"); expiry = GNUNET_TIME_absolute_to_timestamp ( GNUNET_TIME_absolute_add (reserves->execution_time.abs_time, @@ -199,18 +200,18 @@ TEH_PG_batch2_reserves_in_insert (void *cls, 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]); - // fprintf(stdout, "%d", conflicts2[i]); - if ((! conflicts[i] && transaction_duplicate) || (! conflicts2[i] && - transaction_duplicate2)) - { - GNUNET_break (0); - TEH_PG_rollback (pg); - return GNUNET_DB_STATUS_HARD_ERROR; - } - need_update |= conflicted |= conflicted2; + conflicts[i] = conflicted; + conflicts2[i] = conflicted2; + // fprintf(stdout, "%d",conflicts[i]); + // fprintf(stdout, "%d", conflicts2[i]); + if ((!conflicts[i] && transaction_duplicate) ||(!conflicts2[i] && transaction_duplicate2)) + { + GNUNET_break (0); + TEH_PG_rollback (pg); + return GNUNET_DB_STATUS_HARD_ERROR; + } + need_update |= conflicted; + need_update2 |= conflicted2; } // commit { @@ -237,7 +238,7 @@ TEH_PG_batch2_reserves_in_insert (void *cls, enum GNUNET_DB_QueryStatus qs2; 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++) { |