Implement SQLiteBatch::Close

achow101 · achow101 · commit 6636a2608a4e · 2020-10-14T11:28:18.000-04:00
diff --git a/src/wallet/sqlite.cpp b/src/wallet/sqlite.cpp
@@ -182,6 +182,14 @@ SQLiteBatch::SQLiteBatch(SQLiteDatabase& database)
 
 void SQLiteBatch::Close()
 {
+    // If m_db is in a transaction (i.e. not in autocommit mode), then abort the transaction in progress
+    if (m_database.m_db && sqlite3_get_autocommit(m_database.m_db) == 0) {
+        if (TxnAbort()) {
+            LogPrintf("SQLiteBatch: Batch closed unexpectedly without the transaction being explicitly committed or aborted\n");
+        } else {
+            LogPrintf("SQLiteBatch: Batch closed and failed to abort transaction\n");
+        }
+    }
 }
 
 bool SQLiteBatch::ReadKey(CDataStream&& key, CDataStream& value)

Original file line number	Diff line number	Diff line change
`@@ -182,6 +182,14 @@ SQLiteBatch::SQLiteBatch(SQLiteDatabase& database)`
`182`	`182`
`183`	`183`	`void SQLiteBatch::Close()`
`184`	`184`	`{`
	`185`	`+ // If m_db is in a transaction (i.e. not in autocommit mode), then abort the transaction in progress`
	`186`	`+ if (m_database.m_db && sqlite3_get_autocommit(m_database.m_db) == 0) {`
	`187`	`+ if (TxnAbort()) {`
	`188`	`+ LogPrintf("SQLiteBatch: Batch closed unexpectedly without the transaction being explicitly committed or aborted\n");`
	`189`	`+ } else {`
	`190`	`+ LogPrintf("SQLiteBatch: Batch closed and failed to abort transaction\n");`
	`191`	`+ }`
	`192`	`+ }`
`185`	`193`	`}`
`186`	`194`
`187`	`195`	`bool SQLiteBatch::ReadKey(CDataStream&& key, CDataStream& value)`