Skip to content

CS-2286 Fix SQLite write ahead logging checkpoint corruption on M1 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ValeriyLapin merged 1 commit into from
Mar 5, 2026
+2 −1
Merged

CS-2286 Fix SQLite write ahead logging checkpoint corruption on M1 #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Source/CBL_SQLiteStorage.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@ - (BOOL) openFMDB: (NSError**)outError {

// Register CouchDB-compatible JSON collation functions:
sqlite3* dbHandle = _fmdb.sqliteHandle;
sqlite3_busy_timeout(dbHandle, 5000);
sqlite3_create_collation(dbHandle, "JSON", SQLITE_UTF8,
kCBLCollateJSON_Unicode, CBLCollateJSON);
sqlite3_create_collation(dbHandle, "JSON_RAW", SQLITE_UTF8,
Expand Down Expand Up @@ -2209,7 +2210,7 @@ - (BOOL) compact: (NSError**)outError {
Log(@" ... deleted %d revisions", _fmdb.changes);

Log(@"Flushing SQLite WAL...");
if (![_fmdb executeUpdate: @"PRAGMA wal_checkpoint(RESTART)"])
if (![_fmdb executeUpdate: @"PRAGMA wal_checkpoint(PASSIVE)"])
return CBLStatusToOutNSError(self.lastDbError, outError);

Log(@"Vacuuming SQLite database...");
Expand Down