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

auditordb postgres plugin: sql fixes, callback return value

Browse Source
This commit is contained in:
tg(x) 2016-11-04 00:34:09 +01:00
parent 176bd57550
commit 59fa9d8255
2 changed files with 97 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

177
src/auditordb/plugin_auditordb_postgres.c
View File

@ -326,7 +326,7 @@ postgres_create_tables (void *cls)
of; "refund_serial_id" tells us the last entry in "refunds" of; "refund_serial_id" tells us the last entry in "refunds"
for this denom_pub that the auditor is aware of. */ for this denom_pub that the auditor is aware of. */
SQLEXEC ("CREATE TABLE IF NOT EXISTS denomination_pending" SQLEXEC ("CREATE TABLE IF NOT EXISTS denomination_pending"
"(denom_pub_hash BYTEA PRIMARY KEY REFERENCES denominations (denom_pub_hash) ON DELETE CASCADE" "(denom_pub_hash BYTEA PRIMARY KEY REFERENCES auditor_denominations (denom_pub_hash) ON DELETE CASCADE"
",denom_balance_val INT8 NOT NULL" ",denom_balance_val INT8 NOT NULL"
",denom_balance_frac INT4 NOT NULL" ",denom_balance_frac INT4 NOT NULL"
",denom_balance_curr VARCHAR("TALER_CURRENCY_LEN_STR") NOT NULL" ",denom_balance_curr VARCHAR("TALER_CURRENCY_LEN_STR") NOT NULL"
@ -566,7 +566,7 @@ postgres_prepare (PGconn *db_conn)
/* Used in #postgres_insert_reserve_info() */ /* Used in #postgres_insert_reserve_info() */
PREPARE ("auditor_reserves_insert", PREPARE ("auditor_reserves_insert",
"INSERT INTO auditor_reserves" "INSERT INTO auditor_reserves "
"(reserve_pub" "(reserve_pub"
",master_pub" ",master_pub"
",reserve_balance_val" ",reserve_balance_val"
@ -577,8 +577,8 @@ postgres_prepare (PGconn *db_conn)
",withdraw_fee_balance_curr" ",withdraw_fee_balance_curr"
",expiration_date" ",expiration_date"
",last_reserve_in_serial_id" ",last_reserve_in_serial_id"
",last_reserve_out_serial_id)" ",last_reserve_out_serial_id"
") VALUES ($1,$2,$3,$4,$5,$7,$8,$9,$10,$11);", ") VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11);",
11, NULL); 11, NULL);
/* Used in #postgres_update_reserve_info() */ /* Used in #postgres_update_reserve_info() */
@ -652,75 +652,7 @@ postgres_prepare (PGconn *db_conn)
/* Used in #postgres_insert_denomination_balance() */ /* Used in #postgres_insert_denomination_balance() */
PREPARE ("denomination_pending_insert", PREPARE ("denomination_pending_insert",
"INSERT INTO denomination_pending" "INSERT INTO denomination_pending "
"(denom_pub_hash"
",denom_balance_val"
",denom_balance_frac"
",denom_balance_curr"
",deposit_fee_balance_val"
",deposit_fee_balance_frac"
",deposit_fee_balance_curr"
",melt_fee_balance_val"
",melt_fee_balance_frac"
",melt_fee_balance_curr"
",refund_fee_balance_val"
",refund_fee_balance_frac"
",refund_fee_balance_curr"
",last_reserve_out_serial_id"
",last_deposit_serial_id"
",last_melt_serial_id"
",last_refund_serial_id"
") VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,,$11,$12,$13,$14,$15,$16,$17);",
17, NULL);
/* Used in #postgres_update_denomination_balance() */
PREPARE ("denomination_pending_update",
"UPDATE denomination_pending SET"
" denom_balance_val=$1"
",denom_balance_frac=$2"
",denom_balance_curr=$3"
",deposit_fee_balance_val=$4"
",deposit_fee_balance_frac=$5"
",deposit_fee_balance_curr=$6"
",melt_fee_balance_val=$7"
",melt_fee_balance_frac=$8"
",melt_fee_balance_curr=$9"
",refund_fee_balance_val=$10"
",refund_fee_balance_frac=$11"
",refund_fee_balance_curr=$12"
",last_reserve_out_serial_id=$13"
",last_deposit_serial_id=$14"
",last_melt_serial_id=$15"
",last_refund_serial_id=$16"
" WHERE donom_pub_hash=$17",
18, NULL);
/* Used in #postgres_get_denomination_balance() */
PREPARE ("denomination_pending_select",
"SELECT"
" denom_balance_val"
",denom_balance_frac"
",denom_balance_curr"
",deposit_fee_balance_val"
",deposit_fee_balance_frac"
",deposit_fee_balance_curr"
",melt_fee_balance_val"
",melt_fee_balance_frac"
",melt_fee_balance_curr"
",refund_fee_balance_val"
",refund_fee_balance_frac"
",refund_fee_balance_curr"
",last_reserve_out_serial_id"
",last_deposit_serial_id"
",last_melt_serial_id"
",last_refund_serial_id"
" FROM denomination_pending"
" WHERE denom_pub_hash=$1",
1, NULL);
/* Used in #postgres_insert_denomination_balance() */
PREPARE ("denomination_pending_insert",
"INSERT INTO denomination_pending"
"(denom_pub_hash" "(denom_pub_hash"
",denom_balance_val" ",denom_balance_val"
",denom_balance_frac" ",denom_balance_frac"
@ -760,10 +692,10 @@ postgres_prepare (PGconn *db_conn)
",last_deposit_serial_id=$14" ",last_deposit_serial_id=$14"
",last_melt_serial_id=$15" ",last_melt_serial_id=$15"
",last_refund_serial_id=$16" ",last_refund_serial_id=$16"
" WHERE denom_pub_hash=$17;", " WHERE denom_pub_hash=$17",
17, NULL); 18, NULL);
/* Used in #postgres_insert_denomination_balance() */ /* Used in #postgres_get_denomination_balance() */
PREPARE ("denomination_pending_select", PREPARE ("denomination_pending_select",
"SELECT" "SELECT"
" denom_balance_val" " denom_balance_val"
@ -782,13 +714,13 @@ postgres_prepare (PGconn *db_conn)
",last_deposit_serial_id" ",last_deposit_serial_id"
",last_melt_serial_id" ",last_melt_serial_id"
",last_refund_serial_id" ",last_refund_serial_id"
" FROM denomination_pending" " FROM denomination_pending"
" WHERE denom_pub_hash=$1", " WHERE denom_pub_hash=$1",
1, NULL); 1, NULL);
/* Used in #postgres_insert_denomination_summary() */ /* Used in #postgres_insert_denomination_summary() */
PREPARE ("total_liabilities_insert", PREPARE ("total_liabilities_insert",
"INSERT INTO total_liabilities" "INSERT INTO total_liabilities "
"(master_pub" "(master_pub"
",denom_balance_val" ",denom_balance_val"
",denom_balance_frac" ",denom_balance_frac"
@ -820,7 +752,7 @@ postgres_prepare (PGconn *db_conn)
",refund_fee_balance_val=$10" ",refund_fee_balance_val=$10"
",refund_fee_balance_frac=$11" ",refund_fee_balance_frac=$11"
",refund_fee_balance_curr=$12" ",refund_fee_balance_curr=$12"
" WHERE master_pub=$14;", " WHERE master_pub=$13;",
13, NULL); 13, NULL);
/* Used in #postgres_get_denomination_summary() */ /* Used in #postgres_get_denomination_summary() */
@ -853,7 +785,7 @@ postgres_prepare (PGconn *db_conn)
4, NULL); 4, NULL);
/* Used in #postgres_update_risk_summary() */ /* Used in #postgres_update_risk_summary() */
PREPARE ("total_risk_select", PREPARE ("total_risk_update",
"UPDATE total_risk SET " "UPDATE total_risk SET "
" risk_val=$1" " risk_val=$1"
",risk_frac=$2" ",risk_frac=$2"
@ -890,7 +822,7 @@ postgres_prepare (PGconn *db_conn)
",refund_fee_balance_val" ",refund_fee_balance_val"
",refund_fee_balance_frac" ",refund_fee_balance_frac"
",refund_fee_balance_curr" ",refund_fee_balance_curr"
") VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,,$11,$12,$13,$14,$15);", ") VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15);",
15, NULL); 15, NULL);
/* Used in #postgres_select_historic_denom_revenue() */ /* Used in #postgres_select_historic_denom_revenue() */
@ -975,7 +907,7 @@ postgres_prepare (PGconn *db_conn)
/* Used in #postgres_update_predicted_result() */ /* Used in #postgres_update_predicted_result() */
PREPARE ("predicted_result_update", PREPARE ("predicted_result_update",
"UPDATE predicted_result SET" "UPDATE predicted_result SET"
",balance_val=$1" " balance_val=$1"
",balance_frac=$2" ",balance_frac=$2"
",balance_curr=$3" ",balance_curr=$3"
" WHERE master_pub=$4;", " WHERE master_pub=$4;",
@ -1317,6 +1249,7 @@ postgres_select_denomination_info (void *cls,
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
int ret = GNUNET_OK;
int nrows = PQntuples (result); int nrows = PQntuples (result);
if (0 == nrows) if (0 == nrows)
{ {
@ -1327,7 +1260,7 @@ postgres_select_denomination_info (void *cls,
} }
for (int i = 0; i < nrows; i++) for (int i = 0; i < nrows; i++)
{ {
struct TALER_DenominationKeyValidityPS issue; struct TALER_DenominationKeyValidityPS issue = { 0 };
struct GNUNET_PQ_ResultSpec rs[] = { struct GNUNET_PQ_ResultSpec rs[] = {
GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash", &issue.denom_hash), GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash", &issue.denom_hash),
@ -1366,11 +1299,19 @@ postgres_select_denomination_info (void *cls,
PQclear (result); PQclear (result);
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
cb (cb_cls, ret = cb (cb_cls,
&issue); &issue);
switch (ret)
{
case GNUNET_OK:
break;
default:
i = nrows;
}
} }
PQclear (result); PQclear (result);
return GNUNET_OK; return ret;
} }
@ -2548,6 +2489,7 @@ postgres_select_historic_denom_revenue (void *cls,
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
int ret = GNUNET_OK;
int nrows = PQntuples (result); int nrows = PQntuples (result);
if (0 == nrows) if (0 == nrows)
{ {
@ -2595,16 +2537,25 @@ postgres_select_historic_denom_revenue (void *cls,
PQclear (result); PQclear (result);
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
cb (cb_cls,
&denom_pub_hash, ret = cb (cb_cls,
revenue_timestamp, &denom_pub_hash,
&revenue_balance, revenue_timestamp,
&deposit_fee_balance, &revenue_balance,
&melt_fee_balance, &deposit_fee_balance,
&refund_fee_balance); &melt_fee_balance,
&refund_fee_balance);
switch (ret)
{
case GNUNET_OK:
break;
default:
i = nrows;
}
} }
PQclear (result); PQclear (result);
return GNUNET_OK; return ret;
} }
@ -2699,6 +2650,7 @@ postgres_select_historic_losses (void *cls,
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
int ret = GNUNET_OK;
int nrows = PQntuples (result); int nrows = PQntuples (result);
if (0 == nrows) if (0 == nrows)
{ {
@ -2731,13 +2683,21 @@ postgres_select_historic_losses (void *cls,
PQclear (result); PQclear (result);
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
cb (cb_cls, ret = cb (cb_cls,
&denom_pub_hash, &denom_pub_hash,
loss_timestamp, loss_timestamp,
&loss_balance); &loss_balance);
switch (ret)
{
case GNUNET_OK:
break;
default:
i = nrows;
}
} }
PQclear (result); PQclear (result);
return GNUNET_OK; return ret;
} }
@ -2827,6 +2787,7 @@ postgres_select_historic_reserve_revenue (void *cls,
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
int ret = GNUNET_OK;
int nrows = PQntuples (result); int nrows = PQntuples (result);
if (0 == nrows) if (0 == nrows)
{ {
@ -2858,13 +2819,21 @@ postgres_select_historic_reserve_revenue (void *cls,
PQclear (result); PQclear (result);
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
cb (cb_cls, ret = cb (cb_cls,
start_time, start_time,
end_time, end_time,
&reserve_profits); &reserve_profits);
switch (ret)
{
case GNUNET_OK:
break;
default:
i = nrows;
}
} }
PQclear (result); PQclear (result);
return GNUNET_OK; return ret;
} }

28
src/include/taler_auditordb_plugin.h
View File

@ -33,8 +33,13 @@
* *
* @param cls closure * @param cls closure
* @param issue issuing information with value, fees and other info about the denomination. * @param issue issuing information with value, fees and other info about the denomination.
*
* @return sets the return value of select_denomination_info(),
* #GNUNET_OK to continue,
* #GNUNET_NO to stop processing further rows
* #GNUNET_SYSERR or other values on error.
*/ */
typedef void typedef int
(*TALER_AUDITORDB_DenominationInfoDataCallback)(void *cls, (*TALER_AUDITORDB_DenominationInfoDataCallback)(void *cls,
const struct TALER_DenominationKeyValidityPS *issue); const struct TALER_DenominationKeyValidityPS *issue);
@ -51,8 +56,13 @@ typedef void
* @param deposit_fee_balance total profits from deposit fees * @param deposit_fee_balance total profits from deposit fees
* @param melt_fee_balance total profits from melting fees * @param melt_fee_balance total profits from melting fees
* @param refund_fee_balance total profits from refund fees * @param refund_fee_balance total profits from refund fees
*
* @return sets the return value of select_denomination_info(),
* #GNUNET_OK to continue,
* #GNUNET_NO to stop processing further rows
* #GNUNET_SYSERR or other values on error.
*/ */
typedef void typedef int
(*TALER_AUDITORDB_HistoricDenominationRevenueDataCallback)(void *cls, (*TALER_AUDITORDB_HistoricDenominationRevenueDataCallback)(void *cls,
const struct GNUNET_HashCode *denom_pub_hash, const struct GNUNET_HashCode *denom_pub_hash,
struct GNUNET_TIME_Absolute revenue_timestamp, struct GNUNET_TIME_Absolute revenue_timestamp,
@ -69,8 +79,13 @@ typedef void
* @param denom_pub_hash hash of the denomination key * @param denom_pub_hash hash of the denomination key
* @param loss_timestamp when did this profit get realized * @param loss_timestamp when did this profit get realized
* @param loss_balance what was the total loss * @param loss_balance what was the total loss
*
* @return sets the return value of select_denomination_info(),
* #GNUNET_OK to continue,
* #GNUNET_NO to stop processing further rows
* #GNUNET_SYSERR or other values on error.
*/ */
typedef void typedef int
(*TALER_AUDITORDB_HistoricLossesDataCallback)(void *cls, (*TALER_AUDITORDB_HistoricLossesDataCallback)(void *cls,
const struct GNUNET_HashCode *denom_pub_hash, const struct GNUNET_HashCode *denom_pub_hash,
struct GNUNET_TIME_Absolute loss_timestamp, struct GNUNET_TIME_Absolute loss_timestamp,
@ -84,8 +99,13 @@ typedef void
* @param start_time beginning of aggregated time interval * @param start_time beginning of aggregated time interval
* @param end_time end of aggregated time interval * @param end_time end of aggregated time interval
* @param reserve_profits total profits made * @param reserve_profits total profits made
*
* @return sets the return value of select_denomination_info(),
* #GNUNET_OK to continue,
* #GNUNET_NO to stop processing further rows
* #GNUNET_SYSERR or other values on error.
*/ */
typedef void typedef int
(*TALER_AUDITORDB_HistoricReserveRevenueDataCallback)(void *cls, (*TALER_AUDITORDB_HistoricReserveRevenueDataCallback)(void *cls,
struct GNUNET_TIME_Absolute start_time, struct GNUNET_TIME_Absolute start_time,
struct GNUNET_TIME_Absolute end_time, struct GNUNET_TIME_Absolute end_time,