diff --git a/processing/src/main/java/io/druid/segment/IndexMerger.java b/processing/src/main/java/io/druid/segment/IndexMerger.java index 56fdd4079fc..063cfbab644 100644 --- a/processing/src/main/java/io/druid/segment/IndexMerger.java +++ b/processing/src/main/java/io/druid/segment/IndexMerger.java @@ -45,7 +45,6 @@ import com.metamx.collections.spatial.RTree; import com.metamx.collections.spatial.split.LinearGutmanSplitStrategy; import com.metamx.common.IAE; import com.metamx.common.ISE; -import com.metamx.common.guava.CloseQuietly; import com.metamx.common.guava.FunctionalIterable; import com.metamx.common.guava.MergeIterable; import com.metamx.common.guava.nary.BinaryFn; @@ -522,11 +521,8 @@ public class IndexMerger long startTime = System.currentTimeMillis(); File indexFile = new File(v8OutDir, "index.drd"); - FileOutputStream fileOutputStream = null; - FileChannel channel = null; - try { - fileOutputStream = new FileOutputStream(indexFile); - channel = fileOutputStream.getChannel(); + try (FileOutputStream fileOutputStream = new FileOutputStream(indexFile); + FileChannel channel = fileOutputStream.getChannel()) { channel.write(ByteBuffer.wrap(new byte[]{IndexIO.V8_VERSION})); GenericIndexed.fromIterable(mergedDimensions, GenericIndexed.STRING_STRATEGY).writeToChannel(channel); @@ -544,12 +540,6 @@ public class IndexMerger serializerUtils.writeString(channel, String.format("%s/%s", minTime, maxTime)); serializerUtils.writeString(channel, mapper.writeValueAsString(indexSpec.getBitmapSerdeFactory())); } - finally { - CloseQuietly.close(channel); - channel = null; - CloseQuietly.close(fileOutputStream); - fileOutputStream = null; - } IndexIO.checkFileSize(indexFile); log.info("outDir[%s] completed index.drd in %,d millis.", v8OutDir, System.currentTimeMillis() - startTime); @@ -928,7 +918,7 @@ public class IndexMerger ); if (segmentMetadata != null && !segmentMetadata.isEmpty()) { - writeMetadataToFile( new File(v8OutDir, "metadata.drd"), segmentMetadata); + writeMetadataToFile(new File(v8OutDir, "metadata.drd"), segmentMetadata); log.info("wrote metadata.drd in outDir[%s].", v8OutDir); expectedFiles.add("metadata.drd"); @@ -994,9 +984,7 @@ public class IndexMerger { File indexFile = new File(inDir, "index.drd"); - FileChannel channel = null; - try { - channel = new FileOutputStream(indexFile).getChannel(); + try (FileChannel channel = new FileOutputStream(indexFile).getChannel()) { channel.write(ByteBuffer.wrap(new byte[]{versionId})); availableDimensions.writeToChannel(channel); @@ -1008,10 +996,6 @@ public class IndexMerger channel, mapper.writeValueAsString(bitmapSerdeFactory) ); } - finally { - CloseQuietly.close(channel); - channel = null; - } IndexIO.checkFileSize(indexFile); } @@ -1310,28 +1294,14 @@ public class IndexMerger private static void writeMetadataToFile(File metadataFile, Map metadata) throws IOException { - FileOutputStream metadataFileOutputStream = null; - FileChannel metadataFilechannel = null; - try { - metadataFileOutputStream = new FileOutputStream(metadataFile); - metadataFilechannel = metadataFileOutputStream.getChannel(); - + try (FileOutputStream metadataFileOutputStream = new FileOutputStream(metadataFile); + FileChannel metadataFilechannel = metadataFileOutputStream.getChannel() + ) { byte[] metadataBytes = mapper.writeValueAsBytes(metadata); if (metadataBytes.length != metadataFilechannel.write(ByteBuffer.wrap(metadataBytes))) { throw new IOException("Failed to write metadata for file"); } } - finally { - if (metadataFilechannel != null) { - metadataFilechannel.close(); - metadataFilechannel = null; - } - - if (metadataFileOutputStream != null) { - metadataFileOutputStream.close(); - metadataFileOutputStream = null; - } - } IndexIO.checkFileSize(metadataFile); } } diff --git a/processing/src/main/java/io/druid/segment/MetricHolder.java b/processing/src/main/java/io/druid/segment/MetricHolder.java index 4a731d9b7e8..62637912dce 100644 --- a/processing/src/main/java/io/druid/segment/MetricHolder.java +++ b/processing/src/main/java/io/druid/segment/MetricHolder.java @@ -22,7 +22,6 @@ import com.google.common.io.InputSupplier; import com.google.common.io.OutputSupplier; import com.metamx.common.IAE; import com.metamx.common.ISE; -import com.metamx.common.guava.CloseQuietly; import io.druid.common.utils.SerializerUtils; import io.druid.segment.data.CompressedFloatsIndexedSupplier; import io.druid.segment.data.CompressedFloatsSupplierSerializer; @@ -69,24 +68,15 @@ public class MetricHolder OutputSupplier outSupplier, String name, String typeName, GenericIndexedWriter column ) throws IOException { - OutputStream out = null; - InputStream in = null; - - try { - out = outSupplier.getOutput(); - + try (OutputStream out = outSupplier.getOutput()) { out.write(version); serializerUtils.writeString(out, name); serializerUtils.writeString(out, typeName); final InputSupplier supplier = column.combineStreams(); - in = supplier.getInput(); - - ByteStreams.copy(in, out); - } - finally { - CloseQuietly.close(out); - CloseQuietly.close(in); + try (InputStream in = supplier.getInput()) { + ByteStreams.copy(in, out); + } } }