This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
Neels Hofmeyr gerrit-no-reply at lists.osmocom.org
Review at https://gerrit.osmocom.org/5205
db: wrap dbi querying to log actual SQL on debug and error
To be able to tell at all which DB query failed without introspecting the code
in gdb or similar, wrap the database query functions in local shims that log
the SQL.
Related: OS#2667, OS#2706
Change-Id: I4171dad8ffffbf634a75dedde752d82c51ff7803
---
M src/libmsc/db.c
1 file changed, 64 insertions(+), 34 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/05/5205/1
diff --git a/src/libmsc/db.c b/src/libmsc/db.c
index 4e4477b..a983976 100644
--- a/src/libmsc/db.c
+++ b/src/libmsc/db.c
@@ -181,6 +181,36 @@
")",
};
+dbi_result query(dbi_conn conn, const char *sql)
+{
+ dbi_result result;
+
+ LOGP(DDB, LOGL_DEBUG, "Running query: %s\n", sql);
+ result = dbi_conn_query(conn, sql);
+
+ if (!result)
+ LOGP(DDB, LOGL_ERROR, "Failed to query: %s\n", sql);
+
+ return result;
+}
+
+dbi_result queryf(dbi_conn conn, const char *format, ...)
+{
+ va_list args;
+ char *sql;
+ dbi_result result;
+
+ va_start(args, format);
+ sql = talloc_vasprintf(NULL, format, args);
+ va_end(args);
+
+ result = query(conn, sql);
+
+ talloc_free(sql);
+
+ return result;
+}
+
void db_error_func(dbi_conn conn, void *data)
{
const char *msg;
@@ -193,7 +223,7 @@
{
dbi_result result;
- result = dbi_conn_query(conn,
+ result = query(conn,
"ALTER TABLE Subscriber "
"ADD COLUMN expire_lu "
"TIMESTAMP DEFAULT NULL");
@@ -204,7 +234,7 @@
}
dbi_result_free(result);
- result = dbi_conn_query(conn,
+ result = query(conn,
"UPDATE Meta "
"SET value = '3' "
"WHERE key = 'revision'");
@@ -245,7 +275,7 @@
snprintf(buf, sizeof(buf), "%llu", sender_id);
dbi_conn_quote_string_copy(conn, buf, "ed);
- result2 = dbi_conn_queryf(conn,
+ result2 = queryf(conn,
"SELECT extension FROM Subscriber "
"WHERE id = %s ", quoted);
free(quoted);
@@ -285,7 +315,7 @@
LOGP(DDB, LOGL_NOTICE, "Going to migrate from revision 3\n");
- result = dbi_conn_query(conn, "BEGIN EXCLUSIVE TRANSACTION");
+ result = query(conn, "BEGIN EXCLUSIVE TRANSACTION");
if (!result) {
LOGP(DDB, LOGL_ERROR,
"Failed to begin transaction (upgrade from rev 3)\n");
@@ -294,7 +324,7 @@
dbi_result_free(result);
/* Rename old SMS table to be able create a new one */
- result = dbi_conn_query(conn, "ALTER TABLE SMS RENAME TO SMS_3");
+ result = query(conn, "ALTER TABLE SMS RENAME TO SMS_3");
if (!result) {
LOGP(DDB, LOGL_ERROR,
"Failed to rename the old SMS table (upgrade from rev 3).\n");
@@ -303,7 +333,7 @@
dbi_result_free(result);
/* Create new SMS table with all the bells and whistles! */
- result = dbi_conn_query(conn, create_stmts[SCHEMA_SMS]);
+ result = query(conn, create_stmts[SCHEMA_SMS]);
if (!result) {
LOGP(DDB, LOGL_ERROR,
"Failed to create a new SMS table (upgrade from rev 3).\n");
@@ -312,7 +342,7 @@
dbi_result_free(result);
/* Cycle through old messages and convert them to the new format */
- result = dbi_conn_query(conn, "SELECT * FROM SMS_3");
+ result = query(conn, "SELECT * FROM SMS_3");
if (!result) {
LOGP(DDB, LOGL_ERROR,
"Failed fetch messages from the old SMS table (upgrade from rev 3).\n");
@@ -331,7 +361,7 @@
dbi_result_free(result);
/* Remove the temporary table */
- result = dbi_conn_query(conn, "DROP TABLE SMS_3");
+ result = query(conn, "DROP TABLE SMS_3");
if (!result) {
LOGP(DDB, LOGL_ERROR,
"Failed to drop the old SMS table (upgrade from rev 3).\n");
@@ -340,7 +370,7 @@
dbi_result_free(result);
/* We're done. Bump DB Meta revision to 4 */
- result = dbi_conn_query(conn,
+ result = query(conn,
"UPDATE Meta "
"SET value = '4' "
"WHERE key = 'revision'");
@@ -351,7 +381,7 @@
}
dbi_result_free(result);
- result = dbi_conn_query(conn, "COMMIT TRANSACTION");
+ result = query(conn, "COMMIT TRANSACTION");
if (!result) {
LOGP(DDB, LOGL_ERROR,
"Failed to commit the transaction (upgrade from rev 3)\n");
@@ -361,7 +391,7 @@
}
/* Shrink DB file size by actually wiping out SMS_3 table data */
- result = dbi_conn_query(conn, "VACUUM");
+ result = query(conn, "VACUUM");
if (!result)
LOGP(DDB, LOGL_ERROR,
"VACUUM failed. Ignoring it (upgrade from rev 3).\n");
@@ -371,7 +401,7 @@
return 0;
rollback:
- result = dbi_conn_query(conn, "ROLLBACK TRANSACTION");
+ result = query(conn, "ROLLBACK TRANSACTION");
if (!result)
LOGP(DDB, LOGL_ERROR,
"Rollback failed (upgrade from rev 3).\n");
@@ -431,7 +461,7 @@
LOGP(DDB, LOGL_NOTICE, "Going to migrate from revision 4\n");
- result = dbi_conn_query(conn, "BEGIN EXCLUSIVE TRANSACTION");
+ result = query(conn, "BEGIN EXCLUSIVE TRANSACTION");
if (!result) {
LOGP(DDB, LOGL_ERROR,
"Failed to begin transaction (upgrade from rev 4)\n");
@@ -440,7 +470,7 @@
dbi_result_free(result);
/* Rename old SMS table to be able create a new one */
- result = dbi_conn_query(conn, "ALTER TABLE SMS RENAME TO SMS_4");
+ result = query(conn, "ALTER TABLE SMS RENAME TO SMS_4");
if (!result) {
LOGP(DDB, LOGL_ERROR,
"Failed to rename the old SMS table (upgrade from rev 4).\n");
@@ -449,7 +479,7 @@
dbi_result_free(result);
/* Create new SMS table with all the bells and whistles! */
- result = dbi_conn_query(conn, create_stmts[SCHEMA_SMS]);
+ result = query(conn, create_stmts[SCHEMA_SMS]);
if (!result) {
LOGP(DDB, LOGL_ERROR,
"Failed to create a new SMS table (upgrade from rev 4).\n");
@@ -458,7 +488,7 @@
dbi_result_free(result);
/* Cycle through old messages and convert them to the new format */
- result = dbi_conn_query(conn, "SELECT * FROM SMS_4");
+ result = query(conn, "SELECT * FROM SMS_4");
if (!result) {
LOGP(DDB, LOGL_ERROR,
"Failed fetch messages from the old SMS table (upgrade from rev 4).\n");
@@ -477,7 +507,7 @@
dbi_result_free(result);
/* Remove the temporary table */
- result = dbi_conn_query(conn, "DROP TABLE SMS_4");
+ result = query(conn, "DROP TABLE SMS_4");
if (!result) {
LOGP(DDB, LOGL_ERROR,
"Failed to drop the old SMS table (upgrade from rev 4).\n");
@@ -486,7 +516,7 @@
dbi_result_free(result);
/* We're done. Bump DB Meta revision to 4 */
- result = dbi_conn_query(conn,
+ result = query(conn,
"UPDATE Meta "
"SET value = '5' "
"WHERE key = 'revision'");
@@ -497,7 +527,7 @@
}
dbi_result_free(result);
- result = dbi_conn_query(conn, "COMMIT TRANSACTION");
+ result = query(conn, "COMMIT TRANSACTION");
if (!result) {
LOGP(DDB, LOGL_ERROR,
"Failed to commit the transaction (upgrade from rev 4)\n");
@@ -507,7 +537,7 @@
}
/* Shrink DB file size by actually wiping out SMS_4 table data */
- result = dbi_conn_query(conn, "VACUUM");
+ result = query(conn, "VACUUM");
if (!result)
LOGP(DDB, LOGL_ERROR,
"VACUUM failed. Ignoring it (upgrade from rev 4).\n");
@@ -517,7 +547,7 @@
return 0;
rollback:
- result = dbi_conn_query(conn, "ROLLBACK TRANSACTION");
+ result = query(conn, "ROLLBACK TRANSACTION");
if (!result)
LOGP(DDB, LOGL_ERROR,
"Rollback failed (upgrade from rev 4).\n");
@@ -533,7 +563,7 @@
int db_rev = 0;
/* Make a query */
- result = dbi_conn_query(conn,
+ result = query(conn,
"SELECT value FROM Meta "
"WHERE key = 'revision'");
@@ -593,7 +623,7 @@
{
dbi_result result;
- result = dbi_conn_query(conn,
+ result = query(conn,
"PRAGMA synchronous = FULL");
if (!result)
return -EINVAL;
@@ -647,7 +677,7 @@
int i;
for (i = 0; i < ARRAY_SIZE(create_stmts); i++) {
- result = dbi_conn_query(conn, create_stmts[i]);
+ result = query(conn, create_stmts[i]);
if (!result) {
LOGP(DDB, LOGL_ERROR,
"Failed to create some table.\n");
@@ -694,7 +724,7 @@
&q_udata);
/* FIXME: correct validity period */
- result = dbi_conn_queryf(conn,
+ result = queryf(conn,
"INSERT INTO SMS "
"(created, valid_until, "
"reply_path_req, status_rep_req, is_report, "
@@ -782,7 +812,7 @@
dbi_result result;
struct gsm_sms *sms;
- result = dbi_conn_queryf(conn,
+ result = queryf(conn,
"SELECT * FROM SMS WHERE SMS.id = %llu", id);
if (!result)
return NULL;
@@ -806,7 +836,7 @@
dbi_result result;
struct gsm_sms *sms;
- result = dbi_conn_queryf(conn,
+ result = queryf(conn,
"SELECT * FROM SMS"
" WHERE sent IS NULL"
" AND id >= %llu"
@@ -840,7 +870,7 @@
if (!vsub->lu_complete)
return NULL;
- result = dbi_conn_queryf(conn,
+ result = queryf(conn,
"SELECT * FROM SMS"
" WHERE sent IS NULL"
" AND dest_addr=%s"
@@ -869,7 +899,7 @@
dbi_result result;
struct gsm_sms *sms;
- result = dbi_conn_queryf(conn,
+ result = queryf(conn,
"SELECT * FROM SMS"
" WHERE sent IS NULL"
" AND dest_addr > '%s'"
@@ -896,7 +926,7 @@
{
dbi_result result;
- result = dbi_conn_queryf(conn,
+ result = queryf(conn,
"UPDATE SMS "
"SET sent = datetime('now') "
"WHERE id = %llu", sms->id);
@@ -914,7 +944,7 @@
{
dbi_result result;
- result = dbi_conn_queryf(conn,
+ result = queryf(conn,
"UPDATE SMS "
"SET deliver_attempts = deliver_attempts + 1 "
"WHERE id = %llu", sms->id);
@@ -934,7 +964,7 @@
dbi_result result;
if (!msisdn || !*msisdn)
return 0;
- result = dbi_conn_queryf(conn,
+ result = queryf(conn,
"DELETE FROM SMS WHERE src_addr=%s OR dest_addr=%s",
msisdn, msisdn);
if (!result) {
@@ -953,7 +983,7 @@
dbi_conn_quote_string_copy(conn, ctr->name, &q_name);
- result = dbi_conn_queryf(conn,
+ result = queryf(conn,
"INSERT INTO Counters "
"(timestamp,name,value) VALUES "
"(datetime('now'),%s,%lu)", q_name, ctr->value);
@@ -976,7 +1006,7 @@
dbi_conn_quote_string_copy(conn, ctrg->desc->ctr_desc[num].name,
&q_name);
- result = dbi_conn_queryf(conn,
+ result = queryf(conn,
"Insert INTO RateCounters "
"(timestamp,name,idx,value) VALUES "
"(datetime('now'),%s.%s,%u,%"PRIu64")",
--
To view, visit https://gerrit.osmocom.org/5205
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4171dad8ffffbf634a75dedde752d82c51ff7803
Gerrit-PatchSet: 1
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>