Revision: 17329
http://sourceforge.net/p/gate/code/17329
Author: valyt
Date: 2014-02-18 11:52:45 +0000 (Tue, 18 Feb 2014)
Log Message:
-----------
Bug fix: after merging a set of archive files, restart the process of finding
candidate sets for merging.
Modified Paths:
--------------
mimir/branches/5.0/mimir-core/src/gate/mimir/index/DocumentCollection.java
Modified:
mimir/branches/5.0/mimir-core/src/gate/mimir/index/DocumentCollection.java
===================================================================
--- mimir/branches/5.0/mimir-core/src/gate/mimir/index/DocumentCollection.java
2014-02-17 17:24:45 UTC (rev 17328)
+++ mimir/branches/5.0/mimir-core/src/gate/mimir/index/DocumentCollection.java
2014-02-18 11:52:45 UTC (rev 17329)
@@ -462,7 +462,6 @@
synchronized(collectionFiles) {
// open the newly saved zip file
collectionFiles.add(new
CollectionFile(collectionFileWriter.zipFile));
-
}
// open a new one and try again
openCollectionWriter();
@@ -610,7 +609,11 @@
for(int j = intervalStart; j <= intervalEnd; j++) {
if(colFilesArr[j] != collectionFiles.get(j)) {
logger.warn("Collection files have changed since the "
- + "compacting operation started. Compact aborted.");
+ + "compacting operation started. Compact aborted." +
+ "Details: " + colFilesArr[j].file.getAbsolutePath() +
+ " not the same as " +
+ collectionFiles.get(j).file.getAbsolutePath());
+
// delete the newly created collection file
newZipFile.delete();
return;
@@ -637,13 +640,13 @@
// add new collection file
collectionFiles.add(intervalStart, new
CollectionFile(newCollectionFile));
}
- } else {
- // we only found an interval of length 1: start again
- intervalEnd = -1;
- intervalLength = 0;
- intervalEntries = 0;
- intervalBytes = 0;
}
+ // we found and merged an interval,
+ // or we only found an interval of length 1: start again
+ intervalEnd = -1;
+ intervalLength = 0;
+ intervalEntries = 0;
+ intervalBytes = 0;
}
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Managing the Performance of Cloud-Based Applications
Take advantage of what the Cloud has to offer - Avoid Common Pitfalls.
Read the Whitepaper.
http://pubads.g.doubleclick.net/gampad/clk?id=121054471&iu=/4140/ostg.clktrk
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
