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

Reduce memory consumption of full-text index clear

Browse source
This commit is contained in:
Dan Stillman 2018-08-19 03:59:34 -04:00
parent 18021d1aeb
commit 926e2f7317
1 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

24
chrome/content/zotero/xpcom/fulltext.js
View file

@ -1447,8 +1447,8 @@ Zotero.Fulltext = Zotero.FullText = new function(){
* *
* @return {Promise} * @return {Promise}
*/ */
this.clearIndex = function (skipLinkedURLs) { this.clearIndex = async function (skipLinkedURLs) {
return Zotero.DB.executeTransaction(function* () { await Zotero.DB.executeTransaction(async function () {
var sql = "DELETE FROM fulltextItems"; var sql = "DELETE FROM fulltextItems";
if (skipLinkedURLs) { if (skipLinkedURLs) {
var linkSQL = "SELECT itemID FROM itemAttachments WHERE linkMode =" var linkSQL = "SELECT itemID FROM itemAttachments WHERE linkMode ="
@ -1456,23 +1456,23 @@ Zotero.Fulltext = Zotero.FullText = new function(){
sql += " WHERE itemID NOT IN (" + linkSQL + ")"; sql += " WHERE itemID NOT IN (" + linkSQL + ")";
} }
yield Zotero.DB.queryAsync(sql); await Zotero.DB.queryAsync(sql);
sql = "DELETE FROM fulltextItemWords"; sql = "DELETE FROM fulltextItemWords";
if (skipLinkedURLs) { if (skipLinkedURLs) {
sql += " WHERE itemID NOT IN (" + linkSQL + ")"; sql += " WHERE itemID NOT IN (" + linkSQL + ")";
} }
yield Zotero.DB.queryAsync(sql); await Zotero.DB.queryAsync(sql);
});
if (skipLinkedURLs) { if (skipLinkedURLs) {
yield this.purgeUnusedWords(); await this.purgeUnusedWords();
} }
else { else {
yield Zotero.DB.queryAsync("DELETE FROM fulltextWords"); await Zotero.DB.queryAsync("DELETE FROM fulltextWords");
} }
yield clearCacheFiles(); await clearCacheFiles();
}.bind(this));
} }