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

Don't use single DB transaction when rebuilding full-text index

Browse source 
This might slow down the rebuild, but it will hopefully also prevent
excessive memory usage and crashing.
This commit is contained in:
Dan Stillman 2013-11-16 15:54:31 -05:00
parent fb03c87305
commit cb41a2ecd6
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -425,6 +425,8 @@ Zotero.Fulltext = new function(){
} }
} }
Zotero.DB.beginTransaction();
this.indexString(text, charset, itemID); this.indexString(text, charset, itemID);
// Record the number of characters indexed (unless we're indexing a (PDF) cache file, // Record the number of characters indexed (unless we're indexing a (PDF) cache file,
@ -433,6 +435,8 @@ Zotero.Fulltext = new function(){
this.setChars(itemID, { indexed: text.length, total: totalChars }); this.setChars(itemID, { indexed: text.length, total: totalChars });
} }
Zotero.DB.commitTransaction();
return true; return true;
} }
@ -540,8 +544,6 @@ Zotero.Fulltext = new function(){
var items = Zotero.Items.get(items); var items = Zotero.Items.get(items);
var found = []; var found = [];
Zotero.DB.beginTransaction();
for each (let item in items) { for each (let item in items) {
if (!item.isAttachment()) { if (!item.isAttachment()) {
continue; continue;
@ -569,8 +571,6 @@ Zotero.Fulltext = new function(){
this.indexFile(file, item.attachmentMIMEType, item.attachmentCharset, itemID, complete); this.indexFile(file, item.attachmentMIMEType, item.attachmentCharset, itemID, complete);
} }
} }
Zotero.DB.commitTransaction();
} }
@ -1351,8 +1351,6 @@ Zotero.Fulltext = new function(){
function rebuildIndex(unindexedOnly){ function rebuildIndex(unindexedOnly){
Zotero.DB.beginTransaction();
// Get all attachments other than web links // Get all attachments other than web links
var sql = "SELECT itemID FROM itemAttachments WHERE linkMode!=" var sql = "SELECT itemID FROM itemAttachments WHERE linkMode!="
+ Zotero.Attachments.LINK_MODE_LINKED_URL; + Zotero.Attachments.LINK_MODE_LINKED_URL;
@ -1362,11 +1360,13 @@ Zotero.Fulltext = new function(){
} }
var items = Zotero.DB.columnQuery(sql); var items = Zotero.DB.columnQuery(sql);
if (items) { if (items) {
Zotero.DB.beginTransaction();
Zotero.DB.query("DELETE FROM fulltextItemWords WHERE itemID IN (" + sql + ")"); Zotero.DB.query("DELETE FROM fulltextItemWords WHERE itemID IN (" + sql + ")");
Zotero.DB.query("DELETE FROM fulltextItems WHERE itemID IN (" + sql + ")"); Zotero.DB.query("DELETE FROM fulltextItems WHERE itemID IN (" + sql + ")");
Zotero.DB.commitTransaction();
this.indexItems(items, false, true); this.indexItems(items, false, true);
} }
Zotero.DB.commitTransaction();
} }