[taler-exchange] branch master updated (4e380d49 -> 9294f366)

[gnunet]

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

grothoff pushed a change to branch master
in repository exchange.

    from 4e380d49 remove select-* logics'
     new c190a1cd -use partial indices where applicable
     new 9294f366 -remove dead index, add comment on live index

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/exchangedb/0002-prewire.sql                          | 16 +++++++++-------
 src/exchangedb/0002-reserves_in.sql                      | 16 ++++++----------
 src/exchangedb/exchange_do_reserve_open.sql              |  2 +-
 .../pg_select_reserves_in_above_serial_id_by_account.c   |  7 +++++--
 src/exchangedb/pg_wire_prepare_data_get.c                |  2 --
 src/exchangedb/pg_wire_prepare_data_mark_failed.c        |  2 --
 src/exchangedb/pg_wire_prepare_data_mark_finished.c      |  2 --
 7 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/src/exchangedb/0002-prewire.sql b/src/exchangedb/0002-prewire.sql
index 8dc8cd5d..396a2760 100644
--- a/src/exchangedb/0002-prewire.sql
+++ b/src/exchangedb/0002-prewire.sql
@@ -1,6 +1,6 @@
 --
 -- This file is part of TALER
--- Copyright (C) 2014--2022 Taler Systems SA
+-- Copyright (C) 2014--2023 Taler Systems SA
 --
 -- TALER is free software; you can redistribute it and/or modify it under the
 -- terms of the GNU General Public License as published by the Free Software
@@ -27,8 +27,8 @@ BEGIN
     'CREATE TABLE %I'
       '(prewire_uuid BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY'
       ',wire_method TEXT NOT NULL'
-      ',finished BOOLEAN NOT NULL DEFAULT false'
-      ',failed BOOLEAN NOT NULL DEFAULT false'
+      ',finished BOOLEAN NOT NULL DEFAULT FALSE'
+      ',failed BOOLEAN NOT NULL DEFAULT FALSE'
       ',buf BYTEA NOT NULL'
     ') %s ;'
     ,table_name
@@ -75,17 +75,19 @@ BEGIN
   EXECUTE FORMAT (
     'CREATE INDEX ' || table_name || '_by_finished_index '
     'ON ' || table_name || ' '
-    '(finished);'
+    '(finished)'
+    ' WHERE finished;'
   );
   EXECUTE FORMAT (
     'COMMENT ON INDEX ' || table_name || '_by_finished_index '
-    'IS ' || quote_literal('for gc_prewire') || ';'
+    'IS ' || quote_literal('for do_gc') || ';'
   );
-  -- FIXME: find a way to combine these two indices?
   EXECUTE FORMAT (
     'CREATE INDEX ' || table_name || '_by_failed_finished_index '
     'ON ' || table_name || ' '
-    '(failed,finished);'
+    '(prewire_uuid)'
+    ' WHERE finished=FALSE'
+    '   AND failed=FALSE;'
   );
   EXECUTE FORMAT (
     'COMMENT ON INDEX ' || table_name || '_by_failed_finished_index '
diff --git a/src/exchangedb/0002-reserves_in.sql 
b/src/exchangedb/0002-reserves_in.sql
index 1dfc5db6..197a815b 100644
--- a/src/exchangedb/0002-reserves_in.sql
+++ b/src/exchangedb/0002-reserves_in.sql
@@ -83,22 +83,18 @@ BEGIN
     'ON ' || table_name || ' '
     '(reserve_in_serial_id);'
   );
-  -- FIXME: where do we need this index? Can we do better?
-  EXECUTE FORMAT (
-    'CREATE INDEX ' || table_name || 
'_by_exch_accnt_section_execution_date_idx '
-    'ON ' || table_name || ' '
-    '(exchange_account_section '
-    ',execution_date'
-    ');'
-  );
-  -- FIXME: where do we need this index? Can we do better?
   EXECUTE FORMAT (
     'CREATE INDEX ' || table_name || '_by_exch_accnt_reserve_in_serial_id_idx '
     'ON ' || table_name || ' '
     '(exchange_account_section'
-    ',reserve_in_serial_id DESC'
+    ',reserve_in_serial_id ASC'
     ');'
   );
+  EXECUTE FORMAT (
+    'COMMENT ON INDEX ' || table_name || 
'_by_exch_accnt_reserve_in_serial_id_idx '
+    'IS ' || quote_literal ('for 
pg_select_reserves_in_above_serial_id_by_account') || ';'
+  ); 
+
 END
 $$;
 
diff --git a/src/exchangedb/exchange_do_reserve_open.sql 
b/src/exchangedb/exchange_do_reserve_open.sql
index f37129e5..dd7a578e 100644
--- a/src/exchangedb/exchange_do_reserve_open.sql
+++ b/src/exchangedb/exchange_do_reserve_open.sql
@@ -44,7 +44,7 @@ DECLARE
 BEGIN
 
 SELECT current_balance
-      ,expiration_time
+      ,expiration_date
       ,purses_allowed
   INTO reserve
   FROM reserves
diff --git a/src/exchangedb/pg_select_reserves_in_above_serial_id_by_account.c 
b/src/exchangedb/pg_select_reserves_in_above_serial_id_by_account.c
index daedb3f8..1c7bc15a 100644
--- a/src/exchangedb/pg_select_reserves_in_above_serial_id_by_account.c
+++ b/src/exchangedb/pg_select_reserves_in_above_serial_id_by_account.c
@@ -24,6 +24,8 @@
 #include "taler_pq_lib.h"
 #include "pg_select_reserves_in_above_serial_id_by_account.h"
 #include "pg_helper.h"
+
+
 /**
  * Closure for #reserves_in_serial_helper_cb().
  */
@@ -152,8 +154,9 @@ TEH_PG_select_reserves_in_above_serial_id_by_account (
            "   USING (reserve_pub)"
            " JOIN wire_targets"
            "   ON (wire_source_h_payto = wire_target_h_payto)"
-           " WHERE reserve_in_serial_id>=$1 AND exchange_account_section=$2"
-           " ORDER BY reserve_in_serial_id;");
+           " WHERE reserve_in_serial_id>=$1"
+           "   AND exchange_account_section=$2"
+           " ORDER BY reserve_in_serial_id ASC;");
   qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
                                              
"audit_reserves_in_get_transactions_incr_by_account",
                                              params,
diff --git a/src/exchangedb/pg_wire_prepare_data_get.c 
b/src/exchangedb/pg_wire_prepare_data_get.c
index 21d1b947..0cc57e41 100644
--- a/src/exchangedb/pg_wire_prepare_data_get.c
+++ b/src/exchangedb/pg_wire_prepare_data_get.c
@@ -117,8 +117,6 @@ TEH_PG_wire_prepare_data_get (void *cls,
   };
   enum GNUNET_DB_QueryStatus qs;
 
-
-  /* Used in #postgres_wire_prepare_data_get() */
   PREPARE (pg,
            "wire_prepare_data_get",
            "SELECT"
diff --git a/src/exchangedb/pg_wire_prepare_data_mark_failed.c 
b/src/exchangedb/pg_wire_prepare_data_mark_failed.c
index 4e4d729a..1d46c84d 100644
--- a/src/exchangedb/pg_wire_prepare_data_mark_failed.c
+++ b/src/exchangedb/pg_wire_prepare_data_mark_failed.c
@@ -37,8 +37,6 @@ TEH_PG_wire_prepare_data_mark_failed (
     GNUNET_PQ_query_param_end
   };
 
-  /* Used in #postgres_wire_prepare_data_mark_failed() */
-
   PREPARE (pg,
            "wire_prepare_data_mark_failed",
            "UPDATE prewire"
diff --git a/src/exchangedb/pg_wire_prepare_data_mark_finished.c 
b/src/exchangedb/pg_wire_prepare_data_mark_finished.c
index af4a0fbb..998b9d73 100644
--- a/src/exchangedb/pg_wire_prepare_data_mark_finished.c
+++ b/src/exchangedb/pg_wire_prepare_data_mark_finished.c
@@ -36,13 +36,11 @@ TEH_PG_wire_prepare_data_mark_finished (
     GNUNET_PQ_query_param_end
   };
 
-  /* Used in #postgres_wire_prepare_data_mark_finished() */
   PREPARE (pg,
            "wire_prepare_data_mark_done",
            "UPDATE prewire"
            " SET finished=TRUE"
            " WHERE prewire_uuid=$1;");
-
   return GNUNET_PQ_eval_prepared_non_select (pg->conn,
                                              "wire_prepare_data_mark_done",
                                              params);

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