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

sqlite3: Move begin transaction and commit into the driver

Browse Source 
This has a slight side-effect of removing the actual begin and commit
statements from the `db_write` hooks, but they are mostly redundant anyway (no
harm in grouping pre-init statements into one transaction, and we know that
each post-init call is supposed to be wrapped anyway).

Signed-off-by: Christian Decker <decker.christian@gmail.com>
This commit is contained in:
Christian Decker 2019-08-08 21:21:12 +02:00 committed by Rusty Russell
parent 492d77f213
commit 716a3b11a5
3 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/plugins/dblog.py
View File

@ -16,9 +16,18 @@ def init(configuration, options, plugin):
plugin.conn = sqlite3.connect(plugin.get_option('dblog-file'),
isolation_level=None)
plugin.log("replaying pre-init data:")
plugin.conn.execute("PRAGMA foreign_keys = ON;")
print(plugin.sqlite_pre_init_cmds)
plugin.conn.execute("BEGIN TRANSACTION;")
for c in plugin.sqlite_pre_init_cmds:
plugin.conn.execute(c)
plugin.log("{}".format(c))
plugin.conn.execute("COMMIT;")
plugin.initted = True
plugin.log("initialized {}".format(configuration))
@ -29,9 +38,15 @@ def db_write(plugin, writes, **kwargs):
plugin.log("deferring {} commands".format(len(writes)))
plugin.sqlite_pre_init_cmds += writes
else:
print(writes)
plugin.conn.execute("BEGIN TRANSACTION;")
for c in writes:
plugin.conn.execute(c)
plugin.log("{}".format(c))
plugin.conn.execute("COMMIT;")
return True

21
wallet/db.c
View File

@ -789,30 +789,29 @@ size_t db_changes(struct db *db)
void db_begin_transaction_(struct db *db, const char *location)
{
bool ok;
if (db->in_transaction)
db_fatal("Already in transaction from %s", db->in_transaction);
db_prepare_for_changes(db);
db_do_exec(location, db, "BEGIN TRANSACTION;");
ok = db->config->begin_tx_fn(db);
if (!ok)
db_fatal("Failed to start DB transaction: %s", db->error);
db->in_transaction = location;
}
void db_commit_transaction(struct db *db)
{
int err;
char *errmsg;
const char *cmd = "COMMIT;";
bool ok;
assert(db->in_transaction);
db_assert_no_outstanding_statements();
ok = db->config->commit_tx_fn(db);
/* We expect at least the BEGIN TRANSACTION */
db_report_changes(db, cmd, 1);
err = sqlite3_exec(db->sql, cmd, NULL, NULL, &errmsg);
if (err != SQLITE_OK)
db_fatal("%s:%s:%s:%s", __func__, sqlite3_errstr(err), cmd, errmsg);
if (!ok)
db_fatal("Failed to commit DB transaction: %s", db->error);
db_report_changes(db, NULL, 0);
db->in_transaction = NULL;
}

3
wallet/test/run-wallet.c
View File

@ -1138,6 +1138,9 @@ static bool test_htlc_crud(struct lightningd *ld, const tal_t *ctx)
/* Make sure we have our references correct */
CHECK(transaction_wrap(w->db,
db_exec(__func__, w->db, "INSERT INTO channels (id) VALUES (1);")));
db_begin_transaction(w->db);
db_commit_transaction(w->db);
chan->dbid = 1;
chan->peer = peer;