From 94e167995537015f5100b526791cd51268aa0f2f Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Tue, 31 May 2016 09:13:03 +0200
Subject: [PATCH] adding a few more uniqueness constraints to DB

---
 src/Makefile.am                               |   6 +--
 src/benchmark/taler-exchange-benchmark        | Bin 20776 -> 24848 bytes
 src/exchange/test_taler_exchange_aggregator.c |  44 +++++++++---------
 src/exchangedb/plugin_exchangedb_postgres.c   |  44 +++++++++++++-----
 src/include/taler_exchangedb_plugin.h         |  12 +++++
 5 files changed, 69 insertions(+), 37 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index a1db78b48..45ff87a09 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,12 +22,12 @@ pkgcfg_DATA = \
 EXTRA_DIST = \
   taler.conf
 
-SUBDIRS = include util json $(PQ_DIR) $(BANK_LIB) wire exchangedb exchange exchange-tools benchmark
+SUBDIRS = include util json $(PQ_DIR) $(BANK_LIB) wire exchangedb exchange exchange-tools 
 if HAVE_LIBCURL
- SUBDIRS += exchange-lib
+ SUBDIRS += exchange-lib benchmark
 else
 if HAVE_LIBGNURL
- SUBDIRS += exchange-lib
+ SUBDIRS += exchange-lib benchmark
 endif
 endif
 
diff --git a/src/benchmark/taler-exchange-benchmark b/src/benchmark/taler-exchange-benchmark
index 034b287e4199e4595f327b0479ce365f2bba484f..ae793dc928edf868454e8568abb3ab639222a5ed 100755
GIT binary patch
literal 24848
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
SpI*t?Y=>0P&`kXW%KjfooRn(-

literal 20776
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
Kde8u0>-%pWX<C{9

diff --git a/src/exchange/test_taler_exchange_aggregator.c b/src/exchange/test_taler_exchange_aggregator.c
index 826a7dfa9..dd8e4575b 100644
--- a/src/exchange/test_taler_exchange_aggregator.c
+++ b/src/exchange/test_taler_exchange_aggregator.c
@@ -645,7 +645,7 @@ run_test ()
       .label = "do-deposit-2a",
       .details.deposit.merchant_name = "bob",
       .details.deposit.merchant_account = 4,
-      .details.deposit.transaction_id = 1,
+      .details.deposit.transaction_id = 2,
       .details.deposit.wire_deadline = { 1000LL * 1000 * 0 }, /* 0s */
       .details.deposit.amount_with_fee = "EUR:1",
       .details.deposit.deposit_fee = "EUR:0.1"
@@ -655,7 +655,7 @@ run_test ()
       .label = "do-deposit-2b",
       .details.deposit.merchant_name = "bob",
       .details.deposit.merchant_account = 4,
-      .details.deposit.transaction_id = 1,
+      .details.deposit.transaction_id = 3,
       .details.deposit.wire_deadline = { 1000LL * 1000 * 0 }, /* 0s */
       .details.deposit.amount_with_fee = "EUR:1",
       .details.deposit.deposit_fee = "EUR:0.1"
@@ -683,7 +683,7 @@ run_test ()
       .label = "do-deposit-3a",
       .details.deposit.merchant_name = "bob",
       .details.deposit.merchant_account = 4,
-      .details.deposit.transaction_id = 1,
+      .details.deposit.transaction_id = 4,
       .details.deposit.wire_deadline = { 1000LL * 1000 * 0 }, /* 0s */
       .details.deposit.amount_with_fee = "EUR:1",
       .details.deposit.deposit_fee = "EUR:0.1"
@@ -693,7 +693,7 @@ run_test ()
       .label = "do-deposit-3b",
       .details.deposit.merchant_name = "bob",
       .details.deposit.merchant_account = 5,
-      .details.deposit.transaction_id = 1,
+      .details.deposit.transaction_id = 5,
       .details.deposit.wire_deadline = { 1000LL * 1000 * 0 }, /* 0s */
       .details.deposit.amount_with_fee = "EUR:1",
       .details.deposit.deposit_fee = "EUR:0.1"
@@ -744,7 +744,7 @@ run_test ()
       .label = "do-deposit-4a",
       .details.deposit.merchant_name = "bob",
       .details.deposit.merchant_account = 4,
-      .details.deposit.transaction_id = 1,
+      .details.deposit.transaction_id = 6,
       .details.deposit.wire_deadline = { 1000LL * 1000 * 5 }, /* 5s */
       .details.deposit.amount_with_fee = "EUR:0.2",
       .details.deposit.deposit_fee = "EUR:0.1"
@@ -754,7 +754,7 @@ run_test ()
       .label = "do-deposit-4b",
       .details.deposit.merchant_name = "bob",
       .details.deposit.merchant_account = 4,
-      .details.deposit.transaction_id = 1,
+      .details.deposit.transaction_id = 7,
       .details.deposit.wire_deadline = { 1000LL * 1000 * 5 }, /* 5s */
       .details.deposit.amount_with_fee = "EUR:0.2",
       .details.deposit.deposit_fee = "EUR:0.1"
@@ -790,7 +790,7 @@ run_test ()
       .label = "do-deposit-5a",
       .details.deposit.merchant_name = "bob",
       .details.deposit.merchant_account = 4,
-      .details.deposit.transaction_id = 1,
+      .details.deposit.transaction_id = 8,
       .details.deposit.wire_deadline = { 1000LL * 1000 * 10 }, /* 10s */
       .details.deposit.amount_with_fee = "EUR:0.2",
       .details.deposit.deposit_fee = "EUR:0.1"
@@ -800,7 +800,7 @@ run_test ()
       .label = "do-deposit-5b",
       .details.deposit.merchant_name = "bob",
       .details.deposit.merchant_account = 4,
-      .details.deposit.transaction_id = 1,
+      .details.deposit.transaction_id = 9,
       .details.deposit.wire_deadline = { 1000LL * 1000 * 5 }, /* 5s */
       .details.deposit.amount_with_fee = "EUR:0.2",
       .details.deposit.deposit_fee = "EUR:0.1"
@@ -836,7 +836,7 @@ run_test ()
       .label = "do-deposit-6a",
       .details.deposit.merchant_name = "bob",
       .details.deposit.merchant_account = 4,
-      .details.deposit.transaction_id = 1,
+      .details.deposit.transaction_id = 10,
       .details.deposit.wire_deadline = { 1000LL * 1000 * 0 }, /* 0s */
       .details.deposit.amount_with_fee = "EUR:0.102",
       .details.deposit.deposit_fee = "EUR:0.1"
@@ -854,7 +854,7 @@ run_test ()
       .label = "do-deposit-6b",
       .details.deposit.merchant_name = "bob",
       .details.deposit.merchant_account = 4,
-      .details.deposit.transaction_id = 1,
+      .details.deposit.transaction_id = 11,
       .details.deposit.wire_deadline = { 1000LL * 1000 * 0 }, /* 0s */
       .details.deposit.amount_with_fee = "EUR:0.102",
       .details.deposit.deposit_fee = "EUR:0.1"
@@ -864,7 +864,7 @@ run_test ()
       .label = "do-deposit-6c",
       .details.deposit.merchant_name = "bob",
       .details.deposit.merchant_account = 4,
-      .details.deposit.transaction_id = 1,
+      .details.deposit.transaction_id = 12,
       .details.deposit.wire_deadline = { 1000LL * 1000 * 0 }, /* 0s */
       .details.deposit.amount_with_fee = "EUR:0.102",
       .details.deposit.deposit_fee = "EUR:0.1"
@@ -882,7 +882,7 @@ run_test ()
       .label = "do-deposit-6d",
       .details.deposit.merchant_name = "bob",
       .details.deposit.merchant_account = 4,
-      .details.deposit.transaction_id = 1,
+      .details.deposit.transaction_id = 13,
       .details.deposit.wire_deadline = { 1000LL * 1000 * 0 }, /* 0s */
       .details.deposit.amount_with_fee = "EUR:0.102",
       .details.deposit.deposit_fee = "EUR:0.1"
@@ -900,7 +900,7 @@ run_test ()
       .label = "do-deposit-6e",
       .details.deposit.merchant_name = "bob",
       .details.deposit.merchant_account = 4,
-      .details.deposit.transaction_id = 1,
+      .details.deposit.transaction_id = 14,
       .details.deposit.wire_deadline = { 1000LL * 1000 * 0 }, /* 0s */
       .details.deposit.amount_with_fee = "EUR:0.102",
       .details.deposit.deposit_fee = "EUR:0.1"
@@ -923,7 +923,7 @@ run_test ()
       .label = "do-deposit-7a",
       .details.deposit.merchant_name = "bob",
       .details.deposit.merchant_account = 4,
-      .details.deposit.transaction_id = 1,
+      .details.deposit.transaction_id = 15,
       .details.deposit.wire_deadline = { 1000LL * 1000 * 0 }, /* 0s */
       .details.deposit.amount_with_fee = "EUR:0.109",
       .details.deposit.deposit_fee = "EUR:0.1"
@@ -941,7 +941,7 @@ run_test ()
       .label = "do-deposit-7b",
       .details.deposit.merchant_name = "bob",
       .details.deposit.merchant_account = 4,
-      .details.deposit.transaction_id = 1,
+      .details.deposit.transaction_id = 16,
       .details.deposit.wire_deadline = { 1000LL * 1000 * 0 }, /* 0s */
       .details.deposit.amount_with_fee = "EUR:0.109",
       .details.deposit.deposit_fee = "EUR:0.1"
@@ -963,7 +963,7 @@ run_test ()
       .label = "do-deposit-7c",
       .details.deposit.merchant_name = "bob",
       .details.deposit.merchant_account = 4,
-      .details.deposit.transaction_id = 1,
+      .details.deposit.transaction_id = 17,
       .details.deposit.wire_deadline = { 1000LL * 1000 * 0 }, /* 0s */
       .details.deposit.amount_with_fee = "EUR:0.122",
       .details.deposit.deposit_fee = "EUR:0.1"
@@ -986,7 +986,7 @@ run_test ()
       .label = "do-deposit-8a",
       .details.deposit.merchant_name = "bob",
       .details.deposit.merchant_account = 4,
-      .details.deposit.transaction_id = 1,
+      .details.deposit.transaction_id = 18,
       .details.deposit.wire_deadline = { 1000LL * 1000 * 5 }, /* 5s */
       .details.deposit.amount_with_fee = "EUR:0.109",
       .details.deposit.deposit_fee = "EUR:0.1"
@@ -1004,7 +1004,7 @@ run_test ()
       .label = "do-deposit-8b",
       .details.deposit.merchant_name = "bob",
       .details.deposit.merchant_account = 4,
-      .details.deposit.transaction_id = 1,
+      .details.deposit.transaction_id = 19,
       .details.deposit.wire_deadline = { 1000LL * 1000 * 5 }, /* 5s */
       .details.deposit.amount_with_fee = "EUR:0.109",
       .details.deposit.deposit_fee = "EUR:0.1"
@@ -1023,7 +1023,7 @@ run_test ()
       .label = "do-deposit-8c",
       .details.deposit.merchant_name = "bob",
       .details.deposit.merchant_account = 4,
-      .details.deposit.transaction_id = 1,
+      .details.deposit.transaction_id = 20,
       .details.deposit.wire_deadline = { 1000LL * 1000 * 0 }, /* 0s */
       .details.deposit.amount_with_fee = "EUR:0.122",
       .details.deposit.deposit_fee = "EUR:0.1"
@@ -1047,7 +1047,7 @@ run_test ()
       .label = "do-deposit-9a",
       .details.deposit.merchant_name = "bob",
       .details.deposit.merchant_account = 4,
-      .details.deposit.transaction_id = 1,
+      .details.deposit.transaction_id = 21,
       .details.deposit.wire_deadline = { 1000LL * 1000 * 5 }, /* 5s */
       .details.deposit.amount_with_fee = "EUR:0.104",
       .details.deposit.deposit_fee = "EUR:0.1"
@@ -1065,7 +1065,7 @@ run_test ()
       .label = "do-deposit-9b",
       .details.deposit.merchant_name = "bob",
       .details.deposit.merchant_account = 4,
-      .details.deposit.transaction_id = 1,
+      .details.deposit.transaction_id = 22,
       .details.deposit.wire_deadline = { 1000LL * 1000 * 5 }, /* 5s */
       .details.deposit.amount_with_fee = "EUR:0.105",
       .details.deposit.deposit_fee = "EUR:0.1"
@@ -1084,7 +1084,7 @@ run_test ()
       .label = "do-deposit-9c",
       .details.deposit.merchant_name = "bob",
       .details.deposit.merchant_account = 4,
-      .details.deposit.transaction_id = 1,
+      .details.deposit.transaction_id = 23,
       .details.deposit.wire_deadline = { 1000LL * 1000 * 0 }, /* 0s */
       .details.deposit.amount_with_fee = "EUR:0.112",
       .details.deposit.deposit_fee = "EUR:0.1"
diff --git a/src/exchangedb/plugin_exchangedb_postgres.c b/src/exchangedb/plugin_exchangedb_postgres.c
index bc53be4ea..be9cbf32e 100644
--- a/src/exchangedb/plugin_exchangedb_postgres.c
+++ b/src/exchangedb/plugin_exchangedb_postgres.c
@@ -295,6 +295,8 @@ postgres_create_tables (void *cls)
   /* index on reserves table */
   SQLEXEC_INDEX ("CREATE INDEX reserves_reserve_pub_index ON "
                  "reserves (reserve_pub)");
+  SQLEXEC_INDEX ("CREATE INDEX reserves_expiration_index"
+		 " ON reserves (expiration_date);");
   /* reserves_in table collects the transactions which transfer funds
      into the reserve.  The rows of this table correspond to each
      incoming transaction. */
@@ -306,14 +308,10 @@ postgres_create_tables (void *cls)
           ",sender_account_details TEXT NOT NULL "
           ",transfer_details TEXT NOT NULL "
           ",execution_date INT8 NOT NULL"
-          ",PRIMARY KEY (reserve_pub,transfer_details)"
+          ",PRIMARY KEY (reserve_pub, transfer_details)"
           ");");
   /* Create indices on reserves_in */
-  SQLEXEC_INDEX ("CREATE INDEX reserves_in_reserve_pub_index"
-		 " ON reserves_in (reserve_pub);");
-  SQLEXEC_INDEX ("CREATE INDEX reserves_in_reserve_pub_details_index"
-		 " ON reserves_in (reserve_pub,details);");
-  SQLEXEC_INDEX ("CREATE INDEX execution_index"
+  SQLEXEC_INDEX ("CREATE INDEX reserves_in_execution_index"
 		 " ON reserves_in (execution_date);");
   /* Table with the withdraw operations that have been performed on a reserve.
      The 'h_blind_ev' is the hash of the blinded coin. It serves as a primary
@@ -334,8 +332,8 @@ postgres_create_tables (void *cls)
   /* Index blindcoins(reserve_pub) for get_reserves_out statement */
   SQLEXEC_INDEX ("CREATE INDEX reserves_out_reserve_pub_index ON"
                  " reserves_out (reserve_pub)");
-  SQLEXEC_INDEX ("CREATE INDEX reserves_out_h_blind_ev_index ON "
-                 "reserves_out (h_blind_ev)");
+  SQLEXEC_INDEX ("CREATE INDEX reserves_out_execution_date ON "
+                 "reserves_out (execution_date)");
   /* Table with coins that have been (partially) spent, used to track
      coin information only once. */
   SQLEXEC("CREATE TABLE IF NOT EXISTS known_coins "
@@ -382,9 +380,10 @@ postgres_create_tables (void *cls)
           ",transfer_pub BYTEA NOT NULL CHECK(LENGTH(transfer_pub)=32)"
           ",link_secret_enc BYTEA NOT NULL CHECK(LENGTH(link_secret_enc)=64)"
           ",cnc_index INT2 NOT NULL"
+          ",UNIQUE (session_hash, cnc_index)"
           ")");
   SQLEXEC_INDEX("CREATE INDEX refresh_commit_link_session_hash_index "
-                "ON refresh_commit_link(session_hash,cnc_index)");
+                "ON refresh_commit_link(session_hash, cnc_index)");
 
   /* Table with the commitments for the new coins that are to be created
      during a melting session.  Includes the session, the cut-and-choose
@@ -398,9 +397,10 @@ postgres_create_tables (void *cls)
           ",newcoin_index INT2 NOT NULL"
           ",link_vector_enc BYTEA NOT NULL CHECK(LENGTH(link_vector_enc)=64)"
           ",coin_ev BYTEA NOT NULL"
+          ",UNIQUE (session_hash, cnc_index, newcoin_index)"
           ")");
   SQLEXEC_INDEX("CREATE INDEX refresh_commit_coin_session_hash_index "
-                "ON refresh_commit_coin(session_hash,cnc_index,newcoin_index)");
+                "ON refresh_commit_coin(session_hash, cnc_index, newcoin_index)");
 
 
   /* Table with the signatures over coins generated during a refresh
@@ -410,9 +410,10 @@ postgres_create_tables (void *cls)
           "(session_hash BYTEA NOT NULL REFERENCES refresh_sessions (session_hash) ON DELETE CASCADE"
           ",newcoin_index INT2 NOT NULL"
           ",ev_sig BYTEA NOT NULL"
+          ",UNIQUE (session_hash, newcoin_index)"
           ")");
   SQLEXEC_INDEX("CREATE INDEX refresh_out_session_hash_index "
-                "ON refresh_out(session_hash,newcoin_index)");
+                "ON refresh_out(session_hash, newcoin_index)");
 
   /* This table contains the wire transfers the exchange is supposed to
      execute to transmit funds to the merchants (and manage refunds). */
@@ -433,6 +434,7 @@ postgres_create_tables (void *cls)
           ",wire TEXT NOT NULL"
           ",tiny BOOLEAN NOT NULL DEFAULT false"
           ",done BOOLEAN NOT NULL DEFAULT false"
+          ",UNIQUE (coin_pub, transaction_id, merchant_pub)"
           ")");
   /* Index for get_deposit statement on coin_pub, transaction_id and merchant_pub */
   SQLEXEC_INDEX("CREATE INDEX deposits_coin_pub_index "
@@ -456,7 +458,7 @@ postgres_create_tables (void *cls)
   /* Table for the tracking API, mapping from wire transfer identifiers
      to transactions and back */
   SQLEXEC("CREATE TABLE IF NOT EXISTS aggregation_tracking "
-          "(deposit_serial_id INT8 NOT NULL REFERENCES deposits (deposit_serial_id) ON DELETE CASCADE"
+          "(deposit_serial_id INT8 PRIMARY KEY REFERENCES deposits (deposit_serial_id) ON DELETE CASCADE"
           ",wtid_raw BYTEA NOT NULL CHECK (LENGTH(wtid_raw)=" TALER_WIRE_TRANSFER_IDENTIFIER_LEN_STR ")"
           ",execution_time INT8 NOT NULL"
           ")");
@@ -4252,6 +4254,23 @@ postgres_wire_prepare_data_get (void *cls,
 }
 
 
+/**
+ * Function called to perform "garbage collection" on the
+ * database, expiring records we no longer require.
+ *
+ * @param cls closure
+ * @return #GNUNET_OK on success,
+ *         #GNUNET_NO if there was nothing to GC
+ *         #GNUNET_SYSERR on DB errors
+ */
+static int
+postgres_gc (void *cls)
+{
+  GNUNET_break (0); // #3485
+  return GNUNET_OK;
+}
+
+
 /**
  * Initialize Postgres database subsystem.
  *
@@ -4342,6 +4361,7 @@ libtaler_plugin_exchangedb_postgres_init (void *cls)
   plugin->wire_prepare_data_insert = &postgres_wire_prepare_data_insert;
   plugin->wire_prepare_data_mark_finished = &postgres_wire_prepare_data_mark_finished;
   plugin->wire_prepare_data_get = &postgres_wire_prepare_data_get;
+  plugin->gc = &postgres_gc;
   return plugin;
 }
 
diff --git a/src/include/taler_exchangedb_plugin.h b/src/include/taler_exchangedb_plugin.h
index 978c335d6..d55bd8d15 100644
--- a/src/include/taler_exchangedb_plugin.h
+++ b/src/include/taler_exchangedb_plugin.h
@@ -1488,6 +1488,18 @@ struct TALER_EXCHANGEDB_Plugin
                            void *cb_cls);
 
 
+  /**
+   * Function called to perform "garbage collection" on the
+   * database, expiring records we no longer require.
+   *
+   * @param cls closure
+   * @return #GNUNET_OK on success,
+   *         #GNUNET_NO if there was nothing to GC
+   *         #GNUNET_SYSERR on DB errors
+   */
+  int
+  (*gc) (void *cls);
+
 };