[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-exchange] 01/04: some modifications on batch_test for reserves_in
|
From: |
gnunet |
|
Subject: |
[taler-exchange] 01/04: some modifications on batch_test for reserves_in |
|
Date: |
Mon, 21 Nov 2022 16:40:14 +0100 |
This is an automated email from the git hooks/post-receive script.
joseph-xu pushed a commit to branch master
in repository exchange.
commit f60e38077c7e2ddd2ac6ae3e35c4b27f3225512a
Author: Joseph <Joseph.xu@efrei.net>
AuthorDate: Wed Nov 16 11:44:48 2022 -0500
some modifications on batch_test for reserves_in
---
src/exchangedb/Makefile.am | 18 +++++-
...s_in_insert.c => pg_batch_reserves_in_insert.c} | 67 ++++++++++------------
src/exchangedb/pg_batch_reserves_in_insert.h | 34 +++++++++++
src/exchangedb/pg_reserves_in_insert.c | 14 +++--
src/exchangedb/plugin_exchangedb_postgres.c | 5 +-
src/exchangedb/procedures.sql | 58 +++++++++++++++++++
src/exchangedb/test_exchangedb_by_j.c | 39 ++++++-------
src/include/taler_exchangedb_plugin.h | 28 +++++++++
8 files changed, 196 insertions(+), 67 deletions(-)
diff --git a/src/exchangedb/Makefile.am b/src/exchangedb/Makefile.am
index 4d892efe..59aeb321 100644
--- a/src/exchangedb/Makefile.am
+++ b/src/exchangedb/Makefile.am
@@ -239,6 +239,7 @@ libtaler_plugin_exchangedb_postgres_la_SOURCES = \
pg_select_purse_deposits_above_serial_id.h
pg_select_purse_deposits_above_serial_id.c \
pg_select_account_merges_above_serial_id.h
pg_select_account_merges_above_serial_id.c \
pg_select_all_purse_decisions_above_serial_id.h
pg_select_all_purse_decisions_above_serial_id.c \
+ pg_batch_reserves_in_insert.h pg_batch_reserves_in_insert.c \
pg_select_reserve_open_above_serial_id.c
pg_select_reserve_open_above_serial_id.h
libtaler_plugin_exchangedb_postgres_la_LIBADD = \
$(LTLIBINTL)
@@ -275,11 +276,13 @@ libtalerexchangedb_la_LDFLAGS = \
check_PROGRAMS = \
test-exchangedb-postgres \
bench-db-postgres\
+ perf-exchangedb-reserves-in-insert-postgres\
test-exchangedb-by-j-postgres
AM_TESTS_ENVIRONMENT=export TALER_PREFIX=$${TALER_PREFIX:-@libdir@};export
PATH=$${TALER_PREFIX:-@prefix@}/bin:$$PATH;
TESTS = \
test-exchangedb-postgres\
- test-exchangedb-by-j-postgres
+ test-exchangedb-by-j-postgres\
+ perf-exchangedb-reserves-in-insert-postgres
test_exchangedb_postgres_SOURCES = \
test_exchangedb.c
test_exchangedb_postgres_LDADD = \
@@ -304,6 +307,19 @@ test_exchangedb_by_j_postgres_LDADD = \
-lgnunetutil \
$(XLIB)
+
+perf_exchangedb_reserves_in_insert_postgres_SOURCES = \
+ perf_exchangedb_reserves_in_insert.c
+perf_exchangedb_reserves_in_insert_postgres_LDADD = \
+ libtalerexchangedb.la \
+ $(top_builddir)/src/json/libtalerjson.la \
+ $(top_builddir)/src/util/libtalerutil.la \
+ $(top_builddir)/src/pq/libtalerpq.la \
+ -ljansson \
+ -lgnunetjson \
+ -lgnunetutil \
+ $(XLIB)
+
bench_db_postgres_SOURCES = \
bench_db.c
bench_db_postgres_LDADD = \
diff --git a/src/exchangedb/pg_reserves_in_insert.c
b/src/exchangedb/pg_batch_reserves_in_insert.c
similarity index 84%
copy from src/exchangedb/pg_reserves_in_insert.c
copy to src/exchangedb/pg_batch_reserves_in_insert.c
index 2fcca241..d7ce47dc 100644
--- a/src/exchangedb/pg_reserves_in_insert.c
+++ b/src/exchangedb/pg_batch_reserves_in_insert.c
@@ -14,15 +14,15 @@
TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
*/
/**
- * @file exchangedb/pg_reserves_in_insert.c
+ * @file exchangedb/pg_bash_reserves_in_insert.c
* @brief Implementation of the reserves_in_insert function for Postgres
- * @author Christian Grothoff
+ * @author JOSEPHxu
*/
#include "platform.h"
#include "taler_error_codes.h"
#include "taler_dbevents.h"
#include "taler_pq_lib.h"
-#include "pg_reserves_in_insert.h"
+#include "pg_batch_reserves_in_insert.h"
#include "pg_helper.h"
#include "pg_start.h"
#include "pg_start_read_committed.h"
@@ -31,6 +31,8 @@
#include "pg_reserves_update.h"
#include "pg_setup_wire_target.h"
#include "pg_event_notify.h"
+
+
/**
* Generate event notification for the reserve
* change.
@@ -38,7 +40,6 @@
* @param pg plugin state
* @param reserve_pub reserve to notfiy on
*/
-
static void
notify_on_reserve (struct PostgresClosure *pg,
const struct TALER_ReservePublicKeyP *reserve_pub)
@@ -52,19 +53,17 @@ notify_on_reserve (struct PostgresClosure *pg,
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Notifying on reserve!\n");
TEH_PG_event_notify (pg,
- &rep.header,
- NULL,
- 0);
+ &rep.header,
+ NULL,
+ 0);
}
+
enum GNUNET_DB_QueryStatus
-TEH_PG_reserves_in_insert (void *cls,
- const struct TALER_ReservePublicKeyP *reserve_pub,
- const struct TALER_Amount *balance,
- struct GNUNET_TIME_Timestamp execution_time,
- const char *sender_account_details,
- const char *exchange_account_section,
- uint64_t wire_ref)
+TEH_PG_batch_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;
@@ -73,16 +72,16 @@ TEH_PG_reserves_in_insert (void *cls,
struct GNUNET_TIME_Timestamp gc;
uint64_t reserve_uuid;
- reserve.pub = *reserve_pub;
+ reserve.pub = reserves->reserve_pub;
expiry = GNUNET_TIME_absolute_to_timestamp (
- GNUNET_TIME_absolute_add (execution_time.abs_time,
+ GNUNET_TIME_absolute_add (reserves->execution_time.abs_time,
pg->idle_reserve_expiration_time));
gc = GNUNET_TIME_absolute_to_timestamp (
GNUNET_TIME_absolute_add (GNUNET_TIME_absolute_get (),
pg->legal_reserve_expiration_time));
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Creating reserve %s with expiration in %s\n",
- TALER_B2S (reserve_pub),
+ TALER_B2S (&(reserves->reserve_pub)),
GNUNET_STRINGS_relative_time_to_string (
pg->idle_reserve_expiration_time,
GNUNET_NO));
@@ -92,8 +91,8 @@ TEH_PG_reserves_in_insert (void *cls,
the 'add' operation needs the reserve entry as a foreign key. */
{
struct GNUNET_PQ_QueryParam params[] = {
- GNUNET_PQ_query_param_auto_from_type (reserve_pub),
- TALER_PQ_query_param_amount (balance),
+ GNUNET_PQ_query_param_auto_from_type (&(reserves->reserve_pub)),
+ TALER_PQ_query_param_amount (&(reserves->balance)),
GNUNET_PQ_query_param_timestamp (&expiry),
GNUNET_PQ_query_param_timestamp (&gc),
GNUNET_PQ_query_param_end
@@ -109,16 +108,8 @@ TEH_PG_reserves_in_insert (void *cls,
/* Note: query uses 'on conflict do nothing' */
PREPARE (pg,
"reserve_create",
- "INSERT INTO reserves "
- "(reserve_pub"
- ",current_balance_val"
- ",current_balance_frac"
- ",expiration_date"
- ",gc_date"
- ") VALUES "
- "($1, $2, $3, $4, $5)"
- " ON CONFLICT DO NOTHING"
- " RETURNING reserve_uuid;");
+ "SELECT bash_reserves_in('34', '20','//asdddfs3', '60',
'20'),bash_reserves_in('24', '10','//dfs3', '40', '50'),bash_reserves_in('42',
'40','//d43', '40', '50'),bash_reserves_in('44', '10','//ghs3', '40', '50') AS
existed from reserves;");
+
qs1 = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
"reserve_create",
params,
@@ -135,18 +126,18 @@ TEH_PG_reserves_in_insert (void *cls,
struct TALER_PaytoHashP h_payto;
qs3 = TEH_PG_setup_wire_target (pg,
- sender_account_details,
- &h_payto);
+ reserves->sender_account_details,
+ &h_payto);
if (qs3 < 0)
return qs3;
/* We do not have the UUID, so insert by public key */
struct GNUNET_PQ_QueryParam params[] = {
GNUNET_PQ_query_param_auto_from_type (&reserve.pub),
- GNUNET_PQ_query_param_uint64 (&wire_ref),
- TALER_PQ_query_param_amount (balance),
- GNUNET_PQ_query_param_string (exchange_account_section),
+ GNUNET_PQ_query_param_uint64 (&(reserves->wire_reference)),
+ TALER_PQ_query_param_amount (&(reserves->balance)),
+ GNUNET_PQ_query_param_string (reserves->exchange_account_name),
GNUNET_PQ_query_param_auto_from_type (&h_payto),
- GNUNET_PQ_query_param_timestamp (&execution_time),
+ GNUNET_PQ_query_param_timestamp (&reserves->execution_time),
GNUNET_PQ_query_param_end
};
@@ -185,7 +176,7 @@ TEH_PG_reserves_in_insert (void *cls,
{
/* New reserve, we are finished */
notify_on_reserve (pg,
- reserve_pub);
+ &(reserves->reserve_pub));
return GNUNET_DB_STATUS_SUCCESS_ONE_RESULT;
}
@@ -243,7 +234,7 @@ TEH_PG_reserves_in_insert (void *cls,
if (0 >
TALER_amount_add (&updated_reserve.balance,
&reserve.balance,
- balance))
+ &reserves->balance))
{
/* currency overflow or incompatible currency */
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -273,7 +264,7 @@ TEH_PG_reserves_in_insert (void *cls,
}
}
notify_on_reserve (pg,
- reserve_pub);
+ &reserves->reserve_pub);
/* Go back to original transaction mode */
{
enum GNUNET_DB_QueryStatus cs;
diff --git a/src/exchangedb/pg_batch_reserves_in_insert.h
b/src/exchangedb/pg_batch_reserves_in_insert.h
new file mode 100644
index 00000000..9422096d
--- /dev/null
+++ b/src/exchangedb/pg_batch_reserves_in_insert.h
@@ -0,0 +1,34 @@
+/*
+ This file is part of TALER
+ Copyright (C) 2022 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
+ Foundation; either version 3, or (at your option) any later version.
+
+ TALER is distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR
+ A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along with
+ TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
+ */
+/**
+ * @file exchangedb/pg_batch_reserves_in_insert.h
+ * @brief implementation of the batch_reserves_in_insert function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_BATCH_RESERVES_IN_INSERT_H
+#define PG_BATCH_RESERVES_IN_INSERT_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_batch_reserves_in_insert (void *cls,
+ const struct TALER_EXCHANGEDB_ReserveInInfo
*reserves,
+ unsigned int reserves_length,
+ enum GNUNET_DB_QueryStatus *results);
+#endif
diff --git a/src/exchangedb/pg_reserves_in_insert.c
b/src/exchangedb/pg_reserves_in_insert.c
index 2fcca241..428e1923 100644
--- a/src/exchangedb/pg_reserves_in_insert.c
+++ b/src/exchangedb/pg_reserves_in_insert.c
@@ -31,6 +31,8 @@
#include "pg_reserves_update.h"
#include "pg_setup_wire_target.h"
#include "pg_event_notify.h"
+
+
/**
* Generate event notification for the reserve
* change.
@@ -38,7 +40,6 @@
* @param pg plugin state
* @param reserve_pub reserve to notfiy on
*/
-
static void
notify_on_reserve (struct PostgresClosure *pg,
const struct TALER_ReservePublicKeyP *reserve_pub)
@@ -52,11 +53,12 @@ notify_on_reserve (struct PostgresClosure *pg,
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Notifying on reserve!\n");
TEH_PG_event_notify (pg,
- &rep.header,
- NULL,
- 0);
+ &rep.header,
+ NULL,
+ 0);
}
+
enum GNUNET_DB_QueryStatus
TEH_PG_reserves_in_insert (void *cls,
const struct TALER_ReservePublicKeyP *reserve_pub,
@@ -135,8 +137,8 @@ TEH_PG_reserves_in_insert (void *cls,
struct TALER_PaytoHashP h_payto;
qs3 = TEH_PG_setup_wire_target (pg,
- sender_account_details,
- &h_payto);
+ sender_account_details,
+ &h_payto);
if (qs3 < 0)
return qs3;
/* We do not have the UUID, so insert by public key */
diff --git a/src/exchangedb/plugin_exchangedb_postgres.c
b/src/exchangedb/plugin_exchangedb_postgres.c
index 6a2a473c..11421700 100644
--- a/src/exchangedb/plugin_exchangedb_postgres.c
+++ b/src/exchangedb/plugin_exchangedb_postgres.c
@@ -207,7 +207,7 @@
#include "pg_reserves_update.h"
#include "pg_setup_wire_target.h"
#include "pg_compute_shard.h"
-
+#include "pg_batch_reserves_in_insert.h"
/**
* Set to 1 to enable Postgres auto_explain module. This will
* slow down things a _lot_, but also provide extensive logging
@@ -5446,7 +5446,8 @@ libtaler_plugin_exchangedb_postgres_init (void *cls)
= &TEH_PG_select_purse_by_merge_pub;
plugin->set_purse_balance
= &TEH_PG_set_purse_balance;
-
+ plugin->batch_reserves_in_insert
+ = &TEH_PG_batch_reserves_in_insert;
return plugin;
}
diff --git a/src/exchangedb/procedures.sql b/src/exchangedb/procedures.sql
index a732ef75..a9d90294 100644
--- a/src/exchangedb/procedures.sql
+++ b/src/exchangedb/procedures.sql
@@ -2521,3 +2521,61 @@ BEGIN
END $$;
COMMIT;
+
+/*************************************************************/
+
+
+CREATE OR REPLACE FUNCTION bash_reserves_in(
+ IN amount_val INT8,
+ IN amount_frac INT4,
+ IN rpub BYTEA,
+ IN now INT8,
+ IN min_reserve_gc INT8,
+ OUT reserve_found BOOLEAN,
+ OUT ruuid INT8)
+LANGUAGE plpgsql
+AS $$
+DECLARE
+ existed BOOLEAN;
+ not_existed BOOLEAN;
+BEGIN
+ SELECT reserves.reserve_uuid into ruuid from reserves
+ where reserves.reserve_pub = rpub;
+ IF ruuid IS NOT NULL
+ THEN
+ existed = TRUE;
+ UPDATE reserves
+ SET (current_balance_val
+ ,current_balance_frac
+ ,expiration_date
+ ,gc_date) =
+ (amount_val
+ ,amount_frac
+ ,now
+ ,min_reserve_gc)
+ WHERE
+ reserve_pub = rpub
+ RETURNING existed into reserve_found;
+ END IF;
+ IF NOT FOUND
+ THEN
+ SELECT MAX(reserve_uuid)+1 into ruuid from reserves;
+ existed = FALSE;
+ INSERT INTO reserves
+ (reserve_uuid
+ ,reserve_pub
+ ,current_balance_val
+ ,current_balance_frac
+ ,expiration_date
+ ,gc_date)
+ VALUES
+ (ruuid
+ ,rpub
+ ,amount_val
+ ,amount_frac
+ ,now
+ ,min_reserve_gc) RETURNING existed into reserve_found;
+
+ END IF;
+
+END $$;
diff --git a/src/exchangedb/test_exchangedb_by_j.c
b/src/exchangedb/test_exchangedb_by_j.c
index b81d82d6..175691e9 100644
--- a/src/exchangedb/test_exchangedb_by_j.c
+++ b/src/exchangedb/test_exchangedb_by_j.c
@@ -98,46 +98,46 @@ run (void *cls)
goto cleanup;
}
- for (unsigned int i = 0; i< 7; i++)
+ for (unsigned int i = 0; i< 8; i++)
{
- static unsigned int batches[] = {1, 1, 0, 2, 4, 16, 64};
+ static unsigned int batches[] = {1, 1, 0, 2, 4, 16, 64, 256};
const char *sndr = "payto://x-taler-bank/localhost:8080/1";
struct TALER_Amount value;
unsigned int batch_size = batches[i];
struct GNUNET_TIME_Absolute now;
struct GNUNET_TIME_Timestamp ts;
struct GNUNET_TIME_Relative duration;
- struct TALER_ReservePublicKeyP reserve_pub;
-
+ struct TALER_EXCHANGEDB_ReserveInInfo reserves[batch_size];
+ enum GNUNET_DB_QueryStatus *results;
GNUNET_assert (GNUNET_OK ==
TALER_string_to_amount (CURRENCY ":1.000010",
&value));
now = GNUNET_TIME_absolute_get ();
ts = GNUNET_TIME_timestamp_get ();
- fprintf (stdout,
- "Now: %llu\n",
- now.abs_value_us);
plugin->start (plugin->cls,
"test_by_exchange_j");
for (unsigned int k = 0; k<batch_size; k++)
{
- RND_BLK (&reserve_pub);
- FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
- plugin->reserves_in_insert (plugin->cls,
- &reserve_pub,
- &value,
- ts,
- sndr,
- "section",
- 4));
+ RND_BLK (&reserves[k].reserve_pub);
+ reserves[k].balance = value;
+ reserves[k].execution_time = ts;
+ reserves[k].sender_account_details = sndr;
+ reserves[k].exchange_account_name = "name";
}
+ FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
+ plugin->batch_reserves_in_insert (plugin->cls,
+ reserves,
+ batch_size,
+ &results));
+
+
plugin->commit (plugin->cls);
duration = GNUNET_TIME_absolute_get_duration (now);
fprintf (stdout,
"for a batchsize equal to %d it took %s\n",
batch_size,
GNUNET_STRINGS_relative_time_to_string (duration,
- GNUNET_YES) );
+ GNUNET_NO) );
}
drop:
GNUNET_break (GNUNET_OK ==
@@ -174,7 +174,7 @@ main (int argc,
(void) GNUNET_asprintf (&config_filename,
"%s.conf",
testname);
- fprintf (stderr,
+ fprintf (stdout,
"Using config: %s\n",
config_filename);
cfg = GNUNET_CONFIGURATION_create ();
@@ -195,5 +195,4 @@ main (int argc,
return result;
}
-
-/* end of test_exchangedb.c */
+/* end of test_exchangedb_by_j.c */
diff --git a/src/include/taler_exchangedb_plugin.h
b/src/include/taler_exchangedb_plugin.h
index f21301e7..6f5dedd0 100644
--- a/src/include/taler_exchangedb_plugin.h
+++ b/src/include/taler_exchangedb_plugin.h
@@ -2571,6 +2571,17 @@ struct TALER_EXCHANGEDB_KycStatus
};
+struct TALER_EXCHANGEDB_ReserveInInfo
+{
+ struct TALER_ReservePublicKeyP reserve_pub;
+ struct TALER_Amount balance;
+ struct GNUNET_TIME_Timestamp execution_time;
+ const char *sender_account_details;
+ const char *exchange_account_name;
+ uint64_t wire_reference;
+};
+
+
/**
* Function called on each @a amount that was found to
* be relevant for a KYC check.
@@ -3457,6 +3468,23 @@ struct TALER_EXCHANGEDB_Plugin
uint64_t wire_reference);
+ /**
+ * Insert a batch of incoming transaction into reserves. New reserves are
+ * also created through this function.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param reserves
+ * @param reserves_length length of the @a reserves array
+ * @param[out] results array of transaction status codes of length @a
reserves_length,
+ * set to the status of the
+ */
+ enum GNUNET_DB_QueryStatus
+ (*batch_reserves_in_insert)(void *cls,
+ const struct TALER_EXCHANGEDB_ReserveInInfo
*reserves,
+ unsigned int reserves_length,
+ enum GNUNET_DB_QueryStatus *results);
+
+
/**
* Locate a nonce for use with a particular public key.
*
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.