suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set locking_mode=EXCLUSIVE only for main database in Zotero.DBConnection

Browse Source 
Otherwise attached databases are also exclusive
This commit is contained in:
Dan Stillman 2018-02-20 03:46:29 -05:00
parent 6ff51103f5
commit 52737ec694
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
chrome/content/zotero/xpcom/db.js
View File

@ -879,7 +879,7 @@ Zotero.DBConnection.prototype.vacuum = function () {
// TEMP // TEMP
Zotero.DBConnection.prototype.info = Zotero.Promise.coroutine(function* () { Zotero.DBConnection.prototype.info = Zotero.Promise.coroutine(function* () {
var info = {}; var info = {};
var pragmas = ['auto_vacuum', 'cache_size', 'locking_mode', 'page_size']; var pragmas = ['auto_vacuum', 'cache_size', 'main.locking_mode', 'page_size'];
for (let p of pragmas) { for (let p of pragmas) {
info[p] = yield Zotero.DB.valueQueryAsync(`PRAGMA ${p}`); info[p] = yield Zotero.DB.valueQueryAsync(`PRAGMA ${p}`);
} }
@ -1038,7 +1038,7 @@ Zotero.DBConnection.prototype.backupDatabase = Zotero.Promise.coroutine(function
// the lock is lost // the lock is lost
try { try {
if (DB_LOCK_EXCLUSIVE) { if (DB_LOCK_EXCLUSIVE) {
yield this.queryAsync("PRAGMA locking_mode=NORMAL", false, { inBackup: true }); yield this.queryAsync("PRAGMA main.locking_mode=NORMAL", false, { inBackup: true });
} }
storageService.backupDatabaseFile(file, OS.Path.basename(tmpFile), file.parent); storageService.backupDatabaseFile(file, OS.Path.basename(tmpFile), file.parent);
} }
@ -1049,7 +1049,7 @@ Zotero.DBConnection.prototype.backupDatabase = Zotero.Promise.coroutine(function
} }
finally { finally {
if (DB_LOCK_EXCLUSIVE) { if (DB_LOCK_EXCLUSIVE) {
yield this.queryAsync("PRAGMA locking_mode=EXCLUSIVE", false, { inBackup: true }); yield this.queryAsync("PRAGMA main.locking_mode=EXCLUSIVE", false, { inBackup: true });
} }
} }
@ -1288,10 +1288,10 @@ Zotero.DBConnection.prototype._getConnectionAsync = Zotero.Promise.coroutine(fun
} }
if (DB_LOCK_EXCLUSIVE) { if (DB_LOCK_EXCLUSIVE) {
yield this.queryAsync("PRAGMA locking_mode=EXCLUSIVE"); yield this.queryAsync("PRAGMA main.locking_mode=EXCLUSIVE");
} }
else { else {
yield this.queryAsync("PRAGMA locking_mode=NORMAL"); yield this.queryAsync("PRAGMA main.locking_mode=NORMAL");
} }
// Set page cache size to 8MB // Set page cache size to 8MB