You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2014/12/10 22:30:36 UTC
svn commit: r1644528 - in /lucene/dev/branches/branch_5x: ./ lucene/
lucene/core/ lucene/core/src/java/org/apache/lucene/index/SegmentMerger.java
Author: rmuir
Date: Wed Dec 10 21:30:36 2014
New Revision: 1644528
URL: http://svn.apache.org/r1644528
Log:
simplify exception handling
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/lucene/ (props changed)
lucene/dev/branches/branch_5x/lucene/core/ (props changed)
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SegmentMerger.java
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SegmentMerger.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SegmentMerger.java?rev=1644528&r1=1644527&r2=1644528&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SegmentMerger.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SegmentMerger.java Wed Dec 10 21:30:36 2014
@@ -28,7 +28,6 @@ import org.apache.lucene.codecs.StoredFi
import org.apache.lucene.codecs.TermVectorsWriter;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.IOContext;
-import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.InfoStream;
/**
@@ -152,32 +151,14 @@ final class SegmentMerger {
}
private void mergeDocValues(SegmentWriteState segmentWriteState) throws IOException {
- DocValuesConsumer consumer = codec.docValuesFormat().fieldsConsumer(segmentWriteState);
- boolean success = false;
- try {
+ try (DocValuesConsumer consumer = codec.docValuesFormat().fieldsConsumer(segmentWriteState)) {
consumer.merge(mergeState);
- success = true;
- } finally {
- if (success) {
- IOUtils.close(consumer);
- } else {
- IOUtils.closeWhileHandlingException(consumer);
- }
}
}
private void mergeNorms(SegmentWriteState segmentWriteState) throws IOException {
- NormsConsumer consumer = codec.normsFormat().normsConsumer(segmentWriteState);
- boolean success = false;
- try {
+ try (NormsConsumer consumer = codec.normsFormat().normsConsumer(segmentWriteState)) {
consumer.merge(mergeState);
- success = true;
- } finally {
- if (success) {
- IOUtils.close(consumer);
- } else {
- IOUtils.closeWhileHandlingException(consumer);
- }
}
}
@@ -197,21 +178,9 @@ final class SegmentMerger {
* @throws IOException if there is a low-level IO error
*/
private int mergeFields() throws IOException {
- final StoredFieldsWriter fieldsWriter = codec.storedFieldsFormat().fieldsWriter(directory, mergeState.segmentInfo, context);
-
- boolean success = false;
- int numDocs;
- try {
- numDocs = fieldsWriter.merge(mergeState);
- success = true;
- } finally {
- if (success) {
- IOUtils.close(fieldsWriter);
- } else {
- IOUtils.closeWhileHandlingException(fieldsWriter);
- }
+ try (StoredFieldsWriter fieldsWriter = codec.storedFieldsFormat().fieldsWriter(directory, mergeState.segmentInfo, context)) {
+ return fieldsWriter.merge(mergeState);
}
- return numDocs;
}
/**
@@ -219,35 +188,14 @@ final class SegmentMerger {
* @throws IOException if there is a low-level IO error
*/
private int mergeVectors() throws IOException {
- final TermVectorsWriter termVectorsWriter = codec.termVectorsFormat().vectorsWriter(directory, mergeState.segmentInfo, context);
-
- boolean success = false;
- int numDocs;
- try {
- numDocs = termVectorsWriter.merge(mergeState);
- success = true;
- } finally {
- if (success) {
- IOUtils.close(termVectorsWriter);
- } else {
- IOUtils.closeWhileHandlingException(termVectorsWriter);
- }
+ try (TermVectorsWriter termVectorsWriter = codec.termVectorsFormat().vectorsWriter(directory, mergeState.segmentInfo, context)) {
+ return termVectorsWriter.merge(mergeState);
}
- return numDocs;
}
private void mergeTerms(SegmentWriteState segmentWriteState) throws IOException {
- FieldsConsumer consumer = codec.postingsFormat().fieldsConsumer(segmentWriteState);
- boolean success = false;
- try {
+ try (FieldsConsumer consumer = codec.postingsFormat().fieldsConsumer(segmentWriteState)) {
consumer.merge(mergeState);
- success = true;
- } finally {
- if (success) {
- IOUtils.close(consumer);
- } else {
- IOUtils.closeWhileHandlingException(consumer);
- }
}
}
}