mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix one cause of "operation timed out" during sync

Browse source 
Remove some unnecessary transactions in Sync.Data.Local
This commit is contained in:
Dan Stillman 2017-06-16 01:50:17 -04:00
parent 3e0ab63b9b
commit 8de0b024f0
1 changed files with 50 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

8
chrome/content/zotero/xpcom/sync/syncLocal.js
View file

@ -640,7 +640,6 @@ Zotero.Sync.Data.Local = {
var sql = "INSERT OR REPLACE INTO syncCache "
+ "(libraryID, key, syncObjectTypeID, version, data) VALUES ";
var chunkSize = Math.floor(Zotero.DB.MAX_BOUND_PARAMETERS / 5);
return Zotero.DB.executeTransaction(function* () {
return Zotero.Utilities.Internal.forEachChunkAsync(
jsonArray,
chunkSize,
@ -655,7 +654,6 @@ Zotero.Sync.Data.Local = {
);
})
);
}.bind(this));
}),
@ -1646,7 +1644,6 @@ Zotero.Sync.Data.Local = {
var syncObjectTypeID = Zotero.Sync.Data.Utilities.getSyncObjectTypeID(objectType);
var sql = "DELETE FROM syncDeleteLog WHERE libraryID=? AND syncObjectTypeID=? AND key IN (";
return Zotero.DB.executeTransaction(function* () {
return Zotero.Utilities.Internal.forEachChunkAsync(
keys,
Zotero.DB.MAX_BOUND_PARAMETERS - 2,
@ -1657,7 +1654,6 @@ Zotero.Sync.Data.Local = {
);
})
);
}.bind(this));
},
@ -1691,7 +1687,6 @@ Zotero.Sync.Data.Local = {
);
// Insert or update
yield Zotero.DB.executeTransaction(function* () {
var sql = "INSERT OR REPLACE INTO syncQueue "
+ "(libraryID, key, syncObjectTypeID, lastCheck, tries) VALUES ";
return Zotero.Utilities.Internal.forEachChunkAsync(
@ -1708,7 +1703,6 @@ Zotero.Sync.Data.Local = {
);
}
);
}.bind(this));
}),
@ -1746,7 +1740,6 @@ Zotero.Sync.Data.Local = {
removeObjectsFromSyncQueue: function (objectType, libraryID, keys) {
var syncObjectTypeID = Zotero.Sync.Data.Utilities.getSyncObjectTypeID(objectType);
var sql = "DELETE FROM syncQueue WHERE libraryID=? AND syncObjectTypeID=? AND key IN (";
return Zotero.DB.executeTransaction(function* () {
return Zotero.Utilities.Internal.forEachChunkAsync(
keys,
Zotero.DB.MAX_BOUND_PARAMETERS - 2,
@ -1757,7 +1750,6 @@ Zotero.Sync.Data.Local = {
);
})
);
}.bind(this));
},