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

improve style of some SQL queries (no semantic change)

Browse Source
This commit is contained in:
Christian Grothoff 2022-03-19 08:27:01 +01:00
parent f0a95037ef
commit 280f94c3a6
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
4 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/gana

@ -1 +1 @@
Subproject commit 048ad729b3177a5de1726517bc905e6cd7688d0d Subproject commit baeb820366b88befd6f5aa2a551e2827ef406daf

31
src/exchangedb/plugin_exchangedb_postgres.c
View File

@ -722,13 +722,13 @@ prepare_statements (struct PostgresClosure *pg)
",ro.amount_with_fee_frac" ",ro.amount_with_fee_frac"
",denom.fee_withdraw_val" ",denom.fee_withdraw_val"
",denom.fee_withdraw_frac" ",denom.fee_withdraw_frac"
" FROM denominations denom" " FROM reserves res"
" JOIN reserves_out ro"
" ON (ro.denominations_serial = denom.denominations_serial)"
" JOIN reserves_out_by_reserve ror" " JOIN reserves_out_by_reserve ror"
" ON (ro.h_blind_ev = ror.h_blind_ev)"
" JOIN reserves res"
" ON (res.reserve_uuid = ror.reserve_uuid)" " ON (res.reserve_uuid = ror.reserve_uuid)"
" JOIN reserves_out ro"
" ON (ro.h_blind_ev = ror.h_blind_ev)"
" JOIN denominations denom"
" ON (ro.denominations_serial = denom.denominations_serial)"
" WHERE res.reserve_pub=$1;", " WHERE res.reserve_pub=$1;",
1), 1),
/* Used in #postgres_select_withdrawals_above_serial_id() */ /* Used in #postgres_select_withdrawals_above_serial_id() */
@ -1654,17 +1654,17 @@ prepare_statements (struct PostgresClosure *pg)
" recoup_timestamp," " recoup_timestamp,"
" denoms.denom_pub_hash," " denoms.denom_pub_hash,"
" coins.denom_sig" " coins.denom_sig"
" FROM denominations denoms" " FROM reserves res"
" JOIN known_coins coins"
" ON (coins.denominations_serial = denoms.denominations_serial)"
" JOIN recoup rc"
" ON (rc.coin_pub = coins.coin_pub)"
" JOIN reserves_out ro"
" ON (ro.reserve_out_serial_id = rc.reserve_out_serial_id)"
" JOIN reserves_out_by_reserve ror" " JOIN reserves_out_by_reserve ror"
" ON (ror.h_blind_ev = ro.h_blind_ev)"
" JOIN reserves res"
" ON (res.reserve_uuid = ror.reserve_uuid)" " ON (res.reserve_uuid = ror.reserve_uuid)"
" JOIN reserves_out ro"
" ON (ror.h_blind_ev = ro.h_blind_ev)"
" JOIN recoup rc"
" ON (ro.reserve_out_serial_id = rc.reserve_out_serial_id)"
" JOIN known_coins coins"
" ON (rc.coin_pub = coins.coin_pub)"
" JOIN denominations denoms"
" ON (coins.denominations_serial = denoms.denominations_serial)"
" WHERE res.reserve_pub=$1;", " WHERE res.reserve_pub=$1;",
1), 1),
/* Used in #postgres_get_coin_transactions() to obtain recoup transactions /* Used in #postgres_get_coin_transactions() to obtain recoup transactions
@ -1743,6 +1743,9 @@ prepare_statements (struct PostgresClosure *pg)
",recoup_timestamp" ",recoup_timestamp"
",recoup_uuid" ",recoup_uuid"
" FROM recoup" " FROM recoup"
// FIXME: suboptimal sub-query here: crosses shards!
// MAYBE: replace reserve_out_serial_id with
// reserve_pub and use new reserve_out_by_reserve table?
" JOIN reserves_out ro" " JOIN reserves_out ro"
" USING (reserve_out_serial_id)" " USING (reserve_out_serial_id)"
" JOIN reserves" " JOIN reserves"

1
src/lib/exchange_api_deposit.c
View File

@ -382,7 +382,6 @@ handle_deposit_finished (void *cls,
TEAH_get_auditors_for_dc (dh->exchange, TEAH_get_auditors_for_dc (dh->exchange,
&auditor_cb, &auditor_cb,
dh); dh);
} }
dr.details.success.exchange_sig = &dh->exchange_sig; dr.details.success.exchange_sig = &dh->exchange_sig;
dr.details.success.exchange_pub = &dh->exchange_pub; dr.details.success.exchange_pub = &dh->exchange_pub;

1
src/lib/exchange_api_handle.c
View File

@ -598,7 +598,6 @@ update_auditors (struct TALER_EXCHANGE_Handle *exchange)
GNUNET_CONTAINER_DLL_insert (exchange->auditors_head, GNUNET_CONTAINER_DLL_insert (exchange->auditors_head,
exchange->auditors_tail, exchange->auditors_tail,
ale); ale);
ale->ah = TALER_AUDITOR_connect (exchange->ctx, ale->ah = TALER_AUDITOR_connect (exchange->ctx,
ale->auditor_url, ale->auditor_url,
&auditor_version_cb, &auditor_version_cb,