www

commit 701a46ba84a37e54baa9130bd677f8e6db246ecb
parent fd7c2a6f6f163ac5500a1655e567161ddf29cfb1
Author: Dan Stillman <dstillman@zotero.org>
Date:   Tue, 11 Jul 2017 04:28:40 -0400

Batch object deletions during syncing

Diffstat:
M
chrome/content/zotero/xpcom/sync/syncEngine.js
 | 
23
+++++++++++++++--------

1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/chrome/content/zotero/xpcom/sync/syncEngine.js b/chrome/content/zotero/xpcom/sync/syncEngine.js
@@ -765,6 +765,8 @@ Zotero.Sync.Data.Engine.prototype._restoreRestoredCollectionItems = async functi
  * @return {Promise<Integer>} - A download result code (this.DOWNLOAD_RESULT_*)
  */
 Zotero.Sync.Data.Engine.prototype._downloadDeletions = Zotero.Promise.coroutine(function* (since, newLibraryVersion) {
+	const batchSize = 50;
+	
 	let results = yield this.apiClient.getDeleted(
 		this.library.libraryType,
 		this.libraryTypeID,
@@ -856,10 +858,9 @@ Zotero.Sync.Data.Engine.prototype._downloadDeletions = Zotero.Promise.coroutine(
 				Zotero.debug("Cancelling sync");
 				throw new Zotero.Sync.UserCancelledException();
 			}
-			let concurrentObjects = 50;
 			yield Zotero.Utilities.Internal.forEachChunkAsync(
 				mergeData,
-				concurrentObjects,
+				batchSize,
 				function (chunk) {
 					return Zotero.DB.executeTransaction(function* () {
 						for (let json of chunk) {
@@ -882,14 +883,20 @@ Zotero.Sync.Data.Engine.prototype._downloadDeletions = Zotero.Promise.coroutine(
 		}
 		
 		if (toDelete.length) {
-			yield Zotero.DB.executeTransaction(function* () {
-				for (let obj of toDelete) {
-					yield obj.erase({
-						skipEditCheck: true,
-						skipDeleteLog: true
+			yield Zotero.Utilities.Internal.forEachChunkAsync(
+				toDelete,
+				batchSize,
+				function (chunk) {
+					return Zotero.DB.executeTransaction(function* () {
+						for (let obj of chunk) {
+							yield obj.erase({
+								skipEditCheck: true,
+								skipDeleteLog: true
+							});
+						}
 					});
 				}
-			});
+			);
 		}
 	}