mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-01-17 19:03:42 +01:00
Code Issues Projects Releases Wiki Activity

db: Add setup and teardown function to DB

Browse Source 
These are used to do one-time initializations and wait for pending statements
before closing.

Signed-off-by: Christian Decker <decker.christian@gmail.com>
This commit is contained in:
Christian Decker 2019-08-08 13:42:39 +02:00 committed by Rusty Russell
parent a2b5b1561e
commit 492d77f213
5 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/test_plugin.py
View File

@ -299,10 +299,9 @@ def test_db_hook(node_factory, executor):
# It should see the db being created, and sometime later actually get # It should see the db being created, and sometime later actually get
# initted. # initted.
# This precedes startup, so needle already past # This precedes startup, so needle already past
assert l1.daemon.is_in_log('plugin-dblog.py deferring 1 commands') assert l1.daemon.is_in_log(r'plugin-dblog.py deferring \d+ commands')
l1.daemon.logsearch_start = 0 l1.daemon.logsearch_start = 0
l1.daemon.wait_for_log('plugin-dblog.py replaying pre-init data:') l1.daemon.wait_for_log('plugin-dblog.py replaying pre-init data:')
l1.daemon.wait_for_log('plugin-dblog.py PRAGMA foreign_keys = ON;')
l1.daemon.wait_for_log('plugin-dblog.py CREATE TABLE version \\(version INTEGER\\)') l1.daemon.wait_for_log('plugin-dblog.py CREATE TABLE version \\(version INTEGER\\)')
l1.daemon.wait_for_log("plugin-dblog.py initialized.* 'startup': True") l1.daemon.wait_for_log("plugin-dblog.py initialized.* 'startup': True")

9
wallet/db.c
View File

@ -826,10 +826,17 @@ static void setup_open_db(struct db *db)
assert(!db->in_transaction); assert(!db->in_transaction);
db_prepare_for_changes(db); db_prepare_for_changes(db);
db_do_exec(__func__, db, "PRAGMA foreign_keys = ON;"); if (db->config->setup_fn)
db->config->setup_fn(db);
db_report_changes(db, NULL, 0); db_report_changes(db, NULL, 0);
} }
void db_close(struct db *db)
{
if (db->config->teardown_fn)
db->config->teardown_fn(db);
}
/** /**
* db_open - Open or create a sqlite3 database * db_open - Open or create a sqlite3 database
*/ */

2
wallet/db.h
View File

@ -242,6 +242,8 @@ void sqlite3_bind_timeabs(sqlite3_stmt *stmt, int col, struct timeabs t);
struct timeabs sqlite3_column_timeabs(sqlite3_stmt *stmt, int col); struct timeabs sqlite3_column_timeabs(sqlite3_stmt *stmt, int col);
void db_close(struct db *db);
void db_bind_null(struct db_stmt *stmt, int pos); void db_bind_null(struct db_stmt *stmt, int pos);
void db_bind_int(struct db_stmt *stmt, int pos, int val); void db_bind_int(struct db_stmt *stmt, int pos, int val);
void db_bind_u64(struct db_stmt *stmt, int pos, u64 val); void db_bind_u64(struct db_stmt *stmt, int pos, u64 val);

3
wallet/db_common.h
View File

@ -124,6 +124,9 @@ struct db_config {
s64 (*column_int_fn)(struct db_stmt *stmt, int col); s64 (*column_int_fn)(struct db_stmt *stmt, int col);
size_t (*count_changes_fn)(struct db_stmt *stmt); size_t (*count_changes_fn)(struct db_stmt *stmt);
bool (*setup_fn)(struct db *db);
void (*teardown_fn)(struct db *db);
}; };
/* Provide a way for DB backends to register themselves */ /* Provide a way for DB backends to register themselves */

17
wallet/db_sqlite3.c
View File

@ -28,6 +28,16 @@ static const char *db_sqlite3_fmt_error(struct db_stmt *stmt)
sqlite3_errmsg(stmt->db->conn)); sqlite3_errmsg(stmt->db->conn));
} }
static bool db_sqlite3_setup(struct db *db)
{
sqlite3_stmt *stmt;
int err;
sqlite3_prepare_v2(db->conn, "PRAGMA foreign_keys = ON;", -1, &stmt, NULL);
err = sqlite3_step(stmt);
sqlite3_finalize(stmt);
return err == SQLITE_DONE;
}
static bool db_sqlite3_query(struct db_stmt *stmt) static bool db_sqlite3_query(struct db_stmt *stmt)
{ {
sqlite3_stmt *s; sqlite3_stmt *s;
@ -173,6 +183,11 @@ static size_t db_sqlite3_count_changes(struct db_stmt *stmt)
return sqlite3_changes(s); return sqlite3_changes(s);
} }
static void db_sqlite3_close(struct db *db)
{
sqlite3_close(db->sql);
}
struct db_config db_sqlite3_config = { struct db_config db_sqlite3_config = {
.name = "sqlite3", .name = "sqlite3",
.queries = db_sqlite3_queries, .queries = db_sqlite3_queries,
@ -193,6 +208,8 @@ struct db_config db_sqlite3_config = {
.column_text_fn = &db_sqlite3_column_text, .column_text_fn = &db_sqlite3_column_text,
.count_changes_fn = &db_sqlite3_count_changes, .count_changes_fn = &db_sqlite3_count_changes,
.setup_fn = &db_sqlite3_setup,
.teardown_fn = &db_sqlite3_close,
}; };
AUTODATA(db_backends, &db_sqlite3_config); AUTODATA(db_backends, &db_sqlite3_config);