cutting 2004/06/09 04:28:46
Modified: . CHANGES.txt
src/java/org/apache/lucene/index IndexWriter.java
Log:
Fixed a bug where obsolete segment files were not deleted on Win32.
Revision Changes Path
1.93 +3 -1 jakarta-lucene/CHANGES.txt
Index: CHANGES.txt
===================================================================
RCS file: /home/cvs/jakarta-lucene/CHANGES.txt,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- CHANGES.txt 7 Jun 2004 16:55:51 -0000 1.92
+++ CHANGES.txt 9 Jun 2004 11:28:46 -0000 1.93
@@ -25,6 +25,8 @@
termFreq(), termDocs() or termPositions() to improve
multi-threaded performance. (cutting)
+ 6. Fix a bug where obsolete segment files were not deleted on Win32.
+
1.4 RC3
1.31 +4 -2 jakarta-lucene/src/java/org/apache/lucene/index/IndexWriter.java
Index: IndexWriter.java
===================================================================
RCS file:
/home/cvs/jakarta-lucene/src/java/org/apache/lucene/index/IndexWriter.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- IndexWriter.java 20 Apr 2004 19:33:35 -0000 1.30
+++ IndexWriter.java 9 Jun 2004 11:28:46 -0000 1.31
@@ -490,6 +490,9 @@
segmentInfos.addElement(new SegmentInfo(mergedName, mergedDocCount,
directory));
+ // close readers before we attempt to delete now-obsolete segments
+ merger.closeReaders();
+
synchronized (directory) { // in- & inter-process sync
new Lock.With(directory.makeLock(IndexWriter.COMMIT_LOCK_NAME),
COMMIT_LOCK_TIMEOUT) {
public Object doBody() throws IOException {
@@ -499,8 +502,7 @@
}
}.run();
}
-
- merger.closeReaders();
+
}
/* Some operating systems (e.g. Windows) don't permit a file to be deleted
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
