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

ensure we close the dv consumer even if we hit exception when writing 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene4547@1436430 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Muir 2013-01-21 15:55:25 +00:00
parent ba67596a0e
commit 7c35e206ce
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lucene/core/src/java/org/apache/lucene/index/DocValuesProcessor.java
View File

@ -26,6 +26,7 @@ import org.apache.lucene.codecs.DocValuesFormat;
import org.apache.lucene.index.FieldInfo.DocValuesType; import org.apache.lucene.index.FieldInfo.DocValuesType;
import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.Counter; import org.apache.lucene.util.Counter;
import org.apache.lucene.util.IOUtils;
final class DocValuesProcessor extends StoredFieldsConsumer { final class DocValuesProcessor extends StoredFieldsConsumer {
@ -80,26 +81,22 @@ final class DocValuesProcessor extends StoredFieldsConsumer {
void flush(SegmentWriteState state) throws IOException { void flush(SegmentWriteState state) throws IOException {
if (!writers.isEmpty()) { if (!writers.isEmpty()) {
DocValuesFormat fmt = state.segmentInfo.getCodec().docValuesFormat(); DocValuesFormat fmt = state.segmentInfo.getCodec().docValuesFormat();
// nocommit once we make
// Codec.simpleDocValuesFormat abstract, change
// this to assert fmt != null!
if (fmt == null) {
return;
}
DocValuesConsumer dvConsumer = fmt.fieldsConsumer(state); DocValuesConsumer dvConsumer = fmt.fieldsConsumer(state);
// nocommit change to assert != null: boolean success = false;
if (dvConsumer == null) { try {
return; for(DocValuesWriter writer : writers.values()) {
writer.finish(state.segmentInfo.getDocCount());
writer.flush(state, dvConsumer);
}
writers.clear();
success = true;
} finally {
if (success) {
IOUtils.close(dvConsumer);
} else {
IOUtils.closeWhileHandlingException(dvConsumer);
}
} }
for(DocValuesWriter writer : writers.values()) {
writer.finish(state.segmentInfo.getDocCount());
writer.flush(state, dvConsumer);
}
writers.clear();
dvConsumer.close();
} }
} }