Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix silly bug that crept in during last trunk merge 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/realtime_search@1073625 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Busch 2011-02-23 07:29:02 +00:00
parent 541a7263fa
commit 05bfc58294
1 changed files with 45 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
lucene/src/java/org/apache/lucene/index/IndexWriter.java
View File

@ -2085,12 +2085,12 @@ public class IndexWriter implements Closeable {
setDiagnostics(newSegment, "flush");
if (useCompoundFile(newSegment)) {
String compoundFileName = IndexFileNames.segmentFileName(newSegment.name, "", IndexFileNames.COMPOUND_FILE_EXTENSION);
message("creating compound file " + compoundFileName);
boolean success = false;
try {
if (useCompoundFile(newSegment)) {
String compoundFileName = IndexFileNames.segmentFileName(newSegment.name, "", IndexFileNames.COMPOUND_FILE_EXTENSION);
message("creating compound file " + compoundFileName);
// Now build compound file
boolean success = false;
try {
CompoundFileWriter cfsWriter = new CompoundFileWriter(directory, compoundFileName);
for(String fileName : newSegment.files()) {
cfsWriter.addFile(fileName);
@ -2103,56 +2103,55 @@ public class IndexWriter implements Closeable {
}
newSegment.setUseCompoundFile(true);
}
// Must write deleted docs after the CFS so we don't
// slurp the del file into CFS:
if (deletedDocs != null) {
final int delCount = deletedDocs.count();
assert delCount > 0;
newSegment.setDelCount(delCount);
newSegment.advanceDelGen();
final String delFileName = newSegment.getDelFileName();
if (infoStream != null) {
message("flush: write " + delCount + " deletes to " + delFileName);
}
boolean success2 = false;
try {
// TODO: in the NRT case it'd be better to hand
// this del vector over to the
// shortly-to-be-opened SegmentReader and let it
// carry the changes; there's no reason to use
// filesystem as intermediary here.
deletedDocs.write(directory, delFileName);
success2 = true;
} finally {
if (!success2) {
try {
directory.deleteFile(delFileName);
} catch (Throwable t) {
// suppress this so we keep throwing the
// original exception
}
}
}
// Must write deleted docs after the CFS so we don't
// slurp the del file into CFS:
if (deletedDocs != null) {
final int delCount = deletedDocs.count();
assert delCount > 0;
newSegment.setDelCount(delCount);
newSegment.advanceDelGen();
final String delFileName = newSegment.getDelFileName();
if (infoStream != null) {
message("flush: write " + delCount + " deletes to " + delFileName);
}
success = true;
} finally {
if (!success) {
if (infoStream != null) {
message("hit exception " +
"reating compound file for newly flushed segment " + newSegment.name);
}
synchronized(this) {
deleter.refresh(newSegment.name);
boolean success2 = false;
try {
// TODO: in the NRT case it'd be better to hand
// this del vector over to the
// shortly-to-be-opened SegmentReader and let it
// carry the changes; there's no reason to use
// filesystem as intermediary here.
deletedDocs.write(directory, delFileName);
success2 = true;
} finally {
if (!success2) {
try {
directory.deleteFile(delFileName);
} catch (Throwable t) {
// suppress this so we keep throwing the
// original exception
}
}
}
}
success = true;
} finally {
if (!success) {
if (infoStream != null) {
message("hit exception " +
"reating compound file for newly flushed segment " + newSegment.name);
}
synchronized(this) {
deleter.refresh(newSegment.name);
}
}
}
synchronized(this) {
segmentInfos.add(newSegment);
checkpoint();