[taler-exchange] branch master updated: corrections applied to batch 1

[gnunet]

This is an automated email from the git hooks/post-receive script.

joseph-xu pushed a commit to branch master
in repository exchange.

The following commit(s) were added to refs/heads/master by this push:
     new 865f3aca corrections applied to batch 1
865f3aca is described below

commit 865f3aca19347bf797b289a1f2ea005282a739a3
Author: Joseph <Joseph.xu@efrei.net>
AuthorDate: Fri Jan 6 06:16:52 2023 -0500

    corrections applied to batch 1
---
 src/exchangedb/exchange_do_batch_reserves_in_insert.sql |  4 ++--
 src/exchangedb/pg_batch2_reserves_in_insert.c           | 12 +++---------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/exchangedb/exchange_do_batch_reserves_in_insert.sql 
b/src/exchangedb/exchange_do_batch_reserves_in_insert.sql
index d86bd1ee..4e0383f6 100644
--- a/src/exchangedb/exchange_do_batch_reserves_in_insert.sql
+++ b/src/exchangedb/exchange_do_batch_reserves_in_insert.sql
@@ -92,9 +92,9 @@ transaction_duplicate= TRUE;
     transaction_duplicate = FALSE;
   ELSE
     -- Unhappy...
-    RAISE EXCEPTION 'Reserve did not exist, but INSERT into reserves_in gave 
conflict';
+--    RAISE EXCEPTION 'Reserve did not exist, but INSERT into reserves_in gave 
conflict';
     transaction_duplicate = TRUE;
-    ROLLBACK;
+--    ROLLBACK;
   END IF;
   RETURN;
 END $$;
diff --git a/src/exchangedb/pg_batch2_reserves_in_insert.c 
b/src/exchangedb/pg_batch2_reserves_in_insert.c
index dd4c10f7..510fde85 100644
--- a/src/exchangedb/pg_batch2_reserves_in_insert.c
+++ b/src/exchangedb/pg_batch2_reserves_in_insert.c
@@ -787,6 +787,9 @@ TEH_PG_batch2_reserves_in_insert (void *cls,
       need_update |= conflicts[i+1];
       t_duplicate |= transaction_duplicate[i];
       t_duplicate |= transaction_duplicate[i+1];
+      results[i] = (t_duplicate)
+      ? GNUNET_DB_STATUS_SUCCESS_NO_RESULTS
+      : GNUNET_DB_STATUS_SUCCESS_ONE_RESULT;
       i += 2;
       break;
     case 1:
@@ -831,15 +834,6 @@ TEH_PG_batch2_reserves_in_insert (void *cls,
   {
     goto exit;
   }
-  /*  fprintf(stdout, "t : %d", t_duplicate);
-  if (t_duplicate)
-    {
-      GNUNET_break (0);
-      TEH_PG_rollback (pg);
-      return GNUNET_DB_STATUS_HARD_ERROR;
-    }
-  */
-
   // begin serializable
   {
     if (GNUNET_OK !=

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.