taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

resolve #7124: ensure -s also deletes work_shards

Browse Source
This commit is contained in:
Christian Grothoff 2021-12-26 13:05:39 +01:00
parent e7d4183d1c
commit 070f442a11
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
3 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/exchange-tools/taler-exchange-dbinit.c
View File

@ -105,7 +105,7 @@ run (void *cls,
if (clear_shards) if (clear_shards)
{ {
if (0 > if (0 >
plugin->delete_revolving_shards (plugin->cls)) plugin->delete_shard_locks (plugin->cls))
{ {
fprintf (stderr, fprintf (stderr,
"Clearing revolving shards failed!\n"); "Clearing revolving shards failed!\n");

22
src/exchangedb/plugin_exchangedb_postgres.c
View File

@ -2743,11 +2743,6 @@ prepare_statements (struct PostgresClosure *pg)
" AND start_row=$2" " AND start_row=$2"
" AND end_row=$3", " AND end_row=$3",
3), 3),
/* Used in #postgres_delete_revolving_shards() */
GNUNET_PQ_make_prepare (
"delete_revolving_shards",
"DELETE FROM revolving_work_shards",
0),
GNUNET_PQ_PREPARED_STATEMENT_END GNUNET_PQ_PREPARED_STATEMENT_END
}; };
@ -11385,16 +11380,17 @@ postgres_release_revolving_shard (void *cls,
* @return transaction status code * @return transaction status code
*/ */
enum GNUNET_DB_QueryStatus enum GNUNET_DB_QueryStatus
postgres_delete_revolving_shards (void *cls) postgres_delete_shard_locks (void *cls)
{ {
struct PostgresClosure *pg = cls; struct PostgresClosure *pg = cls;
struct GNUNET_PQ_QueryParam params[] = { struct GNUNET_PQ_ExecuteStatement es[] = {
GNUNET_PQ_query_param_end GNUNET_PQ_make_execute ("DELETE FROM work_shards;"),
GNUNET_PQ_make_execute ("DELETE FROM revolving_work_shards;"),
GNUNET_PQ_EXECUTE_STATEMENT_END
}; };
return GNUNET_PQ_eval_prepared_non_select (pg->conn, return GNUNET_PQ_exec_statements (pg->conn,
"delete_revolving_shards", es);
params);
} }
@ -11630,8 +11626,8 @@ libtaler_plugin_exchangedb_postgres_init (void *cls)
= &postgres_begin_revolving_shard; = &postgres_begin_revolving_shard;
plugin->release_revolving_shard plugin->release_revolving_shard
= &postgres_release_revolving_shard; = &postgres_release_revolving_shard;
plugin->delete_revolving_shards plugin->delete_shard_locks
= &postgres_delete_revolving_shards; = &postgres_delete_shard_locks;
return plugin; return plugin;
} }

2
src/include/taler_exchangedb_plugin.h
View File

@ -4022,7 +4022,7 @@ struct TALER_EXCHANGEDB_Plugin
* @return transaction status code * @return transaction status code
*/ */
enum GNUNET_DB_QueryStatus enum GNUNET_DB_QueryStatus
(*delete_revolving_shards)(void *cls); (*delete_shard_locks)(void *cls);
/** /**
* TODO-oec: add function for adding extension config * TODO-oec: add function for adding extension config